Merge remote-tracking branch 'origin/master'

pages/tab/index.vue

@@ -140,8 +140,11 @@
           rows: this.queryParam.rows
         }
         bannerList(query).then(res =>{
-          //将res.data.rows集合里的bannerPicture取出来，放到集合中  将\替换成/
-          this.bannerList = res.data.data.map(item => item.url.replace(/\\/g, '/'));
+          res.data.data.forEach(item => {
+            getOssUrl(item.pictureId).then(imgRes => {
+              this.bannerList.push(imgRes.data.data)
+            })
+          })
         }).catch(e => {
           console.log(e)
         })

pagesUser/userInfo.vue

@@ -27,9 +27,7 @@
 								v-else-if="userData.selfMatchingStatus!=null&&userData.selfMatchingStatus=='LIKE'">
 								<image :src="baseUrl+'/user/mutuallyLike.png'" mode="aspectFill"></image>
 								<view class="t">
-									{{
-											'我喜欢过'
-										}}
+									{{'我喜欢过' }}
 								</view>
 							</view>
 						</view>
@@ -224,6 +222,7 @@
   import {parseDate,calculateAge} from '../common/index'
 	import LsSwiper from '../components/ls-swiper/index.vue';
 	import myPopup from '@/components/myPopup.vue'
+  import {getOssUrl} from "../api/article";
 	export default {
 		components: {
 			LsSwiper,
@@ -346,8 +345,10 @@
             this.userData = res.data.data
             this.userId = this.userData.userId
             //处理头像
-            if (res.data.data.avatarUrl !== '' && res.data.data.avatarUrl !== null){
-              this.imgList.push(res.data.data.avatarUrl.replace(/\\/g, '/'))
+            if (res.data.data.avatar !== '' && res.data.data.avatar !== null){
+              getOssUrl(res.data.data.avatar).then( imgRes =>{
+                this.imgList.push(imgRes.data.data)
+              })
             }
             //处理星座
             if (res.data.data.memConstellation !== '' && res.data.data.memConstellation !== null){

pagesme/me/updateInformation.vue

@@ -246,9 +246,6 @@ import {getOssUrl} from "../../api/article";
         baseUrl: this.$IMG_URL,
         //用户资料
         userInfo: {},
-        uploadImgJSON:{
-          id:[]
-        },
 				multiple: 100, //倍数
 				percent: 0, //百分比
 				perceptualScore: 0,
@@ -305,6 +302,8 @@ import {getOssUrl} from "../../api/article";
 					this.singleIndex = 9;
 				} else {
           console.log('index',Index)
+          console.log('this.userInfo.memPictureId',this.userInfo.memPictureId)
+          console.log('this.userInfo.pictureUrls',this.userInfo.pictureUrls)
 					this.singleIndex = Index;
 				}
 				this.singleNoShow = true;
@@ -389,6 +388,7 @@ import {getOssUrl} from "../../api/article";
               title: '操作失败',
               icon: 'error',
             })
+            this.getUserInfo()
           }
 				})
 			},