jufubao-admin-library 1.1.203 → 1.1.205

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',

package/library/viewModules/viewWalking/schemas/walking.js

@@ -256,6 +256,26 @@ module.exports = {
       role: '',
       method:'put'
     },
+    // #ifdef saas-admin sms-walking
+    {
+      title: '健步走：地图 - 修改点位周期限制',
+      mapFn: "walkingPointPeriodLimit",
+      // #ifdef saas-admin
+      path: '/saas-app-company/v1/walking/x_map/point-period-limit/:id',
+      // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map/point-period-limit/:id',
+      // #endif
+      isRule: false,
+      data: {
+        id: ['点位ID', 'string', '必填'],
+        point_period_limit: ['点位周期限制', 'string', '必填'],
+      },
+      disabled: true,
+      role: '',
+      method: 'put'
+    },
+    // #endif
     {
       title: '健步走：地图 - 删除点位',
       mapFn: "walkingPointDelete",

package/library/viewModules/viewWalking/viewWalking/config.vue

@@ -37,6 +37,11 @@
           <span>到达点位颜色:</span>
           <el-color-picker v-model="color" size="small" @change="e => handleColorChange(e)"></el-color-picker>
         </div>
+        <div class="btn-item">
+          <el-tooltip content="在限制周期内未到达，即未完成也按未达到展示。" placement="top">
+            <span class="el-icon-question"></span>
+          </el-tooltip>
+        </div>
       </div>
       <div class="right">
         <el-button type="primary" round size="mini" @click="add">新增点位</el-button>
@@ -55,6 +60,19 @@
         >关闭辅助线</el-button>
       </div>
     </div>
+    <!-- #ifdef saas-admin sms-walking -->
+    <div>
+      <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item label="点位周期限制" required prop="isCycle">
+          <el-radio-group v-model="form.isCycle" @input="handleCycleChange">
+            <el-radio label="Y">开启</el-radio>
+            <el-radio label="N">关闭</el-radio>
+          </el-radio-group>
+          <div style="color: red;">开启后，将限制在指定周期内到达点位才算完成</div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- #endif -->
     <div class="container" :style="containerObjet">
       <div class="content" id="content"></div>
       <div
@@ -86,6 +104,7 @@
           :circle-color="color"
           :site_id="siteId"
           :typeData="typeData"
+          :is-cycle="form.isCycle"
           @onDelete="handleItemDelete"
           @onSubmit="handleItemSubmit"
           v-model="item.model"
@@ -154,8 +173,12 @@ export default {
       yLeft:15.2,
       yHeight: 15.2,
       siteId:'',
-      typeData:[],
-
+      typeData: [],
+      // #ifdef saas-admin sms-walking
+      form:{
+        isCycle:'',
+      }
+      // #endif
     };
   },
   computed:{
@@ -226,12 +249,16 @@ export default {
       'walkingPointColor',//点位颜色
       'walkingPointSize',//点位大小
       'walkingPointDelete',//删除点位
+      // #ifdef saas-admin sms-walking
+      'walkingPointPeriodLimit',//点位周期限制
+      // #endif
     ]),
     getInfo(){
       let loading = Loading.service({});
       this.containerDone = false;
       Promise.all([this.getDetail(),this.getPointList()])
-        .then(([info, list])=>{
+        .then(([info, list]) => {
+          
         let backgroundImage = this.getImageFullPath(info['map_image_url'])
         let pointList = []
         list.map(item=>{
@@ -254,6 +281,7 @@ export default {
           this.color = info['map_point_color'] || '#3498db';
           this.noArriveColor = info['map_point_color_for_no_arrived'] || '#999999';
           this.name = info['map_name'];
+          this.form.isCycle = info['point_period_limit'];
           this.backgroundImage = backgroundImage;
           loading.close()
 
@@ -445,6 +473,22 @@ export default {
         this.$message.error('请至少设置一个点位！')
         return
       }
+      
+      // 检查点位周期限制
+      if(this.form.isCycle === 'Y') {
+        let noPeriodPoints = [];
+        this.dataList.forEach(item => {
+          if(!item.model.period_start_time || !item.model.period_end_time) {
+            noPeriodPoints.push(`点位${item.model.point_total_mileage + 1}`);
+          }
+        });
+        
+        if(noPeriodPoints.length > 0) {
+          this.$message.error(`${noPeriodPoints.join('、')}完成周期需设置`);
+          return;
+        }
+      }
+      
       // let  params = this.getDoneParams();
       let params = {
         // #ifdef admin
@@ -472,6 +516,19 @@ export default {
 
     //获取完成参数
     getDoneParams(){},
+    // #ifdef saas-admin sms-walking
+    // 处理周期限制切换
+    handleCycleChange(value) {
+      this.walkingPointPeriodLimit({
+        id: this.map_id,
+        point_period_limit: value
+      }).then(res => {
+        this.$message.success('点位周期限制设置成功')
+      }).catch(err => {
+        console.log(err, 'err')
+      })
+    },
+    // #endif
 
     //半径改变
     handleRadiusChange(e){

package/library/viewModules/viewWalking/viewWalking/jbz/XdJbzItemScale.vue

@@ -35,6 +35,7 @@
       :show.sync="dialogShow"
       :is-move="true"
       :is-btn="false"
+      width="1000px"
     >
       <xd-base-dynamic-field
         :list="formList"
@@ -122,6 +123,10 @@ export default {
         return []
       }
     },
+    isCycle: {
+      type: String,
+      default: 'N'
+    },
   },
   data(){
     return {
@@ -197,7 +202,16 @@ export default {
           }       
         }
       }
+    },
+    // #ifdef saas-admin sms-walking
+    isCycle: {
+      handler(n,o){
+        if(n&&n!==o){
+          this.initForm(Object.assign({},this.orgFormValue,this.formValue))
+        }
+      }
     }
+    // #endif
   },
   computed: {
     styleObject() {
@@ -217,8 +231,8 @@ export default {
     },
     orgFormValue(){
       let point_position = this.item.point_position;
-      if(typeof point_position === 'string') point_position = JSON.parse(this.item.point_position);
-      return {
+      if(typeof point_position === 'string') point_position = JSON.parse(point_position);
+      let formValue = {
         ...this.item,
         point_image_url: {
           url: this.item.point_image_url
@@ -227,7 +241,14 @@ export default {
         // #ifdef sms-walking saas-admin
         sms_activity_list:[{label:this.item.sms_activity_name,value:this.item.sms_activity_id}]
         // #endif
+      };
+      // 处理完成周期
+      if (this.item.period_start_time && this.item.period_end_time) {
+        // 反显时将秒转换为毫秒
+        formValue.period_start_time = parseInt(this.item.period_start_time) * 1000;
+        formValue.period_end_time = parseInt(this.item.period_end_time) * 1000;
       }
+      return formValue;
     },
   },
   created(){
@@ -539,6 +560,22 @@ export default {
           notice: '单位:里，2里=1公里',
           inline: true
         },
+        // #ifdef saas-admin sms-walking
+        this.isCycle === 'Y' && {
+          label: '完成周期:',
+          ele: 'xd-date-range',
+          valueKey: ['period_start_time', 'period_end_time'],
+          value: params['period_start_time']?[params['period_start_time'],params['period_end_time']]:[],
+          placeholder: ['开始日期', '结束日期'],
+          className: 'input40',
+          format: 'yyyy/MM/dd HH:mm:ss',//时间显示格式
+          formatValue: 'timestamp', //输出时间格式
+          notice: '在周期内兑换的步数才算有效兑换，超过结束时间未达到点位，则算未完成',
+          rules: [
+            {required: true, message: '请选择完成周期', trigger: 'change'},
+          ]
+        },
+        // #endif
         {
           label: '点位知识:',
           ele: 'xd-tinymce',
@@ -581,12 +618,36 @@ export default {
         y: this.changeOffsetY || this.defaultValue.y,
       }
       if(isString) point_position = JSON.stringify(point_position);
+      let period_start_time = '';
+      let period_end_time = '';
+      
+      if (this.formValue.period_start_time) {
+        // 提交时将毫秒转换为秒
+        period_start_time = Math.floor(this.formValue.period_start_time / 1000);
+      } else if (this.orgFormValue.period_start_time) {
+        // 提交时将毫秒转换为秒
+        period_start_time = Math.floor(this.orgFormValue.period_start_time / 1000);
+      }
+      
+      if (this.formValue.period_end_time) {
+        // 提交时将毫秒转换为秒
+        period_end_time = Math.floor(this.formValue.period_end_time / 1000);
+      } else if (this.orgFormValue.period_end_time) {
+        // 提交时将毫秒转换为秒
+        period_end_time = Math.floor(this.orgFormValue.period_end_time / 1000);
+      }
+      
       let params = {
         point_image_url: type==='normal'?this.formValue.point_image_url.url || this.orgFormValue.point_image_url.url:this.orgFormValue.point_image_url.url,
         point_knowledge: type==='normal'?this.formValue.point_knowledge || this.orgFormValue.point_knowledge:this.orgFormValue.point_knowledge,
         point_name: type==='normal'?this.formValue.point_name || this.orgFormValue.point_name:this.orgFormValue.point_name,
         point_total_mileage: type==='normal'?Number( this.formValue.point_total_mileage || this.orgFormValue.point_total_mileage):Number(this.orgFormValue.point_total_mileage),
         point_position:point_position,
+        // 只有当 isCycle 为 Y 时，才提交周期相关字段
+        ...(this.isCycle === 'Y' && {
+          period_start_time: period_start_time,
+          period_end_time: period_end_time,
+        }),
         // #ifdef sms-walking saas-admin
         sms_activity_type: type==='normal'?this.formValue.sms_activity_type || this.orgFormValue.sms_activity_type:this.orgFormValue.sms_activity_type,
         sms_activity_id: type==='normal'?(this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length)?this.formValue.sms_activity_list[0]['value']:'':this.orgFormValue.sms_activity_list[0]['value'],

package/package.json

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