Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pages.json

@@ -101,6 +101,12 @@
 						"navigationBarTitleText": "选择售后"
 					}
 				},
+				{
+					"path": "logistics/index",
+					"style": {
+						"navigationBarTitleText": "物流信息"
+					}
+				},
 				{
 					"path": "discount/index",
 					"style": {
@@ -192,7 +198,7 @@
 					"style": {
 						"navigationBarTitleText": "地方特产"
 					}
-				},	{
+				}, {
 					"path": "place/detail",
 					"style": {
 						"navigationBarTitleText": "地方特产"
@@ -240,7 +246,7 @@
 						"navigationBarTitleText": "店铺"
 					}
 				}
-            ]
+			]
 		}
 	],
 	"globalStyle": {

pagesMy/logistics/index.vue

@@ -0,0 +1,61 @@
+<template>
+	<mobile-frame>
+		<view class="main">
+			<view class="one">
+				地图
+			</view>
+			<view class="two">
+				代付
+			</view>
+		</view>
+	</mobile-frame>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {}
+			};
+		},
+		onLoad: function(e) {
+			const that = this;
+			that.$set(that, `id`, e.id || '6343b53f21b24c75ad8dbf7a');
+			that.watchLogin()
+		},
+		onShow: function() {},
+		methods: {
+			watchLogin() {
+				const that = this;
+				uni.getStorage({
+					key: 'token',
+					success: function(res) {
+						let user = that.$jwt(res.data);
+						if (user) that.$set(that, `user`, user);
+						that.searchInfo();
+					}
+				})
+			},
+			async searchInfo() {
+				const that = this;
+				if (that.id) {
+					let res = await that.$api(`/orderDetail/${that.id}`, 'GET')
+					if (res.errcode == '0') {
+						that.$set(that, `info`, res.data);
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						})
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pagesMy/order/index.vue

@@ -47,10 +47,10 @@
 										<text>总价¥{{item.total_detail.goods_total}}</text>
 									</view>
 									<view class="btn">
-										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini" @click="toCancel(item)">取消订单</button>
-										<button class="toPay" v-if="item.status=='0'" type="default" size="mini" @click="toPay(item)">付款</button>
-										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini" @click="toAfter(item)">申请售后</button>
-										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini" @click="toAfter(item)">申请退款</button>
+										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toCancel(item)">取消订单</button>
+										<button class="toPay" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toPay(item)">付款</button>
+										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini" @tap.stop="toAfter(item)">申请售后</button>
+										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini" @tap.stop="toAfter(item)">申请退款</button>
 									</view>
 								</view>
 								<view class="list_2 list_3" v-for="(item,index) in list" :key="index" @tap="toInfo(item)" v-else>
@@ -90,11 +90,11 @@
 										<text>总价¥{{item.total_detail.goods_total}}</text>
 									</view>
 									<view class="btn">
-										<button class="toCancel" v-if="item.status=='2'||item.status=='3'" type="default" size="mini" @click="toLogi(item)">查看物流</button>
-										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini" @click="toCancel(item)">取消订单</button>
-										<button class="toPay" v-if="item.status=='0'" type="default" size="mini" @click="toPay(item)">付款</button>
-										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini" @click="toAfter(item)">申请售后</button>
-										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini" @click="toAfter(item)">申请退款</button>
+										<button class="toCancel" v-if="item.status=='2'||item.status=='3'" type="default" size="mini" @tap.stop="toLogi(item)">查看物流</button>
+										<button class="toCancel" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toCancel(item)">取消订单</button>
+										<button class="toPay" v-if="item.status=='0'" type="default" size="mini" @tap.stop="toPay(item)">付款</button>
+										<button class="toAfter" v-if="item.status!='0'" type="default" size="mini" @tap.stop="toAfter(item)">申请售后</button>
+										<button class="toAfter" v-if="item.status=='3'" type="default" size="mini" @tap.stop="toAfter(item)">申请退款</button>
 									</view>
 								</view>
 							</view>
@@ -336,7 +336,9 @@
 			},
 			// 查看物流
 			toLogi(e) {
-				console.log(e);
+				uni.navigateTo({
+					url: `/pagesMy/logistics/index?id=${e._id}`
+				})
 			},
 			// 选择选项卡
 			tabsChange(e) {