From 068be2757aa2d51e3f6604dae54287683160ad0e Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 19 一月 2026 17:29:48 +0800
Subject: [PATCH] 2026.1.19
---
service/baserequest.js | 119 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 43 deletions(-)
diff --git a/service/baserequest.js b/service/baserequest.js
index 21ed36a..7449b7e 100644
--- a/service/baserequest.js
+++ b/service/baserequest.js
@@ -5,41 +5,65 @@
* success: function(data),
* page: function(page, totalPage)
* fail: function(error)
- * }
+ * }
*/
-const util = require("../utils/util.js")
+const util = require('../utils/util.js');
-const originProperties = ['url', 'data', 'header', 'method', 'success', 'fail', 'complete'];
-// const baseUrl = "http://127.0.0.1:8080"
-const baseUrl = "http://192.168.0.106:8080"
-// const baseUrl = "https://fyami.com.cn:447"
-// const basePicUrl = baseUrl + "/images/"
-const basePicUrl = "https://fyami.com.cn:447/images/"
-const baseFileUrl = baseUrl + "/meeting/file/"
+// 灏忕▼搴忓悗鍙�
+const baseUrl = "http://192.168.1.9:8082"
+// const baseUrl = 'https://fyami.com.cn';
+const bu = 'https://fyami.com.cn';
+const basePicUrl = `${bu}/images/`;
+const baseIconUrl = `${bu}/images/weixin/eplaw/`;
+const baseFileUrl = `${bu}/meeting/file/`;
-function request(fun) {
+// 椋炵窘鐩戠绯荤粺鍚庡彴
+const spUrl = "https://fyami.com.cn:447"
+const spBu = "https://fyami.com.cn:447"
+const spPicUrl = `${spBu}/images/`;
+
+const mode = 'debug';
+// const mode = 'prod';
+
+function request(fun, hostUrl) {
+ const bUrl = hostUrl ? hostUrl : baseUrl;
if (fun.params != undefined) {
- var param = ""
+ var param = '';
Object.keys(fun.params).forEach(key => {
- var value = fun.params[key]
- if (param == "") {
- param += key + "=" + value
+ var value = fun.params[key];
+ if (param == '') {
+ param += key + '=' + value;
} else {
- param += "&" + key + "=" + value
+ param += '&' + key + '=' + value;
}
});
- var url = fun.url
- fun.url = baseUrl + url + "?" + param
- }else{
- var url = fun.url
- fun.url = baseUrl + url
+ var url = fun.url;
+ fun.url = bUrl + url + '?' + param;
+ } else {
+ var url = fun.url;
+ fun.url = bUrl + url;
}
- var fun1 = util.deepCopy(fun)
+ var fun1 = util.deepCopy(fun);
+ if (mode == 'debug') {
+ console.log(
+ '|------------------------------------------------------------------------------------------------------------',
+ );
+ console.log('|--璁块棶: ', fun.url);
+ console.log('|--鍙傛暟: ', fun.data);
+ }
fun1.success = function (res) {
- console.log("--------------璇锋眰缁撴灉----------------" + fun.url);
- console.log(res);
-
- fun.success(res.data)
+ if (mode == 'debug') {
+ console.log('|--缁撴灉: ', res);
+ }
+
+ if (res.statusCode == 200) {
+ if (fun.onHead) {
+ fun.onHead(res.header);
+ }
+ fun.success(res.data);
+ } else {
+ fun.fail(res.statusCode);
+ }
// if(res.data.success) {
// var head = res.data['head']
// if (head != undefined && fun.page != undefined) {
@@ -49,28 +73,37 @@
// } else {
// fun.fail(res.data)
// }
- }
+ };
fun1.fail = function (error) {
+ if (mode == 'debug') {
+ console.log('|--閿欒: ', error);
+ }
wx.showToast({
- title: '缃戠粶杩炴帴澶辫触',
- icon: 'none'
- })
- fun.fail(error)
- }
- fun1.complete = fun.complete
- wx.request(fun1)
+ title: '璇锋眰澶辫触',
+ icon: 'none',
+ duration: 2000,
+ });
+ if (fun.fail) {
+ fun.fail(error);
+ }
+ };
+ fun1.complete = fun.complete;
+ wx.request(fun1);
}
module.exports = {
- get: function (fun) {
- fun['method'] = 'GET'
- request(fun)
+ get: function (fun, hostUrl) {
+ fun['method'] = 'GET';
+ request(fun, hostUrl);
},
- post: function (fun) {
- fun['method'] = 'POST'
- request(fun)
+ post: function (fun, hostUrl) {
+ fun['method'] = 'POST';
+ request(fun, hostUrl);
},
- basePicUrl:basePicUrl,
- baseUrl:baseUrl,
- baseFileUrl:baseFileUrl
-}
\ No newline at end of file
+ basePicUrl: basePicUrl,
+ baseUrl: baseUrl,
+ baseFileUrl: baseFileUrl,
+ baseIconUrl: baseIconUrl,
+ spUrl: spUrl,
+ spPicUrl: spPicUrl,
+};
--
Gitblit v1.9.3