From eee75e1d71c9278031e25f7c30482ece8ae49f43 Mon Sep 17 00:00:00 2001
From: YOGO <1587218160@qq.com>
Date: Wed, 18 Mar 2026 13:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dapp=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                |  4 +++
 config.js              |  5 +++
 hooks/useLoading.js    | 33 ++++++++++++++++++++
 index.html             | 71 ++++++++++++++++++++++--------------------
 main.js                |  4 +--
 manifest.json          |  6 ++--
 pages/index/index.vue  |  4 ++-
 pages/unlock/index.vue |  2 +-
 utils/common.js        | 39 +++++++++++++++++++++--
 9 files changed, 124 insertions(+), 44 deletions(-)
 create mode 100644 config.js
 create mode 100644 hooks/useLoading.js

diff --git a/App.vue b/App.vue
index 24b165d..f19e471 100644
--- a/App.vue
+++ b/App.vue
@@ -119,6 +119,10 @@ export default {
 			        	}).catch((err) => {
 			        	    logOut();
 			        	})
+			}else{
+				if(window.sf.isSfApp()){
+					shunfenLogin();
+				}
 			}
 			
 		// 清掉请求有优惠价的时间记录
diff --git a/config.js b/config.js
new file mode 100644
index 0000000..a36f49e
--- /dev/null
+++ b/config.js
@@ -0,0 +1,5 @@
+window.config = {
+	BACK_URL: "https://uat.kingkongcang.com/client/",
+	ENV: "sit",
+	SF_APP_ID: "202603041358374970",
+}
\ No newline at end of file
diff --git a/hooks/useLoading.js b/hooks/useLoading.js
new file mode 100644
index 0000000..fc27345
--- /dev/null
+++ b/hooks/useLoading.js
@@ -0,0 +1,33 @@
+// /hooks/useLoading.js
+
+const loadingMap = new Set()
+
+export function useLoading() {
+
+  const openLoading = (key = 'default', loadingObj) => {
+    loadingMap.add(key)
+
+    uni.showLoading({
+      ...loadingObj
+    })
+  }
+
+  const closeLoading = (key = 'default') => {
+    loadingMap.delete(key)
+
+    if (loadingMap.size === 0) {
+      uni.hideLoading()
+    }
+  }
+
+  const clearLoading = () => {
+    loadingMap.clear()
+    uni.hideLoading()
+  }
+
+  return {
+    openLoading,
+    closeLoading,
+    clearLoading
+  }
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index fddb072..3d17cb5 100644
--- a/index.html
+++ b/index.html
@@ -12,44 +12,47 @@
 	
     <!-- <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="/client/config.js"></script>
+	<script src="https://ucmp-static.sf-express.com/assets/sdks/microservice-1.0.4.min.js"></script>
 	<script>
-		function loadScript(url, retry = 3) {
-			return new Promise((resolve, reject) => {
-				const script = document.createElement('script')
-				script.src = url
-				script.async = true
+			const sf = new SFUIP.SfMicroservice(window?.config?.ENV??'sit')
+			window.sf = sf
+		// function loadScript(url, retry = 3) {
+		// 	return new Promise((resolve, reject) => {
+		// 		const script = document.createElement('script')
+		// 		script.src = url
+		// 		script.async = true
 
-				script.onload = () => {
-				resolve()
-				}
+		// 		script.onload = () => {
+		// 		resolve()
+		// 		}
 
-				script.onerror = () => {
-				if (retry > 0) {
-					console.warn('脚本加载失败，重试中...', retry)
-					setTimeout(() => {
-					loadScript(url, retry - 1)
-						.then(resolve)
-						.catch(reject)
-					}, 1000)
-				} else {
-					reject(new Error('脚本加载失败'))
-				}
-				}
+		// 		script.onerror = () => {
+		// 		if (retry > 0) {
+		// 			console.warn('脚本加载失败，重试中...', retry)
+		// 			setTimeout(() => {
+		// 			loadScript(url, retry - 1)
+		// 				.then(resolve)
+		// 				.catch(reject)
+		// 			}, 1000)
+		// 		} else {
+		// 			reject(new Error('脚本加载失败'))
+		// 		}
+		// 		}
 
-				document.head.appendChild(script)
-			})
-			}
-			loadScript(
-			'https://ucmp-static.sf-express.com/assets/sdks/microservice-1.0.4.min.js',
-			3
-			).then(() => {
-			console.log('SDK加载成功')
-			const sf = new SFUIP.SfMicroservice( window?.config?.ENV??'sit')
-				window.sf = sf
-			}).catch(err => {
-			console.error('最终加载失败', err)
-			})
+		// 		document.head.appendChild(script)
+		// 	})
+		// 	}
+		// 	loadScript(
+		// 	'https://ucmp-static.sf-express.com/assets/sdks/microservice-1.0.4.min.js',
+		// 	3
+		// 	).then(() => {
+		// 	console.log('SDK加载成功')
+		// 	const sf = new SFUIP.SfMicroservice(window?.config?.ENV??'sit')
+		// 		window.sf = sf
+		// 	}).catch(err => {
+		// 	console.error('最终加载失败', err)
+		// 	})
 		
 	</script>
 	<script>
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 19844c7..6219641 100644
--- a/manifest.json
+++ b/manifest.json
@@ -75,7 +75,7 @@
     "vueVersion" : "3",
     "h5" : {
         "router" : {
-            "base" : "./"
+            "base" : "/client/"
         },
         "devServer" : {
             "port" : 8999,
@@ -100,8 +100,8 @@
             }
         }
     },
-    "locale" : "en",
-    "fallbackLocale" : "en",
+    "locale" : "zh-Hans",
+    "fallbackLocale" : "zh-Hans",
     "mp-xhs" : {
         "appid" : "6786436ac669e40001348567",
         "permission" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b1b3093..b3efcad 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -499,7 +499,7 @@ const goOrder = async () => {
             payChannel: 'payByWeChat' // app微信支付
           }).then(res => {
             const { channelType, status, message, channelResult } = res && res.result || {}
-            if (state === 0) {
+            if (status === 0) {
               uni.showToast({
                 title: '支付成功',
                 icon: 'none',
@@ -1108,6 +1108,8 @@ function changeMove(event) {
   .info {
     display: flex;
     font-size: 28rpx;
+    max-height: 60vh;
+    overflow-y: auto;
 
     .list {
       display: flex;
diff --git a/pages/unlock/index.vue b/pages/unlock/index.vue
index ce64a04..059330e 100644
--- a/pages/unlock/index.vue
+++ b/pages/unlock/index.vue
@@ -571,7 +571,7 @@ const goOrder = async () => {
             payChannel: 'payByWeChat' // app微信支付
           }).then(res => {
             const { channelType, status, message, channelResult } = res && res.result || {}
-            if (state === 0) {
+            if (status === 0) {
               uni.showToast({
                 title: '支付成功',
                 icon: 'none',
diff --git a/utils/common.js b/utils/common.js
index 899e738..10db66c 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1,5 +1,8 @@
 import { projectInfo,OFFICIAL_URL} from "@/config/index.js";
 import i18n from '../locale/index';
+import { useLoginApi } from "@/Apis/login.js";
+import { useMainStore } from "@/store/index.js";
+const getApi = useLoginApi();
 const { t } = i18n.global;
 
 export const onTabItemTap = (event)=>{
@@ -256,17 +259,47 @@ export const parseUrlParams = (url) => {
 	return params;
 } 
 // 顺丰参数
-export const shunfenLogin = (code) => {
+export const shunfenLogin = async (code) => {
 	// 授权参数（请根据实际情况修改）
 const authOptions = {
-  appId: "202603041358374970", // 第三方接入ID
+  appId: window?.config?.SF_APP_ID ??"202603041358374970", // 第三方接入ID
   scope: ["sf_userinfo", "sf_mobile", "sf_base", "sf_emp", "sf_channelId"],
   successUrl: window?.config?.BACK_URL ?? "https://uat.kingkongcang.com/client/", // 当前页面地址
 };
  window.sf.getAuthCode({
     ...authOptions,
   })
-    .then((res) => {
+    .then(async(res) => {
+		if (window.sf.isSfApp()) {
+			const authCode = res.authCode;
+			if(authCode){
+				let source = window.sf.isSfApp() ? 2 : 1;
+				uni.showLoading({
+					mask:true,
+				});
+				getApi.ShunFengLogin({
+			        		code:authCode,
+							source,
+			        	})
+			        	.then(async(res) => {
+			        		uni.hideLoading();
+			        		if (res.code == 200) {
+										const store = useMainStore(); // ✅ 在这里调用
+										store.storeState.token = res.data.token;
+										store.storeState.hasTrytoLogin = true;
+										await store.getUserInfo();
+										console.log("token", res.data.token);
+										uni.setStorageSync("token", res.data.token);
+										uni.setStorageSync("openId", res.data.openId);
+										console.log("登陆成功", res.data.openId);
+			        			
+			        		}
+			        	}).catch((err) => {
+			        	})
+			}else{
+				shunfenLogin()
+			}
+		}
 		console.log('getAuthCode success',res);
 	})
     .catch((err) => console.log('getAuthCode err',err));