jufubao-admin-library 1.1.194 → 1.1.196

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -582,6 +582,22 @@ export default {
             },
           ],
         },
+        (this.$setting.system==='partner-mall'||this.$setting.system==='partner-movie')&&(this.channelParams&&this.channelParams.scene === 'selected')&&{
+          label: "是否置顶:", //label
+          ele: "xd-select-list", //package 名称
+          valueKey: "is_top", //form[valueKey]
+          value: [], //v-model
+          placeholder: "请选择是否置顶",
+          multiple: false, //多选
+          className:'input40',
+          list: [{
+            value:'Y',
+            label:'是'
+          },{
+            value:'N',
+            label:'否'
+          }],
+        },
       ].filter(i => i);
       this.searchStatus = true
       this.renderSearchKey = Date.now()

package/library/pageComponents/modules/JfbProductSku.vue

@@ -34,6 +34,10 @@
        <template slot="market_price_ratio" slot-scope="inScope">
         <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">{{$setting['system']==='open-dist'?'分销':'平台'}}：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_market_discount_ratio, 1000)}}</span>折</div>
+      </template>
+      <template slot="sale_price_ratio" slot-scope="inScope">
+        <div v-if="inScope.row.purchase_div_sale_discount_ratio">货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_sale_discount_ratio, 1000)}}</span>折</div>
+        <div v-if="inScope.row.dist_div_sale_discount_ratio">{{$setting['system']==='open-dist'?'分销':'平台'}}：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_sale_discount_ratio, 1000)}}</span>折</div>
       </template>
 		</xd-table>
     <xd-dialog
@@ -148,6 +152,8 @@
           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": "市场价"},
           this.isShowMarketPriceRatio && {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
+          this.isShowSalePrice&&{"type": "price", "prop": "sale_price", "align": "center", "min-width": 80, "label": "售价"},
+          this.isShowSalePriceRatio&&{"type": "price", "prop": "sale_price_ratio", "align": "center", "min-width": 140, "label": "售价折扣"},
           this.isShowOnNum && {"type": "normal", "prop": "on_num", "align": "center", "min-width": 80, "label": "库存"},
           {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
           {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
@@ -176,6 +182,8 @@
         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;
         this.isShowOnNum = ((this.productSkuList[0].stocks.on_num && this.productSkuList[0].stocks.on_num!==-1)||this.productSkuList[0].stocks.on_num==0)?true:false;
+        this.isShowSalePrice = (this.productSkuList[0].specs.sale_price ||this.productSkuList[0].specs.sale_price==0)?true:false;
+        this.isShowSalePriceRatio = (this.productSkuList[0].specs.purchase_div_sale_discount_ratio || this.productSkuList[0].specs.dist_div_sale_discount_ratio)?true:false;
       }
     },
 		methods: {

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -289,7 +289,15 @@ export default {
           value: params.sort !== undefined ? params.sort : '',
           placeholder: '请输入权重值',
           className: 'input20',
-          rules: [{ required: true, message: '请输入权重值', trigger: 'blur' }],
+          rules: [{
+            required: true,
+            validator(rule, value, callback) {
+              if(!value) callback(new Error('请输入权重值'))
+              else if (value.toString().length>8) callback('权重值不能超过8位数字')
+              else callback();
+            },
+            trigger: 'change'
+          }],
           notice: '按倒叙排列,数值越大越靠前',
           inline: true
         },
@@ -775,8 +783,12 @@ export default {
           className: 'input20',
           rules: [{
             required: true,
-            message: '请输入权重值',
-            trigger: 'blur'
+            validator(rule, value, callback) {
+              if(!value) callback(new Error('请输入权重值'))
+              else if (value.toString().length>8) callback('权重值不能超过8位数字')
+              else callback();
+            },
+            trigger: 'change'
           }],
           notice: '<span class="red">请输入数值，数值越大则会优先按照此规则进行调价</span>',
           inline: false

package/library/viewModules/viewStore/viewStore/rule/create.vue

@@ -101,16 +101,7 @@ export default {
       customRules: {},
       isMain:true,
       channelActive: '',
-      channelTabList:[
-        {
-          label:'聚福宝精选',
-          value:'1'
-        },
-        {
-          label:'聚福宝初筛',
-          value:'2'
-        }
-      ],
+      channelTabList:[],
       ruleOptions:{},
       brand_type:'',
       consume_mode:'',

package/package.json

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