From 838b79873d660a62a7c1d2e29d2f271156f0fa7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Thu, 20 Mar 2025 23:49:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=98=8E=E7=BB=86=E3=80=91:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=BD=99=E9=A2=9D=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/config/env.js                  | 6 +++---
 CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue  | 2 +-
 .../CoreShop/pages/subpackage/member/order/list/list.vue    | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/config/env.js b/CoreCms.Net.Uni-App/CoreShop/config/env.js
index 68e6b857..d46c254e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/config/env.js
+++ b/CoreCms.Net.Uni-App/CoreShop/config/env.js
@@ -1,16 +1,16 @@
 // 不同的环境变量配置
 const development = {
-	requestBaseUrl: 'https://api.test.pro.coreshop.cn',
+	requestBaseUrl: 'https://api.mln.ren',
 	appid: '',
 }
 
 const test = {
-	requestBaseUrl: 'https://api.test.pro.coreshop.cn',
+	requestBaseUrl: 'https://api.mln.ren',
 	appid: '',
 }
 
 const production = {
-	requestBaseUrl: 'https://api.test.pro.coreshop.cn',
+	requestBaseUrl: 'https://api.mln.ren',
 	appid: '',
 }
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue b/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue
index cead8ca8..490a6737 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue
@@ -114,7 +114,7 @@
 		if (state.orderId && isGoodsOrder()) {
 			handleRouteRedirectTo(`/pages/subpackage/member/order/detail/detail?orderId=${state.orderId}`);
 		} else if (state.paymentInfo.type === PaymentTypeEnum.recharge) {
-			handleRouteRedirectTo(`/pages/subpackage/member/balance/detail/detail`);
+			handleRouteRedirectTo(`/pages/subpackage/member/balance/balance-detail/index`);
 		} else if (state.paymentInfo.type === PaymentTypeEnum.formPay || state.paymentInfo.type === PaymentTypeEnum.formOrder) {
 			handleRouteSwitchTab()
 		} else if (state.paymentInfo.type === PaymentTypeEnum.serviceOrder) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/list/list.vue
index 522e7724..45a4a323 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/list/list.vue
@@ -1,11 +1,10 @@
 <template>
-	<coreshop-page title="我的订单" mode="left">
+	<coreshop-page title="我的订单1" mode="left">
 		<view class="layout-order-box">
 			<view class="tab-box">
 				<uv-tabs :list="state.tabList" :activeStyle="{ 'color': '#D33123' }" lineColor="#D33123" :lineWidth="40"
 					:scrollable="false" :current="state.tabsCurrent" keyName="title" @click="handleChangeTab"></uv-tabs>
 			</view>
-
 			<view class="order-list-box">
 				<view class="order-box">
 					<view v-if="state.orderList.length > 0">

From 8d4a88f426749977794a43a9e0848f8af0c09ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E5=9F=8E?=
 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 17 Apr 2025 10:24:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=B8=AD=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/config/env.js           | 12 ++++++------
 CoreCms.Net.Uni-App/CoreShop/core/models/config.ts   |  3 ++-
 CoreCms.Net.Uni-App/CoreShop/manifest.json           |  2 +-
 .../pages/subpackage/member/order/detail/detail.vue  |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/config/env.js b/CoreCms.Net.Uni-App/CoreShop/config/env.js
index d46c254e..733a216c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/config/env.js
+++ b/CoreCms.Net.Uni-App/CoreShop/config/env.js
@@ -1,16 +1,16 @@
 // 不同的环境变量配置
-const development = {
-	requestBaseUrl: 'https://api.mln.ren',
+const development = { 
+	requestBaseUrl: 'https://api.pro.demo.coreshop.cn', 
 	appid: '',
 }
 
-const test = {
-	requestBaseUrl: 'https://api.mln.ren',
+const test = { 
+	requestBaseUrl: 'https://api.pro.demo.coreshop.cn', 
 	appid: '',
 }
 
-const production = {
-	requestBaseUrl: 'https://api.mln.ren',
+const production = { 
+	requestBaseUrl: 'https://api.pro.demo.coreshop.cn', 
 	appid: '',
 }
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts b/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts
index 5e8159ad..36216886 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/models/config.ts
@@ -16,7 +16,8 @@ export interface ShopConfigType {
 	indexPopupWindowImageUrl ?: string;
 	invoiceSwitch ?: number;
 	isAllowUserSecondBind ?: number;
-	
+    orderAutoSignTime ?: number;
+    orderAutoEvalTime ?: number;
 	/** 余额提现 */
 	isAllowWithdrawCash ?: number;
 	isOpenAgent ?: number;
diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json
index 9db936f9..53993205 100644
--- a/CoreCms.Net.Uni-App/CoreShop/manifest.json
+++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3f290252193d7627",
+        "appid" : "wx6a73f5a508da7af2",
         "setting" : {
             "urlCheck" : false,
             "checkSiteMap" : false,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
index d628cfee..1ad8b6a6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
@@ -27,7 +27,7 @@
                     </view>
                     <view class="explain">
                         <view class="tit">务必在收到商品后再确认收货。</view>
-                        <view class="desc">发货20天后将自动确认收货</view>
+                        <view class="desc">发货{{shopConfigStore?.config?.orderAutoSignTime}}天后将自动确认收货</view>
                     </view>
                 </view>
                 <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_RECEIPT">
@@ -36,7 +36,7 @@
                         <view class="desc">请您对此次购物体检进行评价</view>
                     </view>
                     <view class="explain">
-                        <view class="tit">收货30天后将自动评价</view>
+                        <view class="tit">收货{{shopConfigStore?.config?.orderAutoEvalTime}}天后将自动评价</view>
                     </view>
                 </view>
                 <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_EVALUATE">

From 921da15eeb7bcde15f1375d47606de01d702f0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E5=9F=8E?=
 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 7 Aug 2025 10:39:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=93=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=99=86=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E6=97=A0=E6=B3=95=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/core/store/login.ts              | 67 ++++++++++---------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts b/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts
index eae2f630..17e4ec88 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts
@@ -1,38 +1,45 @@
 import { defineStore } from 'pinia';
 import { UserToken } from '@/core/consts';
-import { handleShowToast } from '@/core/utils';
+import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
 import { queryUserInfo } from '@/core/api';
 import type { UserLoginStoreType, Response, UserInfoType } from '@/core/models';
 import { useUserInfoStore } from './userInfo';
 
 export const useLoginStore = defineStore('useLoginStore', {
-	state: () : UserLoginStoreType => {
-		return {
-			showLoginModalTogglePop: false
-		};
-	},
-	actions: {
-		/** 检查是否登录 */
-		checkLogin(callBack : () => void) {
-			if (!uni.getStorageSync(UserToken)) {
-				this.setShowLoginModalTogglePop(true);
-			} else {
-				callBack();
-			}
-		},
-		/** 获取用户数据 */
-		async getUserInfo() {
-			const userInfoStore = useUserInfoStore();
-			const userInfo : Response<UserInfoType> = await queryUserInfo();
-			if (userInfo.status) {
-				userInfoStore.setUserInfo(userInfo?.data);
-			} else {
-				handleShowToast(userInfo.msg)
-			}
-		},
-		/** 设置登录弹框打开或者关闭 */
-		setShowLoginModalTogglePop(showLoginModalTogglePop : boolean) {
-			this.showLoginModalTogglePop = showLoginModalTogglePop;
-		},
-	},
+    state: () : UserLoginStoreType => {
+        return {
+            showLoginModalTogglePop: false
+        };
+    },
+    actions: {
+        /** 检查是否登录 */
+        checkLogin(callBack : () => void) {
+            if (!uni.getStorageSync(UserToken)) {
+                // #ifdef MP-ALIPAY || MP-WEIXIN
+                this.setShowLoginModalTogglePop(true);
+                // #endif
+
+                // #ifndef MP-WEIXIN || MP-ALIPAY 
+                handleRouteNavigateTo(`/pages/login/login?backUrl=${'/pages/member/member'}`)
+                // #endif
+
+            } else {
+                callBack();
+            }
+        },
+        /** 获取用户数据 */
+        async getUserInfo() {
+            const userInfoStore = useUserInfoStore();
+            const userInfo : Response<UserInfoType> = await queryUserInfo();
+            if (userInfo.status) {
+                userInfoStore.setUserInfo(userInfo?.data);
+            } else {
+                handleShowToast(userInfo.msg)
+            }
+        },
+        /** 设置登录弹框打开或者关闭 */
+        setShowLoginModalTogglePop(showLoginModalTogglePop : boolean) {
+            this.showLoginModalTogglePop = showLoginModalTogglePop;
+        },
+    },
 });
\ No newline at end of file