Merge branch 'liuxin' into develop

src/pages/myInfo/my-info.vue

@@ -929,11 +929,15 @@ export default {
       hlsPopup.showLoading('请稍候')
       let res = await vm.$post(url, param)
       hlsPopup.hideLoading()
-      if (res.info.code === 0) {
-        return res.info.data.authUrl
+      if ((res.info.code === 0) && (res.info.data.authUrl)) {
+        vm.authUrl = res.info.data.authUrl
+        return vm.authUrl
+      } else if ((res.info.code === 0) && (res.info.data.openId)) {
+        vm.authUrl = res.info.data.openId
+        return vm.authUrl
       } else {
-        hlsPopup.showLongCenter(res.info.msg)
-        return null
+        hlsPopup.showError(res.info.msg)
+        return ''
       }
     },
     // 获取企业认证url
@@ -946,11 +950,21 @@ export default {
       hlsPopup.showLoading('请稍候')
       let res = await vm.$post(url, param)
       hlsPopup.hideLoading()
-      if (res.info.code === 0) {
-        return res.info.data.authUrl
+      // if (res.info.code === 0) {
+      //   return res.info.data.authUrl
+      // } else {
+      //   hlsPopup.showLongCenter(res.info.msg)
+      //   return null
+      // }
+      if ((res.info.code === 0) && (res.info.data.authUrl)) {
+        vm.authUrl = res.info.data.authUrl
+        return vm.authUrl
+      } else if ((res.info.code === 0) && (res.info.data.openId)) {
+        vm.authUrl = res.info.data.openId
+        return vm.authUrl
       } else {
-        hlsPopup.showLongCenter(res.info.msg)
-        return null
+        hlsPopup.showError(res.info.msg)
+        return ''
       }
     },
   },