feat: 更新正式环境API地址并默认选用

.env

@@ -1,5 +1,5 @@
 NODE_ENV = production
 VUE_APP_ENV_NAME = zhoushang环境
 VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang
-VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1
+VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1
-VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1
+VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1

.env.zhoushang

@@ -1,5 +1,5 @@
 NODE_ENV = production
 VUE_APP_ENV_NAME = zhoushang环境
 VUE_APP_UPGRADE_NAME = erp_pda_zhoushang_zhichang
-VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1
+VUE_APP_PRODUCTION_API_URL = https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1
-VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1
+VUE_APP_DEV_API_URL = https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1

scripts/upload-apk.js

@@ -39,7 +39,7 @@ function parseArgs(argv) {
   for (let i = 0; i < argv.length; i += 1) {
     const key = argv[i];
     const value = argv[i + 1];
-    if (key === '--file' || key === '--target' || key === '--mode' || key === '--version') {
+    if (key === '--file' || key === '--target' || key === '--mode' || key === '--version' || key === '--phone' || key === '--password' || key === '--tenant') {
       args[key.slice(2)] = value;
       i += 1;
     }
@@ -126,9 +126,9 @@ async function apiJson(apiBase, urlPath, { method = 'GET', token, body } = {}) {
   return data.data || {};
 }
 
-async function login(apiBase) {
+async function login(apiBase, { phone: phoneArg, password: passwordArg, tenant: tenantArg } = {}) {
-  const phone = await ask('手机号: ');
+  const phone = phoneArg || await ask('手机号: ');
-  const password = await askPassword('密码: ');
+  const password = passwordArg || await askPassword('密码: ');
   if (!phone || !password) {
     throw new Error('请输入手机号和密码');
   }
@@ -148,6 +148,11 @@ async function login(apiBase) {
 
   let tenant = tenants[0];
   if (tenants.length > 1) {
+    if (tenantArg) {
+      const picked = Number(tenantArg);
+      tenant = tenants[picked - 1];
+      if (!tenant) throw new Error('账套序号无效');
+    } else {
       console.log('请选择账套:');
       tenants.forEach((item, index) => {
         const name = item.company_name || item.database_name || item.tenant_contacts || item.tenant_management_id;
@@ -157,6 +162,7 @@ async function login(apiBase) {
       tenant = tenants[picked - 1];
       if (!tenant) throw new Error('账套序号无效');
     }
+  }
 
   const second = await apiJson(apiBase, '/admin/v1/login', {
     method: 'POST',
@@ -248,7 +254,11 @@ async function main() {
   const fileName = `${version}.apk`;
   const saveKey = `/version/${upgradeName}/${fileName}`;
   const apiBase = API_BASE;
-  const token = await login(apiBase);
+  const token = await login(apiBase, {
+    phone: args.phone,
+    password: args.password,
+    tenant: args.tenant,
+  });
 
   console.log(`版本号: ${version}`);
   console.log(`场景路径: ${saveKey}`);

src/common/config.js

@@ -21,21 +21,21 @@ const config = {
 	isDevelopment: isDevelopment,
 
 	// 生产环境API URL（服务名段 hcscm_weave）
-	productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL || 'https://www.haotopai.com/hcscm_weave/mes/server/pda/v1',
+	productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL,
 
 	// 开发环境API URL选项（仅替换 //域名/ 后第一个路径段 hcscm → hcscm_weave，不改域名）
 	devApiUrlOptions: [
 		{ label: '测试环境', value: 'https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1' },
-		{ label: '正式环境', value: process.env.VUE_APP_DEV_API_URL || process.env.VUE_APP_PRODUCTION_API_URL || 'https://www.haotopai.com/hcscm_weave/mes/server/pda/v1' },
+		{ label: '正式环境', value: process.env.VUE_APP_PRODUCTION_API_URL  },
-		{ label: '本地环境', value: 'http://192.168.1.66:7010/hcscm_weave/pda/v1' },
+		// { label: '本地环境', value: 'http://192.168.1.66:7010/hcscm_weave/pda/v1' },
 		{ label: '自定义', value: 'custom' }
 	]
 
 }
 
-export function getTestApiUrl() {
+export function getDefaultApiUrl() {
-	const test = config.devApiUrlOptions.find(item => item.label === '测试环境');
+	const prod = config.devApiUrlOptions.find(item => item.label === '正式环境');
-	return (test && test.value) || 'https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1';
+	return (prod && prod.value) || config.productionApiUrl || 'https://zszc.yushangfangzhi.com/server/hcscm_weave/pda/v1';
 }
 
 export default config;

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "浩拓织厂",
     "appid" : "__UNI__F79F300",
     "description" : "周尚-浩拓织厂",
-    "versionName" : "1.1.13",
+    "versionName" : "1.1.14",
-    "versionCode" : 113,
+    "versionCode" : 114,
     "transformPx" : false,
     "app-plus" : {
         "optimization" : {

src/pages/sys/login/index.vue

@@ -117,7 +117,7 @@
 /**
  * Copyright (c) 2013-Now http://aidex.vip All rights reserved.
  */
-import config, { getTestApiUrl } from '@/common/config.js';
+import config, { getDefaultApiUrl } from '@/common/config.js';
 import base64 from '@/common/base64.js';
 import util from '@/common/util.js';
 import md5 from '@/common/md5.js';
@@ -135,7 +135,7 @@ export default {
 				password: ""
 			},
 			showApiUrlPicker: false,
-			selectedApiUrl: getTestApiUrl(),
+			selectedApiUrl: getDefaultApiUrl(),
 			customApiUrl: 'http://192.168.1.66:50002/hcscm_weave/pda/v1',
 			apiUrlList: config.devApiUrlOptions,
 			phoneNo: '',
@@ -169,9 +169,9 @@ export default {
 	},
 
 	onShow() {
-		const testUrl = getTestApiUrl();
+		const defaultUrl = getDefaultApiUrl();
-		util.updateApiUrl(testUrl);
+		util.updateApiUrl(defaultUrl);
-		this.selectedApiUrl = testUrl;
+		this.selectedApiUrl = defaultUrl;
 
 		uni.getStorage({
 			key: 'UserInfo',

src/store/index.js

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2013-Now http://aidex.vip All rights reserved.
  */
-import config, { getTestApiUrl } from '@/common/config.js';
+import config, { getDefaultApiUrl } from '@/common/config.js';
 import util from '@/common/util.js';
 import Vue from 'vue'
 import Vuex from 'vuex'
@@ -19,15 +19,15 @@ try{
 	
 }
 
-// 初始化API URL
+// 初始化API URL（默认正式环境）
 function initApiUrl() {
-	const testUrl = getTestApiUrl();
+	const defaultUrl = getDefaultApiUrl();
 	try {
-		uni.setStorageSync('ApiUrl', testUrl);
+		uni.setStorageSync('ApiUrl', defaultUrl);
 	} catch (e) {
-		console.log('写入测试环境地址失败', e);
+		console.log('写入正式环境地址失败', e);
 	}
-	return testUrl;
+	return defaultUrl;
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名