jufubao-admin-library 1.1.158 → 1.1.160

package/library/pageComponents/modules/JfbProductDialog.vue

@@ -110,7 +110,10 @@
       width="460px"
       @onConfirm="handlePublicSet"
     >
-      <el-form ref="setForm" :model="setForm" :rules="setRules" label-width="80px">
+      <el-form ref="setForm" :model="setForm" :rules="setRules" label-width="120px">
+        <el-form-item prop="product_name" label="商品名称"> 
+          {{ dialogRow['product_name'] }}
+        </el-form-item>
         <el-form-item prop="public" label="是否公开">
           <el-radio-group v-model="setForm.public">
             <el-radio
@@ -128,6 +131,9 @@
             <el-checkbox v-for="(item,index) in tagData" :label="item.value" :key="index">{{item.label}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
+        <el-form-item prop="spider_url" label="产品来源地址"> 
+          <el-input v-model="setForm.spider_url" placeholder="请输入"></el-input>
+        </el-form-item>
       </el-form>
     </xd-dialog>
     <xd-dialog :show.sync="showOpen" title="发票名称设置" width="600px" @onConfirm="handleOpenConfirm">
@@ -209,6 +215,7 @@ export default {
       setForm: {
         public: 'mall',
         partner_product_tags:['mall'],
+        spider_url:''
       },
       tagData:[],
       showOpen: false,
@@ -401,6 +408,7 @@ export default {
       this.is_allow_public_product = info.data['entity']['is_allow_public_product']
       this.setForm.partner_product_tags = info.data['entity']['partner_product_tags']
       this.setForm.public = info.data['entity']['is_public']
+      this.setForm.spider_url = info.data['entity']['spider_url']
       this.showPublicSet = true
     }
     //开票设置
@@ -851,6 +859,7 @@ export default {
             entity: {
               is_public: this.setForm.public,
               partner_product_tags:this.setForm.partner_product_tags,
+              spider_url:this.setForm.spider_url,
             }
           }).then(res => {
             console.log(res)
@@ -860,6 +869,7 @@ export default {
             })
             this.showPublicSet = false
             this.setForm.public = 'Y'
+            this.setForm.spider_url = ''
             this.handleDialogSuccess()
             loading.close()
           }).catch(err => {

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

@@ -50,6 +50,15 @@
                 placeholder="选择时间范围">
               </el-time-picker>
             </el-form-item>
+            <el-form-item label="每日兑换步数上限:" prop="daily_max_exchange_type">
+              <el-radio-group v-model="customForm.daily_max_exchange_type">
+                <el-radio label="N">不限制</el-radio>
+                <el-radio label="S">自定义</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="customForm.daily_max_exchange_type === 'S'" label="" prop="daily_max_exchange_step">
+              <el-input style="width: 40%" type="number" v-model="customForm.daily_max_exchange_step" placeholder="请输入每日兑换步数上限"></el-input>
+            </el-form-item>
           </el-form>
         </template>
       </xd-base-dynamic-field>
@@ -97,6 +106,8 @@ export default {
         exchange_ratio_step:'',
         exchange_ratio_mileage:'',
         daily_exchange_deadline:'',
+        daily_max_exchange_type:'N',
+        daily_max_exchange_step:''
       },
       customRules: {
         exchange_ratio_step: [
@@ -108,6 +119,12 @@ export default {
         daily_exchange_deadline: [
           { required: true, message: '请选择每日兑换截止时间', trigger: ['blur', 'change'] },
         ],
+        daily_max_exchange_type: [
+          { required: true, message: '请设置每日兑换步数上限', trigger: ['blur', 'change'] },
+        ],
+        daily_max_exchange_step: [
+          { required: true, message: '请输入每日兑换步数上限', trigger: ['blur', 'change'] },
+        ],
       },
       valueFormat: 'HH:mm:ss',
       pickerOptions: { format: 'HH:mm:ss' },
@@ -177,7 +194,7 @@ export default {
       server:'saas-app-public',
       fn:'exchange-ratio-step',
       path:'p1',
-    }, 
+    },
      // #ifdef sms-walking
     {
       server:'saas-app-public',
@@ -191,7 +208,7 @@ export default {
         server:'saas-company',
         fn:'sub_company',
         path:'p1',
-      }, 
+      },
        // #endif
     ]).then(result => {
       console.log(result, 'aaaaa')
@@ -219,7 +236,11 @@ 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.daily_exchange_deadline = res.data.daily_exchange_deadline  
+          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
+          }
           // #ifdef sms-walking
           if(res.data.activity_url_config){
             res.data.activity_url_config = JSON.parse(res.data.activity_url_config)
@@ -457,21 +478,21 @@ export default {
           ]
         },
         {
-          label: '活动封面图:', 
-          ele: 'xd-upload', 
-          valueKey: 'activity_logo', 
-          value: {}, 
+          label: '活动封面图:',
+          ele: 'xd-upload',
+          valueKey: 'activity_logo',
+          value: {},
           defaultValue: {url:params.activity_logo}||null,
-          slot: true, 
+          slot: true,
           elinputClassName: 'input40',
           tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
           type: ['jpg', 'png', 'jpeg'],
-          styleType: 'one', 
+          styleType: 'one',
           uploadType: 'aliyun',
-          size: 5, 
+          size: 5,
           action: 'aliyun',
-          sort: true, 
-          maxlen: 100, 
+          sort: true,
+          maxlen: 100,
           rules: [
             {required: true, message: '请上传图片', trigger: ['blur', 'change']},
           ]
@@ -497,7 +518,7 @@ export default {
             { required: true, message: "请添加活动规则", trigger: "change" },
           ],
         },
-        
+
       ]
       this.formList = formList.filter(i => i)
       this.renderFormKey = Date.now()
@@ -515,18 +536,28 @@ export default {
       if(this.formParams.activity_end_time){
         formParamsCopy.activity_end_time = this.formParams.activity_end_time/1000
       }
-        // #ifdef sms-walking
+
+      // #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) 
+        formParamsCopy['activity_url_config'] = JSON.stringify(this.formParams.activity_url_config)
       }
       if(this.formParams.activity_show_terminals){
-        formParamsCopy['activity_show_terminals'] = JSON.stringify(this.formParams.activity_show_terminals) 
+        formParamsCopy['activity_show_terminals'] = JSON.stringify(this.formParams.activity_show_terminals)
       }
       // #endif
-      let needFilters = Object.assign({},formParamsCopy,this.customForm)
-      console.log(needFilters,'need')
-      this.$refs.form.submit().then(res => {
+      let needFilters = Object.assign({},formParamsCopy,this.customForm);
+
+      //每日兑换步数限制
+      if(needFilters.daily_max_exchange_type === 'N') {
+        delete needFilters.daily_max_exchange_step;
+      }
+      if(needFilters.daily_max_exchange_type === 'Y'){
+        needFilters.daily_max_exchange_step = Number(needFilters.daily_max_exchange_step);
+      }
+
+        console.log(needFilters,'need')
+      this.$refs.form.submitAll().then(res => {
         let data = {
           item: needFilters,
         }
@@ -563,7 +594,7 @@ export default {
           })
         }
       })
-      
+
     },
     goBack () {
       this.$router.replace('/walking_activity/list')

package/package.json

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