jufubao-admin-library 1.1.230 → 1.1.232

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

@@ -323,5 +323,26 @@ module.exports = {
       role: '',
     },
     // #endif
+    {
+      title: '健步走：地图 - 修改图片显示状态',
+      mapFn: "walkingPointImageStatus",
+      // #ifdef admin
+      path: '/saas-app-admin/v1/walking/map/point-image-status/:id',
+      // #endif
+      // #ifdef saas-admin
+      path: '/saas-app-company/v1/walking/x_map/point-image-status/:id',
+      // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map/point-image-status/:id',
+      // #endif
+      isRule: false,
+      data: {
+        id:['点位ID', 'string', '必填'],
+        status:['status', 'string', '必填'],
+      },
+      disabled: true,
+      role: '',
+      method:'put'
+    },
   ],
 }

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

@@ -38,9 +38,16 @@
           <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">
+        <el-tooltip content="在限制周期内未到达，即未完成也按未达到展示。" placement="top">
             <span class="el-icon-question"></span>
           </el-tooltip>
+          <span>点位图片:</span>
+          <el-switch
+            v-model="showImage"
+            @change="e => handleShowImageChange(e)"
+            active-text="展示"
+            inactive-text="隐藏">
+          </el-switch>
         </div>
       </div>
       <div class="right">
@@ -102,13 +109,23 @@
           :step="myStep"
           :radius-num="radius"
           :circle-color="color"
+          :operate="operate"
           :site_id="siteId"
           :typeData="typeData"
           :is-cycle="form.isCycle"
           @onDelete="handleItemDelete"
           @onSubmit="handleItemSubmit"
           v-model="item.model"
-          ><span slot="sort">{{sortDataList[item.model.point_total_mileage]}}</span></xd-jbz-item>
+          ><span slot="sort">{{sortDataList[item.model.point_total_mileage]}}</span>
+           <div slot="content1" v-if="showImage">
+            <el-image 
+              style="width: 100px; height: 100px;border-radius: 5px"
+              :src="getImageFullPath(item.model.point_image_url)" 
+              :preview-src-list="[getImageFullPath(item.model.point_image_url)]">
+            </el-image>
+            <div class="point_name">{{item['model']['point_name']}}</div>
+            </div>
+          </xd-jbz-item>
       </template>
     </div>
     <div class="template-status" >
@@ -144,6 +161,7 @@ export default {
       //页面可编辑数据
       color:'rgb(52, 152, 219)',
       noArriveColor:'#999999',
+      showImage:false,
       name:'',
       status:'Y',
       backgroundImage:'',
@@ -174,6 +192,7 @@ export default {
       yHeight: 15.2,
       siteId:'',
       typeData: [],
+      operate:'',
       // #ifdef saas-admin sms-walking
       form:{
         isCycle:'',
@@ -202,6 +221,7 @@ export default {
     },
   },
   created() {
+    this.operate = this.$route.query.operate;
     getOptions([{
       // #ifdef sms-walking
       server:'saas-app-partner',
@@ -249,6 +269,7 @@ export default {
       'walkingPointColor',//点位颜色
       'walkingPointSize',//点位大小
       'walkingPointDelete',//删除点位
+      'walkingPointImageStatus',//图片状态
       // #ifdef saas-admin sms-walking
       'walkingPointPeriodLimit',//点位周期限制
       // #endif
@@ -280,6 +301,7 @@ export default {
           this.radius = info['map_point_size'] || 43;
           this.color = info['map_point_color'] || '#3498db';
           this.noArriveColor = info['map_point_color_for_no_arrived'] || '#999999';
+          this.showImage = info['point_image_status'] === 'Y'?true:false;
           this.name = info['map_name'];
           this.form.isCycle = info['point_period_limit'];
           this.backgroundImage = backgroundImage;
@@ -389,18 +411,27 @@ export default {
           cancelButtonText: '取消'
         }).then(() => {
           let loading = Loading.service({});
-          this.walkingPointDelete({id:data.id})
-            .then(res=>{
-              this.$message.success('删除成功')
-              this.dataList = this.dataList.filter(item =>{
-                return item.model.id !== data.id
-              });
-              this.getInfo()
-              loading.close()
-            })
-            .catch(err=>{
-              loading.close()
-            })
+          if(!data.id){
+            this.dataList = this.dataList.filter(item =>{
+              return !item.model.id
+            });
+            this.$message.success('删除成功')
+            this.getInfo()
+            loading.close()
+          }else{
+            this.walkingPointDelete({id:data.id})
+              .then(res=>{
+                this.$message.success('删除成功')
+                this.dataList = this.dataList.filter(item =>{
+                  return item.model.id !== data.id
+                });
+                this.getInfo()
+                loading.close()
+              })
+              .catch(err=>{
+                loading.close()
+              })
+            }
           })
         .catch(err=>{
 
@@ -561,6 +592,21 @@ export default {
         this.$message.error('请选择颜色')
       }
     },
+    //是否展示图片
+    handleShowImageChange(e){
+      console.log(e,'eee')
+      let params = {
+        id:this.map_id,
+        status:e?'Y':'N'
+      }
+      this.walkingPointImageStatus(params)
+      .then(res=>{
+        this.$message.success('修改点位点位图片显示状态成功')
+      })
+      .catch(err=>{
+        console.log(err,'err')
+      })
+    },
   }
 };
 </script>
@@ -597,6 +643,7 @@ export default {
     display: flex;
     justify-content: flex-start;
     align-items: center;
+    flex-wrap: wrap;
     & > * {
       font-size: 14px;
       flex-shrink: 0;
@@ -609,8 +656,9 @@ export default {
       display: flex;
       justify-content: flex-start;
       align-items: center;
+      margin: 2px 40px 2px 0;
       & > span {
-        margin-right: 20px;
+        margin-right: 10px;
       }
     }
   }
@@ -650,5 +698,10 @@ export default {
     margin-right: 10px;
   }
 }
-
+.point_name{
+  width:100%;
+  text-align:center;
+  background-color:#fff;
+  border-radius:4px;
+}
 </style>

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

@@ -1,4 +1,5 @@
 <template>
+  <div>
   <div
     class="xd-jbz-item"
     v-if="containerDone"
@@ -55,6 +56,10 @@
       </div>
     </xd-dialog>
   </div>
+  <div :style="contentStyle" class="content_slot">
+    <slot name="content1"></slot>
+  </div>
+  </div>
 </template>
 <script>
 import XdDialog from "@/components/XdDialog.vue";
@@ -123,6 +128,10 @@ export default {
         return []
       }
     },
+    operate:{
+      type: String,
+      default: ''
+    },
     isCycle: {
       type: String,
       default: 'N'
@@ -187,7 +196,8 @@ export default {
         if(n&&n!==o){
           this.initForm(Object.assign({},this.orgFormValue,this.formValue))
         }
-      }
+      },
+      immediate: true
     },
     'formValue.sms_activity_type':{
       handler(n,o){
@@ -201,7 +211,8 @@ export default {
             this.initForm(Object.assign({},this.orgFormValue,this.formValue))
           }       
         }
-      }
+      },
+      immediate: true
     },
     // #ifdef saas-admin sms-walking
     isCycle: {
@@ -221,6 +232,12 @@ export default {
         width: `${this.width}px`,
         height: `${this.height}px`,
       };
+    },
+     contentStyle() {
+      return {
+        left: `${this.offsetX+this.radiusNum*2+10}px`,
+        top: `${this.offsetY-100}px`,
+      };
     },
     stepStatus(){
       if(this.item.step === undefined) return false;
@@ -234,12 +251,19 @@ export default {
       if(typeof point_position === 'string') point_position = JSON.parse(point_position);
       let formValue = {
         ...this.item,
+        sms_activity_status: this.item.sms_activity_status || (this.operate === 'STEP_AND_ANSWER' ? 'Y' : 'N'),
+        // #ifdef sms-walking 
+        sms_activity_type: this.item.sms_activity_type || (this.operate === 'STEP_AND_ANSWER' ? 'form' : ''),
+        // #endif
+        // #ifdef saas-admin 
+        sms_activity_type: this.item.sms_activity_type || (this.operate === 'STEP_AND_ANSWER' ? 'answer' : ''),
+        // #endif
         point_image_url: {
           url: this.item.point_image_url
         },
         point_position: point_position,
         // #ifdef sms-walking saas-admin
-        sms_activity_list:[{label:this.item.sms_activity_name,value:this.item.sms_activity_id}]
+        sms_activity_list:this.item.sms_activity_id?[{label:this.item.sms_activity_name,value:this.item.sms_activity_id}]:[]
         // #endif
       };
       // 处理完成周期
@@ -252,6 +276,7 @@ export default {
     },
   },
   created(){
+    console.log(this.operate,'operate')
     this.id = `circle_${this.$xdHelper.randomChar(20)}`;
     this.init('init');
     this.$nextTick(() => {
@@ -337,8 +362,9 @@ export default {
           label: '点位活动:', 
           ele: "xd-radio",
           valueKey: 'sms_activity_status', 
-          value: params.sms_activity_status || 'N', 
+          value: params.sms_activity_status?params.sms_activity_status:this.operate==='STEP_AND_ANSWER'?'Y':'N', 
           placeholder: '请选择点位活动',
+          disabled: this.operate==='STEP_AND_ANSWER'?true:false,
           list: [{label:'关闭',value:'N'},{label:'开启',value:'Y'}],
           rules: [
             { required: true, message: '请选择点位活动', trigger: ['blur', 'change'] },
@@ -348,7 +374,8 @@ export default {
           label: '营销工具类型:',
           ele: 'xd-select-list',
           valueKey: 'sms_activity_type',
-          value: params.sms_activity_type||'',
+          value: params.sms_activity_type?params.sms_activity_type:this.operate==='STEP_AND_ANSWER'?'form':'',
+          disabled: this.operate==='STEP_AND_ANSWER'?true:false,
           placeholder: '请选择',
           classNmae:'input40',
           multiple: false,
@@ -491,8 +518,9 @@ export default {
           label: '点位活动:', 
           ele: "xd-radio",
           valueKey: 'sms_activity_status', 
-          value: params.sms_activity_status || 'N', 
+          value: params.sms_activity_status?params.sms_activity_status:this.operate==='STEP_AND_ANSWER'?'Y':'N', 
           placeholder: '请选择点位活动',
+          disabled: this.operate==='STEP_AND_ANSWER'?true:false,
           list: [{label:'关闭',value:'N'},{label:'开启',value:'Y'}],
           rules: [
             { required: true, message: '请选择点位活动', trigger: ['blur', 'change'] },
@@ -502,7 +530,8 @@ export default {
           label: '营销工具类型:',
           ele: 'xd-select-list',
           valueKey: 'sms_activity_type',
-          value: params.sms_activity_type||'',
+          value: params.sms_activity_type?params.sms_activity_type:this.operate==='STEP_AND_ANSWER'?'answer':'',
+          disabled: this.operate==='STEP_AND_ANSWER'?true:false,
           placeholder: '请选择',
           classNmae:'input40',
           multiple: false,
@@ -650,8 +679,8 @@ export default {
         }),
         // #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'],
-        sms_activity_name: type==='normal'?(this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length)?this.formValue.sms_activity_list[0]['label']:'':this.orgFormValue.sms_activity_list[0]['label'],
+          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&&this.orgFormValue.sms_activity_list.length)?this.orgFormValue.sms_activity_list[0]['value']:'',
+        sms_activity_name: type==='normal'?(this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length)?this.formValue.sms_activity_list[0]['label']:'':(this.orgFormValue.sms_activity_list&&this.orgFormValue.sms_activity_list.length)?this.orgFormValue.sms_activity_list[0]['label']:'',
         sms_activity_status: type==='normal'?this.formValue.sms_activity_status || this.orgFormValue.sms_activity_status:this.orgFormValue.sms_activity_status,
         // #endif
         // #ifdef sms-walking
@@ -881,4 +910,9 @@ export default {
   justify-content: flex-end;
   align-items: center;
 }
+.content_slot{
+  position: absolute;
+  width: 100px;
+  text-align: center;
+}
 </style>

package/library/viewModules/viewWalkingActivity/viewWalkingActivity/list.vue

@@ -130,6 +130,7 @@ export default {
         { "type": "normal", "prop": "sub_company_names", "align": "left", "label": "参与企业" },
          // #endif
         { "type": "normal", "prop": "activity_sort", "align": "center", "label": "排序" },
+        { "type": "normal", "prop": "forward_method_name", "align": "center", "label": "行进方式" },
         { "type": "normal", "prop": "exchange", "align": "center", "label": "兑换比例" },
         { "type": "normal", "prop": "activity_status", "align": "center", "label": "状态" },
          // #ifdef sms-walking 
@@ -510,6 +511,18 @@ export default {
           formatValue: 'timestamp', //输出时间格式
           placeholder: ['开始时间', '结束时间'],
         },
+        {
+          label: '行进方式:',
+          ele: 'xd-select-list',
+          valueKey: 'forward_method',
+          value: '',
+          placeholder: '请选择',
+          multiple: false,
+          list: [
+            {label:'步数兑换',value:'STEP_EXCHANGE'},
+            {label:'步数+答题',value:'STEP_AND_ANSWER'},
+          ]
+        },
         {
           label: '更新时间:', //label
           ele: 'xd-date', //package 名称

package/library/viewModules/viewWalkingActivity/viewWalkingActivity/stepBackground.vue

@@ -14,7 +14,7 @@
         @onGetParamsAndHeader="handleGetParamsAndHeader"
       ></xd-base-dynamic-field>
       <div style="padding-left: 150px">
-        <el-button @click="goBack" type="primary">返回</el-button>
+        <el-button @click="goBack" type="primary">上一步</el-button>
         <el-button @click="handleGoNext" type="primary">下一步</el-button>
       </div>
     </el-card>
@@ -52,6 +52,7 @@ export default {
       isFirst: false,
       detailData: null,
       siteId:'',
+      operate:'',
     }
   },
   watch:{
@@ -79,6 +80,7 @@ export default {
     console.log(this.$route.params,'pppp')
     this.activity_id = this.$route.params.activity_id
     this.map_id = this.$route.params.map_id
+    this.operate = this.$route.query.operate
      // #ifdef sms-walking
     this.siteId = this.$route.params.site_id
     // #endif
@@ -212,10 +214,22 @@ export default {
               message: "编辑成功"
             })
             // #ifdef sms-walking
-           this.$router.push(`/walking_config/config/${this.map_id}/${this.activity_id}/${this.siteId}`)
+          //  this.$router.push(`/walking_config/config/${this.map_id}/${this.activity_id}/${this.siteId}`)
+           this.$router.push({
+              path: `/walking_config/config/${this.map_id}/${this.activity_id}/${this.siteId}`,
+              query: {
+                operate: this.operate,
+              }
+            })
             // #endif
             // #ifdef saas-admin
-            this.$router.push(`/walking_config/config/${this.map_id}/${this.activity_id}`)
+            // this.$router.push(`/walking_config/config/${this.map_id}/${this.activity_id}`)
+            this.$router.push({
+              path: `/walking_config/config/${this.map_id}/${this.activity_id}`,
+              query: {
+                operate: this.operate,
+              }
+            })
             // #endif
             
           }).catch(err => {
@@ -230,10 +244,22 @@ export default {
             // this.$bus.$emit('delTags', this.$route, {}, "partnerAccountList")
             
              // #ifdef sms-walking
-           this.$router.push(`/walking_config/config/${res.data.id}/${this.activity_id}/${this.siteId}`)
+          //  this.$router.push(`/walking_config/config/${res.data.id}/${this.activity_id}/${this.siteId}`)
+            this.$router.push({
+              path: `/walking_config/config/${res.data.id}/${this.activity_id}/${this.siteId}`,
+              query: {
+                operate: this.operate,
+              }
+            })
             // #endif
             // #ifdef saas-admin
-            this.$router.push(`/walking_config/config/${res.data.id}/${this.activity_id}`)
+            // this.$router.push(`/walking_config/config/${res.data.id}/${this.activity_id}`)
+            this.$router.push({
+              path: `/walking_config/config/${res.data.id}/${this.activity_id}`,
+              query: {
+                operate: this.operate,
+              }
+            })
             // #endif
           }).catch(err => {
             console.log(err, 'err')

package/library/viewModules/viewWalkingActivity/viewWalkingActivity/stepBase.vue

@@ -38,7 +38,14 @@
                 </el-select>
               </el-form-item>
             </div>
-            <el-form-item label="每日兑换截止时间:" prop="daily_exchange_deadline">
+            <el-form-item label="步数兑换方式:" prop="step_exchange_method ">
+              <el-radio-group v-model="customForm.step_exchange_method " :disabled="activity_id">
+                <el-radio label="DAILY">按日获取并兑换</el-radio>
+                <el-radio label="MONTHLY">按月获取并兑换</el-radio>
+              </el-radio-group>
+              <span style="color:red;margin-left:10px;font-size:12px" v-if="!activity_id">一经选定，将不可修改</span>
+            </el-form-item>
+            <el-form-item v-if="customForm.step_exchange_method === 'DAILY'" label="每日兑换截止时间:" prop="daily_exchange_deadline">
               <el-time-picker
                 v-model="customForm.daily_exchange_deadline"
                 :value-format="valueFormat"
@@ -61,6 +68,43 @@
             </el-form-item>
           </el-form>
         </template>
+        <template slot-scope="scope" slot="rule">
+            <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px">
+            <div
+              v-for="(item, index) in ruleInfo"
+              :key="index"
+              style="margin-bottom: 5px;display:flex"
+            >
+            <div class="m5">
+              <el-form-item label="标题" required>
+                <el-input
+                  v-model="ruleInfo[index].title"
+                  placeholder="请输入标题"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label=" " required>
+                <el-input
+                  type="textarea"
+                  v-model="ruleInfo[index].content"
+                  placeholder="请输入规则"
+                ></el-input>
+              </el-form-item>
+            </div>
+            <div>
+              <i
+                v-if="index + 1 === ruleInfo.length"
+                class="el-icon-circle-plus pl5 pt5"
+                @click="add(item)"
+              ></i>
+              <i
+                v-if="ruleInfo.length > 1"
+                class="el-icon-remove pl5 pt5"
+                @click="remove(index)"
+              ></i>
+            </div>
+            </div>
+          </el-form>
+        </template>
       </xd-base-dynamic-field>
       <div style="padding-left: 150px">
         <el-button @click="goBack" type="primary">取消</el-button>
@@ -105,6 +149,7 @@ export default {
       customForm:{
         exchange_ratio_step:'',
         exchange_ratio_mileage:'',
+        step_exchange_method:'DAILY',
         daily_exchange_deadline:'',
         daily_max_exchange_type:'N',
         daily_max_exchange_step:''
@@ -135,6 +180,18 @@ export default {
       siteData:[],
       siteId:'',
       companyData:[],
+      ruleForm:{},
+      ruleInfo:[
+        {title:'',content:''},
+      ],
+      rules:{
+        title:[
+          { required: true, message: '请输入标题', trigger: ['blur', 'change'] },
+        ],
+        content:[
+          { required: true, message: '请输入规则', trigger: ['blur', 'change'] },
+        ]
+      }
     }
   },
   watch:{
@@ -146,6 +203,12 @@ export default {
           if(this.formParams.activity_logo&&this.formParams.activity_logo['url']){
             copyFormParams.activity_logo = this.formParams.activity_logo['url']
           }
+          if(this.formParams.activity_start_image&&this.formParams.activity_start_image['url']){
+            copyFormParams.activity_start_image = this.formParams.activity_start_image['url']
+          }
+          if(this.formParams.activity_share_image&&this.formParams.activity_share_image['url']){
+            copyFormParams.activity_share_image = this.formParams.activity_share_image['url']
+          }
           if(this.activity_id){
             copyFormParams = Object.assign({},this.detailData,copyFormParams,)
           }
@@ -161,6 +224,12 @@ export default {
           if(this.formParams.activity_logo&&this.formParams.activity_logo['url']){
             copyFormParams.activity_logo = this.formParams.activity_logo['url']
           }
+          if(this.formParams.activity_start_image&&this.formParams.activity_start_image['url']){
+            copyFormParams.activity_start_image = this.formParams.activity_start_image['url']
+          }
+          if(this.formParams.activity_share_image&&this.formParams.activity_share_image['url']){
+            copyFormParams.activity_share_image = this.formParams.activity_share_image['url']
+          }
           if(this.activity_id){
             copyFormParams = Object.assign({},this.detailData,copyFormParams,)
           }
@@ -175,6 +244,32 @@ export default {
           if(this.formParams.activity_logo&&this.formParams.activity_logo['url']){
             copyFormParams.activity_logo = this.formParams.activity_logo['url']
           }
+          if(this.formParams.activity_start_image&&this.formParams.activity_start_image['url']){
+            copyFormParams.activity_start_image = this.formParams.activity_start_image['url']
+          }
+          if(this.formParams.activity_share_image&&this.formParams.activity_share_image['url']){
+            copyFormParams.activity_share_image = this.formParams.activity_share_image['url']
+          }
+          if(this.activity_id){
+            copyFormParams = Object.assign({},this.detailData,copyFormParams,)
+          }
+          this.initFormList(Object.assign({},copyFormParams,this.customForm),this.optionsData)
+        }
+      }
+    },
+    'formParams.activity_registration':{
+       handler(n,o){
+        if(n&&n!==o){
+          let copyFormParams = this.$xdHelper.cloneDeep(this.formParams)
+          if(this.formParams.activity_logo&&this.formParams.activity_logo['url']){
+            copyFormParams.activity_logo = this.formParams.activity_logo['url']
+          }
+          if(this.formParams.activity_start_image&&this.formParams.activity_start_image['url']){
+            copyFormParams.activity_start_image = this.formParams.activity_start_image['url']
+          }
+          if(this.formParams.activity_share_image&&this.formParams.activity_share_image['url']){
+            copyFormParams.activity_share_image = this.formParams.activity_share_image['url']
+          }
           if(this.activity_id){
             copyFormParams = Object.assign({},this.detailData,copyFormParams,)
           }
@@ -236,15 +331,29 @@ export default {
           this.map_id = res.data.x_map_id
           this.customForm.exchange_ratio_step = res.data.exchange_ratio_step
           this.customForm.exchange_ratio_mileage = res.data.exchange_ratio_mileage
+          this.customForm.step_exchange_method = res.data.step_exchange_method || 'DAILY'
           this.customForm.daily_exchange_deadline = res.data.daily_exchange_deadline
           this.customForm.daily_max_exchange_type = res.data.daily_max_exchange_type
           if(res.data.daily_max_exchange_step !== undefined) {
             this.customForm.daily_max_exchange_step = res.data.daily_max_exchange_step
           }
+          if(res.data.company_activity_id){
+            res.data.bind_data_list = [{value:res.data.company_activity_id,label:res.data.company_activity_name}]
+          }
+          if(res.data.activity_desc){
+            try{
+              this.ruleInfo = JSON.parse(res.data.activity_desc)
+            }catch(err){
+              console.log(err, 'err')
+            }
+          }
           // #ifdef sms-walking
           if(res.data.activity_url_config){
             res.data.activity_url_config = JSON.parse(res.data.activity_url_config)
           }
+          if(res.data.activity_start_page_config){
+            res.data.activity_start_page_config = JSON.parse(res.data.activity_start_page_config)
+          }
           if(res.data.activity_show_terminals){
             res.data.activity_show_terminals = JSON.parse(res.data.activity_show_terminals)
           }
@@ -383,6 +492,36 @@ export default {
             { required: true, message: "请选择网站地址", trigger: "change" },
           ],
         },
+        params.site_id&&{
+          label: "活动启动页地址:",
+          ele: "xd-select-site-path",
+          className: "input100",
+          valueKey: "activity_start_page_config",
+          value: params.activity_start_page_config || null,
+          placeholder: "请选择健步走活动启动页面",
+          setting:{
+            site_id:params.site_id,
+            hiddenSite:true
+          },
+          handleCustom: ({ action, data }) => {
+            if (action === "siteList") {
+              data.cb(
+                this.siteData
+              );
+            }
+            //获取应用列表
+            if (action === 'appList') {
+              if (data.params && data.params.value) {
+                getSiteRouter(this, data.cb, {site_id: data.params.value,isLimit: true});
+              } else {
+                data.cb([])
+              }
+            }
+          },
+          rules: [
+            { required: params.activity_registration==='Y', message: "请选择网站地址", trigger: "change" },
+          ],
+        },
         {
           label: '工会ID:', //label
           ele: "xd-radio",
@@ -422,6 +561,84 @@ export default {
           ]
         },
         // #endif
+        {
+          label: '活动报名:',
+          ele: 'xd-item-notice',
+          valueKey: 'activity_registration',
+          value: params.activity_registration || 'N',
+          setting: {
+            inline: false, //true 行内显示  false 换行显示  null: 系统自己判断(默认),
+            type: 'radio', //check复选框  //radio 单选
+          },
+          isKey: true,
+          className: 'input100',
+          handleCustom ({ action, data }) {
+            let list = [
+              { value: 'N', label: '关闭' },
+              { value: 'Y', label: '开启' , notes: '开启时，必须设置活动启用页，且用户参加活动需填写报名信息'},
+            ].filter(i => i);
+            data.cb(list)
+          },
+          rules: [
+            { required: true, message: "请选择" },
+          ]
+        },
+        {
+          label: '行进方式:',
+          ele: 'xd-item-notice',
+          valueKey: 'forward_method',
+          value: params.forward_method || 'STEP_EXCHANGE',
+          setting: {
+            inline: false, //true 行内显示  false 换行显示  null: 系统自己判断(默认),
+            type: 'radio', //check复选框  //radio 单选
+          },
+          isKey: true,
+          className: 'input100',
+          disabled:this.activity_id?true:false,
+          handleCustom ({ action, data }) {
+            let list = [
+              { label: '步数兑换', value: 'STEP_EXCHANGE',},
+              { label: '步数+答题解锁', value: 'STEP_AND_ANSWER', notes: '需用户达到步数，并答题后才能解锁下一点位',},
+            ].filter(i => i);
+            data.cb(list)
+          },
+          rules: [
+            { required: true, message: "请选择处理方式" },
+          ]
+        },
+        {
+          label: '关联企业活动:',
+          ele: 'xd-remote-select',
+          valueKey: 'bind_data_list',
+          value: params.bind_data_list || [],
+          className: 'input40',
+          placeholder: `请选择关联企业活动`,
+          multiple: false,
+          collapseTags: false,
+          remoteSearch: (query, resolve) => {
+            getOptions({
+              // #ifdef saas-admin
+              server: 'saas-app-company',
+               // #endif
+              // #ifdef sms-walking
+              server: 'saas-app-partner',
+               // #endif
+              fn: 'company-activity',
+              path: 'p1',
+              params: {
+                activity_name: query,
+                keyword: query,
+              }
+            })
+              .then(res => {
+                resolve(res.data.list)
+              })
+              .catch()
+          },
+          rules: [
+            { required: false, message: `请选择关联企业活动`, trigger: 'change' },
+          ]
+        },
         {
           ele:'slot',
           label:'兑换比例:',
@@ -478,7 +695,7 @@ export default {
           ]
         },
         {
-          label: '活动封面图:',
+          label: '活动banner图:',
           ele: 'xd-upload',
           valueKey: 'activity_logo',
           value: {},
@@ -498,7 +715,41 @@ export default {
           ]
         },
         {
-          label: "活动规则:", //label
+          label: '活动启动图:',
+          ele: 'xd-upload',
+          valueKey: 'activity_start_image',
+          value: params['activity_start_image']|| null,
+          defaultValue: {url:params.activity_start_image}||null,
+          slot: true,
+          tipsformet: '上传文件格式：@imageType@，不超过@size@MB',
+          type: ['jpg', 'png', 'jpeg', 'gif'],
+          styleType: 'one',
+          uploadType: 'aliyun',
+          size: 5, //5M
+          action: 'aliyun',
+          rules: [
+            { required: params.activity_registration==='Y', message: '请上传活动启动图', trigger: ['blur', 'change'] },
+          ]
+        },
+        {
+          label: '活动分享图:',
+          ele: 'xd-upload',
+          valueKey: 'activity_share_image',
+          value: params['activity_share_image']|| null,
+          defaultValue: {url:params.activity_share_image}||null,
+          slot: true,
+          tipsformet: '上传文件格式：@imageType@，不超过@size@MB',
+          type: ['jpg', 'png', 'jpeg', 'gif'],
+          styleType: 'one',
+          uploadType: 'aliyun',
+          size: 5, //5M
+          action: 'aliyun',
+          rules: [
+            { required: false, message: '请上传活动分享图', trigger: ['blur', 'change'] },
+          ]
+        },
+        {
+          label: "活动简介:", //label
           ele: "xd-tinymce", //package 名称
           valueKey: "activity_rule", //form[valueKey]
           value: params.activity_rule || "",
@@ -515,9 +766,17 @@ export default {
           },
           inline: false,
           rules: [
-            { required: true, message: "请添加活动规则", trigger: "change" },
+            { required: true, message: "请添加活动简介", trigger: "change" },
           ],
         },
+        {
+          ele: "title",
+          label: "活动规则"
+        },
+        {
+          ele:'slot',
+          slot:'rule'
+        }
 
       ]
       this.formList = formList.filter(i => i)
@@ -530,18 +789,44 @@ export default {
       if(this.formParams.activity_logo){
         formParamsCopy.activity_logo = this.formParams.activity_logo.url
       }
+      if(this.formParams.activity_start_image){
+        formParamsCopy.activity_start_image = this.formParams.activity_start_image.url
+      }else{
+        delete formParamsCopy.activity_start_image
+      }
+      if(this.formParams.activity_share_image){
+        formParamsCopy.activity_share_image = this.formParams.activity_share_image.url
+      }else{
+        delete formParamsCopy.activity_share_image
+      }
       if(this.formParams.activity_start_time){
         formParamsCopy.activity_start_time = this.formParams.activity_start_time/1000
       }
       if(this.formParams.activity_end_time){
         formParamsCopy.activity_end_time = this.formParams.activity_end_time/1000
       }
-
+      if(this.formParams.bind_data_list&&this.formParams.bind_data_list.length){
+        formParamsCopy.company_activity_id = this.formParams.bind_data_list[0]['value']
+      }
+      if(this.ruleInfo&&this.ruleInfo.length){
+        for(let i = 0; i < this.ruleInfo.length; i++){
+          if(!this.ruleInfo[i].title || !this.ruleInfo[i].content){
+            this.$message.error('请填写完整的活动规则')
+            return
+          }
+        }
+        formParamsCopy['activity_desc'] = JSON.stringify(this.ruleInfo)
+      }
       // #ifdef sms-walking
       if(this.formParams.activity_url_config){
         formParamsCopy['activity_url'] = this.formParams.activity_url_config['app']['frontPath']
         formParamsCopy['activity_url_config'] = JSON.stringify(this.formParams.activity_url_config)
       }
+      if(this.formParams.activity_start_page_config){
+        formParamsCopy['activity_start_page_config'] = JSON.stringify(this.formParams.activity_start_page_config)
+      }else{
+        delete formParamsCopy['activity_start_page_config']
+      }
       if(this.formParams.activity_show_terminals){
         formParamsCopy['activity_show_terminals'] = JSON.stringify(this.formParams.activity_show_terminals)
       }
@@ -555,6 +840,10 @@ export default {
       if(needFilters.daily_max_exchange_type === 'Y'){
         needFilters.daily_max_exchange_step = Number(needFilters.daily_max_exchange_step);
       }
+      //按月获取并兑换时删除每日兑换截止时间
+      if(needFilters.step_exchange_method === 'MONTHLY') {
+        delete needFilters.daily_exchange_deadline;
+      }
 
         console.log(needFilters,'need')
       this.$refs.form.submitAll().then(res => {
@@ -569,10 +858,22 @@ export default {
               message: "编辑成功"
             })
             // #ifdef sms-walking
-            this.$router.push(`/walking_activity/step_background_update/${this.map_id}/${this.activity_id}/${this.siteId}`)
+            // this.$router.push(`/walking_activity/step_background_update/${this.map_id}/${this.activity_id}/${this.siteId}`)
+            this.$router.push({
+                path: `/walking_activity/step_background_update/${this.map_id}/${this.activity_id}/${this.siteId}`,
+                query: {
+                  operate: formParamsCopy.forward_method,
+              }
+            })
             // #endif
             // #ifdef saas-admin
-            this.$router.push(`/walking_activity/step_background_update/${this.map_id}/${this.activity_id}`)
+            // this.$router.push(`/walking_activity/step_background_update/${this.map_id}/${this.activity_id}`)
+            this.$router.push({
+                path: `/walking_activity/step_background_update/${this.map_id}/${this.activity_id}`,
+                query: {
+                  operate: formParamsCopy.forward_method,
+              }
+            })
             // #endif
           }).catch(err => {
             console.log(err, 'err')
@@ -584,10 +885,22 @@ export default {
               message: "添加成功"
             })
             // #ifdef sms-walking
-            this.$router.push(`/walking_activity/step_background/${res.data.id}/${this.siteId}`)
+            // this.$router.push(`/walking_activity/step_background/${res.data.id}/${this.siteId}`)
+            this.$router.push({
+              path: `/walking_activity/step_background/${res.data.id}/${this.siteId}`,
+              query: {
+                operate: formParamsCopy.forward_method,
+              }
+            })
             // #endif
             // #ifdef saas-admin
-            this.$router.push(`/walking_activity/step_background/${res.data.id}`)
+            // this.$router.push(`/walking_activity/step_background/${res.data.id}`)
+              this.$router.push({
+                path: `/walking_activity/step_background/${res.data.id}`,
+                query: {
+                  operate: formParamsCopy.forward_method,
+              }
+            })
             // #endif
           }).catch(err => {
             console.log(err, 'err')
@@ -599,6 +912,20 @@ export default {
     goBack () {
       this.$router.replace('/walking_activity/list')
     },
+    add(item) {
+      if(!item['title']||!item['content']){
+        this.$message.error('请填写完整')
+        return
+      }
+      // if(this.ruleInfo.length>=10){
+      //   this.$message.error('最多支持十个时间段')
+      //   return
+      // }
+      this.ruleInfo.push({title:'',content:''});
+    },
+    remove(index) {
+      this.ruleInfo.splice(index, 1);
+    },
   }
 }
 
@@ -646,5 +973,23 @@ export default {
     margin-left: 0!important;
   }
 }
+.el-icon-circle-plus {
+  font-size: 22px;
+  color: #42B983;
+}
+
+.el-icon-remove {
+  font-size: 22px;
+  color: #F56C6C;
+}
+.pl5{
+  padding-left: 5px;
+}
+.pt5{
+  padding-top: 5px;
+}
+.m5{
+  width: 40%;
+}
 </style>
 

package/library/viewModules/viewsCompany/viewsCompany/app-list.vue

@@ -266,6 +266,9 @@ export default {
             if(res.data.info.x_app_info.x_app_ext_first_path_info){
               res.data.info.x_app_info.x_app_ext_first_path_info = JSON.parse(res.data.info.x_app_info.x_app_ext_first_path_info)
             }
+            if(res.data.info.x_app_info.x_app_activity_start_page_info){
+              res.data.info.x_app_info.x_app_activity_start_page_info = JSON.parse(res.data.info.x_app_info.x_app_activity_start_page_info)
+            }
             let infoData = Object.assign({},res.data.info.app_info,res.data.info.x_app_info)
             this.initForm(infoData,false);
             this.dialogShow = true;
@@ -432,6 +435,36 @@ export default {
             {required: true, message: '请选择网站地址', trigger: 'change'},
           ],
         },
+        {
+          label: '活动启动页:',
+          ele: 'xd-select-site-path',
+          className: 'input100',
+          valueKey: 'x_app_activity_start_page_info',
+          value: params.x_app_activity_start_page_info || null,
+          setting: {
+            site_id: this.site_id,
+            hiddenSite:true
+          },
+          handleCustom: ({action, data}) => {
+            if (action === 'siteList') {
+              data.cb(
+                this.siteData
+              );
+            }
+
+            //获取应用列表
+            if (action === 'appList') {
+              if (data.params && data.params.value) {
+                getSiteRouter(this, data.cb, {site_id: data.params.value,isLimit: true});
+              } else {
+                data.cb([])
+              }
+            }
+          },
+          rules: [
+            {required: false, message: '请选择网站地址', trigger: 'change'},
+          ],
+        },
         {
           label: '排序:', //label
           ele: 'el-input', //package 名称
@@ -476,6 +509,10 @@ export default {
           copyListValue.x_app_detail_path_info = JSON.stringify(this.listValue.x_app_detail_path_info)
           copyListValue.x_app_detail_path = this.listValue.x_app_detail_path_info.app.frontPath
         }
+        if(this.listValue.x_app_activity_start_page_info&&this.listValue.x_app_activity_start_page_info.app){
+          copyListValue.x_app_activity_start_page_info = JSON.stringify(this.listValue.x_app_activity_start_page_info)
+          copyListValue.x_app_activity_start_page = this.listValue.x_app_activity_start_page_info.app.frontPath
+        }
         if(this.listValue.x_app_ext_first_path_info&&this.listValue.x_app_ext_first_path_info.app){
           copyListValue.x_app_ext_first_path_info = JSON.stringify(this.listValue.x_app_ext_first_path_info)
           copyListValue.x_app_ext_first_path = this.listValue.x_app_ext_first_path_info.app.frontPath

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/create.vue

@@ -247,7 +247,7 @@ export default {
           value: params.activity_type || 'sign_up', //v-model
           placeholder: '请选择活动类型',
           disabled:this.id?true:false,
-          list: [{ value: 'sign_up', label: '企业报名' }, { value: 'activity', label: '企业活动' }],
+          list: [{ value: 'sign_up', label: '企业报名' }, { value: 'activity', label: '企业活动' }, { value: 'walking', label: '用于健步走' }],
           rules: [
             { required: true, message: '请选择活动类型', trigger: ['blur', 'change'] },
           ]
@@ -272,17 +272,17 @@ export default {
             },
           ],
         },
-        {
-          label: '参与设置:', //label
-          ele: "xd-radio",
-          valueKey: 'attend_user_range', //form[valueKey]
-          value: params.attend_user_range || 'ALL', //v-model
-          placeholder: '请选择参与设置',
-          list: [{ value: 'ALL', label: '全部用户' }, { value: 'SPECIFY', label: '指定用户' }],
-          rules: [
-            { required: true, message: '请选择参与设置', trigger: ['blur', 'change'] },
-          ]
-        },
+        // params.activity_type!=='walk'&&{
+        //   label: '参与设置:', //label
+        //   ele: "xd-radio",
+        //   valueKey: 'attend_user_range', //form[valueKey]
+        //   value: params.attend_user_range || 'ALL', //v-model
+        //   placeholder: '请选择参与设置',
+        //   list: [{ value: 'ALL', label: '全部用户' }, { value: 'SPECIFY', label: '指定用户' }],
+        //   rules: [
+        //     { required: true, message: '请选择参与设置', trigger: ['blur', 'change'] },
+        //   ]
+        // },
         // #endif
         // #ifdef saas-admin
          {
@@ -590,15 +590,15 @@ export default {
             { required: true, message: "请输入数值" }
           ]
         },
-        {
-          ele: "title",
-          label: "内容设置",
-          size: "mini", //default/mini/small
-        },
-        {
-          ele:'slot',
-          slot:'content'
-        }
+        // params.activity_type!=='walk'&&{
+        //   ele: "title",
+        //   label: "内容设置",
+        //   size: "mini", //default/mini/small
+        // },
+        // params.activity_type!=='walk'&&{
+        //   ele:'slot',
+        //   slot:'content'
+        // }
       ].filter(i=>i)
 
       this.listForm = form.filter(i => i)
@@ -635,24 +635,24 @@ export default {
       if(this.listValue.activity_banners&&this.listValue.activity_banners.length){
         copyFormParams['activity_banners'] = JSON.stringify(this.listValue.activity_banners)
       }
-      if(this.contentList&&this.contentList.length){
-        let isReturn = false
-        this.contentList.map(i=>{
-          if(!i.rule){
-            isReturn = true
-            return false
-          }
-        })
-        if(isReturn){
-          this.$message.error('请输入规则')
-          return false
-        }else{
-          copyFormParams['activity_content_config'] = JSON.stringify(this.contentList)
-        }
-      }else{
-        this.$message.error('请进行内容设置')
-        return false
-      }
+      // if(this.contentList&&this.contentList.length){
+      //   let isReturn = false
+      //   this.contentList.map(i=>{
+      //     if(!i.rule){
+      //       isReturn = true
+      //       return false
+      //     }
+      //   })
+        // if(isReturn){
+        //   this.$message.error('请输入规则')
+        //   return false
+        // }else{
+        //   copyFormParams['activity_content_config'] = JSON.stringify(this.contentList)
+        // }
+      // }else{
+      //   this.$message.error('请进行内容设置')
+      //   return false
+      // }
       if (this.listValue['fee_type'] === 'no_free') {
         copyFormParams['activity_fee'] = this.$xdHelper.multiplyFloatNumber(Number(this.listValue['activity_fee']), 100)
       }else if(this.listValue['fee_type'] === 'free'){

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/list.vue

@@ -39,7 +39,7 @@
             </div>
           </template> 
           <template slot="activity_type" slot-scope="scope">
-            <div>{{scope.row.activity_type==='sign_up'?'企业报名':scope.row.activity_type==='activity'?'企业活动':''}}</div>
+            <div>{{scope.row.activity_type==='sign_up'?'企业报名':scope.row.activity_type==='activity'?'企业活动':scope.row.activity_type==='walking'?'用于健步走':''}}</div>
           </template>
           <template slot="bucket" slot-scope="scope">
              <div>{{scope.row.bucket==='COMPANY'?'福利':scope.row.activity_type==='PARTNER'?'自有':''}}</div>

package/library/viewModules/viewsFinance/schemas/trade.record.js

@@ -16,6 +16,7 @@ module.exports = {
         trade_type: ["交易类型", "string", "必填"],
         main_order_id: ["主订单ID", "string", "非必填"],
         business_code: ["业务编码", "string", "非必填"],
+        site_id: ["站点ID", "string", "非必填"],
         supplier_name: ["供应商名称", "string", "非必填"],
         start_time: ["开始时间", "string", "非必填"],
         end_time: ["结束时间", "string", "非必填"],
@@ -78,6 +79,7 @@ module.exports = {
         trade_type: ["交易类型", "string", "必填"],
         main_order_id: ["主订单ID", "string", "非必填"],
         business_code: ["业务编码", "string", "非必填"],
+        site_id: ["站点ID", "string", "非必填"],
         supplier_name: ["供应商名称", "string", "非必填"],
         start_time: ["开始时间", "string", "非必填"],
         end_time: ["结束时间", "string", "非必填"],

package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue

@@ -56,6 +56,28 @@
             </el-select>
           </div>
         </template>
+        <template slot="site_id">
+          <div>
+            <el-select v-model="site_id" filterable clearable placeholder="请选择站点">
+              <el-option
+                v-for="item in siteList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-select v-if="site_id" v-model="namespace" clearable placeholder="请选择业务线" :key="namespaceKey">
+              <el-option
+                v-for="item in namespaceList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </template>
       </xd-search>
     </el-card>
     <el-card class="app-container__list">
@@ -181,6 +203,9 @@
               </template>
             </div>
           </template>
+          <template slot="site_business_code_name" slot-scope="scope">
+            <span v-html="scope.row.site_business_code_name"></span>
+          </template>
           <template slot="amount" slot-scope="scope">
             <xd-table-price :price="scope.row.amount" :key="rePriceKey"></xd-table-price>
             <div v-if="isShowDeductDetail(scope.row)" style="display:flex; justify-content: center; align-items: center">
@@ -327,6 +352,13 @@ export default {
           label: "商品信息",
         },
         // { "type": "normal", "prop": "category_name", "align": "center", "minWidth": 200, "label": "公式" },
+        {
+          type: "normal",
+          prop: "site_business_code_name",
+          align: "center",
+          minWidth: 200,
+          label: "站点/业务线",
+        },
         {
           type: "price",
           prop: "amount",
@@ -401,6 +433,11 @@ export default {
       supplier_ids: null,
       supplierList: [],
       showSupplier: false,
+      siteList: [],
+      site_id: null,
+      namespaceList: [],
+      namespace: null,
+      namespaceKey: 'namespaceKey',
 
       //查看明细
       dialogTableVisible:false,
@@ -434,6 +471,24 @@ export default {
         this.showSupplier =  this.channelList.find(item => item.value === val).has_supplier==='Y';
       }
     },
+    site_id(n, o) {
+      if(n && n !== o) {
+        this.namespace = null;
+        this.namespaceList = [];
+        getOptions({
+          server: 'partner',
+          fn: 'business-line',
+          path: 'p1',
+          params: {
+            select_method: 'ALL-SITE',
+            site_id: n === '*' ? 0 : n
+          }
+        }).then(res => {
+          this.namespaceList = res.data.list
+          this.namespaceKey = Date.now()
+        })
+      }
+    },
   },
   created() {
     this.initSearchForm();
@@ -547,6 +602,12 @@ export default {
       if(other.rebate_from_partner_list&&other.rebate_from_partner_list.length){
         other.rebate_from_partner_id = other.rebate_from_partner_list[0]['value']
       }
+      if(this.site_id){
+        other.site_id = this.site_id
+      }
+      if(this.namespace){
+        other.business_code = this.namespace
+      }
       return {
         ...other,
         supplier_ids,
@@ -609,6 +670,9 @@ export default {
           loading.close();
           this.tables = res.data.list.map((item) => {
             item["created_time"] = baseJsDateToTime(item["created_time"]);
+            item["site_business_code_name"] = item["site_name"] && item["business_code_name"]
+              ? `${item["site_name"]}<br/>${item["business_code_name"]}`
+              : (item["site_name"] || item["business_code_name"] || '');
             item["product_list"] = item["product_list"].map((prod) => {
               prod["product_thumb"] = this.getImageFullPath(
                 prod["product_thumb"]
@@ -635,6 +699,8 @@ export default {
       if(action === "reset") {
         this.supplier_ids=null
         this.channel_code=null
+        this.site_id=null
+        this.namespace=null
       }
       this.page_token = 1;
       this.getList();
@@ -660,10 +726,16 @@ export default {
             params: {
               type: 'partner'
             }
+          },
+          {
+            server: 'idaas-partner',
+            fn: 'sites',
+            path: 'p1',
           }
         ]
       ).then(res=>{
           this.channelList = res[0].data.list;
+          this.siteList = res[2].data.list;
           this.searchForm = [
             {
               label: "加盟商",
@@ -672,6 +744,11 @@ export default {
               value: this.partner_name || this.partner_id,
               placeholder: "请输入名称",
             },
+            {
+              label: "业务线: ",
+              ele: "slot",
+              slot: "site_id",
+            },
             {
               label: "账户类型",
               ele: "xd-select-list",

package/package.json

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