feat: 添加设备归还功能和时间解析逻辑
在订单页面中添加了设备归还按钮,允许用户在订单状态为1时归还设备。同时,在归还页面中优化了时间解析逻辑,确保能够正确处理后端返回的时间格式,并更新使用时长和费用信息。删除了不再使用的axios相关文件,整合了uview-ui库以提升项目性能。
This commit is contained in:
+9
-19
@@ -1,25 +1,15 @@
|
||||
{
|
||||
"hash": "cbb77b90",
|
||||
"configHash": "02d49493",
|
||||
"lockfileHash": "a9202ca1",
|
||||
"browserHash": "41ab211e",
|
||||
"hash": "eecc45c6",
|
||||
"configHash": "e4fbd916",
|
||||
"lockfileHash": "78df9316",
|
||||
"browserHash": "8d847c28",
|
||||
"optimized": {
|
||||
"axios": {
|
||||
"src": "../../../../../node_modules/axios/index.js",
|
||||
"file": "axios.js",
|
||||
"fileHash": "a532ef26",
|
||||
"needsInterop": false
|
||||
},
|
||||
"uniapp-axios-adapter": {
|
||||
"src": "../../../../../node_modules/uniapp-axios-adapter/lib/index.esm.js",
|
||||
"file": "uniapp-axios-adapter.js",
|
||||
"fileHash": "63f5b0fe",
|
||||
"uview-ui": {
|
||||
"src": "../../../../../node_modules/uview-ui/index.js",
|
||||
"file": "uview-ui.js",
|
||||
"fileHash": "b095c49f",
|
||||
"needsInterop": false
|
||||
}
|
||||
},
|
||||
"chunks": {
|
||||
"chunk-U6PB43C6": {
|
||||
"file": "chunk-U6PB43C6.js"
|
||||
}
|
||||
}
|
||||
"chunks": {}
|
||||
}
|
||||
-39
@@ -1,39 +0,0 @@
|
||||
import {
|
||||
Axios,
|
||||
AxiosError,
|
||||
AxiosHeaders,
|
||||
Cancel,
|
||||
CancelToken,
|
||||
CanceledError,
|
||||
HttpStatusCode,
|
||||
VERSION,
|
||||
all,
|
||||
axios_default,
|
||||
formToJSON,
|
||||
getAdapter,
|
||||
isAxiosError,
|
||||
isCancel,
|
||||
mergeConfig,
|
||||
spread,
|
||||
toFormData
|
||||
} from "./chunk-U6PB43C6.js";
|
||||
export {
|
||||
Axios,
|
||||
AxiosError,
|
||||
AxiosHeaders,
|
||||
Cancel,
|
||||
CancelToken,
|
||||
CanceledError,
|
||||
HttpStatusCode,
|
||||
VERSION,
|
||||
all,
|
||||
axios_default as default,
|
||||
formToJSON,
|
||||
getAdapter,
|
||||
isAxiosError,
|
||||
isCancel,
|
||||
mergeConfig,
|
||||
spread,
|
||||
toFormData
|
||||
};
|
||||
//# sourceMappingURL=axios.js.map
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"version": 3,
|
||||
"sources": [],
|
||||
"sourcesContent": [],
|
||||
"mappings": "",
|
||||
"names": []
|
||||
}
|
||||
-2534
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -1,54 +0,0 @@
|
||||
import {
|
||||
axios_default
|
||||
} from "./chunk-U6PB43C6.js";
|
||||
|
||||
// ../../../共享风扇1-3/fs/node_modules/uniapp-axios-adapter/lib/index.esm.js
|
||||
var getResponse = (res, config) => {
|
||||
const { statusCode, errMsg } = res;
|
||||
const response = {
|
||||
...res,
|
||||
status: statusCode,
|
||||
statusText: errMsg,
|
||||
config,
|
||||
request: null
|
||||
};
|
||||
return response;
|
||||
};
|
||||
var uniAdapter = (config) => {
|
||||
if (!uni) {
|
||||
throw new Error("please use this in uni-app project!");
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
const { baseURL, url, headers, data, params } = config;
|
||||
const uniConfig = {
|
||||
...config,
|
||||
url: baseURL + url,
|
||||
header: headers
|
||||
};
|
||||
if (data || params) {
|
||||
try {
|
||||
uniConfig.data = JSON.parse(data || params);
|
||||
} catch (e) {
|
||||
uniConfig.data = data || params;
|
||||
}
|
||||
}
|
||||
uni.request({
|
||||
...uniConfig,
|
||||
success(res) {
|
||||
const response = getResponse(res, config);
|
||||
resolve(response);
|
||||
},
|
||||
fail(res) {
|
||||
const response = getResponse(res, config);
|
||||
reject(response);
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
var UniAdapter = uniAdapter;
|
||||
axios_default.defaults.adapter = uniAdapter;
|
||||
export {
|
||||
UniAdapter,
|
||||
axios_default as default
|
||||
};
|
||||
//# sourceMappingURL=uniapp-axios-adapter.js.map
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"version": 3,
|
||||
"sources": ["../../../../../node_modules/uniapp-axios-adapter/lib/index.esm.js"],
|
||||
"sourcesContent": ["import axios from 'axios';\nexport { default } from 'axios';\n\nconst getResponse = (res, config) => {\n const { statusCode, errMsg } = res;\n const response = {\n ...res,\n status: statusCode,\n statusText: errMsg,\n config,\n request: null,\n };\n\n return response;\n};\n\nconst uniAdapter = (config) => {\n if (!uni) {\n throw new Error(\"please use this in uni-app project!\");\n }\n return new Promise((resolve, reject) => {\n const { baseURL, url, headers, data, params } = config;\n const uniConfig = {\n ...config,\n url: baseURL + url,\n header: headers,\n };\n\n if (data || params) {\n try {\n uniConfig.data = JSON.parse(data || params);\n } catch (e) {\n uniConfig.data = data || params;\n }\n }\n uni.request({\n ...uniConfig,\n success(res) {\n const response = getResponse(res, config);\n resolve(response);\n },\n fail(res) {\n const response = getResponse(res, config);\n reject(response);\n },\n });\n });\n};\n\nconst UniAdapter = uniAdapter;\n\naxios.defaults.adapter = uniAdapter;\n\nexport { UniAdapter };\n"],
|
||||
"mappings": ";;;;;AAGA,IAAM,cAAc,CAAC,KAAK,WAAW;AACnC,QAAM,EAAE,YAAY,OAAO,IAAI;AAC/B,QAAM,WAAW;AAAA,IACf,GAAG;AAAA,IACH,QAAQ;AAAA,IACR,YAAY;AAAA,IACZ;AAAA,IACA,SAAS;AAAA,EACX;AAEA,SAAO;AACT;AAEA,IAAM,aAAa,CAAC,WAAW;AAC7B,MAAI,CAAC,KAAK;AACR,UAAM,IAAI,MAAM,qCAAqC;AAAA,EACvD;AACA,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,UAAM,EAAE,SAAS,KAAK,SAAS,MAAM,OAAO,IAAI;AAChD,UAAM,YAAY;AAAA,MAChB,GAAG;AAAA,MACH,KAAK,UAAU;AAAA,MACf,QAAQ;AAAA,IACV;AAEA,QAAI,QAAQ,QAAQ;AAClB,UAAI;AACF,kBAAU,OAAO,KAAK,MAAM,QAAQ,MAAM;AAAA,MAC5C,SAAS,GAAG;AACV,kBAAU,OAAO,QAAQ;AAAA,MAC3B;AAAA,IACF;AACA,QAAI,QAAQ;AAAA,MACV,GAAG;AAAA,MACH,QAAQ,KAAK;AACX,cAAM,WAAW,YAAY,KAAK,MAAM;AACxC,gBAAQ,QAAQ;AAAA,MAClB;AAAA,MACA,KAAK,KAAK;AACR,cAAM,WAAW,YAAY,KAAK,MAAM;AACxC,eAAO,QAAQ;AAAA,MACjB;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH;AAEA,IAAM,aAAa;AAEnB,cAAM,SAAS,UAAU;",
|
||||
"names": []
|
||||
}
|
||||
+1109
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user