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] =?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 @@
务必在收到商品后再确认收货。
- 发货20天后将自动确认收货
+ 发货{{shopConfigStore?.config?.orderAutoSignTime}}天后将自动确认收货
@@ -36,7 +36,7 @@
请您对此次购物体检进行评价
- 收货30天后将自动评价
+ 收货{{shopConfigStore?.config?.orderAutoEvalTime}}天后将自动评价