From aeba6816c82b01da28d0ea7c8e87d5bd6ad1705a Mon Sep 17 00:00:00 2001
From: YOGO <1587218160@qq.com>
Date: Tue, 14 Apr 2026 13:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hooks/useLocation.js                           |  1 +
 index.html                                     |  3 ++-
 main.js                                        |  4 ++--
 manifest.json                                  |  4 ++--
 pages/index/index.vue                          |  8 ++++----
 pages/site/index.vue                           | 18 +++++++++++-------
 .../uv-popup/components/uv-popup/uv-popup.vue  |  5 +++--
 7 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/hooks/useLocation.js b/hooks/useLocation.js
index 5bd77c3..4740e22 100644
--- a/hooks/useLocation.js
+++ b/hooks/useLocation.js
@@ -28,6 +28,7 @@ export function useLocation() {
      
       // 3️⃣ 没有定位才请求
       SFUIP.getLocation().then(res => {
+        console.log(res,"SFUIP.getLocation");
         if (!res.success) {
           resolve(false);
           return;
diff --git a/index.html b/index.html
index d17d717..682649c 100644
--- a/index.html
+++ b/index.html
@@ -13,8 +13,9 @@
     <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" /> -->
     <link rel="icon" href="/favicon.ico" />
 	<script src="./config.js"></script>
-	<script src="https://ucmp-static.sf-express.com/assets/sdks/microservice-1.0.4.min.js"></script>
+	<script src="https://ucmp-static.sf-express.com/assets/sdks/microservice-1.1.9.min.js"></script>
 	<script>
+			console.log(SFUIP,"SFUIP")
 			const sf = new SFUIP.SfMicroservice(window?.config?.ENV??'sit')
 			window.sf = sf
 		// function loadScript(url, retry = 3) {
diff --git a/main.js b/main.js
index 42c1938..250ee2d 100644
--- a/main.js
+++ b/main.js
@@ -2,8 +2,8 @@ import { createSSRApp } from "vue";
 import App from "./App";
 import i18n from "./locale/index";
 import * as Pinia from "pinia";
-// import VConsole from 'vconsole'
-// new VConsole()
+import VConsole from 'vconsole'
+new VConsole()
 // import '@/uni.scss'
 // 引入uvUI
 import uvUI from "@/uni_modules/uv-ui-tools";
diff --git a/manifest.json b/manifest.json
index 50b86fd..9ebcd03 100644
--- a/manifest.json
+++ b/manifest.json
@@ -75,7 +75,7 @@
     "vueVersion" : "3",
     "h5" : {
         "router" : {
-            "base" : "./"
+            "base" : "/client/"
         },
         "devServer" : {
             "port" : 8999,
@@ -100,7 +100,7 @@
             }
         },
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "locale" : "zh-Hans",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index efe1ca4..be9b0a3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -502,7 +502,7 @@ const state = ref({
   active: 0,
   id: "",
   radiovalue: 0,
-  radioMonthvalue: 24,
+  radioMonthvalue: -1,
   checkAgreementUrlTime: 0,
   agreementContent: "无",
   enAgreementContent: "无",
@@ -514,7 +514,7 @@ const state = ref({
   unitTypeId: "",
   lockerId: "",
   selectUnitRow: {},
-  month:1,
+  month: 1,
   selfMonth: 1,
   lockData: {
     discountList: []
@@ -571,6 +571,8 @@ const callPhone = ()=>{
 
 
 
+
+
 const goOrder = async () => {
   if (!state.value.lockerId) {
     return uni.showToast({
@@ -988,8 +990,6 @@ onLoad(async (params) => {
 
 
  }
-
-
   uni.$on('homeSiteId', (data) => {
     if (data.id) {
       state.value.siteId = data.id
diff --git a/pages/site/index.vue b/pages/site/index.vue
index fe300e4..755f3b0 100644
--- a/pages/site/index.vue
+++ b/pages/site/index.vue
@@ -62,6 +62,7 @@ import { useSiteApi } from "@/Apis/site.js";
 import { useLoginApi } from "@/Apis/login.js";
 import { ClientSite } from "@/Apis/book.js";
 import uvPickerSlef from "@/components/uv-pickerself/components/uv-picker/uv-picker.vue";
+import { wgs84ToGcj02 } from '@/utils/map.js'
 // 主题色配置
 import { useMainStore } from "@/store/index.js";
 // 国际化配置
@@ -87,13 +88,16 @@ let siteData = reactive({
 	});
 
 // 点击路线跳转
-const handleNavigate = (item) => {
-    SFUIP.openLocation({
-        latitude: Number(item.latitude),
-        longitude: Number(item.longitude),
-        name: item.name,
-        address: item.address,
-    });
+const handleNavigate = async (item) => {
+  const { latitude, longitude } = wgs84ToGcj02(item.latitude, item.longitude);
+   const { success, errorMessage } = await SFUIP.openLocation({
+        latitude:"113.330713",
+        longitude:"23.113539",
+        name: "广州",
+        address: "广州天河",
+    })
+    console.log((window || global).UIP_WX);
+    console.log(success,errorMessage, "openLocationerr");
 };
 
 const toHome = (item) => {
diff --git a/uni_modules/uv-popup/components/uv-popup/uv-popup.vue b/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
index d01d198..1f32b54 100644
--- a/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
+++ b/uni_modules/uv-popup/components/uv-popup/uv-popup.vue
@@ -43,12 +43,13 @@
 						hover-class="uv-popup__content__close--hover"
 						hover-stay-time="150"
 					>
-						<uv-icon
+						<!-- <uv-icon
 							name="close"
 							color="#000000"
 							size="32rpx"
 							bold
-						></uv-icon>
+						></uv-icon> -->
+						<image class="close-icon" style="width: 30rpx;height: 30rpx;" src="/static/home/close2.svg"></image>
 					</view>
 				</view>
 			</uv-transition>