Merge branch 'liuxin' into develop

fc8b3605 · linxin · 34895437 · 787ef840 · fc8b3605
Commit fc8b3605 authored Jan 09, 2020 by linxin
Show whitespace changes
Inline Side-by-side

Showing with 22 additions and 8 deletions

my-info.vue src/pages/myInfo/my-info.vue +22 -8

No files found.
--- a/src/pages/myInfo/my-info.vue
+++ b/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) {
+      if ((res.info.code === 0) && (res.info.data.authUrl)) {
-        return 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)
+        hlsPopup.showError(res.info.msg)
-        return null
+        return ''
      }
    },
    // 获取企业认证url
@@ -946,11 +950,21 @@ export default {
      hlsPopup.showLoading('请稍候')
      let res = await vm.$post(url, param)
      hlsPopup.hideLoading()
-      if (res.info.code === 0) {
+      // if (res.info.code === 0) {
-        return res.info.data.authUrl
+      //   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)
+        hlsPopup.showError(res.info.msg)
-        return null
+        return ''
      }
    },
  },