diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index b761526..f9bc7d4 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -125,7 +125,7 @@ v-if="orderInfo.shippingType === 2 && orderInfo.paid === 1" >
自提地址信息
-
+
查看位置
@@ -494,25 +494,29 @@ export default { } }); }, - showChang: function() { + showChang: function(data) { // 这里判断是不是微信小程序 - if (isWeixin()) { - let config = { - latitude: this.system_store.latitude, - longitude: this.system_store.longitude, - name: this.system_store.name, - address: this.system_store.address - }; - } else { - if (!this.mapKey) - uni.showToast({ - title: "暂无法使用查看地图,请配置您的腾讯地图key", - icon: "none", - duration: 2000 - }); - return; - this.mapShow = true; - } + this.$yrouter.push({ + path: "/pages/map/index", + query: data + }); + // if (isWeixin()) { + // let config = { + // latitude: this.system_store.latitude, + // longitude: this.system_store.longitude, + // name: this.system_store.name, + // address: this.system_store.address + // }; + // } else { + // if (!this.mapKey) + // uni.showToast({ + // title: "暂无法使用查看地图,请配置您的腾讯地图key", + // icon: "none", + // duration: 2000 + // }); + // return; + // this.mapShow = true; + // } }, goBack() { if (this.name === "MyOrder") { diff --git a/pages/shop/StoreList/index.vue b/pages/shop/StoreList/index.vue index 79eb3a9..e5f6c78 100644 --- a/pages/shop/StoreList/index.vue +++ b/pages/shop/StoreList/index.vue @@ -29,38 +29,6 @@ - @@ -98,6 +66,12 @@ export default { !this.loading && this.getOrderList(); }, methods: { + showMaoLocation(data) { + this.$yrouter.push({ + path: "/pages/map/index", + query: data + }); + }, // 选中门店 checked(e) { if (this.goName === "orders") {