Merge branch 'liuin' into uat

config/dev.env.js

@@ -8,10 +8,12 @@ module.exports = merge(prodEnv, {
   debug: true,
   isMobilePlatform: false,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"1.9.0"',
 })
+
+

src/pages/regiester2.vue

@@ -240,7 +240,7 @@ export default {
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('验证码已发送')
         } else {
-          vm.hlsPopup.showLongCenter(res.return.discription)
+          vm.hlsPopup.showLongCenter(res.return.description)
         }
       })
     },

src/pages/userBindNew/np/bank-info.vue

@@ -251,6 +251,11 @@ export default {
                         name: 'MyInfo',
                       })
                     }
+                  } else if (res.result === 'P') {
+                    vm.hlsPopup.showLongCenter(res.message)
+                    vm.$router.push({
+                      name: 'MyInfo',
+                    })
                   } else {
                     vm.hlsPopup.showLongCenter(res.message)
                   }

src/pages/userBindNew/org/bankInfo.vue

@@ -345,6 +345,11 @@ export default {
                     name: 'MyInfo',
                   })
                 }
+              } else if (res.result === 'P') {
+                vm.hlsPopup.showLongCenter(res.message)
+                vm.$router.push({
+                  name: 'MyInfo',
+                })
               } else {
                 vm.hlsPopup.showLongCenter(res.message)
               }

src/scripts/hlsHttp.js

@@ -12,7 +12,7 @@ axios.interceptors.request.use(config => {
     cancel = c
   })
   if (promiseArr[config.url]) {
-    promiseArr[config.url]('正在计算中，请稍后...')
+    promiseArr[config.url]('网络异常，请稍后再试')
     promiseArr[config.url] = cancel
   } else {
     promiseArr[config.url] = cancel