From 7bbcbd7fee2907cf7b0c90ad1db0d428aa8810ae Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91(=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=A8=A1=E5=9D=97)=EF=BC=9A=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=BC=80=E5=85=B3=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E5=AE=9A=E4=BD=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/core/enum/config.enum.ts             |  6 ++++++
 .../CoreShop/core/models/config.ts                |  1 +
 .../subpackage/member/address/index/index.vue     | 15 ++++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/enum/config.enum.ts b/CoreCms.Net.Uni-App/CoreShop/core/enum/config.enum.ts
index 3b256a19..e26bd13c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/enum/config.enum.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/enum/config.enum.ts
@@ -69,6 +69,12 @@ export enum ShowVasEnum {
 	no = 2,
 }
 
+/** 是否使用地图定位功能 */
+export enum ShowAllowAddressToUseMap {
+	yes = 1,
+	no = 2,
+}
+
 /** 是否显示门店列表*/
 export enum ShowStoresSwitchEnum {
 	yes = 1,
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts b/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts
index a44bd1c7..27467b5d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts
@@ -66,4 +66,5 @@ export interface ShopConfigType {
 	toCashMoneyLow ?: string;
 	toCashMoneyRate ?: string;
 	userAgreementId ?: number;
+	allowAddressToUseMap ?: number;
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
index a48be17f..9ac39331 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
@@ -20,14 +20,14 @@
 					<view class="lab">省市县</view>
 					<view class="val" @click="handleShowCityPicker">
 						<uv-input placeholder="请选择省市县" border="surround" v-model="state.city"
-							:readonly="true"></uv-input>
+							:readonly="true"  suffixIcon="arrow-down" suffixIconStyle="color: #909399"></uv-input>
 					</view>
 				</view>
 				<view class="item">
 					<view class="lab">街道社区</view>
 					<view class="val" @click="handleGoToMap">
 						<uv-input placeholder="请选择街道社区" border="surround" v-model="state.form.street"
-							:readonly="true"></uv-input>
+							:readonly="shopConfigStore.config?.allowAddressToUseMap == ShowAllowAddressToUseMap.yes" suffixIcon="map-fill" suffixIconStyle="color: #5ac725"></uv-input>
 					</view>
 				</view>
 				<view class="item">
@@ -56,7 +56,7 @@
 <script setup lang="ts">
 	import { reactive } from 'vue';
 	import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
-	import { AddressPageTitltEnum } from '@/core/enum';
+	import { AddressPageTitltEnum ,ShowAllowAddressToUseMap} from '@/core/enum';
 	import { queryAreaId, querySaveUserShip, queryShipDetail } from '@/core/api';
 	import type { Response, ShopConfigStoreType, AddressType } from '@/core/models';
 	import { useShopConfigStore } from '@/core/store';
@@ -141,7 +141,10 @@
 			state.shipId = query.id;
 			getShipInfo();
 		}
-		getMyLocation();
+		/** 开启定位 */
+		if(shopConfigStore.config?.allowAddressToUseMap == ShowAllowAddressToUseMap.yes){
+			getMyLocation();
+		}
 	});
 
 	onUnload(() => {
@@ -233,7 +236,9 @@
 
 	/** 去定位 */
 	const handleGoToMap = () => {
-
+		if(shopConfigStore.config?.allowAddressToUseMap != ShowAllowAddressToUseMap.yes){
+			return;
+		}
 		// #ifdef MP-WEIXIN
 		const txMapkey = shopConfigStore?.config?.qqMapKey; //使用在腾讯位置服务申请的key
 		const referer = shopConfigStore?.config?.shopName; //调用插件的app的名称