java_project
/
logpm
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并

test
qb 1 year ago
parent
ae650ecc7e
commit
730d5e5076
1 changed files with 541 additions and 523 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      unpackage/dist/dev/app-plus/app-service.js

80
unpackage/dist/dev/app-plus/app-service.js vendored
Unescape View File

@ -2182,6 +2182,7 @@ if (uni.restoreGlobal) {
delete requestObj[key]; delete requestObj[key];
api.error("接口出错，请联系后端开发人员"); api.error("接口出错，请联系后端开发人员");
utils.ttsspke("接口出错，请联系后端开发人员"); utils.ttsspke("接口出错，请联系后端开发人员");
relove({});
return; return;
} else if (res.statusCode == 401) { } else if (res.statusCode == 401) {
if (isLogin) { if (isLogin) {
@ -2197,7 +2198,7 @@ if (uni.restoreGlobal) {
}); });
}); });
} else { } else {
formatAppLog("log", "at utils/request.js:234", "header :>> ", header); formatAppLog("log", "at utils/request.js:235", "header :>> ", header);
const refreshFn = HandleRefreshToken(header, urlhd, refresh_token, user); const refreshFn = HandleRefreshToken(header, urlhd, refresh_token, user);
refreshFn.then((res2) => { refreshFn.then((res2) => {
HandleRequest(requestObj[key], key, loadingObj).then((res3) => { HandleRequest(requestObj[key], key, loadingObj).then((res3) => {
@ -2209,13 +2210,15 @@ if (uni.restoreGlobal) {
}); });
} }
} else { } else {
formatAppLog("log", "at utils/request.js:251", "111 :>> ", 111);
delete requestObj[key]; delete requestObj[key];
api.error("连接服务器失败"); api.error("连接服务器失败");
utils.ttsspke("连接服务器失败"); utils.ttsspke("连接服务器失败");
reject(res);
} }
} }
}).catch(async (err) => { }).catch(async (err) => {
formatAppLog("log", "at utils/request.js:258", err); formatAppLog("log", "at utils/request.js:261", err);
delete requestObj[key]; delete requestObj[key];
api.error("请检查是否连接到无线网络"); api.error("请检查是否连接到无线网络");
utils.ttsspke("请检查是否连接到无线网络"); utils.ttsspke("请检查是否连接到无线网络");
@ -2236,14 +2239,14 @@ if (uni.restoreGlobal) {
delete params.data.isLogin; delete params.data.isLogin;
} else } else
isLogin = false; isLogin = false;
formatAppLog("log", "at utils/request.js:294", "params :>> ", params); formatAppLog("log", "at utils/request.js:297", "params :>> ", params);
const _key = params.url + JSON.stringify(params.data); const _key = params.url + JSON.stringify(params.data);
if (requestObj[_key]) if (requestObj[_key])
return new Promise((resolve) => resolve({ return new Promise((resolve) => resolve({
code: 4e3 code: 4e3
})); }));
requestObj[_key] = params; requestObj[_key] = params;
formatAppLog("log", "at utils/request.js:303", "_isRefreshToken :>> ", _isRefreshToken); formatAppLog("log", "at utils/request.js:306", "_isRefreshToken :>> ", _isRefreshToken);
if (_isRefreshToken._isRefreshToken) { if (_isRefreshToken._isRefreshToken) {
await _isRefreshToken._isRefreshToken; await _isRefreshToken._isRefreshToken;
return HandleRequest(params, _key, loadingObj); return HandleRequest(params, _key, loadingObj);
@ -21214,7 +21217,7 @@ This will fail in production if not fixed.`);
title: "签收扫描", title: "签收扫描",
haveData: true, haveData: true,
async pullDownRefreshInitPage() { async pullDownRefreshInitPage() {
await init(); return await init();
} }
}; };
let details = vue.reactive({ let details = vue.reactive({
@ -21266,6 +21269,7 @@ This will fail in production if not fixed.`);
}, 200); }, 200);
}); });
async function init() { async function init() {
details.datalist = [];
details.current = 1; details.current = 1;
return await initpage(); return await initpage();
} }
@ -21282,10 +21286,10 @@ This will fail in production if not fixed.`);
type: details.checkstate type: details.checkstate
}; };
let response = await signforpage(data); let response = await signforpage(data);
formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:211", "111 :>> ", 111); formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:212", "111 :>> ", 111);
if (response.code !== 200) if (response.code !== 200)
return; return;
formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:213", "response :>> ", response); formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:214", "response :>> ", response);
if (details.current == 1) { if (details.current == 1) {
if (details.checkstate === data.type) { if (details.checkstate === data.type) {
details.datalist = response.data.records; details.datalist = response.data.records;
@ -21306,7 +21310,7 @@ This will fail in production if not fixed.`);
return; return;
} }
function showtime(value) { function showtime(value) {
formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:235", value); formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:236", value);
details.show = value; details.show = value;
} }
function gocustomersign(item) { function gocustomersign(item) {
@ -21315,7 +21319,7 @@ This will fail in production if not fixed.`);
}); });
} }
function goSignDetailScan(item) { function goSignDetailScan(item) {
formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:250", "item :>> ", item); formatAppLog("log", "at pagesHome/pages/signinScan/signinScan.vue:251", "item :>> ", item);
uni.navigateTo({ uni.navigateTo({
url: "/pagesHome/pages/SignDetailScan/SignDetailScan?item=" + JSON.stringify(item) url: "/pagesHome/pages/SignDetailScan/SignDetailScan?item=" + JSON.stringify(item)
}); });
@ -25731,11 +25735,12 @@ This will fail in production if not fixed.`);
details.isChange = true; details.isChange = true;
imglis = res.data.deliverySignPictures; imglis = res.data.deliverySignPictures;
details.imgList.forEach((item2, index2) => { details.imgList.forEach((item2, index2) => {
item2.imgList = [];
if (!imglis[item2.dictKey]) if (!imglis[item2.dictKey])
return; return;
details.imgList[index2].imgList = imglis[item2.dictKey]; details.imgList[index2].imgList = imglis[item2.dictKey];
}); });
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:261", "details.imgList :>> ", details.imgList); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:262", "details.imgList :>> ", details.imgList);
} else { } else {
details.isChange = false; details.isChange = false;
} }
@ -25744,8 +25749,8 @@ This will fail in production if not fixed.`);
} }
} }
const response = await signforSignNum({ ...data, id: details.id }); const response = await signforSignNum({ ...data, id: details.id });
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:273", "response :>> ", response); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:274", "response :>> ", response);
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:275", "tiplists :>> ", tiplists.value); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:276", "tiplists :>> ", tiplists.value);
tiplists.value.setdetails({ tiplists.value.setdetails({
title: "请上传签收图片", title: "请上传签收图片",
isshow: true, isshow: true,
@ -25759,7 +25764,7 @@ This will fail in production if not fixed.`);
changeImageList: details.changeImageList, changeImageList: details.changeImageList,
ImagesRequiredFields: details.ImagesRequiredFields, ImagesRequiredFields: details.ImagesRequiredFields,
success: async (detail) => { success: async (detail) => {
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:290", "detail :>> ", detail); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:291", "detail :>> ", detail);
let data2 = { let data2 = {
deliveryId: details.id, deliveryId: details.id,
reservationId: item.id, reservationId: item.id,
@ -25768,7 +25773,7 @@ This will fail in production if not fixed.`);
}; };
let res2 = null; let res2 = null;
let isSubmit = true; let isSubmit = true;
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:301", "details.ImagesRequiredFields :>> ", details.ImagesRequiredFields); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:302", "details.ImagesRequiredFields :>> ", details.ImagesRequiredFields);
if (details.isChange) { if (details.isChange) {
const filterMap = detail.imglist.filter((item2) => details.changeImageList.includes(item2.dictKey)); const filterMap = detail.imglist.filter((item2) => details.changeImageList.includes(item2.dictKey));
isSubmit = filterMap.every((item2) => { isSubmit = filterMap.every((item2) => {
@ -25787,11 +25792,11 @@ This will fail in production if not fixed.`);
} }
res2 = await signforUpdatePicture(data2); res2 = await signforUpdatePicture(data2);
} else { } else {
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:320", "details.imgList :>> ", details.imgList); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:321", "details.imgList :>> ", details.imgList);
detail.imglist.forEach((item2) => { detail.imglist.forEach((item2) => {
data2.map[item2.dictKey] = item2.imgList; data2.map[item2.dictKey] = item2.imgList;
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:323", 2); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:324", 2);
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:324", "item.imgList :>> ", item2.imgList); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:325", "item.imgList :>> ", item2.imgList);
if (details.ImagesRequiredFields.find((val) => val.key === item2.dictKey) && item2.imgList.length < 1) if (details.ImagesRequiredFields.find((val) => val.key === item2.dictKey) && item2.imgList.length < 1)
isSubmit = false; isSubmit = false;
else else
@ -25869,7 +25874,7 @@ This will fail in production if not fixed.`);
}); });
} }
function getLocation(item) { function getLocation(item) {
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:405", "getLocation-------"); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:406", "getLocation-------");
uni.getLocation({ uni.getLocation({
type: "wgs84", type: "wgs84",
geocode: true, geocode: true,
@ -25880,9 +25885,9 @@ This will fail in production if not fixed.`);
title: "打卡中", title: "打卡中",
mask: true mask: true
}); });
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:416", JSON.stringify(res)); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:417", JSON.stringify(res));
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:419", "当前位置的经度：" + res.longitude); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:420", "当前位置的经度：" + res.longitude);
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:420", "当前位置的纬度：" + res.latitude); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:421", "当前位置的纬度：" + res.latitude);
let data = { let data = {
deliveryId: details.id, deliveryId: details.id,
reservationId: item.id, reservationId: item.id,
@ -25890,12 +25895,12 @@ This will fail in production if not fixed.`);
positioningAdr: "" positioningAdr: ""
}; };
let response = await signforpositioning(data); let response = await signforpositioning(data);
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:428", response); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:429", response);
if (response.code == 200) { if (response.code == 200) {
initpage(); initpage();
} }
} catch (err) { } catch (err) {
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:434", "err :>> ", err); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:435", "err :>> ", err);
} finally { } finally {
uni.hideLoading(); uni.hideLoading();
} }
@ -25905,7 +25910,7 @@ This will fail in production if not fixed.`);
title: "定位失败", title: "定位失败",
icon: "none" icon: "none"
}); });
formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:446", err); formatAppLog("log", "at pagesHome/pages/CustomerSign/CustomerSign.vue:447", err);
uni.hideLoading(); uni.hideLoading();
} }
}); });
@ -55460,11 +55465,16 @@ This will fail in production if not fixed.`);
vue.Fragment, vue.Fragment,
null, null,
[ [
vue.unref(isshow) ? (vue.openBlock(), vue.createElementBlock("view", { vue.unref(isshow) ? (vue.openBlock(), vue.createElementBlock(
"view",
{
key: 0, key: 0,
class: "maboxbg", class: "maboxbg",
onClick: _cache[14] || (_cache[14] = ($event) => checkbox(0)) onTouchmove: _cache[14] || (_cache[14] = vue.withModifiers(() => {
}, [ }, ["stop", "prevent"])),
onClick: _cache[15] || (_cache[15] = ($event) => checkbox(0))
},
[
vue.createElementVNode("scroll-view", { vue.createElementVNode("scroll-view", {
class: "modtips", class: "modtips",
onClick: _cache[13] || (_cache[13] = vue.withModifiers(() => { onClick: _cache[13] || (_cache[13] = vue.withModifiers(() => {
@ -55980,12 +55990,15 @@ This will fail in production if not fixed.`);
) )
]) ])
]) ])
])) : vue.createCommentVNode("v-if", true), ],
32
/* HYDRATE_EVENTS */
)) : vue.createCommentVNode("v-if", true),
vue.createCommentVNode(" 预览图片 "), vue.createCommentVNode(" 预览图片 "),
vue.unref(showPreviewPicture) ? (vue.openBlock(), vue.createElementBlock("view", { vue.unref(showPreviewPicture) ? (vue.openBlock(), vue.createElementBlock("view", {
key: 1, key: 1,
class: "previewPicture-container", class: "previewPicture-container",
onClick: _cache[15] || (_cache[15] = vue.withModifiers(($event) => handleShowImage(), ["stop"])) onClick: _cache[16] || (_cache[16] = vue.withModifiers(($event) => handleShowImage(), ["stop"]))
}, [ }, [
vue.createElementVNode("img", { vue.createElementVNode("img", {
src: vue.unref(details).previewPictureUrl, src: vue.unref(details).previewPictureUrl,
@ -56112,14 +56125,19 @@ This will fail in production if not fixed.`);
}, 500); }, 500);
}); });
onPullDownRefresh(async () => { onPullDownRefresh(async () => {
try {
await pullDownRefreshInitPage(); await pullDownRefreshInitPage();
} catch (e) {
} finally {
formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:117", "111 :>> ", 111);
const timer = setTimeout(() => { const timer = setTimeout(() => {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
clearTimeout(timer); clearTimeout(timer);
}, 300); }, 300);
}
}); });
function startPullDownRefresh() { function startPullDownRefresh() {
formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:122", "触发下拉"); formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:129", "触发下拉");
uni.startPullDownRefresh(); uni.startPullDownRefresh();
} }
expose({ startPullDownRefresh }); expose({ startPullDownRefresh });
@ -56224,7 +56242,7 @@ This will fail in production if not fixed.`);
key: 0, key: 0,
class: "popUpMask", class: "popUpMask",
onTouchmove: _cache[3] || (_cache[3] = vue.withModifiers(() => { onTouchmove: _cache[3] || (_cache[3] = vue.withModifiers(() => {
}, ["prevent"])), }, ["stop", "prevent"])),
onClick: _cache[4] || (_cache[4] = (...args) => details.close && details.close(...args)) onClick: _cache[4] || (_cache[4] = (...args) => details.close && details.close(...args))
}, },
[ [

Write Preview
Loading…
Cancel
Save