From e7e349e2edfbab29d1572710744915e2ec6d26e9 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Sun, 28 Jun 2020 00:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 42 ++++++++++++++++--------------
 pages/shop/StoreList/index.vue     | 38 +++++----------------------
 2 files changed, 29 insertions(+), 51 deletions(-)

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"
       >
         <div>自提地址信息</div>
-        <div class="place cart-color acea-row row-center-wrapper" @click="showChang">
+        <div class="place cart-color acea-row row-center-wrapper" @click="showChang(orderInfo.systemStore)">
           <span class="iconfont icon-weizhi"></span>查看位置
         </div>
       </div>
@@ -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 @@
       </view>
       <Loading :loaded="loaded" :loading="loading"></Loading>
     </view>
-    <!-- <div>
-      <iframe
-        v-if="locationShow && !isWeixin"
-        ref="geoPage"
-        width="0"
-        height="0"
-        frameborder="0"
-        style="display:none;"
-        scrolling="no"
-        :src="
-          'https://apis.map.qq.com/tools/geolocation?key=' +
-            mapKey +
-            '&referer=myapp'
-        "
-      ></iframe>
-    </div>
-    <div class="geoPage" v-if="mapShow">
-      <iframe
-        width="100%"
-        height="100%"
-        frameborder="0"
-        scrolling="no"
-        :src="
-          'https://apis.map.qq.com/uri/v1/geocoder?coord=' +
-            system_store.latitude +
-            ',' +
-            system_store.longitude +
-            '&referer=' +
-            mapKey
-        "
-      ></iframe>
-    </div>-->
   </view>
 </template>
 
@@ -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") {