Merge remote-tracking branch 'remotes/origin/dev-fix-upload' into test

src/common/upload.js

@@ -7,6 +7,9 @@ function getPhoto(type, token) {
       sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
       sourceType: sourceType, //从相册选择
       success: function(res) {
+        uni.showLoading({
+          title: '上传中...',
+        })
         //上传七牛
         let filePath = res.tempFiles[0].path //为需要上传的文件
         upload(filePath, token)
@@ -22,7 +25,7 @@ function getPhoto(type, token) {
           })
       },
       complete: function() {
-        uni.hideLoading()
+        
       },
     })
   })

src/pages/mine/info.vue

@@ -259,7 +259,6 @@ export default {
         })
     },
     changeHead() {
-      this.inUpload()
       //更换头像
       upload.getPhoto(2, this.qiToken).then((res) => {
         this.student.avatarPath = process.uniEnv.qn_asset_url + res.key
@@ -279,7 +278,6 @@ export default {
       })
     },
     changeCertPhoto() {
-      this.inUpload()
       //更换证件头像
       upload.getPhoto(2, this.qiToken).then((res) => {
         this.student.certificatePhotoPath =