Merge remote-tracking branch 'origin/金牛明医' into 金牛明医

src/views/system/config/config.vue

@@ -2553,7 +2553,7 @@
         </el-form>
 
         <div class="footer">
-          <el-button type="primary" @click="submitForm31">提  交</el-button>
+          <el-button type="primary" @click="submitForm34">提  交</el-button>
         </div>
       </el-tab-pane>
 
@@ -2768,6 +2768,8 @@ export default {
         ],
 
       },
+      form32:{},
+      form34:{},
       storeProductScrmColumns:[],
       storeScrmColumns: [],
       photoArr: [],
@@ -2825,7 +2827,6 @@ export default {
       rules25: {},
       rules26: {},
       rules31:{},
-      rules33: {},
       rules34: {},
     }
   },
@@ -3017,13 +3018,13 @@ export default {
     },
     getConfigByKey(key) {
       getConfigByKey(key).then(response => {
-        if(!!response.data){
-        this.configId = response.data.configId
-        this.configKey = response.data.configKey
-        }else{
-            this.configId = null;
-            this.configKey = key;
-          }
+        if (!!response.data) {
+          this.configId = response.data.configId
+          this.configKey = response.data.configKey
+        } else {
+          this.configId = null;
+          this.configKey = key;
+        }
         if (key == 'sys.oss.cloudStorage') {
           this.form1 = JSON.parse(response.data.configValue)
         }
@@ -3178,25 +3179,13 @@ export default {
 
         if(key=="luckyBag.config"){
           console.log("----------"+response.data.configValue)
-          this.form33 =JSON.parse(response.data.configValue);
+          this.form31 =JSON.parse(response.data.configValue);
         }
         if(key=="im.config"){
-          this.form34 =JSON.parse(response.data.configValue);
-        }
-        if(key == 'vc.config'){
-           if(!!response.data){
+          console.log("----------"+response.data)
           this.configId = response.data.configId
           this.configKey = response.data.configKey
-          this.form31 = {...this.form31, ...JSON.parse(response.data.configValue)}
-          }
-        }
-        if(key == 'living.config'){
-          if(!!response.data){
-            this.configId = response.data.configId
-            this.configKey = response.data.configKey
-            this.form32 = {...this.form32, ...JSON.parse(response.data.configValue)}
-            console.log(this.form32 );
-          }
+          this.form34 =JSON.parse(response.data.configValue);
         }
       })
     },
@@ -3483,6 +3472,7 @@ export default {
       })
     },
     submitForm31(){
+      console.log('configId',this.configId);
       var param={configId:this.configId,configValue:JSON.stringify(this.form31)}
       updateConfigByKey(param).then(response => {
         if (response.code === 200) {
@@ -3490,6 +3480,14 @@ export default {
         }
       });
     },
+    submitForm34(){
+      var param={configId:this.configId,configKey: this.configKey,configValue:JSON.stringify(this.form34)}
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("修改成功");
+        }
+      });
+    },
     formatColumns(){
       console.log(this.form27.pass_columns)