Parcourir la source

Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

# Conflicts:
#	src/views/system/config/config.vue
xgb il y a 1 semaine
Parent
commit
66cd3d48d5
1 fichiers modifiés avec 2 ajouts et 8 suppressions
  1. 2 8
      src/views/system/config/config.vue

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

@@ -2510,7 +2510,7 @@
         </el-form>
 
         <div class="footer">
-          <el-button type="primary" @click="submitForm31">提  交</el-button>
+          <el-button type="primary" @click="submitForm33">提  交</el-button>
         </div>
       </el-tab-pane>
 
@@ -2725,7 +2725,6 @@ export default {
       form31:{},
       form32:{},
       form33:{},
-      form34:{},
       storeProductScrmColumns:[],
       storeScrmColumns: [],
       photoArr: [],
@@ -2782,8 +2781,6 @@ export default {
       rules21: {},
       rules25: {},
       rules26: {},
-      rules33: {},
-      rules34: {},
     }
   },
   created() {
@@ -3134,9 +3131,6 @@ export default {
           console.log("----------"+response.data.configValue)
           this.form33 =JSON.parse(response.data.configValue);
         }
-        if(key=="im.config"){
-          this.form34 =JSON.parse(response.data.configValue);
-        }
         if(key == 'vc.config'){
            if(!!response.data){
           this.configId = response.data.configId
@@ -3446,7 +3440,7 @@ export default {
       })
     },
     submitForm33(){
-      var param={configId:this.configId,configValue:JSON.stringify(this.form31)}
+      var param={configId:this.configId,configValue:JSON.stringify(this.form33)}
       updateConfigByKey(param).then(response => {
         if (response.code === 200) {
           this.msgSuccess("修改成功");