Browse Source

'修复部分bug'

dev
qb 10 months ago
parent
commit
aa0359f7cc
  1. 6
      config/host.js
  2. 3304
      pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
  3. 14
      pagesHome/pages/ScanUp/ScanUp.vue
  4. 85
      pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
  5. 22
      pagesHome/pages/signOrderScan/signOrderScan.vue
  6. 189
      unpackage/dist/dev/app-plus/app-service.js
  7. 12
      unpackage/dist/dev/mp-weixin/api/user.js
  8. 4
      unpackage/dist/dev/mp-weixin/app.js
  9. 2
      unpackage/dist/dev/mp-weixin/app.json
  10. 18
      unpackage/dist/dev/mp-weixin/common/vendor.js
  11. 2
      unpackage/dist/dev/mp-weixin/config/host.js
  12. 15
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  13. 4
      unpackage/dist/dev/mp-weixin/pages/login/login.wxss
  14. 8
      unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.js
  15. 2
      unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js
  16. 11
      unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js
  17. 8
      unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js
  18. 25
      unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js
  19. 7
      unpackage/dist/dev/mp-weixin/project.config.json
  20. 5
      unpackage/dist/dev/mp-weixin/utils/request.js
  21. 2
      unpackage/dist/dev/mp-weixin/utils/utils.js
  22. 4
      utils/request.js
  23. 2
      utils/utils.js

6
config/host.js

@ -4,7 +4,7 @@
* 测试域名
* */
//测试域名s
const devhost = 'http://test.api.huo5you.com/'
// const devhost = 'http://test.api.huo5you.com/'
// lmy
// const devhost = 'http://192.168.10.123:8889/'
// zhy
@ -12,12 +12,12 @@ const devhost = 'http://test.api.huo5you.com/'
// xiaohei
// const devhost = 'http://192.168.3.18:13000/'
// tjj
// const devhost = 'http://192.168.3.14:13000/ '
// const devhost = 'http://192.168.3.14:13000/'
// cyz
// const devhost = 'http://192.168.6.169:9777/'
// const devhost = 'http://192.168.6.141:8777/'
// cg
// const devhost = 'http://192.168.3.2:13000/'
const devhost = 'http://192.168.3.2:13000/'
// 正式
// const devhost = 'https://h5uapi.huitongys.com/'
// cg

3304
pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue

File diff suppressed because it is too large Load Diff

14
pagesHome/pages/ScanUp/ScanUp.vue

@ -378,11 +378,23 @@
details.reqobj.positionInfo = _positionArr[0] + '层' + _positionArr[1] + '列'
details.allocationId = res.data.allocationId
details.datalist = (res.data?.list) || []
if (details.checkstate === 2) return details.renderList = details.datalist
if (details.checkstate === 2) details.renderList = details.datalist
if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0 && details.uplistarr.length !== 0) {
return utils.handleToast('该库位已有数据, 无法上架')
}
const _arr = []
for (let i = 0; i < details.datalist.length; i++) {
_arr.push(details.datalist[i].orderCode)
}
for (let i = 0; i < details.uplistarr.length; i++) {
_arr.push(details.uplistarr[i].orderCode)
}
details.orderCodeArr = _arr
console.log('details.orderCodeArr :>> ', details.orderCodeArr);
// if (details.upshelfScanType === '4') return utils.ttsspke('')
// utils.ttsspke('')
}

85
pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue

@ -606,38 +606,61 @@
}
if (!isHave) {
// #ifdef APP
utils.handleToast('是否异常卸车')
// #endif
OrderStowage.value.setDetails({
title: '异常卸车',
showPopUp: true,
async success() {
try {
const submitData = {
orderPackageCode: _scanCode,
loadId: details.loadId,
incomingType: '6'
}
let res = {} as any
if (details.page === 'ArrivalList') res = await postCarsLoadUnloadPackage(submitData)
else if (details.page === 'RelayScanList') res = await postTransferUnloadPackage(submitData)
if (res.code !== 200) return
details.isAbnormal = true
OrderStowage.value.details.showPopUp = false
//
basicContainer.value.startPullDownRefresh()
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
}
// // #ifdef APP
// utils.handleToast('')
// // #endif
// OrderStowage.value.setDetails({
// title: '',
// showPopUp: true,
// async success() {
// try {
// const submitData = {
// orderPackageCode: _scanCode,
// loadId: details.loadId,
// incomingType: '6'
// }
// let res = {} as any
// if (details.page === 'ArrivalList') res = await postCarsLoadUnloadPackage(submitData)
// else if (details.page === 'RelayScanList') res = await postTransferUnloadPackage(submitData)
// if (res.code !== 200) return
// details.isAbnormal = true
// OrderStowage.value.details.showPopUp = false
// //
// basicContainer.value.startPullDownRefresh()
// } catch (err) {
// console.log('err :>> ', err);
// //TODO handle the exception
// }
// }
// })
try {
const submitData = {
orderPackageCode: _scanCode,
loadId: details.loadId,
incomingType: '6'
}
})
let res = {} as any
if (details.page === 'ArrivalList') res = await postCarsLoadUnloadPackage(submitData)
else if (details.page === 'RelayScanList') res = await postTransferUnloadPackage(submitData)
if (res.code !== 200) return
details.isAbnormal = true
// OrderStowage.value.details.showPopUp = false
//
basicContainer.value.startPullDownRefresh()
} catch (err) {
console.log('err :>> ', err);
//TODO handle the exception
}
return
}

22
pagesHome/pages/signOrderScan/signOrderScan.vue

@ -198,8 +198,8 @@
import { computed, inject, nextTick, onMounted, reactive, ref, toRefs, watchEffect } from "vue";
import useSystemSettingsStore from '@/store/useSystemSettingsStore';
import { storeToRefs } from 'pinia';
import utils from '@/utils/utils.js';
const { scanState } = storeToRefs(useSystemSettingsStore())
const utils = inject('utils') as any
let details = reactive({
schanvalue: '',
typearr: [
@ -405,10 +405,7 @@
let response = await signforsignforcontinue(data)
if (response.code !== 200) return
console.log(response);
uni.showToast({
title: response.msg,
icon: 'none'
})
response.audio && utils.handleToast(response.audio, 'none', false)
initpage()
tip.value.setdetails({ isshow: false })
},
@ -422,10 +419,7 @@
return
} else {
uni.showToast({
title: response.msg,
icon: 'none'
})
response.audio && utils.handleToast(response.audio, 'none', false)
}
} else if (Number(details.orderStatus) === 3) {
// data.barcode="23072405915-2"
@ -444,10 +438,7 @@
let response = await signforsignforcontinue(data)
console.log(response);
if (response.code !== 200) return
uni.showToast({
title: response.msg,
icon: 'none'
})
response.audio && utils.handleToast(response.audio, 'none', false)
initpage()
tip.value.setdetails({ isshow: false })
},
@ -460,10 +451,7 @@
})
return
} else {
uni.showToast({
title: response.msg,
icon: 'none'
})
response.audio && utils.handleToast(response.audio, 'none', false)
}
}
initpage()

189
unpackage/dist/dev/app-plus/app-service.js vendored

@ -1532,6 +1532,8 @@ if (uni.restoreGlobal) {
/**
* 提示
* @param {String} content 提示的文字
* @param {String} icon 提示icon
* @param {Boolean} isShowMsg 是否弹窗显示文字
*/
handleToast(content, icon = "none", isShowMsg = true) {
if (isShowMsg)
@ -1553,7 +1555,7 @@ if (uni.restoreGlobal) {
clearTimeout(timer);
timer = setTimeout(function() {
func2.apply(context, args);
formatAppLog("log", "at utils/utils.js:488", "timer :>> ", timer);
formatAppLog("log", "at utils/utils.js:490", "timer :>> ", timer);
clearTimeout(timer);
}, delay);
}();
@ -1809,7 +1811,7 @@ if (uni.restoreGlobal) {
};
};
const Base64$1 = new Base64();
const devhost = "http://test.api.huo5you.com/";
const devhost = "http://192.168.3.2:13000/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";
@ -2317,8 +2319,9 @@ if (uni.restoreGlobal) {
} = response2;
if (data) {
if (data.code !== 200 && data.code !== 401) {
if (data.msg)
utils.handleToast(data.msg.length > 100 ? "系统异常,请联系管理员" : data.msg);
const content2 = data.audio ? data.audio : data.msg ? data.msg : "";
if (content2)
utils.handleToast(content2.length > 100 ? "系统异常,请联系管理员" : content2);
} else if (data.audio)
utils.handleToast(data.audio, "none", false);
}
@ -2338,22 +2341,22 @@ if (uni.restoreGlobal) {
delete params.data.isLogin;
} else
isLogin = false;
formatAppLog("log", "at utils/request.js:456", "params :>> ", params);
formatAppLog("log", "at utils/request.js:457", "requestObj :>> ", requestObj);
formatAppLog("log", "at utils/request.js:458", "params :>> ", params);
formatAppLog("log", "at utils/request.js:459", "requestObj :>> ", requestObj);
const _key = params.url + JSON.stringify(params.data);
if (requestObj[_key]) {
const {
request
} = requestObj[_key];
if (canCancel && request) {
formatAppLog("log", "at utils/request.js:467", "request :>> ", request);
formatAppLog("log", "at utils/request.js:469", "request :>> ", request);
request.abort();
} else
return new Promise((resolve) => resolve({
code: 4e3
}));
}
formatAppLog("log", "at utils/request.js:473", "222 :>> ", 222);
formatAppLog("log", "at utils/request.js:475", "222 :>> ", 222);
requestObj[_key] = {
params
};
@ -17805,32 +17808,24 @@ This will fail in production if not fixed.`);
return;
}
if (!isHave) {
utils.handleToast("是否异常卸车");
OrderStowage.value.setDetails({
title: "异常卸车",
showPopUp: true,
async success() {
try {
const submitData = {
orderPackageCode: _scanCode,
loadId: details.loadId,
incomingType: "6"
};
let res = {};
if (details.page === "ArrivalList")
res = await postCarsLoadUnloadPackage(submitData);
else if (details.page === "RelayScanList")
res = await postTransferUnloadPackage(submitData);
if (res.code !== 200)
return;
details.isAbnormal = true;
OrderStowage.value.details.showPopUp = false;
basicContainer.value.startPullDownRefresh();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:636", "err :>> ", err);
}
}
});
try {
const submitData = {
orderPackageCode: _scanCode,
loadId: details.loadId,
incomingType: "6"
};
let res = {};
if (details.page === "ArrivalList")
res = await postCarsLoadUnloadPackage(submitData);
else if (details.page === "RelayScanList")
res = await postTransferUnloadPackage(submitData);
if (res.code !== 200)
return;
details.isAbnormal = true;
basicContainer.value.startPullDownRefresh();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:661", "err :>> ", err);
}
return;
}
if (_trayCode) {
@ -17903,7 +17898,7 @@ This will fail in production if not fixed.`);
});
};
function scandata() {
formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:729", "deta :>> ", details.pageType);
formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:752", "deta :>> ", details.pageType);
if (Number(details.pageType) === 1)
scanOrder();
else if (Number(details.pageType) === 2)
@ -17916,7 +17911,7 @@ This will fail in production if not fixed.`);
title: "零担卸车",
showPopUp: true,
async success() {
formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:745", "details.zeroInfo :>> ", details.zeroInfo);
formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:768", "details.zeroInfo :>> ", details.zeroInfo);
const submitData = {
loadId: details.loadId,
waybillNo: details.zeroInfo.waybillNo,
@ -32702,7 +32697,6 @@ This will fail in production if not fixed.`);
__name: "signOrderScan",
setup(__props) {
const { scanState } = storeToRefs(useSystemSettingsStore());
const utils2 = vue.inject("utils");
let details = vue.reactive({
schanvalue: "",
typearr: [
@ -32746,7 +32740,7 @@ This will fail in production if not fixed.`);
return num;
});
onLoad(async (op) => {
utils2.ttsspke("请扫描包条码");
utils.ttsspke("请扫描包条码");
details.items = JSON.parse(op.item);
details.id = JSON.parse(op.item).id;
details.deliveryId = op.deliveryId;
@ -32810,7 +32804,7 @@ This will fail in production if not fixed.`);
});
vue.onMounted(async () => {
await vue.nextTick();
utils2.getViewDistanceFormTop(".scve").then((res) => {
utils.getViewDistanceFormTop(".scve").then((res) => {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:338", "res :>> ", res);
details.scrollHeight = res;
});
@ -32850,7 +32844,7 @@ This will fail in production if not fixed.`);
if (response2.code === 200)
;
else if (response2.code == 3006) {
utils2.ttsspke("是否异常签收");
utils.ttsspke("是否异常签收");
tip.value.setdetails({
isshow: true,
content: "请确认是否异常签收",
@ -32864,10 +32858,7 @@ This will fail in production if not fixed.`);
if (response22.code !== 200)
return;
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:407", response22);
uni.showToast({
title: response22.msg,
icon: "none"
});
response22.audio && utils.handleToast(response22.audio, "none", false);
initpage();
tip.value.setdetails({ isshow: false });
},
@ -32880,14 +32871,11 @@ This will fail in production if not fixed.`);
});
return;
} else {
uni.showToast({
title: response2.msg,
icon: "none"
});
response2.audio && utils.handleToast(response2.audio, "none", false);
}
} else if (Number(details.orderStatus) === 3) {
let response2 = await signforsignforIn(data);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:433", response2);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:427", response2);
if (response2.code == 3006) {
tip.value.setdetails({
isshow: true,
@ -32899,13 +32887,10 @@ This will fail in production if not fixed.`);
reservationId: details.id
};
let response22 = await signforsignforcontinue(data2);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:445", response22);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:439", response22);
if (response22.code !== 200)
return;
uni.showToast({
title: response22.msg,
icon: "none"
});
response22.audio && utils.handleToast(response22.audio, "none", false);
initpage();
tip.value.setdetails({ isshow: false });
},
@ -32918,10 +32903,7 @@ This will fail in production if not fixed.`);
});
return;
} else {
uni.showToast({
title: response2.msg,
icon: "none"
});
response2.audio && utils.handleToast(response2.audio, "none", false);
}
}
initpage();
@ -32950,13 +32932,13 @@ This will fail in production if not fixed.`);
details.orderStatus = state;
if (details.orderStatus === 1) {
details.datalist = details.orderArr;
utils2.ttsspke("请扫描包条码");
utils.ttsspke("请扫描包条码");
} else if (details.orderStatus === 2) {
details.datalist = details.zeroArr;
utils2.ttsspke("请输入数量");
utils.ttsspke("请输入数量");
} else {
details.datalist = details.stockArr;
utils2.ttsspke("请输入库存品");
utils.ttsspke("请输入库存品");
}
}
async function initpage() {
@ -32989,7 +32971,7 @@ This will fail in production if not fixed.`);
if (value.isAbnormalLoading === 1)
val.abnormalLoading += 1;
});
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:549", "val :>> ", val);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:537", "val :>> ", val);
details.orderArr.push(val);
});
} else if (details.orderStatus == 3) {
@ -33005,7 +32987,7 @@ This will fail in production if not fixed.`);
else
details.datalist = details.stockArr;
} catch (err) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:567", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:555", "err :>> ", err);
} finally {
computedNum();
uni.hideLoading();
@ -33033,7 +33015,7 @@ This will fail in production if not fixed.`);
});
}
function checkphon(item2, index2) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:598", "item :>> ", item2);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:586", "item :>> ", item2);
if (item2.isZero === "1") {
const inpList = item2.distributionParcelNumberVOS.map((val) => {
return {
@ -33075,7 +33057,7 @@ This will fail in production if not fixed.`);
parcelListDTOS: []
};
data.parcelListDTOS = deta.inpList.map((val) => {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:642", "val :>> ", val);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:630", "val :>> ", val);
return {
parcelListId: val.id,
stockArticleId: val.stockArticleId,
@ -33086,11 +33068,11 @@ This will fail in production if not fixed.`);
if (res.code !== 200)
return;
if (res.audio) {
utils2.ttsspke(res.audio);
utils.ttsspke(res.audio);
}
initpage();
} catch (err) {
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:659", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:647", "err :>> ", err);
} finally {
uni.hideLoading();
tiplists.value.setdetails({ isshow: false });
@ -36397,7 +36379,7 @@ This will fail in production if not fixed.`);
details.trayType = op.trayType;
if (op.pageName)
utils.ttsspke("当前打托方式为" + op.pageName);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:436", "details.trayType :>> ", details.trayType);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:407", "details.trayType :>> ", details.trayType);
if (!op.trayType) {
uni.showToast({
title: "获取打托方式出错",
@ -36409,7 +36391,7 @@ This will fail in production if not fixed.`);
uni.$off("scancodedate");
uni.$on("scancodedate", function(code2) {
if (code2) {
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:449", code2);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:420", code2);
details.scancode = code2;
if (details.showstate === 2) {
details.waybillCode = code2;
@ -36460,7 +36442,7 @@ This will fail in production if not fixed.`);
let res = await warehouseTrayTypedeleteOrderCode(data);
if (res.code !== 200)
return;
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:519", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:490", "res :>> ", res);
initlist();
tip.value.setisshow(false);
},
@ -36508,7 +36490,7 @@ This will fail in production if not fixed.`);
trayGoodsId: item2.trayGoodsId
};
let res = await warehouseTrayTypedeleteStockByTrayGoodsId(data);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:573", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:544", "res :>> ", res);
if (res.code == 200) {
initlist();
}
@ -36527,14 +36509,16 @@ This will fail in production if not fixed.`);
trayCode: details.trayCode
};
let res = await warehouseTrayTypeorderScanTrayCode(data);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:593", res.data, "resresresres");
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:564", res.data, "resresresres");
if (res.code == 200) {
details.detauser = {};
details.datelist = [];
if (res.data.isHasData == 1) {
details.detauser = res.data.data;
details.stock.marketId = res.data.data.marketId;
details.stock.marketName = res.data.data.marketName;
details.Remarktext = res.data.data.reamrk;
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:602", " details.detauser :>> ", details.detauser);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:576", " details.detauser :>> ", details.detauser);
if (details.tabBarState === 1)
details.datelist = details.detauser.packageList;
else if (details.tabBarState === 2)
@ -36568,7 +36552,7 @@ This will fail in production if not fixed.`);
let res = await warehouseTrayTypeorderScanTrayCode(data);
if (res.code !== 200)
return;
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:639", "res", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:613", "res", res);
if (Number(res.data.isHasData) === 0) {
uni.setStorageSync("trayCodeType", res.data.data);
uni.redirectTo({
@ -36588,11 +36572,11 @@ This will fail in production if not fixed.`);
orderPackageCode: details.scancode
};
let response2 = await warehouseTrayTypeorderScanOrderPackageCode(submitData);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:666", "response", response2);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:640", "response", response2);
const res = await initlist();
const { code: code2 } = res;
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:670", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:672", "details.scancode :>> ", details.scancode);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:644", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:646", "details.scancode :>> ", details.scancode);
if (code2 !== 200)
return;
if (((_a = details == null ? void 0 : details.detauser) == null ? void 0 : _a.trayNum) && ((_b = details == null ? void 0 : details.detauser) == null ? void 0 : _b.trayNum) > 0) {
@ -36602,7 +36586,7 @@ This will fail in production if not fixed.`);
data: { orderCode }
} = response2;
const scanOrder2 = details.datelist.find((val) => val.dataCode === orderCode);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:685", "scanOrder :>> ", scanOrder2);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:659", "scanOrder :>> ", scanOrder2);
if (scanOrder2 && scanOrder2.orderTotalNum === scanOrder2.scanNum) {
utils.ttsspke(`订单${orderCode}已齐套`);
}
@ -36613,26 +36597,26 @@ This will fail in production if not fixed.`);
orderPackageCode: details.scancode
};
const res = warehouseTrayTypeenterStockNoDataMaterialCode(data);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:703", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:677", "res :>> ", res);
}
async function setTabBarState(state) {
details.tabBarState = state;
if (details.tabBarState === 1)
details.datelist = details.detauser ? details.detauser.packageList : [];
details.datelist = details.detauser && details.detauser.packageList ? details.detauser.packageList : [];
else if (details.tabBarState === 2)
details.datelist = details.detauser ? details.detauser.zeroList : [];
details.datelist = details.detauser && details.detauser.zeroList ? details.detauser.zeroList : [];
else if (details.tabBarState === 3) {
details.datelist = details.detauser ? details.detauser.stockList : [];
details.datelist = details.detauser && details.detauser.stockList ? details.detauser.stockList : [];
if (!details.stock.marketId)
chooseMarket();
}
}
async function chooseMarket() {
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:728", "111 :>> ", 111);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:730", "details.datelist :>> ", details.datelist.length);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:702", "111 :>> ", 111);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:704", "details.datelist :>> ", details.datelist.length);
if (details.datelist.length === 0) {
const res = await warehouseTrayTypefindAllMarket({});
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:734", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:708", "res :>> ", res);
if (res.code !== 200)
return;
const _marketArr = res.data;
@ -36650,9 +36634,9 @@ This will fail in production if not fixed.`);
icon: "none"
});
}
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:753", "detail :>> ", detail);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:727", "detail :>> ", detail);
details.stock.marketId = _marketArr[detail.checklist[0]].marketId;
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:755", "_marketName :>> ", _marketArr);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:729", "_marketName :>> ", _marketArr);
details.stock.marketName = _marketArr[detail.checklist[0]].marketName;
tiplists.value.setdetails({ isshow: false });
},
@ -36716,7 +36700,7 @@ This will fail in production if not fixed.`);
let response2 = await warehouseTrayTypegetZeroOrderByWaybillCode(data);
if (response2.code !== 200)
return;
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:829", response2);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:803", response2);
details.codelist = response2.data;
details.codelist.map((item2) => {
item2["number"] = 0;
@ -36726,7 +36710,7 @@ This will fail in production if not fixed.`);
async function confirmlist() {
let zeroList = [];
let isfl = false;
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:845", "details.codelist :>> ", details.codelist);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:819", "details.codelist :>> ", details.codelist);
isfl = !details.codelist.some((item2) => {
if (item2.number === 0) {
return false;
@ -36805,21 +36789,21 @@ This will fail in production if not fixed.`);
}
});
Promise.all(PromiseArr).then((res) => {
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:940", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:914", "res :>> ", res);
setshowstate(0);
initlist();
details.stock.searchStockList = [];
details.stock.materialCode = "";
});
} catch (err) {
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:947", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:921", "err :>> ", err);
} finally {
uni.hideLoading();
}
}
const print = () => {
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:959", "bluetoothList :>> ", bluetoothList);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:960", "details.detauser :>> ", details.detauser);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:933", "bluetoothList :>> ", bluetoothList);
formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:934", "details.detauser :>> ", details.detauser);
tiplists.value.setdetails({
title: "是否打印",
isshow: true,
@ -40570,13 +40554,22 @@ This will fail in production if not fixed.`);
details.allocationId = res.data.allocationId;
details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
if (details.checkstate === 2)
return details.renderList = details.datalist;
details.renderList = details.datalist;
if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0 && details.uplistarr.length !== 0) {
return utils.handleToast("该库位已有数据, 无法上架");
}
const _arr = [];
for (let i2 = 0; i2 < details.datalist.length; i2++) {
_arr.push(details.datalist[i2].orderCode);
}
for (let i2 = 0; i2 < details.uplistarr.length; i2++) {
_arr.push(details.uplistarr[i2].orderCode);
}
details.orderCodeArr = _arr;
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:397", "details.orderCodeArr :>> ", details.orderCodeArr);
}
} catch (err) {
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:391", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:403", "err :>> ", err);
}
};
const scanOther = async (_code) => {
@ -40636,7 +40629,7 @@ This will fail in production if not fixed.`);
utils.ttsspke(res.audio);
}
} catch (err) {
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:472", "err :>> ", err);
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:484", "err :>> ", err);
}
};
async function scandata() {
@ -40860,7 +40853,7 @@ This will fail in production if not fixed.`);
item2.checked = !item2.checked;
};
const handleDownLoadByOrder = async (item2) => {
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:754", "item :>> ", item2);
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:766", "item :>> ", item2);
const res = await postorderUpshelfDetailByAllocationId({
orderCode: item2.orderCode,
allocationId: details.allocationId
@ -40950,7 +40943,7 @@ This will fail in production if not fixed.`);
};
res = await warehouseUpdownTypedownStock(data);
}
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:857", "res :>> ", res);
formatAppLog("log", "at pagesHome/pages/ScanUp/ScanUp.vue:869", "res :>> ", res);
if (res.code !== 200)
return;
details.scancode = details.allocationId;

12
unpackage/dist/dev/mp-weixin/api/user.js vendored

@ -2156,6 +2156,17 @@ function postFindFinanceList(data, loadingObj = {}, canCancel = false) {
canCancel
);
}
function postBusinessPreOrderList(data, loadingObj = {}, canCancel = false) {
return utils_request.service(
{
url: `logpm-distribution/app/businessPreOrder/list`,
method: "post",
data
},
loadingObj,
canCancel
);
}
exports.$_initRetentionList = $_initRetentionList;
exports.$_retentionScan = $_retentionScan;
exports.$_retentionTrayScan = $_retentionTrayScan;
@ -2235,6 +2246,7 @@ exports.postAddContractByLoadId = postAddContractByLoadId;
exports.postArriveCarByLoadId = postArriveCarByLoadId;
exports.postArriveUnloadCarsDetail = postArriveUnloadCarsDetail;
exports.postArriveUnloadPageList = postArriveUnloadPageList;
exports.postBusinessPreOrderList = postBusinessPreOrderList;
exports.postCarsLoadPageList = postCarsLoadPageList;
exports.postCarsLoadUnloadPackage = postCarsLoadUnloadPackage;
exports.postCarsLoadUnloadZero = postCarsLoadUnloadZero;

4
unpackage/dist/dev/mp-weixin/app.js vendored

@ -28,6 +28,7 @@ if (!Math) {
"./pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.js";
"./pagesHome/pages/ArrivalList/ArrivalList.js";
"./pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.js";
"./pagesHome/pages/PreStoragePackage/PreStoragePackage.js";
"./pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.js";
"./pagesHome/pages/SelfPickupScan/SelfPickupScan.js";
"./pagesHome/pages/LoadingScan/LoadingScan.js";
@ -129,6 +130,7 @@ const ScrollList = () => "./compoment/ScrollList/ScrollList.js";
const PullDownBox = () => "./compoment/PullDownBox/PullDownBox.js";
const MyTree = () => "./compoment/MyTree/MyTree.js";
const CheckBox = () => "./compoment/CheckBox/CheckBox.js";
const MyInput = () => "./compoment/MyInput/MyInput.js";
const saomiao1 = () => "./compoment/saomiao1.js";
const saomiao2 = () => "./compoment/saomiao2.js";
const saomiao3 = () => "./compoment/saomiao3.js";
@ -142,7 +144,7 @@ function createApp() {
app.use(store_index.store);
app.use(common_vendor.createPinia());
app.use(uni_modules_fantMiniPlus_index.fantMini);
app.component("saomiao", saomiao).component("tips", tips).component("tiplist", tiplist).component("saomiao1", saomiao1).component("saomiao2", saomiao2).component("saomiao3", saomiao3).component("saomiao4", saomiao4).component("InputNum", InputNum).component("BasicContainer", BasicContainer).component("PopUp", PopUp).component("BluetoothList", BluetoothList).component("ScrollList", ScrollList).component("PullDownBox", PullDownBox).component("MyTree", MyTree).component("CheckBox", CheckBox);
app.component("saomiao", saomiao).component("tips", tips).component("tiplist", tiplist).component("saomiao1", saomiao1).component("saomiao2", saomiao2).component("saomiao3", saomiao3).component("saomiao4", saomiao4).component("InputNum", InputNum).component("BasicContainer", BasicContainer).component("PopUp", PopUp).component("BluetoothList", BluetoothList).component("ScrollList", ScrollList).component("PullDownBox", PullDownBox).component("MyTree", MyTree).component("CheckBox", CheckBox).component("MyInput", MyInput);
common_vendor.index.$u.config.unit = "rpx";
return {
app,

2
unpackage/dist/dev/mp-weixin/app.json vendored

@ -24,6 +24,7 @@
"pages/onLoadOrderDetails/onLoadOrderDetails",
"pages/ArrivalList/ArrivalList",
"pages/VehicleArrivalDetails/VehicleArrivalDetails",
"pages/PreStoragePackage/PreStoragePackage",
"pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray",
"pages/SelfPickupScan/SelfPickupScan",
"pages/LoadingScan/LoadingScan",
@ -168,6 +169,7 @@
"pull-down-box": "/compoment/PullDownBox/PullDownBox",
"my-tree": "/compoment/MyTree/MyTree",
"check-box": "/compoment/CheckBox/CheckBox",
"my-input": "/compoment/MyInput/MyInput",
"saomiao1": "/compoment/saomiao1",
"saomiao2": "/compoment/saomiao2",
"saomiao3": "/compoment/saomiao3",

18
unpackage/dist/dev/mp-weixin/common/vendor.js vendored

@ -12052,6 +12052,24 @@ const subPackages = [
}
}
},
{
path: "pages/PreStoragePackage/PreStoragePackage",
style: {
navigationBarTitleText: "预入库包件",
enablePullDownRefresh: true,
onReachBottomDistance: 1,
navigationStyle: "custom",
"app-plus": {
animationDuration: 300,
animationType: "zoom-fade-out",
pullToRefresh: {
support: true,
color: "#d3832a",
style: "circle"
}
}
}
},
{
path: "pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray",
style: {

2
unpackage/dist/dev/mp-weixin/config/host.js vendored

@ -1,5 +1,5 @@
"use strict";
const devhost = "http://test.api.huo5you.com/";
const devhost = "http://192.168.3.12:13000/";
const imghost = "";
const host = devhost;
const APPKEY = "h5u:h5u_secret";

15
unpackage/dist/dev/mp-weixin/pages/index/index.js vendored

@ -67,12 +67,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
icon: "http://47.108.51.143:9000/basic/upload/20240320/d22bc792f9deff3f106aafc590ec14fb.png",
name: "库位列表",
router: "/pagesHome/pages/StorageLocationList/StorageLocationList"
},
{
icon: "http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png",
name: "发起工单",
router: "/pagesHome/pages/CreateAbnormalWorkOrder/CreateAbnormalWorkOrder"
}
// {
// icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
// name: '发起工单',
// router: '/pagesHome/pages/CreateAbnormalWorkOrder/CreateAbnormalWorkOrder',
// },
]
},
{
@ -93,6 +93,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
icon: "http://47.108.51.143:9000/basic/upload/20240429/49254333c9c5c7aed6e9c8aab89c5998.png",
name: "到车入库",
router: "/pagesHome/pages/ArrivalList/ArrivalList"
},
{
icon: "http://47.108.51.143:9000/basic/upload/20240429/d4325e620aa324658da28d7cabc6f223.png",
name: "预入库包件",
router: "/pagesHome/pages/PreStoragePackage/PreStoragePackage"
}
]
},

4
unpackage/dist/dev/mp-weixin/pages/login/login.wxss vendored

@ -211,10 +211,10 @@
background: #F4F8FB;
border-radius: 8rpx;
opacity: 1;
padding: 10rpx;
padding: 10rpx 0;
padding-left: 20rpx;
box-sizing: border-box;
font-size: 24rpx;
font-size: 24rpx !important;
font-weight: 400;
color: #AFB4BA;
display: flex;

8
unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.js vendored

@ -180,6 +180,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
let res = await api_user.warehouseTrayTypeorderScanTrayCode(data);
console.log(res.data, "resresresres");
if (res.code == 200) {
details.detauser = {};
details.datelist = [];
if (res.data.isHasData == 1) {
details.detauser = res.data.data;
details.stock.marketId = res.data.data.marketId;
@ -205,11 +207,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
async function setTabBarState(state) {
details.tabBarState = state;
if (details.tabBarState === 1)
details.datelist = details.detauser ? details.detauser.packageList : [];
details.datelist = details.detauser && details.detauser.packageList ? details.detauser.packageList : [];
else if (details.tabBarState === 2)
details.datelist = details.detauser ? details.detauser.zeroList : [];
details.datelist = details.detauser && details.detauser.zeroList ? details.detauser.zeroList : [];
else if (details.tabBarState === 3) {
details.datelist = details.detauser ? details.detauser.stockList : [];
details.datelist = details.detauser && details.detauser.stockList ? details.detauser.stockList : [];
if (!details.stock.marketId)
chooseMarket();
}

2
unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js vendored

@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js");
const store_uaeUserStore = require("../../../store/uaeUserStore.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
const store_useStorageStore = require("../../../store/useStorageStore.js");
require("../../../utils/request.js");
require("../../../store/index.js");
require("../../../utils/utils.js");
@ -21,6 +22,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "PickingScanList",
setup(__props) {
common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
store_useStorageStore.useStorageStore();
common_vendor.storeToRefs(store_uaeUserStore.useUserStore());
const tiplists = common_vendor.ref(null);
const basicContainer = common_vendor.ref(null);

11
unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js vendored

@ -91,10 +91,19 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
details.allocationId = res.data.allocationId;
details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
if (details.checkstate === 2)
return details.renderList = details.datalist;
details.renderList = details.datalist;
if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0 && details.uplistarr.length !== 0) {
return utils_utils.utils.handleToast("该库位已有数据, 无法上架");
}
const _arr = [];
for (let i = 0; i < details.datalist.length; i++) {
_arr.push(details.datalist[i].orderCode);
}
for (let i = 0; i < details.uplistarr.length; i++) {
_arr.push(details.uplistarr[i].orderCode);
}
details.orderCodeArr = _arr;
console.log("details.orderCodeArr :>> ", details.orderCodeArr);
}
} catch (err) {
console.log("err :>> ", err);

8
unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js vendored

@ -95,7 +95,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}
function showsdqs() {
if (details.planNum <= details.signedNum)
return utils_utils.utils.handleToast("提货计划已完成");
return;
tiplists.value.setdetails({
isshow: true,
tipstate: 1,
@ -171,10 +171,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
}
async function sacn() {
try {
if (details.orderCode === 3)
if (Number(details.orderType) === 3)
return;
if (details.planNum <= details.signedNum)
return utils_utils.utils.handleToast("提货计划已完成");
let content = "";
let haveData = false;
for (let i = 0; i < details.orderList.length; i++) {
@ -195,6 +193,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
return utils_utils.utils.handleToast("码值错误, 不在本计划内");
if (content)
return utils_utils.utils.handleToast(content);
if (details.planNum <= details.signedNum)
return;
let data = {
id: details.billLadingId,
coding: details.scancode,

25
unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js vendored

@ -2,9 +2,9 @@
const common_vendor = require("../../../common/vendor.js");
const api_user = require("../../../api/user.js");
const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
const utils_utils = require("../../../utils/utils.js");
require("../../../utils/request.js");
require("../../../store/index.js");
require("../../../utils/utils.js");
require("../../../utils/functions.js");
require("../../../utils/IDCardVerification.js");
require("../../../utils/base64.js");
@ -33,7 +33,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
__name: "signOrderScan",
setup(__props) {
common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
const utils = common_vendor.inject("utils");
let details = common_vendor.reactive({
schanvalue: "",
typearr: [
@ -131,7 +130,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
common_vendor.onMounted(async () => {
await common_vendor.nextTick$1();
utils.getViewDistanceFormTop(".scve").then((res) => {
utils_utils.utils.getViewDistanceFormTop(".scve").then((res) => {
console.log("res :>> ", res);
details.scrollHeight = res;
});
@ -184,10 +183,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
if (response2.code !== 200)
return;
console.log(response2);
common_vendor.index.showToast({
title: response2.msg,
icon: "none"
});
response2.audio && utils_utils.utils.handleToast(response2.audio, "none", false);
initpage();
tip.value.setdetails({ isshow: false });
},
@ -200,10 +196,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
return;
} else {
common_vendor.index.showToast({
title: response.msg,
icon: "none"
});
response.audio && utils_utils.utils.handleToast(response.audio, "none", false);
}
} else if (Number(details.orderStatus) === 3) {
let response = await api_user.signforsignforIn(data);
@ -222,10 +215,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
console.log(response2);
if (response2.code !== 200)
return;
common_vendor.index.showToast({
title: response2.msg,
icon: "none"
});
response2.audio && utils_utils.utils.handleToast(response2.audio, "none", false);
initpage();
tip.value.setdetails({ isshow: false });
},
@ -238,10 +228,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
});
return;
} else {
common_vendor.index.showToast({
title: response.msg,
icon: "none"
});
response.audio && utils_utils.utils.handleToast(response.audio, "none", false);
}
}
initpage();

7
unpackage/dist/dev/mp-weixin/project.config.json vendored

@ -6,20 +6,19 @@
},
"setting": {
"urlCheck": false,
"es6": false,
"es6": true,
"postcss": false,
"minified": true,
"newFeature": true,
"bigPackageSizeSupport": true,
"ignoreDevUnusedFiles": false,
"lazyCodeLoading": "requiredComponents",
"enhance": false,
"packNpmRelationList": [],
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"enhance": true
},
"compileType": "miniprogram",
"libVersion": "3.1.2",

5
unpackage/dist/dev/mp-weixin/utils/request.js vendored

@ -198,8 +198,9 @@ const HandleRequest = (params, key, loadingObj) => {
} = response;
if (data) {
if (data.code !== 200 && data.code !== 401) {
if (data.msg)
utils_utils.utils.handleToast(data.msg);
const content2 = data.audio ? data.audio : data.msg ? data.msg : "";
if (content2)
utils_utils.utils.handleToast(content2.length > 100 ? "系统异常,请联系管理员" : content2);
} else if (data.audio)
utils_utils.utils.handleToast(data.audio, "none", false);
}

2
unpackage/dist/dev/mp-weixin/utils/utils.js vendored

@ -74,6 +74,8 @@ const utils = {
/**
* 提示
* @param {String} content 提示的文字
* @param {String} icon 提示icon
* @param {Boolean} isShowMsg 是否弹窗显示文字
*/
handleToast(content, icon = "none", isShowMsg = true) {
if (isShowMsg)

4
utils/request.js

@ -294,7 +294,9 @@ const HandleRequest = (params, key, loadingObj) => {
if (data) {
if (data.code !== 200 && data.code !== 401) {
if (data.msg) utils.handleToast(data.msg.length > 100 ? '系统异常,请联系管理员' : data.msg)
const content = data.audio ? data.audio : data.msg ? data.msg : ''
if (content) utils.handleToast(content.length > 100 ? '系统异常,请联系管理员' : content)
} else if (data.audio) utils.handleToast(data.audio, 'none', false)
}
}

2
utils/utils.js

@ -460,6 +460,8 @@ const utils = {
/**
* 提示
* @param {String} content 提示的文字
* @param {String} icon 提示icon
* @param {Boolean} isShowMsg 是否弹窗显示文字
*/
handleToast(content, icon = 'none', isShowMsg = true) {
if (isShowMsg)

Loading…
Cancel
Save