wangxy 6 дней назад
Родитель
Сommit
ca9397d9d9
2 измененных файлов с 77 добавлено и 9 удалено
  1. 29 7
      src/views/his/store/index.vue
  2. 48 2
      src/views/system/config/config.vue

+ 29 - 7
src/views/his/store/index.vue

@@ -232,11 +232,18 @@
             :on-success="licensehandleAvatarSuccess"
             :before-upload="beforeAvatarUpload">
             <img v-if="form.licenseImages" :src="form.licenseImages" class="avatar" width="200px">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>          
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
         <el-form-item label="店铺介绍" prop="descs" >
           <el-input v-model="form.descs" placeholder="请输入店铺介绍" type="textarea"/>
+        </el-form-item>
+        <el-form-item
+          label="店铺编号"
+          prop="shopCode"
+          v-if="showShopCode"
+          :rules="[{ required: true, message: '店铺编号不能为空', trigger: 'blur' }]">
+          <el-input v-model="form.shopCode" placeholder="请输入店铺编号" />
         </el-form-item>
          <el-row>
           <el-col :span="12">
@@ -246,7 +253,7 @@
               v-model="form.cityIds"
               :options="citys"
               @change="handleCityChange">
-              </el-cascader>        
+              </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -323,11 +330,13 @@
                  </el-checkbox-group>
            </el-form-item>
 
-           <el-form-item label="发货方式" prop="deliveryType">
-                 <el-radio-group v-model="form.deliveryType">
-                          <el-radio :label="item.dictValue" v-for="item in deliveryTypeOptions" >{{item.dictLabel}}</el-radio>
-                 </el-radio-group>
-            </el-form-item>
+        <el-form-item label="发货方式" prop="deliveryType">
+          <el-radio-group v-model="form.deliveryType" @change="handleDeliveryTypeChange">
+            <el-radio :label="item.dictValue" v-for="item in deliveryTypeOptions" :key="item.dictValue">
+              {{ item.dictLabel }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
 
           <el-form-item label="登录帐号" prop="account" v-if="title != '修改店铺管理'">
             <el-input v-model="form.account" placeholder="请输入登录帐号" />
@@ -387,6 +396,7 @@ shippingType:[],
       single: true,
       // 非多个禁用
       multiple: true,
+      showShopCode: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -472,6 +482,8 @@ shippingType:[],
     };
   },
   created() {
+    // 初始化发货方式变化处理
+    this.handleDeliveryTypeChange(this.form.deliveryType);
       this.getCitys();
     this.getList();
     this.getDicts("sys_company_status").then(response => {
@@ -486,6 +498,15 @@ shippingType:[],
   },
   methods: {
 
+    handleDeliveryTypeChange(value) {
+      // 假设“润心聚水潭”的值是 '3',你需要根据实际的字典值调整
+      this.showShopCode = value === '4';
+
+      // 如果不显示,则清空店铺编号
+      if (!this.showShopCode) {
+        this.form.shopCode = '';
+      }
+    },
     handledetails(row){
             this.show.open=true;
             setTimeout(() => {
@@ -573,6 +594,7 @@ shippingType:[],
         brokerageType:"1",
         brokerageRate:0,
         fullName:null,
+        shopCode: null,
       };
       this.resetForm("form");
     },

+ 48 - 2
src/views/system/config/config.vue

@@ -730,6 +730,16 @@
       <el-tab-pane label="短信配置" name="his.sms">
 
         <el-form ref="form14" :model="form14" label-width="150px">
+          <el-form-item label="是否开启APP短信验证" label-width="160px">
+            <el-switch
+              v-model="form14.isSmsVerification"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-value="1"
+              inactive-value="0"
+            >
+            </el-switch>
+          </el-form-item>
           <el-form-item label="短信服务商" prop="type">
             <el-radio-group v-model="form14.type">
               <el-radio label="rf">重庆润芳</el-radio>
@@ -1030,6 +1040,10 @@
           <el-form-item label="hook地址" prop="hookUrl">
             <el-input v-model="form13.hookUrl" label="请输入hook域名"></el-input>
           </el-form-item>
+          <el-form-item label="APP投诉电话" prop="complaintPhone">
+            <el-input v-model="form13.complaintPhone" label="请输入APP投诉电话" />
+          </el-form-item>
+
           <div class="footer">
             <el-button type="primary" @click="submitForm13">提 交</el-button>
           </div>
@@ -2236,7 +2250,22 @@
           </div>
         </el-form>
       </el-tab-pane>
+      <el-tab-pane label="IM配置" name="im.config">
+        <!--   小米     -->
+        <el-form ref="form34" :model="form34" :rules="rules34" label-width="300px">
+          <el-form-item label="离线推送 小米系统申请channel_id">
+            <el-input v-model="form34.xm_channel_id" style="width: 200px"></el-input>
+          </el-form-item>
+          <el-form-item label="离线推送 华为系统申请channel_id">
+            <el-input v-model="form34.hw_channel_id" style="width: 200px"></el-input>
+          </el-form-item>
 
+        </el-form>
+
+        <div class="footer">
+          <el-button type="primary" @click="submitForm34">提  交</el-button>
+        </div>
+      </el-tab-pane>
     </el-tabs>
 
 
@@ -2317,7 +2346,8 @@ export default {
       form10: [],
       form12: [],
       form13: {
-        dfAccounts: [] // 初始化代付管家账户数组
+        dfAccounts: [], // 初始化代付管家账户数组
+        complaintPhone: ''
       },
       form14: {},
       form15: {},
@@ -2416,6 +2446,7 @@ export default {
       },
       form27: {},
       form28: {},
+      form34:{},
       storeProductScrmColumns:[],
       storeScrmColumns: [],
       photoArr: [],
@@ -2471,7 +2502,8 @@ export default {
       },
       rules21: {},
       rules25: {},
-      rules26: {}
+      rules26: {},
+      rules34: {},
     }
   },
   created() {
@@ -2790,6 +2822,9 @@ export default {
           this.configKey = response.data.configKey
           this.form28 = {...this.form28, ...JSON.parse(response.data.configValue)}
         }
+        if(key=="im.config"){
+          this.form34 =JSON.parse(response.data.configValue);
+        }
       })
     },
     /** 提交按钮 */
@@ -2920,6 +2955,9 @@ export default {
       })
     },
     submitForm14() {
+      if (!this.form14.isSmsVerification) {
+        this.form14.isSmsVerification = 0;
+      }
       var param = { configId: this.configId, configValue: JSON.stringify(this.form14) }
       updateConfigByKey(param).then(response => {
         if (response.code === 200) {
@@ -3064,6 +3102,14 @@ export default {
       console.log(this.form27.pass_columns)
 
     },
+    submitForm34(){
+      var param={configId:this.configId,configValue:JSON.stringify(this.form34)}
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("修改成功");
+        }
+      });
+    },
     submitForm24() {
       this.$refs['form24'].validate(valid => {
         if (valid) {