Merge branch 'youda' into youda_wz

提交
2025-04-18 11:49:38 +08:00 · 2025-04-18 11:23:12 +08:00 · 2025-04-18 11:17:22 +08:00 · 2025-04-16 20:54:47 +08:00 · 2025-04-16 20:38:40 +08:00
2 changed files with 6 additions and 6 deletions
--- a/common/env.js
+++ b/common/env.js
@ -17,10 +17,10 @@ const development = {
 // 生产环境配置
 const production = {
-  // baseUrl: 'https://youda.zfunbox.cn',
+  
-  baseUrl: 'https://api.zfunbox.cn',
+  baseUrl: 'https://youda.zfunbox.cn',
  imageUrl: 'https://image.zfunbox.cn',
-  loginPage: 'https://api.zfunbox.cn/login.html',
+  loginPage: 'https://youda.zfunbox.cn/login.html',
  wxAppId: 'wx0e33d80d35e4a3b1'
 };
@ -33,7 +33,7 @@ const testing = {
 };
 // 根据环境变量选择对应配置
-let currentEnv = production;
+let currentEnv = development;
 // 判断当前环境
 // #ifdef H5
@ -46,7 +46,7 @@ if (process.env.NODE_ENV === 'production') {
 // #ifdef MP-WEIXIN
 // currentEnv =testing;//小程序默认使用测试环境配置
-// currentEnv = production; // 小程序默认使用生产环境配置
+currentEnv = production; // 小程序默认使用生产环境配置
 // #endif
 // 衍生配置
--- a/manifest.json
+++ b/manifest.json
@ -127,7 +127,7 @@
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
-        "appid" : "wx683d8a8a499d7ec6",
+        "appid" : "wx9ade414ae5755f0d",
        "setting" : {
            "urlCheck" : false,
            "es6" : false,
Author	SHA1	Message	Date
zpc	504452087e	Merge branch 'youda' into youda_wz	2025-04-18 11:49:38 +08:00
zpc	e077da1515	提交	2025-04-18 11:23:12 +08:00
zpc	55a6b589ab	Merge branch 'youda' into youda_wz	2025-04-18 11:17:22 +08:00
zpc	1150eb5a9d	Merge branch 'main' into youda_wz	2025-04-16 20:54:47 +08:00
zpc	4834ebfdf7	提交	2025-04-16 20:38:40 +08:00