jufubao-admin-library 1.1.59 → 1.1.61

package/library/pageComponents/modules/JfbProductSku.vue

@@ -24,11 +24,11 @@
 				{{$xdHelper.divisionFloatNumber(inScope.row.volume, 100)}}m³
 			</template>
       <template slot="jfb_price_ratio" slot-scope="inScope">
-        <div>货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
+        <div v-if="inScope.row.purchase_div_jfb_discount_ratio">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
         <div v-if="inScope.row.dist_div_jfb_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_jfb_discount_ratio, 1000)}}</span>折</div>
       </template>
        <template slot="market_price_ratio" slot-scope="inScope">
-        <div>货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_market_discount_ratio, 1000)}}</span>折</div>
+        <div v-if="inScope.row.purchase_div_market_discount_ratio">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_market_discount_ratio, 1000)}}</span>折</div>
         <div v-if="inScope.row.dist_div_market_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_market_discount_ratio, 1000)}}</span>折</div>
       </template>
 		</xd-table>
@@ -75,6 +75,8 @@
         datePricesRow:null,
         sku_name:'',
         isShowPurchasePrice: false,
+        isShowJfbPriceRatio: false,
+        isShowMarketPriceRatio: false
 			}
 		},
     computed:{
@@ -137,9 +139,9 @@
           {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
           this.isShowPurchasePrice && {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},
           {"type": "price", "prop": "jfb_price", "align": "center", "min-width": 80, "label": "建议零售价"},
-          {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
+          this.isShowJfbPriceRatio && {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
           {"type": "price", "prop": "market_price", "align": "center", "min-width": 80, "label": "市场价"},
-          {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
+          this.isShowMarketPriceRatio && {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
           {"type": "normal", "prop": "init_num", "align": "left", "min-width": 80, "label": "库存"},
           {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
           {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
@@ -165,6 +167,8 @@
     created(){
       if(this.productSkuList && this.productSkuList.length && this.productSkuList.length > 0) {
         this.isShowPurchasePrice = this.productSkuList[0].specs.purchase_price > 0;
+        this.isShowJfbPriceRatio = (this.productSkuList[0].specs.purchase_div_jfb_discount_ratio || this.productSkuList[0].specs.dist_div_jfb_discount_ratio)?true:false;
+        this.isShowMarketPriceRatio = (this.productSkuList[0].specs.purchase_div_market_discount_ratio || this.productSkuList[0].specs.dist_div_market_discount_ratio)?true:false;
       }
     },
 		methods: {

package/library/viewModules/viewCardsGift/viewCardsGift/config.vue

@@ -97,7 +97,7 @@
                     v-if="item.nickName"
                     :style="{
                       color: item.color,
-                      fontSize: item['material_font_size'] + 4 + 'px',
+                      fontSize: Number(item['material_font_size']) + 4 + 'px',
                       paddingBottom: item['material_p_spacing'] + 'px'
                     }"
                   >{{item.nickName}}</div>
@@ -117,10 +117,10 @@
                     :style="{
                       color: item.color,
                        paddingTop: item['material_p_spacing'] + 'px',
-                       fontSize: item['material_font_size'] + 4 + 'px',
+                       fontSize: Number(item['material_font_size']) + 4 + 'px',
                     }"
                   >{{item.companyName}}</div>
-                  <div class="iphone-box-content__text-btn" v-if="key === 'detail'" :style="{paddingTop: item['material_p_spacing'] + 'px',}">
+                  <div class="iphone-box-content__text-btn" v-if="key === 'detail'" :style="{paddingTop: item['material_b_spacing'] + 'px',}">
                     <div>去签收</div>
                   </div>
                 </div>
@@ -675,6 +675,7 @@ export default {
       let fontSize = 28;
       let lineHeight = 50;
       let spacing = 20;
+      let bSpacing = 100
 
       //详情
       if(this.mainActive === 'material_detail_config') {
@@ -815,6 +816,14 @@ export default {
           className: "input100",
           type:'number',
         },
+        this.mainActive === 'material_detail_config'&&params['material_status'] ==='Y' && {
+          label: "按钮间距",
+          ele: "el-input",
+          value: params['material_b_spacing'] || bSpacing ,
+          valueKey: "material_b_spacing",
+          className: "input100",
+          type:'number',
+        },
 
 
       ].filter(i=>i);
@@ -838,6 +847,7 @@ export default {
       let fontSize = 28;
       let lineHeight = 50;
       let spacing = 20;
+      let bSpacing = 100;
 
       //详情
       if(params['key'] === 'material_detail_config') {
@@ -849,9 +859,10 @@ export default {
         fontSize = 32;
         lineHeight = 60;
         spacing = 50;
+        bSpacing = 100;
       }
-      params['companyName'] = (item['material_end'] ||'') .replace('{{company}}','聚福宝福利');
-      params['nickName'] = (item['material_nickname'] ||'') .replace('{{name}}','李婷夏');
+      params['companyName'] = (item['material_end'] ||'') .replace('{{company}}','xxxx');
+      params['nickName'] = (item['material_nickname'] ||'') .replace('{{name}}','xxx');
       params['isText'] = (item['material_status'] || 'Y') === 'Y';
       params['outHeight'] = (item['material_height'] || defaultHeight);
       if(params['outHeight'] > 1246) params['outHeight'] = params['outHeight'] - 21*1334/750;
@@ -859,6 +870,7 @@ export default {
       params['material_line_height'] = item['material_line_height'] || lineHeight;
       params['material_font_size'] = Number(item['material_font_size'] || fontSize);
       params['material_p_spacing'] = Number(item['material_p_spacing'] || spacing);
+      params['material_b_spacing'] = Number(item['material_b_spacing'] || spacing);
       params['colorText'] = Color(item['material_color'] || colorValue).alpha(0.9).toString();
       params['color'] = item['material_color'] || colorValue;
       params['material_content'] = item['material_content'] || '';

package/library/viewModules/viewCardsGift/viewCardsGift/list.vue

@@ -658,6 +658,7 @@ export default {
         align-items: center;
         & img {
           width: 100%;
+          height: 100%;
         }
         & i {
           font-size: 100px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.59",
+  "version": "1.1.61",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {