From 449b90af2dd15d322ac9c97a677cd5b4574cdf69 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 10 Aug 2022 19:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E9=94=99=E8=AF=AF=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../open-setting-location.vue                 | 31 +++++++++----------
 pages/error/error.vue                         |  2 +-
 pages/goods-detail/goods-detail.vue           | 17 ++++++++++
 .../orderallot-list/orderallot-list.vue       |  2 +-
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/pages/common/open-setting-location/open-setting-location.vue b/pages/common/open-setting-location/open-setting-location.vue
index 2d392f70..bde19cd1 100644
--- a/pages/common/open-setting-location/open-setting-location.vue
+++ b/pages/common/open-setting-location/open-setting-location.vue
@@ -4,9 +4,9 @@
             <view class="content bg-white">
                 <view class="msg cr-gray">开启相应的权限服务</view>
                 <view class="value cr-base">获取[ <text>位置信息</text> ]权限</view>
-                <button type="primary" open-type="openSetting" size="mini" @opensetting="setting_callback_event">打开设置页</button>
-                <view class="tc margin-top-sm">
-                    <navigator open-type="navigateBack" class="cp cr-gray dis-inline-block" hover-class="none">返回</navigator>
+                <button type="primary" open-type="openSetting" size="mini" @opensetting="setting_callback_event">打开设置页</button>
+                <view class="tc margin-top-sm">
+                    <navigator open-type="navigateBack" class="cp cr-gray dis-inline-block" hover-class="none">返回</navigator>
                 </view>
             </view>
         </view>
@@ -17,11 +17,11 @@
 </template>
 <script>
     const app = getApp();
-
+
     var common_static_url = app.globalData.get_static_url('common');
     export default {
         data() {
-            return {
+            return {
                 common_static_url: common_static_url,
                 params: null,
                 is_show_open_setting: false,
@@ -40,7 +40,7 @@
         },
         methods: {
             // 获取权限
-            init() {
+            init() {
                 // #ifdef MP-WEIXIN || MP-ALIPAY || MP-BAIDU || MP-TOUTIAO || MP-QQ
                 var self = this;
                 uni.getSetting({
@@ -64,14 +64,14 @@
                     fail: res => {
                         app.globalData.showToast("请先获取授权");
                     }
-                });
-                // #endif
-                // #ifdef H5 || APP
-                this.choose_location();
-                // #endif
-                // #ifdef MP-KUAISHOU
-                app.globalData.showToast('不支持地理位置选择！');
-                uni.navigateBack();
+                });
+                // #endif
+                // #ifdef H5 || APP
+                this.choose_location();
+                // #endif
+                // #ifdef MP-KUAISHOU
+                app.globalData.showToast('不支持地理位置选择！');
+                uni.navigateBack();
                 // #endif
             },
 
@@ -89,9 +89,6 @@
             choose_location() {
                 uni.chooseLocation({
                     success: res => {
-                        var position = app.globalData.map_gcj_to_bd(res.longitude, res.latitude);
-                        res.longitude = position.lng;
-                        res.latitude = position.lat;
                         uni.setStorageSync(this.cache_key, res);
                         uni.navigateBack();
                     },
diff --git a/pages/error/error.vue b/pages/error/error.vue
index 10429d3a..c033397b 100644
--- a/pages/error/error.vue
+++ b/pages/error/error.vue
@@ -54,7 +54,7 @@
                 } else {
                     uni.switchTab({
                         url: app.globalData.data.tabbar_pages[0]
-                    })
+                    });
                 }
             }
         }
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 7a2fc0e1..9e40b789 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -557,6 +557,11 @@
         <!-- 提示信息 -->
         <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
 
+        <!-- 无商品信息展示返回按钮 -->
+        <view v-if="goods == null && data_list_loding_status != 1" class="tc margin-top-xxxl">
+            <button type="default" class="bg-main br-main cr-white round" size="mini" @tap="goods_error_event">返回</button>
+        </view>
+
         <!-- 快捷导航 -->
         <component-quick-nav :propIsNav="true"></component-quick-nav>
     </view>
@@ -1900,6 +1905,18 @@
                     }
                     app.globalData.url_open(url);
                 }
+            },
+
+            // 商品错误返回、无上一个则返回首页
+            goods_error_event(e) {
+                var prev_url = app.globalData.prev_page();
+                if(prev_url == null) {
+                    uni.switchTab({
+                        url: app.globalData.data.tabbar_pages[0]
+                    });
+                } else {
+                    uni.navigateBack();
+                }
             }
         }
     };
diff --git a/pages/plugins/realstore/orderallot-list/orderallot-list.vue b/pages/plugins/realstore/orderallot-list/orderallot-list.vue
index fb21cccb..7316508d 100644
--- a/pages/plugins/realstore/orderallot-list/orderallot-list.vue
+++ b/pages/plugins/realstore/orderallot-list/orderallot-list.vue
@@ -40,7 +40,7 @@
                     <view v-if="item.operate_data.is_collect == 1 || ((item.express_data || null) != null && item.express_data.length > 0)" class="item-operation tr br-t padding-vertical-main">
                         <button v-if="item.operate_data.is_collect == 1" class="round bg-white cr-green br-green" type="default" size="mini" @tap="collect_event" :data-value="item.id" :data-index="index" hover-class="none">收货</button>
                         <block v-if="(item.express_data || null) != null && item.express_data.length > 0">
-                            <block v-for="(ev, ei) in item.express_data" :key="item.id+ei">
+                            <block v-for="(ev, ei) in item.express_data" :key="ei">
                                 <button class="round bg-white cr-main br-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/express/detail/detail?oid='+item.id+'&eid='+ev.id+'&action_type=realstore'" hover-class="none">物流{{ei+1}}</button>
                             </block>
                         </block>