Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/lang/zh.js

@@ -67,7 +67,7 @@ export default {
     profile: '个人中心',
 
     customers: '代理商管理',
-    potentialCustomers: '省级代理商',
+    potentialCustomers: '代理商审批',
     regularCustomers: '城市级代理商',
     enterpriseCustomers: '企业客户',
 

src/views/customers/potential-list/index.vue

@@ -362,11 +362,13 @@ extChannelType_SDK:this.formData.ExtChannelType_SDK}
          const add={customerDTO:cc,note:this.form.note,result:"approve"}
           ProcessApproval(add).then((resp)=>{
             this.$message.success("审批成功!")
+            this.dialogFormVisible=false
        })
       }else{
          const bdd={customerDTO:cc,note:this.form.note,result:"reject"}
           ProcessApproval(bdd).then((resp)=>{
             this.$message.success("退回成功!")
+            this.dialogFormVisible=false
        })
       }
       

src/views/login/city-register/index.vue

@@ -355,7 +355,6 @@ export default {
       formInline: {},
       recordList: [],
       tableData: [],
-      loading:false,
       fileList:[],
       countryOptions:[],
       cityOptions:[],
@@ -435,13 +434,13 @@ export default {
     },
     handleApprove(){
       this.formData.ExtCustomerType_SDK=111
-      this.loading=true
+      // this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
-        this.loading=false
-        console.log(resp)
+        // this.loading=false
+        // console.log(resp)
          if(resp.results.length<40){
            this.$message.success('提交成功！')
-            this.$router.back()
+            this.handleClickGoBack()
         }else{
           this.$message.error('提交失败！')
         }

src/views/login/prov-register/index.vue

@@ -405,7 +405,6 @@ export default {
       formData: {},
       inputEnter: false,
       countryArea: '',
-      loading: false,
       formInline: {},
       recordList: [],
       tableData: [],
@@ -527,9 +526,9 @@ export default {
         // });
           
         this.formData. ExtCustomerType_SDK=101
-        this.loading=true
+        // this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
-         this.loading=false
+        //  this.loading=false
         if(resp.results.length<40){
            this.$message.success('提交成功！')
             this.handleClickGoBack()