Merge branch 'dev-fix-auth' into test

src/common/upload.js

@@ -31,9 +31,6 @@ function getPhoto(type, token) {
 //上传七牛
 function upload(filePath, token) {
   return new Promise((resolve, reject) => {
-    uni.showLoading({
-      title: '上传中...',
-    })
     let key =
       new Date().getTime() + Math.random(1000) + filePath.split('/').pop() //key为自定义文件名
     uni.uploadFile({

src/pages/mine/info.vue

@@ -117,12 +117,16 @@ export default {
     },
   },
   onLoad() {
+    uni.showLoading({
+      title: '加载中',
+    })
     getApp().trackPage('我的信息')
     this.$u.api.getQiNiuToken({ bucketName: 'wsy-exam' }).then((res) => {
       this.qiToken = res
       getApp().globalData.qiNiuToken = res
     })
     this.$u.api.getUserInfo().then((res) => {
+      uni.hideLoading()
       if (res) {
         res.isCertify =
           res && res.identityNumber && res.identityNumber.length > 5
@@ -157,6 +161,7 @@ export default {
           })
           return
         } else if (e.detail.encryptedData && e.detail.iv) {
+          this.inGetPhone()
           //允许授权-解析-更新手机号
           params = {
             encryptedData: e.detail.encryptedData,
@@ -211,13 +216,15 @@ export default {
       })
     },
     inUpload() {
+      if (uni.getSystemInfoSync().platform === 'android') {
+        return
+      }
       uni.showLoading({
         title: '上传中...',
       })
     },
     refleshCode() {
       let that = this
-      this.inGetPhone()
       uni.login({
         provider: 'weixin',
         success: (code_res) => {