From 49db1d6b42e831ea273e2c8e9f48a5e5cc8ab594 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 19 十二月 2024 14:09:50 +0800
Subject: [PATCH] test

---
 libs/mobox.api.js |   20 ++++++++++++++++----
 api/index.js      |   24 ++++++++++++------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/api/index.js b/api/index.js
index fdbc0e0..c4321c7 100644
--- a/api/index.js
+++ b/api/index.js
@@ -63,7 +63,7 @@
 						let verCode = versionInfo[2].replace(".apk", "").replace(".", "").replace(
 							".", ""); //鏈嶅姟绔増鏈彿
 						let dldUrl = openinfo +
-							"/Program/" +
+							"Program/" +
 							verName; //app涓嬭浇閾炬帴this.
 						resolve({
 							verName,
@@ -112,7 +112,7 @@
 						const verCode = ret.data?.VersionCode || ""; //鐗堟湰缂栫爜
 						const verNum = ret.data?.Version || ""; //鏈嶅姟绔増鏈彿
 						let dldUrl = openinfo +
-							"/Program/" +
+							"Program/" +
 							verName; //app涓嬭浇閾炬帴this.
 						resolve({
 							verName,
@@ -202,7 +202,7 @@
 		data = {
 			uname: id || "",
 			pwd: pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0"
 		}
 		return http.request2({
@@ -235,7 +235,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 		var data = {
@@ -274,7 +274,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
@@ -312,7 +312,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
@@ -347,7 +347,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
@@ -381,7 +381,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
@@ -414,7 +414,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
@@ -452,7 +452,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
@@ -486,7 +486,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
@@ -521,7 +521,7 @@
 		let loginInfo = {
 			uname: app.globalData.loginUser.id || "",
 			pwd: app.globalData.loginUser.pwd || "",
-			cname: app.globalData.cname,
+			cname: app.globalData.cname|| "",
 			type: "0",
 		}
 
diff --git a/libs/mobox.api.js b/libs/mobox.api.js
index b582987..d640814 100644
--- a/libs/mobox.api.js
+++ b/libs/mobox.api.js
@@ -12,7 +12,7 @@
 		options.method = options.method || this.common.method;
 		options.dataType = options.dataType || this.common.dataType;
 		return new Promise((resolve, reject) => {
-			console.log("request:", options);
+			//console.log("request:", options);
 
 			uni.request({
 				url: options.url,
@@ -21,12 +21,18 @@
 				method: options.method,
 				dataType: options.dataType,
 				success: (result) => {
-					console.log("result", result)
+				//	console.log("result", result)
 					if (result.statusCode != 200) {
+						if (result.statusCode == 404) {
+							return reject({
+								errMsg: "鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細" + options.url
+							});
+						}
 						return reject({
 							errMsg: "璁块棶澶辫触锛岀姸鎬佺爜锛� + result.statusCode
 						})
 					}
+				
 					var ret = result.data
 					if (typeof ret == 'string') {
 						try {
@@ -70,7 +76,7 @@
 		options.method = options.method || this.common.method;
 		options.dataType = options.dataType || this.common.dataType;
 		return new Promise((resolve, reject) => {
-			console.log("request:", options);
+			//console.log("request:", options);
 
 			uni.request({
 				url: options.url,
@@ -79,12 +85,18 @@
 				method: options.method,
 				dataType: options.dataType,
 				success: (result) => {
-					console.log("result", result)
+				//	console.log("result", result)
 					if (result.statusCode != 200) {
+						if (result.statusCode == 404) {
+							return reject({
+								errMsg: "鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細" + options.url
+							});
+						}
 						return reject({
 							errMsg: "璁块棶澶辫触锛岀姸鎬佺爜锛� + result.statusCode
 						})
 					}
+					
 					var ret = result.data
 					if (typeof ret == 'string') {
 						try {

--
Gitblit v1.9.1