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

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

@@ -374,7 +374,7 @@ export default {
         this.loading=false
         this.formData = resp.results[0]
         if(this.formData.ExtProcessNode_SDK==2){
-          this.formData.ExtChannelType_SDK=[]
+          this.formData.extChannelType_SDK=''
            this.formData.ExtLockRsp_SDK=[]
           this.formData.ExtLockCity_SDK=[]
         }

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

@@ -473,9 +473,15 @@ export default {
           this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
             this.btnloading = false
             this.$message.success('提交成功！')
-            setTimeout(() => {
-              this.$router.back()
-            }, 1000);
+      
+              // var userAgent = navigator.userAgent;
+              // if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") != -1) {
+              //   window.open('', '_self').close()
+              // } else {
+              this.$store.dispatch("tagsView/delView", this.$route);
+               this.$router.go(-1);
+              // }
+    
             //              setTimeout(function(){
             //                console.log('延时两秒')
             // 　　           window.location.href="about:blank";