avater

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/388

components/mine/order-item/index.vue

@@ -130,7 +130,7 @@ export default {
 					state = '待退款';
 					break;
 				case 7:
-					state = '已退款';
+					state = '商家已退款';
 					break;
 				case 9:
 					state = '拼团中';
@@ -139,7 +139,9 @@ export default {
 					state = '已取消';
 					break;
 				case 11:
-					state = '已拒绝';
+					state = '商家已拒绝';
+				case 12:
+					state = '平台已退款';
 					break;	
 				default:
 					break;

pageC/merchant/storeClassify.vue

@@ -12,7 +12,7 @@
 			<view v-for="classifyA in classifyList" :key="classifyA.gc_parent_id" class="classify-view">
 				<view class="title">{{ classifyA.gc_parent_name }}</view>
 				<view class="classifyA-view">
-					<view v-for="classifyB in classifyA.gc_child" :key="classifyB.gc_id" class="classifyB-item u-line-1" @click="viewGoods({ type: classifyB.gc_parent_id, name: classifyB.gc_parent_name })">{{ classifyB.gc_parent_name }}</view>
+					<view v-for="classifyB in classifyA.gc_child" :key="classifyB.gc_id" class="classifyB-item u-line-1" @click="viewGoods({ type: classifyB.gc_id, name: classifyB.gc_name })">{{ classifyB.gc_name }}</view>
 				</view>
 			</view>
 		</view>

pageE/mine/MineInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="information">
 		<view class="info-avatar">
-			<u-avatar :src="userInfo.member_avatar" :size="120"></u-avatar>
+			<u-avatar :src="userInfo.member_avatar + '?' + (new Date().getTime())" :size="120"></u-avatar>
 		</view>
 		<view class="info-item">
 			<view class="title">昵称</view>
@@ -51,8 +51,8 @@ export default {
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
 				if (res.errCode == 0) {
-					// this.userInfo = res.data.MemberArray;
+					this.userInfo = res.data.MemberArray;
-					this.$set(this, 'userInfo', res.data.MemberArray);
+					// this.$set(this, 'userInfo', res.data.MemberArray);
 				}
 			})
 		},

pageE/order/Details.vue

@@ -115,7 +115,7 @@ export default {
 					image: '../static/mine/36.png',
 				},
 				'5': {
-					text: '已退款',
+					text: '商家已退款',
 					image: '../static/mine/34.png',
 				},
 				'6': {
@@ -135,7 +135,11 @@ export default {
 					image: '../static/mine/33.png',
 				},
 				'10': {
-					text: '已拒绝',
+					text: '商家已拒绝',
+					image: '../static/mine/34.png',
+				},
+				'11': {
+					text: '平台已退款',
 					image: '../static/mine/34.png',
 				},
 			},
@@ -329,6 +333,9 @@ export default {
 				case 11:
 					state = '10';
 					break;
+				case 12:
+					state = '11';
+					break;
 				default:
 					break;
 			}

pageE/setting/Index.vue

@@ -129,8 +129,8 @@
                             plus.cache.clear(function(e) {
                                 console.log(e);
                             })
+                            this.getCache();
                         }
-                        this.getCache();
                     }
                 })
                 // #endif

pageE/tool/SendWash.vue

@@ -21,7 +21,7 @@
 							<view class="order-status">{{ item.order_status | viewStatus }}</view>
 						</view>
 						<view class="order-info">
-							<image :src="type == 1 ? item.goods_image : item.images[0]" mode="aspectFit"></image>
+							<image :src="type == 1 ? item.goods_image : (Array.isArray(item.images) ? item.images[0] : '/static/image/mine/47.png')" mode="aspectFit"></image>
 							<view v-if="item.deliver_goods_type == 2 && item.order_status == 20">
 								<view>骑手名字：{{ item.takeawayer_name || '' }}</view>
 								<view>联系方式：{{ item.takeawayer_mobile || '' }}</view>

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" :size="110"></u-avatar>
+				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + (new Date().getTime())" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-top">
 						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
@@ -207,8 +207,8 @@ export default {
 			this.$u.api.getMemberInfo().then(res => {
 				// uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
-					// this.userInfo = res.data.MemberArray;
+					this.userInfo = res.data.MemberArray;
-					this.$set(this, 'userInfo', res.data.MemberArray);
+					// this.$set(this, 'userInfo', res.data.MemberArray);
 				}
 			})
 		},