From f691bf6749adc13f95f953eafe41703dedf08f42 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 17 Apr 2024 14:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud_warehouse/market/market.vue | 208 +++++++++++++++---------
 pages/index/component/homeComb.vue      |  11 +-
 2 files changed, 141 insertions(+), 78 deletions(-)

diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 2c51a81..d002f3e 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -291,6 +291,36 @@
       }
     }
   }
+
+  .position-address {
+    position: absolute;
+    top: 70rpx;
+    right: -10rpx;
+    // background-color: rgba(#000, 0.7);
+    width: 250rpx;
+    padding: 20rpx;
+    padding-top: 30rpx;
+    font-size: 26rpx;
+    text-align: center;
+    border-radius: 10rpx;
+    background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39cd0202404171145486922.png);
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+
+    .icon {
+      position: absolute;
+      right: 10rpx;
+      top: 25rpx;
+    }
+
+    .btn {
+      background-color: #40AE36;
+      width: 100%;
+      height: 40rpx;
+      margin-top: 20rpx;
+      border-radius: 40rpx;
+    }
+  }
 </style>
 <template>
   <view class="wholeSale">
@@ -299,13 +329,23 @@
     <view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
       <!-- 适配不同机 -->
       <view style="height: var(--status-bar-height);background-color: #40af37;"></view>
-      <view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;justify-content: space-between;">
-        <view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20"
-            color="#fff" @click="navBack"></u-icon>供销综合云市场</view>
-        <view style="display: flex;" @click="changeMap">
-          <view style="width: 250rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right;">{{street}}</view>
-          <u-icon name="arrow-down" size="14"
-              color="#fff"></u-icon>
+      <view
+        style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;justify-content: space-between;">
+        <view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
+            name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>供销综合云市场</view>
+        <view style="display: flex;position: relative;" @click="changeMap">
+          <view style="width: 250rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right;">
+            {{street}}
+          </view>
+          <u-icon name="arrow-down" size="14" color="#fff"></u-icon>
+          <view class="position-address" v-if="isShowAddress" @click.stop="">
+            <u-icon class="icon" name="close" size="14" @click="closeShowAddress" color="#fff"></u-icon>
+            <view class="title">
+              <view>开启定位服务</view>
+              <view>查看附近商铺</view>
+            </view>
+            <view class="btn" @click.stop="getLocation">立即开启</view>
+          </view>
         </view>
       </view>
     </view>
@@ -315,14 +355,14 @@
       <view class="wholeSale-nav">
         <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
         <!-- 搜索 -->
-        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=true`)" hover-class="none"
-        	class="search_content flex_a_c_j_sb">
-        	<view class="flex_a_c search_content_wrap">
-        		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-        		<input type="text" placeholder="搜索店铺名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
-        			disabled style="pointer-events: none;">
-        	</view>
-        	<!-- <button class="search_btn">搜索</button> -->
+        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=true`)"
+          hover-class="none" class="search_content flex_a_c_j_sb">
+          <view class="flex_a_c search_content_wrap">
+            <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+            <input type="text" placeholder="搜索店铺名称" :value="where.keyword"
+              placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
+          </view>
+          <!-- <button class="search_btn">搜索</button> -->
         </view>
       </view>
 
@@ -333,7 +373,8 @@
             <block v-for="(item,index) in store_category" :key="index">
               <view class="category-item" :class="{'category-item-active': index==cate_change}"
                 @click="changeCate(index)">
-                <u--image class="category-item-img" width="108rpx" :src="item.background" height="108rpx" shape="circle">
+                <u--image class="category-item-img" width="108rpx" :src="item.background" height="108rpx"
+                  shape="circle">
                   <template v-slot:loading>
                     <u-loading-icon color="#999" size="15" />
                   </template>
@@ -377,15 +418,15 @@
           </view>
           <view class="content-two">
             <u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
-            	height="33.85rpx"></u--image>
+              height="33.85rpx"></u--image>
             <text> {{item.service_phone}}</text>
-            <u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
-            	height="33.85rpx"></u--image>
+            <u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
+              src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
             <text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
           </view>
           <view class="content-two">
             <u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
-            	height="33.85rpx"></u--image>
+              height="33.85rpx"></u--image>
             <text class="address">{{item.mer_address}}</text>
           </view>
         </view>
@@ -416,7 +457,7 @@
   import {
     HTTP_REQUEST_URL
   } from '@/config/app';
-import { Toast } from '../../../libs/uniApi';
+  import { Toast } from '../../../libs/uniApi';
   export default {
     components: {
       WaterfallsFlow
@@ -429,6 +470,7 @@ import { Toast } from '../../../libs/uniApi';
         cate_change: 0,
         goodsList: [],
         isLoading: 0,
+        isShowAddress: false,
         street: '定位中',
         where: {
           page: 1,
@@ -451,10 +493,13 @@ import { Toast } from '../../../libs/uniApi';
       }, mapGetters(['viewColor', 'keyColor'])),
     },
     onLoad(option) {
+      let getAddress = uni.getStorageSync('getAddress');
+      let closeShow = uni.getStorageSync('closeShow');
+      if (!getAddress && !closeShow) this.isShowAddress = true;
       this.street = this.$store.state.storage.address.townName;
-      if(this.$store.state.storage.location.lat) {
+      if (this.$store.state.storage.location.lat) {
         this.where.location = `${this.$store.state.storage.location.lat},${this.$store.state.storage.location.long}`;
-      } else if(uni.getStorageSync('getAddress')){
+      } else if (getAddress) {
         this.street = '';
         this.getLocation();
       } else Toast('点击右上角开启定位后才可获取附近商家')
@@ -468,18 +513,18 @@ import { Toast } from '../../../libs/uniApi';
       uni.$emit('scroll');
     },
     methods: {
-      navTo(url){
+      navTo(url) {
         uni.navigateTo({
-          url:url,
+          url: url,
           success: () => {
-            uni.$once('searchValue', (e)=>{
-              this.$nextTick(()=>{
+            uni.$once('searchValue', (e) => {
+              this.$nextTick(() => {
                 this.where.keyword = e;
                 this.storeMerchantList(true);
               })
             })
           }
-        })        
+        })
       },
       navBack() {
         uni.navigateBack();
@@ -494,9 +539,9 @@ import { Toast } from '../../../libs/uniApi';
       },
       // 进店
       goStore(id) {
-      	uni.navigateTo({
-      		url: `/pages/store/home/index?id=${id}`
-      	})
+        uni.navigateTo({
+          url: `/pages/store/home/index?id=${id}`
+        })
       },
       merClassifly() {
         merClassifly().then(res => {
@@ -508,50 +553,56 @@ import { Toast } from '../../../libs/uniApi';
         })
       },
       storeMerchantList(reLoad = false) {
-        if(reLoad){
+        if (reLoad) {
           this.where.page = 1;
           this.goodsList = [];
           this.isLoading = 0;
         }
-        if(this.isLoading==-1)return;
+        if (this.isLoading == -1) return;
         this.isLoading = 1;
         storeMerchantList(this.where).then(res => {
           this.goodsList = [...this.goodsList, ...res.data.list];
           this.isLoading = 0;
-          if(res.data.list.length<this.where.limit) this.isLoading = -1;
+          if (res.data.list.length < this.where.limit) this.isLoading = -1;
           this.where.page++;
         })
       },
+      closeShowAddress() {
+        this.isShowAddress = false;
+        uni.setStorageSync('closeShow', true);
+      },
       // 选择位置
       changeMap() {
-      	uni.navigateTo({
-      		url: `/pages/select_address_n/select_address_n`,
-      		success: () => {
-      			uni.$once('changeAddress', (e) => {
-      				this.street = e.street.name;
-      				this.$store.commit('setAddress', {
-      					street_id: e.street.code,
-      					townName: e.street.name
-      				});
-      				if (e.longitude) {
-      					let latitude = e.latitude;
-      					let longitude = e.longitude;
+        uni.navigateTo({
+          url: `/pages/select_address_n/select_address_n`,
+          success: () => {
+            uni.$once('changeAddress', (e) => {
+              this.isShowAddress = false;
+              uni.setStorageSync('closeShow', true);
+              this.street = e.street.name;
+              this.$store.commit('setAddress', {
+                street_id: e.street.code,
+                townName: e.street.name
+              });
+              if (e.longitude) {
+                let latitude = e.latitude;
+                let longitude = e.longitude;
                 this.where.location = `${latitude},${longitude}`;
-      					this.$store.commit('setLocation', {
-      						lat: e.latitude,
-      						long: e.longitude,
-      					});
-                this.$nextTick(()=>{
-                  setTimeout(()=>{
+                this.$store.commit('setLocation', {
+                  lat: e.latitude,
+                  long: e.longitude,
+                });
+                this.$nextTick(() => {
+                  setTimeout(() => {
                     this.storeMerchantList(true);
                   }, 200)
                 })
-      				}
-      			})
-      		}
-      	})
+              }
+            })
+          }
+        })
       },
-      getLocation(){
+      getLocation() {
         uni.getLocation({
           type: 'gcj02',
           success: (res) => {
@@ -559,29 +610,38 @@ import { Toast } from '../../../libs/uniApi';
             latitude = res.latitude.toString();
             longitude = res.longitude.toString();
             this.$store.commit('setLocation', {
-            	lat: res.latitude.toFixed(6),
-            	long: res.longitude.toFixed(6),
+              lat: res.latitude.toFixed(6),
+              long: res.longitude.toFixed(6),
             });
+            this.isShowAddress = false;
+            uni.setStorageSync('closeShow', true);
+            uni.setStorageSync('getAddress', true);
             getGeocoder({
-            	lat: latitude,
-            	long: longitude
+              lat: latitude,
+              long: longitude
             }).then(res => {
-            	let town = res.data.address_reference.town.title
-            	let street_id = street_id = res.data.address_reference.town.id
-            	this.street = res.data.address_reference.town.title;
-            	this.$store.commit('setAddress', {
-            		street_id: street_id,
-            		townName: town
-            	});
-            	uni.$emit('getLocation_succees', {
+              let town = res.data.address_reference.town.title
+              let street_id = street_id = res.data.address_reference.town.id
+              this.street = res.data.address_reference.town.title;
+              this.$store.commit('setAddress', {
+                street_id: street_id,
+                townName: town
+              });
+              uni.$emit('getLocation_succees', {
                 street_id,
+              });
+              this.where.location = `${latitude},${longitude}`;
+              this.$nextTick(() => {
+                setTimeout(() => {
+                  this.storeMerchantList(true);
+                }, 200)
               })
             }).catch(err => {
-            	uni.showToast({
-            		title: err,
-            		icon: 'none'
-            	})
-            	this.street = '定位失败'
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+              this.street = '定位失败'
             })
           }
         })
diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue
index 857d1f4..f0b9e82 100644
--- a/pages/index/component/homeComb.vue
+++ b/pages/index/component/homeComb.vue
@@ -5,9 +5,9 @@
       <view style="height: var(--status-bar-height);"></view>
       <view class="location">
         <view class="box flex_a_c_j_sb">
-          <view class="place_wrapper flex_a_c" @click="changeMap">
-            <view class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
-            <view class="town_name">{{street||'定位中' }}</view>
+          <view class="place_wrapper flex_a_c">
+            <view v-if="street&&street!='未开启定位'" @click="changeMap"  class="iconfont icon-weizhi" style="color:#fff;font-size:40rpx;"></view>
+            <view v-if="street&&street!='未开启定位'" @click="changeMap"  class="town_name">{{street}}</view>
           </view>
           <view class="flex_a_c_j_sb">
             <view style="margin-right: 30rpx;" @click="scanQRcode" hover-class="none">
@@ -129,7 +129,7 @@
         isCategory: false,
         swiperTop: 0,
         isFixed: true,
-        street: '未开启定位'
+        street: ''
       };
     },
     watch: {
@@ -138,6 +138,9 @@
       }
     },
     created() {
+      uni.$on('changeAddress', (e)=>{
+        this.street = e.street.name;
+      })
       var that = this
       // 获取设备宽度
       uni.getSystemInfo({