From d69486d1ab2c33140ca790d4734d6fd3aefba356 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Thu, 20 Aug 2020 17:39:30 +0800
Subject: [PATCH] fixing bug

---
 pageC/components/merchant/list-item.vue |  5 +++-
 pageC/merchant/index.vue                |  2 +-
 pageE/mine/EditUserInfo.vue             |  4 +--
 pageE/mine/MineInfo.vue                 |  2 +-
 pages/mine/index.vue                    | 38 +++----------------------
 5 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/pageC/components/merchant/list-item.vue b/pageC/components/merchant/list-item.vue
index fda4ffc..c2fa52c 100644
--- a/pageC/components/merchant/list-item.vue
+++ b/pageC/components/merchant/list-item.vue
@@ -57,6 +57,9 @@ export default {
 
         }
     },
-    props:['url','type']
+	props:['url','type'],
+	created() {
+		console.log(this.url, this.type);
+	}
 }
 </script>
\ No newline at end of file
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index 52c6ade..0b0e467 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -46,7 +46,7 @@
 					<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></imageTop>
 				</view>
 				<view v-if="indexlist.length" class="container-bottom">
-					<listitem v-for="item in indexlist" :key="item.id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></listitem>
+					<listitem v-for="item in indexlist" :key="item.article_id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></listitem>
 				</view>
 			</scroll-view>
 			<view class="item" v-if="cur==1">
diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue
index 5232045..1a7c8c8 100644
--- a/pageE/mine/EditUserInfo.vue
+++ b/pageE/mine/EditUserInfo.vue
@@ -136,7 +136,7 @@ export default {
 				sizeType: ['original', 'compressed'],
 				sourceType: ['album'],
 				success: (res) => {
-					this.avatar = res.tempFilePaths[0];
+					// this.avatar = res.tempFilePaths[0];
 					common.uploadFile({ 
 						url: url,
 						name: 'avatar',
@@ -144,7 +144,7 @@ export default {
 					}).then(result => {
 						// console.log(result);
 						// this.$set(this, 'avatar', result.file_path);
-						// this.avatar = result.file_path;
+						this.avatar = result.file_path + "?" + new Date().getTime();
 						this.uploadPath = result.file_name;
 					}, error => {
 						this.$u.toast(error);
diff --git a/pageE/mine/MineInfo.vue b/pageE/mine/MineInfo.vue
index 74f885f..120ae70 100644
--- a/pageE/mine/MineInfo.vue
+++ b/pageE/mine/MineInfo.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="information">
 		<view class="info-avatar">
-			<u-avatar :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="120"></u-avatar>
+			<u-avatar :src="userInfo.member_avatar" :size="120"></u-avatar>
 		</view>
 		<view class="info-item">
 			<view class="title">昵称</view>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 227e8be..ab2048c 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -2,7 +2,7 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
+				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-top">
 						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
@@ -58,35 +58,6 @@
 							<text>{{ item.number }}</text>
 						</view>
 					</view>
-					<!-- <view @click="toOtherPage('/order/Index?current=1')">
-						<image src="/static/image/mine/6.png"></image>
-						<view>待支付</view>
-						<view class="order-num">{{ 99 }}</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=2')">
-						<image src="/static/image/mine/35.png"></image>
-						<view>待发货</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=3')">
-						<image src="/static/image/mine/2.png"></image>
-						<view>待收货</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=4')">
-						<image src="/static/image/mine/1.png"></image>
-						<view>试穿试送</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=5')">
-						<image src="/static/image/mine/37.png"></image>
-						<view>拼团中</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=6')">
-						<image src="/static/image/mine/3.png"></image>
-						<view>待评价</view>
-					</view>
-                    <view @click="toOtherPage('/order/Index?current=7')">
-                    	<image src="/static/image/mine/9.png"></image>
-                    	<view>售后</view>
-                    </view> -->
 				</view>
 			</view>
 			<view class="tool">
@@ -181,7 +152,7 @@ export default {
 				{
 					name: 'wait_evaluation',
 					title: '待评价',
-					img: '/static/image/mine/40.png',
+					img: '/static/image/mine/3.png',
 					link: '/order/Index?current=6',
 					number: '',
 				},
@@ -415,8 +386,7 @@ export default {
 					.order-num{
 						position: absolute;
 						top: -12rpx;
-						right: -38rpx;
-						width: 50rpx;
+						left: 40rpx;
 					}
 					.order-num > text {
 						z-index: 9;
@@ -447,7 +417,7 @@ export default {
 					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 43rpx, $image-height: 35rpx);
+					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(6){
 					@include image-size($image-width: 33rpx, $image-height: 35rpx);