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}}天后将自动评价