jufubao-admin-library 1.1.201 → 1.1.204

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -78,6 +78,20 @@
           </div>
           <div style="color: red;font-size: 12px;line-height: 18px;">设置后将按每周周几对应时间点调价，例如每周星期五17点~22点调价<br/>另所选时间是向后包含的，例如23时即为23:00:00~23:59:59</div>
         </el-form-item>
+      </template>
+      <template slot="sale_num_rank">
+        <el-form-item label="按销量排行:" prop="sale_num_rank">
+          <div style="display:flex">
+            <div style="margin-right:10px">前 </div>
+            <el-input
+            style="width: 40%;"
+            v-model="rankForm.sale_num_rank"
+            type="number"
+            placeholder="请输入销量排行"
+          ></el-input>
+          <div style="font-size:12px;color:#999;margin-left:10px">销量排行变更无法自动触发选品</div>
+          </div>
+        </el-form-item>
       </template>
 			</xd-base-dynamic-field>
 			<div v-if="!isView" class="adjust-btn" style="margin-left: 140px">
@@ -130,6 +144,9 @@
             { required: true, message: '请选择标签', trigger: 'change' }
           ],
         },
+        rankForm:{
+          sale_num_rank:'',
+        },
         valueFormat: 'HH',
         pickerOptions: { start: '01',end:'00',step:'01' },
         handTimeOptions:[{start:'',end:''}],
@@ -335,6 +352,10 @@
               this.tagForm.zTag = conditions.partner_product_tags['includes']
               // this.tagForm.fTag = conditions.partner_product_tags['excludes']
             }
+            //按销量排行
+            if (conditions.sale_num_rank !== undefined) {
+              this.rankForm.sale_num_rank = conditions.sale_num_rank
+            }
 
             //设置渠道选择值
             this.channelActiveName = agg_channel_code || this.channelTabList[0]['value'];
@@ -536,7 +557,9 @@
                  }
               }
             }
-
+            if(this.rankForm.sale_num_rank){
+              params['item']['conditions']['sale_num_rank'] = this.rankForm.sale_num_rank
+            }
             // console.log(params)
             // return;
 

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

@@ -110,7 +110,7 @@ export default {
     validateSaleNum(rule, value, callback){
       console.log(rule, value,'apapapap');
       if(value) {
-        if(value.end<value.start) {
+        if(Number(value.end)<Number(value.start)) {
           callback(new Error('结束值不能小于起始值'));
         } else {
           callback()
@@ -508,6 +508,10 @@ export default {
           },
           rules: [{ validator: this.validateSaleNum, trigger: 'blur' }],
         },
+        this.channelParams.scene === "select" &&{
+          ele:'slot',
+          slot:'sale_num_rank',
+        },
         this.checkConfig('is_push_gift') && {
           label: '是否推送至礼包:',
           ele: 'xd-radio',
@@ -1322,18 +1326,27 @@ export default {
     handleRemoteCategorySearch ({ node, resolve }) {
       let value = 0
       if (node.level !== 0) value = node.value
-      this.getChildrenAndProfitRate({
-        value,
-        agg_channel_code: this.channelActiveName
-      }).then(res => {
-        console.log(res,'res')
-        if(this.channelActiveName === 'jufubao') {
-          res.data.list.map(item=>{
-            item.profit_rate_string = '（'+item.profit_rate/100+'%）'
-          })
-        }
-        resolve(res.data.list)
-      }) .catch((err) => { console.error(err) })
+      if(this.channelParams.scene&&this.channelParams.scene==='select'){
+        this.getChildrenAndProfitRate({
+          value,
+          agg_channel_code: this.channelActiveName
+        }).then(res => {
+          console.log(res,'res')
+          if(this.channelActiveName === 'jufubao') {
+            res.data.list.map(item=>{
+              item.profit_rate_string = '（'+item.profit_rate/100+'%）'
+            })
+          }
+          resolve(res.data.list)
+        }) .catch((err) => { console.error(err) })
+      }else{
+        getOptions({ server: "product-partner", fn: "categories", path: "p4", params: { value } })
+        .then(res => {
+          resolve(res.data.list)
+        })
+        .catch((err) => { console.error(err) })
+      }
+      
     },
 
     /**

package/package.json

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