Merge remote-tracking branch 'remotes/origin/dev/1.0' into dev/1.0

common/js/config.js

@@ -20,6 +20,10 @@ try {
 // 默认域名, 自定义发行时可以修改
 let defaultDomain = ''; 
 
+// #ifdef H5_XCX_5G_QUICKAPP_COM
+defaultDomain = 'https://xcx20.5g-quickapp.com';
+// #endif
+
 // #ifdef H5_XCX_AIGC_QUICKAPP_COM
 defaultDomain = 'https://xcx.aigc-quickapp.com/';
 // #endif

package.json

@@ -21,6 +21,17 @@
           "PRODUCTION": true
         }
       },
+      "h5-xcx20.5g-quickapp.com": {
+        "title": "H5-xcx20.5g-quickapp.com",
+        "env": {
+          "UNI_PLATFORM": "h5"
+        },
+        "define": {
+          "H5_XCX_5G_QUICKAPP_COM": true,
+          "H5_PRODUCTION": true,
+          "PRODUCTION": true
+        }
+      },      
       "h5-xcx.aigc-quickapp.com": {
         "title": "H5-xcx.aigc-quickapp.com",
         "env": {

vue.config.js

@@ -1,8 +1,40 @@
+const path = require('path');
 const { zionUniMpLoadPackagePlugin } = require('zion-uniapp-mp-load-package/webpack');
+
+// 打印出process.env
+// for (let key in process.env) {
+//   console.log(key, process.env[key]);
+// }
+
+
+// 定义UNI_OUTPUT_DIR环境变量
+try {
+  if (!process.env.NODE_ENV) {
+    throw new Error('NODE_ENV 环境变量未设置');
+  }
+
+  const buildDir = process.env.NODE_ENV === 'production' ? 'build' : 'dev';
+
+  const UNI_SCRIPT = process.env.UNI_SCRIPT ?? '';
+
+  if ([
+    // 参照 package.json 中定义的 "uni-app" --> "scripts"
+    'h5-xcx20.5g-quickapp.com', 'h5-xcx.aigc-quickapp.com', 'h5-5g.aigc-quickapp.com', 'h5-test.aigc-quickapp.com'
+  ].includes(UNI_SCRIPT)) {
+    process.env.UNI_OUTPUT_DIR = path.join(__dirname, `unpackage/dist/${buildDir}/h5/${UNI_SCRIPT}`);
+    console.log('UNI_OUTPUT_DIR = ', process.env.UNI_OUTPUT_DIR);
+  }
+
+} catch (e) {
+  console.log('NODE_ENV 环境变量未设置，默认使用开发模式');
+}
+
+// 导出配置
 module.exports = {
   productionSourceMap: false,
   configureWebpack: config => {
     console.log('config.mode = ', config.mode);
+
     if (config.mode === 'production') {
       console.log('开始尝试配置极限压缩');
       // 配置zion-uniapp-mp-load-package插件