Merge remote-tracking branch 'origin/dev_cd' into dev_jd

pagesD/pages/personal/userInfo.vue

@@ -246,7 +246,7 @@ export default {
                 success: function (res) {
                     const tempFilePaths = res.tempFilePaths;
                     uni.uploadFile({
-                        url: that.http.baseUrl + '/common/upload',
+                        url: that.http.baseUrl + '/app/user/upload',
                         //url: 'http://192.168.2.21:7001/upload',//仅为示例，非真实的接口地址
                         method: 'POST',
                         filePath: tempFilePaths[0],
@@ -256,7 +256,8 @@ export default {
                         },
                         // 请求头一定要加，否则 iOS 图片上传会失败
                         header: {
-                            'content-type': 'multipart/form-data'
+                            'content-type': 'multipart/form-data',
+                            'Authorization': 'Bearer ' + uni.getStorageSync('userToken')
                         },
                         success: (res) => {
                             let uploadData = JSON.parse(res.data)
@@ -266,12 +267,12 @@ export default {
                             };
                             let userInfoItem = {
                                 type: 1,
-                                val: uploadData.data.fileName
+                                val: uploadData.data.url
                             };
                             that.http.httpTokenRequest(opts, userInfoItem).then(response => {
                                 if (response.data.code == 200) {
                                     that.$nextTick(() => {
-                                        that.image = that.http.baseUrl + uploadData.data.fileName
+                                        that.image = uploadData.data.url
                                     })
                                 }
                             })