nvue3 1.1.28 → 1.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nvue3",
-	"version": "1.1.28",
+	"version": "1.1.30",
 	"description": "for uniapp & vue3",
 	"main": "src/kernel.js",
 	"scripts": {

package/src/http.js

@@ -1,10 +1,7 @@
-/**
- * toast最少显示长时间，主要是加载api的读取中后续关闭
- */
-const tstShow = 350;
+const tstShow = 350; //如果请求太快，toast会一闪而过，这里限制为至少350ms后执行hideLoading
+const nextPost = []; //页面不紧急的消息暂存在这里，下一次请求时顺带捎上_append
+const failBox = []; //保存错误消息，若服务器不可达，则临时存在这里
 const isDebug = (process.env.NODE_ENV === 'development');
-const nextPost = [];
-const failBox = [];
 
 const baseResp = {
 	success: 1,
@@ -14,15 +11,32 @@ const baseResp = {
 };
 
 const toastConf = {
-	'l': '加载中...',
-	'r': '读取中...',
-	'f': '正在刷新...',
-	's': '保存中...',
-	'd': '删除中...',
-	'm': '发送短信...',
-	'p': '请求支付...',
+	'l': 'Loading...',
+	'r': 'Reading ...',
+	'f': 'Refreshing...',
+	's': 'Saving...',
+	'd': 'Deletion...',
+	'm': 'Sending...',
+	'p': 'Paying...',
 };
 
+const dimMsg = {
+	apierr: 'The API request target must be a string type address and must be mandatory',
+	cert: 'Network error or certificate error',
+	failed: 'Data request failed',
+	system: 'System exception',
+	server: 'Server connection failed',
+	timeout: 'Connection timeout, please check the network',
+	resolve: 'Unable to resolve host',
+	network: 'Network request failed',
+	bakin: 'Currently using a backup line, should we switch to the main line?',
+	bakout: 'Should we switch to the backup line?',
+	valid: 'The server did not respond with valid data',
+	upload: 'Upload failed',
+	frequent: 'Operation too frequent',
+	notexist: 'File does not exist',
+}
+
 const aliasConf = {};
 
 const config = {
@@ -38,25 +52,28 @@ let justModalTime = 0;
 let justPostTime = 0;
 let justPostApi = '';
 
-
-
 const _request = class {
 
 	constructor(uri, data, method) {
 		this.method = method.toUpperCase();
+
 		if (!data || data === undefined) data = {};
 		if (typeof data !== 'object') data = { value: data };
-		if ((typeof uri !== 'string') || (!uri)) {
-			console.error('error', uri)
-			throw new Error('api 请求目标必须是string类型地址，且必填');
-		}
-
 		if ((nextPost.length > 0) && (this.method === 'POST')) {
 			data._append = JSON.parse(JSON.stringify(nextPost));
 			nextPost.length = 0;
 		}
+		this.request = data;
 
-		let host = config.path;
+		if ((typeof uri !== 'string') || (!uri)) {
+			if (isDebug) console.error('error', uri)
+			throw new Error(dimMsg.apierr);
+		}
+
+		if (uri.slice(0, 4) === 'http') {
+			this.api = uri;
+			return;
+		}
 
 		if (uri[0] === '!') { //uri第1个字符为!，静默处理
 			this.silent = true;
@@ -67,20 +84,12 @@ const _request = class {
 			uri = uri.slice(1);
 		}
 
-		if (uri.slice(0, 4) === 'http') {
-			//https://domain.com/cont/action
-			let tmp = uri.split('/');
-			uri = '/' + tmp.slice(3).join('/'); //提取URL中的uri部分
-			host = `${tmp[0]}//${tmp[2]}`; //提取URL中的host部分
-		}
-
 		if (uri[0] !== '/') { //uri第1个字符为toast，提取出来
 			this.toast = toastConf[uri[0]] || '';
 			uri = uri.slice(1);
 		}
 
-		this.api = host + apiAlias(uri);
-		this.request = data;
+		this.api = config.path + apiAlias(uri);
 	}
 
 	api = '';
@@ -109,7 +118,6 @@ const _request = class {
 	response = {};
 }
 
-
 function apiAlias(api) {
 	let uri = api.split('/');
 	if (!uri[1]) uri[1] = 'index';
@@ -132,6 +140,8 @@ function apiAlias(api) {
 
 /**
  * 请求后台数据出错时，统一弹窗
+ * 
+ * 
  */
 function failMessage(RFM, resolve, reject) {
 
@@ -141,10 +151,10 @@ function failMessage(RFM, resolve, reject) {
 		RFM.loading = false;
 		uni.hideLoading();
 		uni.showToast({
-			title: '网络错误或证书错误',
+			title: dim.dimMsg,
 			icon: 'none'
 		});
-		reject({ error: 1, message: '网络错误或证书错误' });
+		reject({ error: 1, message: dim.dimMsg });
 		return;
 	}
 	if (typeof reject !== 'function') reject = () => {};
@@ -168,7 +178,7 @@ function failMessage(RFM, resolve, reject) {
 		const { title, message, cancel } = RFM.response.modal;
 		uni.showModal({
 			showCancel: Boolean(cancel || false),
-			title: title || '请求数据失败',
+			title: title || dimMsg.failed,
 			content: message || RFM.message,
 			success(res) {
 				RFM.response.confirm = res.confirm;
@@ -264,7 +274,7 @@ function doSuccess(REQ, res, resolve, reject) {
 			else {
 				//PHP框架级错误，得到的是一个json格式错误信息，基本为php直接返回非200的状态
 				REQ.error = REQ.response.error || 502;
-				REQ.message = REQ.response.message || '系统异常';
+				REQ.message = REQ.response.message || dimMsg.system;
 				Object.assign(REQ.response, baseResp, {
 					success: 0,
 					error: REQ.error,
@@ -276,9 +286,9 @@ function doSuccess(REQ, res, resolve, reject) {
 	}
 	catch (err) {
 		//上面try里自身出错
-		console.error(err)
+		if (isDebug) console.error(err)
 		REQ.error = 9;
-		REQ.message = err.description || err.message || '系统错误';
+		REQ.message = err.description || err.message || dimMsg.system;
 		Object.assign(REQ.response, baseResp, {
 			success: 0,
 			error: 9
@@ -298,16 +308,42 @@ function doFail(REF, res, resolve, reject) {
 			host: info[2],
 			port: info[3]
 		}
-		res.message = "服务器连接失败:" + info[2];
+		res.message = dimMsg.server + info[2];
 	}
 	else if (res.errMsg.includes('timeout')) {
-		res.message = '连接服务器超时，请检查网络';
+		res.message = dimMsg.timeout;
 	}
-	else if (res.errMsg.includes('Unable to resolve host')) {
-		res.message = '域名解析失败';
-	}
-	else if (res.errMsg.includes('NAME_NOT_RESOLVED')) {
-		res.message = '域名解析失败';
+	else if (res.errMsg.includes('Unable to resolve host') || res.errMsg.includes('NAME_NOT_RESOLVED')) {
+		res.message = dimMsg.resolve;
+
+		if (import.meta.env.VITE_API_BACKUP) {
+			if (config.path === import.meta.env.VITE_API_BACKUP) {
+				uni.showModal({
+					title: dimMsg.network,
+					content: dimMsg.bakin,
+					showCancel: true,
+					success(cnf) {
+						if (cnf.confirm) {
+							config.path = import.meta.env.VITE_API;
+						}
+					}
+				});
+			}
+			else {
+				uni.showModal({
+					title: dimMsg.network,
+					content: dimMsg.bakout,
+					showCancel: true,
+					success(cnf) {
+						if (cnf.confirm) {
+							config.path = import.meta.env.VITE_API_BACKUP;
+						}
+					}
+				});
+			}
+
+		}
+
 	}
 	else {
 		let mer = res.errMsg.match(/<title>(.+)<\/title>/);
@@ -343,15 +379,11 @@ function doComplete(request, res, resolve, reject) {
 	console.log(request)
 }
 
-
 function postFailBox() {
 	if (failBox.length === 0) return;
 	return doRequest(new _request(`!${api}`, failBox, 'post'));
 }
 
-
-
-
 async function doRequest(request) {
 
 	if (request.toast) {
@@ -362,10 +394,10 @@ async function doRequest(request) {
 		});
 	}
 
-
 	return new Promise(async (resolve, reject) => {
 		request.timer.ready = Date.now();
-		request.header.put = await processor.header(request.api, request.request, request.method);
+		await processor.preprocessing(request);
+		// request.header.put = await processor.header(request.api, request.request, request.method);
 		const contType = (request.method === 'UPLOAD') ? 'multipart/form-data' : 'application/json';
 		request.header.put['content-type'] = contType;
 		delete request.header.put['referer'];
@@ -394,14 +426,10 @@ async function doRequest(request) {
 	});
 }
 
-
 function thisPost(api, data = {}) {
 	return doRequest(new _request(api, data, 'post'));
 }
 
-/**
- * @param {Object} option
- */
 /**
  * @param {Object} uri
  * @param {Object} option
@@ -426,7 +454,7 @@ async function doUploadAliYun(uri, option) {
 				const { url, formData, name, save } = resConf.data;
 				// console.log({ url, formData, name });
 				if (!url) {
-					return reject({ success: false, error: 505, message: `服务器未响应有效数据` });
+					return reject({ success: false, error: 505, message: dimMsg.valid });
 				}
 
 				uni.uploadFile({
@@ -462,10 +490,9 @@ async function doUploadAliYun(uri, option) {
 						}
 
 						else {
-							reject({ success: false, error: resUp.statusCode, message: `上传失败` });
+							reject({ success: false, error: resUp.statusCode, message: dimMsg.upload });
 						}
 
-
 					},
 					fail: errUp => {
 						// console.log({ errUp });
@@ -480,15 +507,9 @@ async function doUploadAliYun(uri, option) {
 			}
 		);
 
-
-
-
-
-
 	})
 }
 
-
 /**
  * 操作频率检查
  * @param {Object} api
@@ -503,7 +524,7 @@ async function FrequencyDetection(api) {
 		// console.log({ nowTime, justPostTime, just: nowTime - justPostTime, detection: config.detection });
 
 		return new Promise((resolve, reject) => {
-			reject({ error: 1, success: 0, message: '操作太频繁' })
+			reject({ error: 1, success: 0, message: dimMsg.frequent })
 		});
 
 	}
@@ -514,8 +535,6 @@ async function FrequencyDetection(api) {
 	return null; //操作正常，可以继续
 }
 
-
-
 async function downloadFile(url, callback) {
 
 	const key = url.md5();
@@ -549,7 +568,7 @@ async function downloadFile(url, callback) {
 					}
 					else {
 						console.log('download null', { res })
-						resolve({ success: false, message: '文件不存在' })
+						resolve({ success: false, message: dimMsg.notexist })
 					}
 				},
 				fail: err => {
@@ -569,13 +588,10 @@ async function downloadFile(url, callback) {
 
 			});
 
-
-
 		});
 
 	}
 
-
 	return new Promise(async (resolve, reject) => {
 
 		let cache = uni.getStorageSync(key);
@@ -602,8 +618,6 @@ async function downloadFile(url, callback) {
 
 }
 
-
-
 export default class {
 	processor = null;
 
@@ -612,6 +626,7 @@ export default class {
 		for (let k in config) config[k] = conf[k];
 		if (conf.toast) Object.assign(toastConf, conf.toast);
 		if (conf.alias) Object.assign(aliasConf, conf.alias);
+		if (conf.locale) Object.assign(dimMsg, conf.locale);
 		if (isDebug) console.log(config);
 	}
 
@@ -658,6 +673,4 @@ export default class {
 		return await downloadFile(uri, callback);
 	}
 
-
-
 };

package/src/soft.js

@@ -1,6 +1,6 @@
 export default class {
 	system = ''; //操作系统及版本
-	platform = process.env.VUE_APP_PLATFORM; //mp-weixin,h5,app-plus等
+	platform = process.env.VUE_APP_PLATFORM; //mp-weixin,h5,app等
 	mode = process.env.NODE_ENV; //运行环境 
 
 	brand = ''; //手机品牌，huawei,xiaomi,vivo,oppo
@@ -9,7 +9,7 @@ export default class {
 
 	singlePage = false; //是否从朋友圈进入的单页模式
 
-	// #ifdef APP-PLUS
+	// #ifdef APP
 	os = '';
 	ua = '';
 	packName = ''; //APP包名
@@ -51,7 +51,7 @@ export default class {
 				const base = uni.getAppBaseInfo();
 				this.name = base.appName || 'unknow'; //应用名称
 				this.sdk = base.SDKVersion || '0.0.0'; //SDK主版本号
-				this.appid = base.appId; //这是uniAPP的ID，不是小程序的ID
+				this.appid = base.appId; //这是DCloud uniAPP的ID，不是小程序的ID
 				this.version = base.appVersion; //APP的版本号，也就是在manifest中设置的版本号，小程序为提交申核的版本号
 				this.theme = base.theme; //主体色
 
@@ -96,11 +96,11 @@ export default class {
 			const system = uni.getSystemInfoSync();
 
 			this.brand = (system.brand || 'unknow').toLowerCase(); //手机品牌
-			this.name = system.name || 'unknow'; //应用名称
+			this.name = system.appName || system.name || 'unknow'; //应用名称，manifest中设的名称
 			this.model = system.model || 'unknow'; //手机品牌下的型号
 			this.devid = system.deviceId || 'unknow'; //设备唯一编码
-			this.sdk = system.SDKVersion || '0.0.0'; //小程序主版本号
-			this.appid = system.appId;
+			this.sdk = system.SDKVersion || system.hostSDKVersion || '0.0.0'; //小程序主版本号
+			this.appid = system.appId; //这是DCloud uniapp的appID
 			this.os = system.osName;
 			this.osver = system.osVersion;
 			this.version = system.appVersion; //APP的版本号，也就是在manifest中设置的版本号，小程序为提交申核的版本号
@@ -141,7 +141,6 @@ export default class {
 			if (!this.version) this.version = accountTou.microapp.envType;
 			// #endif
 
-
 			//胶囊按钮
 			// #ifdef MP-WEIXIN||MP-ALIPAY||MP-BAIDU||MP-TOUTIAO||MP-QQ
 			this.size.button = uni.getMenuButtonBoundingClientRect();
@@ -152,7 +151,7 @@ export default class {
 			this.size.button = { bottom: 56, height: 32, left: (width - 94), right: (width - 7), top: 24, width: 87 };
 			// #endif
 
-			// #ifdef APP-PLUS
+			// #ifdef APP
 			this.os = plus.os.name.toLowerCase(); //操作系统，android或ios
 			this.osver = plus.os.version; //操作系统版本号
 			this.version = import.meta.env.VITE_VERSION; //热更包版本号
@@ -184,7 +183,6 @@ export default class {
 				});
 			}
 
-
 			plus.device.getInfo({
 				success: (res) => {
 					// console.log('plus.device.getInfo', res)
@@ -206,8 +204,6 @@ export default class {
 
 	}
 
-
-
 	/**
 	 * 设置屏幕常亮
 	 * 
@@ -220,7 +216,7 @@ export default class {
 			keepScreenOn: keep
 		});
 		//#endif
-		//#ifdef APP-PLUS
+		//#ifdef APP
 		plus.device.setWakelock(keep);
 		//#endif
 	}
@@ -235,7 +231,7 @@ export default class {
 			version: this.version,
 			theme: this.theme,
 
-			//#ifdef APP-PLUS
+			//#ifdef APP
 			os: this.os,
 			packName: this.packName,
 			simulator: this.simulator, //模拟器可能性判断，oaid,aaid,uuid其中任一个读取出错各加1
@@ -248,7 +244,6 @@ export default class {
 		}
 	}
 
-
 	/**
 	 * 为了防止快速点按返回键导致程序退出重写quit方法改为隐藏至后台
 	 * 重写toast方法如果内容为 ‘再次返回退出应用’ 就隐藏应用，其他正常toast
@@ -264,18 +259,18 @@ export default class {
 			/**
 			 * 再次返回退出应用
 			 */
-			if (str == '再按一次退出应用') {
+			const title = 'Press again to exit the application';
+			if (str === title) {
 				plus.runtime.quit();
+				return;
 			}
-			else {
-				uni.showToast({
-					title: '再按一次退出应用啦',
-					icon: 'none'
-				})
-			}
+
+			uni.showToast({
+				title,
+				icon: 'none'
+			})
 		});
 
 	}
 
-
 }