Merge pull request 'fixing bug' (#355) from zhy into master

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

pageE/order/Details.vue

@@ -73,9 +73,9 @@
 			</view>
 		</view>
 		 <!-- '4', '8' -->
-		<view class="btn" v-if="['1', '2', '6'].indexOf(orderstate) >= 0">
+		<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
 			<!-- orderstate == '4' ||  -->
-			<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
+			<view class="cancel" v-if="(orderstate == '1' || orderstate == '4') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
 			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
 			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.member_deliver_type != 3" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>

pageE/order/Index.vue

@@ -129,11 +129,11 @@ export default {
 				page: this.page,
 				type: type,
 			})
-			res.data.forEach(element => {
-				element.extend_order_goods.forEach(i=>{
-					// console.log(i)
-				})
-			});
+			// res.data.forEach(element => {
+			// 	element.extend_order_goods.forEach(i=>{
+			// 		// console.log(i)
+			// 	})
+			// });
 			this.timer = true;
 			uni.stopPullDownRefresh(); // 结束刷新
 			if(res.errCode == 0) {
@@ -145,11 +145,11 @@ export default {
 					this.orderList[this.current].push(...res.data);
 				}
 			}
-			this.orderList[this.current].forEach(element => {
-				element.extend_order_goods.forEach(i=>{
-					// console.log(i)
-				})
-			});
+			// this.orderList[this.current].forEach(element => {
+			// 	element.extend_order_goods.forEach(i=>{
+			// 		// console.log(i)
+			// 	})
+			// });
 			this.$forceUpdate();
 			
 			// console.log(this.orderList);

pageE/setting/version.vue

@@ -15,6 +15,10 @@
 				<text class="tips" v-if="version" @click="updateVersion">发现新版本: {{ version }}</text>
 				<text class="tips" v-else>已是最新版本</text>
 			</view>
+			<view>
+				<text class="title">联系我们</text>
+				<text class="tips">0539-09875421</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -96,7 +100,7 @@ export default {
 	}
 	.tips {
 		color: #999;
-		font-size: 22rpx;
+		font-size: 28rpx;
 	}
 	.version-view {
 		.tips {

pages/mine/index.vue

@@ -83,6 +83,10 @@
 						<image src="/static/image/mine/39.png"></image>
 						<view>试穿试送</view>
 					</view>
+					<view @click="toCartPage">
+						<image src="/static/image/common/33.png"></image>
+						<view>购物车</view>
+					</view>
 				</view>
 			</view>
 			<view class="more-tool">
@@ -224,7 +228,10 @@ export default {
 			uni.navigateTo({
 				url: '/pageE' + url
 			});
-		}
+		},
+		toCartPage() {
+			this.$u.route('/pageC/cart/index');
+		},
 	}
 };
 </script>