pcwl_yancheng/uni-fans-score
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复订单监控总会显示弹窗的bug（采用时间比较形式）

Browse Source
This commit is contained in:
ISFP_T
2025-09-19 09:06:18 +08:00
parent 5ad77a857c
commit 703f80ad75
24 changed files with 66 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unpackage/dist/dev/.sourcemap/mp-weixin/config/http.js.map
Vendored
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"http.js","sources":["config/http.js"],"sourcesContent":["import {\r\n\tURL,\r\n\tappid\r\n} from './url'\r\n\r\nconst request = (option) => {\r\n\treturn new Promise((resolve, reject) => {\r\n\r\n\t\t// 默认不显示加载中提示\r\n\t\tif (!option.hideLoading) {\r\n\t\t\tuni.showLoading({\r\n\t\t\t\ttitle: option.loadingText || '加载中...',\r\n\t\t\t\tmask: true\r\n\t\t\t})\r\n\t\t}\r\n\t\t\r\n\t\tuni.request({\r\n\t\t\turl: URL + option.url,\r\n\t\t\tmethod: option.method,\r\n\t\t\tdata: option.data,\r\n\t\t\theader: {\r\n\t\t\t\t\"Content-Type\": \"application/json\",\r\n\t\t\t\t\t...option.headers,\r\n\t\t\t\t'appid': appid,\r\n\t\t\t\t'Authorization': \"Bearer \" + uni.getStorageSync('token'),\r\n\t\t\t\t'Clientid': uni.getStorageSync('client_id')\r\n\t\t\t},\r\n\t\t\tsuccess(res) {\r\n\r\n\t\t\t\t\r\n\t\t\t\t// 检查响应状态码\r\n\t\t\t\tif (res.statusCode !== 200) {\r\n\t\t\t\t\tconsole.error(`HTTP状态码错误: ${res.statusCode}`, res.data)\r\n\t\t\t\t\t\r\n\t\t\t\t\t// 为了适应某些服务器的异常响应，我们仍然返回数据\r\n\t\t\t\t\tif (res.data) {\r\n\t\t\t\t\t\tresolve(res.data)\r\n\t\t\t\t\t\treturn\r\n\t\t\t\t\t}\r\n\t\t\t\t\t\r\n\t\t\t\t\treject({msg: `请求失败，状态码：${res.statusCode}`})\r\n\t\t\t\t\treturn\r\n\t\t\t\t}\r\n\t\t\t\t\r\n\t\t\t\t// 检查业务状态码\r\n\t\t\t\tif (res.data && res.data.code !== 200) {\r\n\t\t\t\t\tconsole.warn(`业务状态码错误: ${res.data.code}`, res.data)\r\n\t\t\t\t\t\r\n\t\t\t\t\t// 判断是否需要忽略数据为空的错误\r\n\t\t\t\t\tif (option.ignoreEmptyError && \r\n\t\t\t\t\t\t(res.data.code === 500 && res.data.msg && \r\n\t\t\t\t\t\t(res.data.msg.includes('未找到') || res.data.msg.includes('不存在')))) {\r\n\t\t\t\t\t\t// 对于指定需要忽略的错误，返回一个标准的\"成功但数据为空\"的响应\r\n\t\t\t\t\t\tresolve({\r\n\t\t\t\t\t\t\tcode: 200,\r\n\t\t\t\t\t\t\tmsg: \"操作成功\",\r\n\t\t\t\t\t\t\tdata: []\r\n\t\t\t\t\t\t})\r\n\t\t\t\t\t\treturn\r\n\t\t\t\t\t}\r\n\t\t\t\t\t\r\n\t\t\t\t\t// 仍然返回数据，由业务逻辑处理\r\n\t\t\t\t\tresolve(res.data)\r\n\t\t\t\t\treturn\r\n\t\t\t\t}\r\n\t\t\t\t\r\n\t\t\t\tresolve(res.data)\r\n\t\t\t},\r\n\t\t\tfail(err) {\r\n\t\t\t\t// 网络请求本身失败\r\n\t\t\t\tconsole.error(`请求失败: ${option.url}`, err)\r\n\t\t\t\treject(err)\r\n\t\t\t},\r\n\t\t\tcomplete() {\r\n\t\t\t\t// 隐藏加载提示\r\n\t\t\t\tif (!option.hideLoading) {\r\n\t\t\t\t\tuni.hideLoading()\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t})\r\n\t})\r\n}\r\n\r\n\r\nexport default request"],"names":["uni","URL","appid"],"mappings":";;;AAKK,MAAC,UAAU,CAAC,WAAW;AAC3B,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAGvC,QAAI,CAAC,OAAO,aAAa;AACxBA,oBAAAA,MAAI,YAAY;AAAA,QACf,OAAO,OAAO,eAAe;AAAA,QAC7B,MAAM;AAAA,MACV,CAAI;AAAA,IACD;AAEDA,kBAAAA,MAAI,QAAQ;AAAA,MACX,KAAKC,WAAAA,MAAM,OAAO;AAAA,MAClB,QAAQ,OAAO;AAAA,MACf,MAAM,OAAO;AAAA,MACb,QAAQ;AAAA,QACP,gBAAgB;AAAA,QACf,GAAG,OAAO;AAAA,QACX,SAASC,WAAK;AAAA,QACd,iBAAiB,YAAYF,oBAAI,eAAe,OAAO;AAAA,QACvD,YAAYA,cAAAA,MAAI,eAAe,WAAW;AAAA,MAC1C;AAAA,MACD,QAAQ,KAAK;AAIZ,YAAI,IAAI,eAAe,KAAK;AAC3BA,wBAAAA,6CAAc,cAAc,IAAI,UAAU,IAAI,IAAI,IAAI;AAGtD,cAAI,IAAI,MAAM;AACb,oBAAQ,IAAI,IAAI;AAChB;AAAA,UACA;AAED,iBAAO,EAAC,KAAK,YAAY,IAAI,UAAU,GAAE,CAAC;AAC1C;AAAA,QACA;AAGD,YAAI,IAAI,QAAQ,IAAI,KAAK,SAAS,KAAK;AACtCA,wBAAAA,MAAa,MAAA,QAAA,wBAAA,YAAY,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI;AAGlD,cAAI,OAAO,qBACT,IAAI,KAAK,SAAS,OAAO,IAAI,KAAK,QAClC,IAAI,KAAK,IAAI,SAAS,KAAK,KAAK,IAAI,KAAK,IAAI,SAAS,KAAK,KAAK;AAEjE,oBAAQ;AAAA,cACP,MAAM;AAAA,cACN,KAAK;AAAA,cACL,MAAM,CAAE;AAAA,YACf,CAAO;AACD;AAAA,UACA;AAGD,kBAAQ,IAAI,IAAI;AAChB;AAAA,QACA;AAED,gBAAQ,IAAI,IAAI;AAAA,MAChB;AAAA,MACD,KAAK,KAAK;AAETA,4BAAA,MAAA,SAAA,wBAAc,SAAS,OAAO,GAAG,IAAI,GAAG;AACxC,eAAO,GAAG;AAAA,MACV;AAAA,MACD,WAAW;AAEV,YAAI,CAAC,OAAO,aAAa;AACxBA,wBAAAA,MAAI,YAAa;AAAA,QACjB;AAAA,MACD;AAAA,IACJ,CAAG;AAAA,EACH,CAAE;AACF;;"}
{"version":3,"file":"http.js","sources":["config/http.js"],"sourcesContent":["import {\r\n\tURL,\r\n\tappid\r\n} from './url'\r\n\r\nconst request = (option) => {\r\n\treturn new Promise((resolve, reject) => {\r\n\r\n\t\t// 默认不显示加载中提示\r\n\t\tif (!option.hideLoading) {\r\n\t\t\tuni.showLoading({\r\n\t\t\t\ttitle: option.loadingText || '加载中...',\r\n\t\t\t\tmask: true\r\n\t\t\t})\r\n\t\t}\r\n\t\t\r\n\t\tuni.request({\r\n\t\t\turl: URL + option.url,\r\n\t\t\tmethod: option.method,\r\n\t\t\tdata: option.data,\r\n\t\t\theader: {\r\n\t\t\t\t\"Content-Type\": \"application/x-www-form-urlencoded\",\r\n\t\t\t\t\t...option.headers,\r\n\t\t\t\t'appid': appid,\r\n\t\t\t\t'Authorization': \"Bearer \" + uni.getStorageSync('token'),\r\n\t\t\t\t'Clientid': uni.getStorageSync('client_id')\r\n\t\t\t},\r\n\t\t\tsuccess(res) {\r\n\r\n\t\t\t\t\r\n\t\t\t\t// 检查响应状态码\r\n\t\t\t\tif (res.statusCode !== 200) {\r\n\t\t\t\t\tconsole.error(`HTTP状态码错误: ${res.statusCode}`, res.data)\r\n\t\t\t\t\t\r\n\t\t\t\t\t// 为了适应某些服务器的异常响应，我们仍然返回数据\r\n\t\t\t\t\tif (res.data) {\r\n\t\t\t\t\t\tresolve(res.data)\r\n\t\t\t\t\t\treturn\r\n\t\t\t\t\t}\r\n\t\t\t\t\t\r\n\t\t\t\t\treject({msg: `请求失败，状态码：${res.statusCode}`})\r\n\t\t\t\t\treturn\r\n\t\t\t\t}\r\n\t\t\t\t\r\n\t\t\t\t// 检查业务状态码\r\n\t\t\t\tif (res.data && res.data.code !== 200) {\r\n\t\t\t\t\tconsole.warn(`业务状态码错误: ${res.data.code}`, res.data)\r\n\t\t\t\t\t\r\n\t\t\t\t\t// 判断是否需要忽略数据为空的错误\r\n\t\t\t\t\tif (option.ignoreEmptyError && \r\n\t\t\t\t\t\t(res.data.code === 500 && res.data.msg && \r\n\t\t\t\t\t\t(res.data.msg.includes('未找到') || res.data.msg.includes('不存在')))) {\r\n\t\t\t\t\t\t// 对于指定需要忽略的错误，返回一个标准的\"成功但数据为空\"的响应\r\n\t\t\t\t\t\tresolve({\r\n\t\t\t\t\t\t\tcode: 200,\r\n\t\t\t\t\t\t\tmsg: \"操作成功\",\r\n\t\t\t\t\t\t\tdata: []\r\n\t\t\t\t\t\t})\r\n\t\t\t\t\t\treturn\r\n\t\t\t\t\t}\r\n\t\t\t\t\t\r\n\t\t\t\t\t// 仍然返回数据，由业务逻辑处理\r\n\t\t\t\t\tresolve(res.data)\r\n\t\t\t\t\treturn\r\n\t\t\t\t}\r\n\t\t\t\t\r\n\t\t\t\tresolve(res.data)\r\n\t\t\t},\r\n\t\t\tfail(err) {\r\n\t\t\t\t// 网络请求本身失败\r\n\t\t\t\tconsole.error(`请求失败: ${option.url}`, err)\r\n\t\t\t\treject(err)\r\n\t\t\t},\r\n\t\t\tcomplete() {\r\n\t\t\t\t// 隐藏加载提示\r\n\t\t\t\tif (!option.hideLoading) {\r\n\t\t\t\t\tuni.hideLoading()\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t})\r\n\t})\r\n}\r\n\r\n\r\nexport default request"],"names":["uni","URL","appid"],"mappings":";;;AAKK,MAAC,UAAU,CAAC,WAAW;AAC3B,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAGvC,QAAI,CAAC,OAAO,aAAa;AACxBA,oBAAAA,MAAI,YAAY;AAAA,QACf,OAAO,OAAO,eAAe;AAAA,QAC7B,MAAM;AAAA,MACV,CAAI;AAAA,IACD;AAEDA,kBAAAA,MAAI,QAAQ;AAAA,MACX,KAAKC,WAAAA,MAAM,OAAO;AAAA,MAClB,QAAQ,OAAO;AAAA,MACf,MAAM,OAAO;AAAA,MACb,QAAQ;AAAA,QACP,gBAAgB;AAAA,QACf,GAAG,OAAO;AAAA,QACX,SAASC,WAAK;AAAA,QACd,iBAAiB,YAAYF,oBAAI,eAAe,OAAO;AAAA,QACvD,YAAYA,cAAAA,MAAI,eAAe,WAAW;AAAA,MAC1C;AAAA,MACD,QAAQ,KAAK;AAIZ,YAAI,IAAI,eAAe,KAAK;AAC3BA,wBAAAA,6CAAc,cAAc,IAAI,UAAU,IAAI,IAAI,IAAI;AAGtD,cAAI,IAAI,MAAM;AACb,oBAAQ,IAAI,IAAI;AAChB;AAAA,UACA;AAED,iBAAO,EAAC,KAAK,YAAY,IAAI,UAAU,GAAE,CAAC;AAC1C;AAAA,QACA;AAGD,YAAI,IAAI,QAAQ,IAAI,KAAK,SAAS,KAAK;AACtCA,wBAAAA,MAAa,MAAA,QAAA,wBAAA,YAAY,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI;AAGlD,cAAI,OAAO,qBACT,IAAI,KAAK,SAAS,OAAO,IAAI,KAAK,QAClC,IAAI,KAAK,IAAI,SAAS,KAAK,KAAK,IAAI,KAAK,IAAI,SAAS,KAAK,KAAK;AAEjE,oBAAQ;AAAA,cACP,MAAM;AAAA,cACN,KAAK;AAAA,cACL,MAAM,CAAE;AAAA,YACf,CAAO;AACD;AAAA,UACA;AAGD,kBAAQ,IAAI,IAAI;AAChB;AAAA,QACA;AAED,gBAAQ,IAAI,IAAI;AAAA,MAChB;AAAA,MACD,KAAK,KAAK;AAETA,4BAAA,MAAA,SAAA,wBAAc,SAAS,OAAO,GAAG,IAAI,GAAG;AACxC,eAAO,GAAG;AAAA,MACV;AAAA,MACD,WAAW;AAEV,YAAI,CAAC,OAAO,aAAa;AACxBA,wBAAAA,MAAI,YAAa;AAAA,QACjB;AAAA,MACD;AAAA,IACJ,CAAG;AAAA,EACH,CAAE;AACF;;"}
unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map
Vendored
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\n// export const URL = \"https://fansdev.gxfs123.com/api\" //测试服务器\r\n// export const URL = \"http://192.168.5.13:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AAAY,MAAC,MAAM;AAIP,MAAC,QAAQ;;;"}
{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\n// export const URL = \"https://fansdev.gxfs123.com/api\" //测试服务器\r\n// export const URL = \"http://192.168.5.22:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AAAY,MAAC,MAAM;AAIP,MAAC,QAAQ;;;"}
unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/detail.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
unpackage/dist/dev/.sourcemap/mp-weixin/utils/mapUtils.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
unpackage/dist/dev/mp-weixin/common/vendor.js
Vendored
+1 -1
View File
@@ -7049,7 +7049,7 @@ function isConsoleWritable() {
function initRuntimeSocketService() {
const hosts = "192.168.5.17,127.0.0.1";
const port = "8090";
const id = "mp-weixin_Pk5qpf";
const id = "mp-weixin_7kve6_";
const lazy = typeof swan !== "undefined";
let restoreError = lazy ? () => {
} : initOnError();
unpackage/dist/dev/mp-weixin/config/http.js
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ const request = (option) => {
method: option.method,
data: option.data,
header: {
"Content-Type": "application/json",
"Content-Type": "application/x-www-form-urlencoded",
...option.headers,
"appid": config_url.appid,
"Authorization": "Bearer " + common_vendor.index.getStorageSync("token"),
unpackage/dist/dev/mp-weixin/pages/device/detail.js
Vendored
+1
View File
@@ -194,6 +194,7 @@ const _sfc_main = {
common_vendor.index.showLoading({
title: "处理中"
});
common_vendor.index.__f__("log", "at pages/device/detail.vue:428", deviceId.value);
const rentResult = await config_user.rentPowerBank(deviceId.value, phoneNumber.value);
if (rentResult.code !== 200) {
throw new Error(rentResult.msg || "设备租借失败");
unpackage/dist/dev/mp-weixin/pages/index/index.js
Vendored
+12 -10
View File
@@ -88,13 +88,14 @@ const _sfc_main = {
longitude: location.longitude,
latitude: location.latitude
};
common_vendor.index.__f__("log", "at pages/index/index.vue:260", userLocation.value);
try {
common_vendor.index.setStorageSync("userLocation", {
longitude: location.longitude,
latitude: location.latitude
});
} catch (e) {
common_vendor.index.__f__("warn", "at pages/index/index.vue:267", "缓存基础定位信息失败:", e);
common_vendor.index.__f__("warn", "at pages/index/index.vue:268", "缓存基础定位信息失败:", e);
}
if (!isLocationInitialized.value) {
isLocationInitialized.value = true;
@@ -115,7 +116,7 @@ const _sfc_main = {
district: userLocation.value.district
});
} catch (e) {
common_vendor.index.__f__("warn", "at pages/index/index.vue:294", "缓存带地址的定位信息失败:", e);
common_vendor.index.__f__("warn", "at pages/index/index.vue:295", "缓存带地址的定位信息失败:", e);
}
}
} catch (error) {
@@ -125,7 +126,7 @@ const _sfc_main = {
common_vendor.index.hideLoading();
}, 800);
} catch (error) {
common_vendor.index.__f__("error", "at pages/index/index.vue:309", "获取位置失败:", error);
common_vendor.index.__f__("error", "at pages/index/index.vue:310", "获取位置失败:", error);
common_vendor.index.showToast({
title: "获取位置失败，显示默认地图",
icon: "none"
@@ -149,15 +150,16 @@ const _sfc_main = {
longitude: userLocation.value.longitude
}
});
common_vendor.index.__f__("log", "at pages/index/index.vue:336", res);
if (res.statusCode === 200 && res.data.code === 200) {
positionList.value = res.data.rows || [];
calculateDistances();
filteredPositions.value = [...positionList.value];
} else {
common_vendor.index.__f__("error", "at pages/index/index.vue:341", "获取场地列表失败:", res.data.msg);
common_vendor.index.__f__("error", "at pages/index/index.vue:343", "获取场地列表失败:", res.data.msg);
}
} catch (error) {
common_vendor.index.__f__("error", "at pages/index/index.vue:344", "获取场地列表异常:", error);
common_vendor.index.__f__("error", "at pages/index/index.vue:346", "获取场地列表异常:", error);
}
};
const calculateDistances = async (centerPoint = null) => {
@@ -178,7 +180,7 @@ const _sfc_main = {
item.distance = formatDistance(distanceInMeters);
item.distanceInMeters = distanceInMeters;
} catch (error) {
common_vendor.index.__f__("error", "at pages/index/index.vue:372", "计算距离异常:", error, item);
common_vendor.index.__f__("error", "at pages/index/index.vue:374", "计算距离异常:", error, item);
item.distance = "999.0km";
item.distanceInMeters = 999e3;
}
@@ -209,12 +211,12 @@ const _sfc_main = {
return !item.distanceInMeters || item.distanceInMeters <= maxDistanceInMeters;
});
} else {
common_vendor.index.__f__("error", "at pages/index/index.vue:413", "根据地图中心加载场地失败:", res.data.msg);
common_vendor.index.__f__("error", "at pages/index/index.vue:415", "根据地图中心加载场地失败:", res.data.msg);
positionList.value = [];
filteredPositions.value = [];
}
} catch (error) {
common_vendor.index.__f__("error", "at pages/index/index.vue:418", "根据地图中心加载场地异常:", error);
common_vendor.index.__f__("error", "at pages/index/index.vue:420", "根据地图中心加载场地异常:", error);
}
};
const handleRelocate = async () => {
@@ -337,14 +339,14 @@ const _sfc_main = {
});
}
} catch (error) {
common_vendor.index.__f__("error", "at pages/index/index.vue:581", "获取设备信息异常:", error);
common_vendor.index.__f__("error", "at pages/index/index.vue:583", "获取设备信息异常:", error);
common_vendor.index.navigateTo({
url: `/pages/device/detail?deviceNo=${deviceNo}`
});
}
}
} catch (error) {
common_vendor.index.__f__("error", "at pages/index/index.vue:588", "扫码处理失败:", error);
common_vendor.index.__f__("error", "at pages/index/index.vue:590", "扫码处理失败:", error);
common_vendor.index.showToast({
title: "扫码失败",
icon: "none"
unpackage/dist/dev/mp-weixin/utils/mapUtils.js
Vendored
+8 -6
View File
@@ -369,13 +369,15 @@ function getUserLocation() {
common_vendor.wx$1.getLocation({
type: "gcj02",
success: (res) => {
const longitude = parseFloat(res.longitude.toFixed(5));
const latitude = parseFloat(res.latitude.toFixed(5));
resolve({
longitude: res.longitude,
latitude: res.latitude
longitude,
latitude
});
},
fail: (error) => {
common_vendor.index.__f__("error", "at utils/mapUtils.js:423", "获取位置失败:", error);
common_vendor.index.__f__("error", "at utils/mapUtils.js:427", "获取位置失败:", error);
reject(error);
}
});
@@ -410,7 +412,7 @@ function getRegeo(longitude, latitude) {
});
},
fail: (error) => {
common_vendor.index.__f__("error", "at utils/mapUtils.js:462", "逆地理编码失败:", error);
common_vendor.index.__f__("error", "at utils/mapUtils.js:484", "逆地理编码失败:", error);
reject({ success: false, message: error.message || "逆地理编码失败" });
}
});
@@ -428,8 +430,8 @@ function testDistanceCalculation() {
const tiananmen = { lat: 39.908823, lng: 116.39747 };
const gugong = { lat: 39.916527, lng: 116.397128 };
const distance = calculateDistanceSync(tiananmen.lat, tiananmen.lng, gugong.lat, gugong.lng);
common_vendor.index.__f__("log", "at utils/mapUtils.js:586", "天安门到故宫的距离:", distance, "米");
common_vendor.index.__f__("log", "at utils/mapUtils.js:587", "转换为公里:", (distance / 1e3).toFixed(2), "公里");
common_vendor.index.__f__("log", "at utils/mapUtils.js:608", "天安门到故宫的距离:", distance, "米");
common_vendor.index.__f__("log", "at utils/mapUtils.js:609", "转换为公里:", (distance / 1e3).toFixed(2), "公里");
return distance;
}
exports.calculateDistanceSync = calculateDistanceSync;