From 96e08ea23543f970c7569ed75a731d5839b4203d Mon Sep 17 00:00:00 2001
From: cc_zbp <487602586@qq.com>
Date: Thu, 25 May 2023 14:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=9A=E4=BD=8D=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/zbpSwiper.vue              |  5 +++--
 pages/index/index.vue                 |  5 +++--
 pages/supply_chains/supply_chains.vue |  2 +-
 store/modules/app.js                  | 11 +----------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index 3b35aa7..8e49db0 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -45,6 +45,7 @@
   import { getGeocoder } from '@/api/store.js';
   import { mapGetters } from 'vuex'
   import { Toast } from '../libs/uniApi';
+  import Cache from '@/utils/cache';
   export default {
     props: {
       isSelectPlace: {
@@ -82,7 +83,7 @@
     watch: {
       location: {
         handler(newVal, oldVal) {
-          this.street = newVal.address_component.street
+          if(newVal.address_component?.street) this.street = newVal.address_component.street
         },
         immediate: true
       }
@@ -90,7 +91,7 @@
     created() {
       this.getBanner()
       this.Area()
-      this.street = JSON.parse(this.location).address_component.street
+      if(this.location.address_component?.street) this.street = this.location.address_component.street
     },
     methods: {
       swiperClick(item) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b869105..a57864d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -213,6 +213,7 @@
         }
       },
       selfLocation() {
+        const that = this
         uni.getLocation({
           type: 'gcj02',
           success: (res) => {
@@ -220,8 +221,8 @@
             latitude = res.latitude.toString();
             longitude = res.longitude.toString();
             getGeocoder({ lat: latitude, long: longitude }).then(res => {
-              this.$store.commit('setLocation', res.data)
-              this.street = res.data.address_component.street
+              that.$store.commit('setLocation', res.data)
+              that.street = res.data.address_component.street
             }).catch(err => {
               uni.showToast({
                 title: err,
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 0f20fe4..b3cf378 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -135,7 +135,7 @@
     },
     methods: {
       getTownAndStoreId() {
-        const LOCA = JSON.parse(this.location)
+        const LOCA = this.location
         this.street_id = LOCA.address_reference.town.id
         this.getCloudShopMerId(this.street_id)
         this.town = LOCA.address_component.street ?? ''
diff --git a/store/modules/app.js b/store/modules/app.js
index 41f744a..632187b 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -1,19 +1,10 @@
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
 import { getUserInfo } from "../../api/user.js";
 import { LOGIN_STATUS, UID } from '../../config/cache';
 import Cache from '../../utils/cache';
 import { USER_INFO } from '../../config/cache';
 
 const state = {
-  location: Cache.get('LOCATION_DATA') || {},
+  location: Cache.get('LOCATION_DATA',true) || {},
   token: Cache.get(LOGIN_STATUS) || null,
   backgroundColor: "#fff",
   userInfo: null,