|
|
@@ -4805,7 +4805,7 @@ if (uni.restoreGlobal) {
|
|
|
type: "primary"
|
|
|
},
|
|
|
{
|
|
|
- name: "快速\n\r拆包",
|
|
|
+ name: "快递\n\r拆包",
|
|
|
path: "/pages/index/express/quick-unpack",
|
|
|
type: "warning"
|
|
|
}
|
|
|
@@ -12710,7 +12710,7 @@ This will fail in production.`);
|
|
|
let text = code2 + "拆包成功";
|
|
|
uni.$u.ttsModule.speak(text);
|
|
|
} else {
|
|
|
- let text = code2 + "订单不存在";
|
|
|
+ let text = code2 + res2.msg;
|
|
|
uni.$u.ttsModule.speak(text);
|
|
|
}
|
|
|
});
|
|
|
@@ -12759,15 +12759,11 @@ This will fail in production.`);
|
|
|
}
|
|
|
};
|
|
|
function _sfc_render$1r(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
- const _component_u_button = resolveEasycom(vue.resolveDynamicComponent("u-button"), __easycom_3$6);
|
|
|
const _component_u_input = resolveEasycom(vue.resolveDynamicComponent("u-input"), __easycom_0$f);
|
|
|
+ const _component_u_button = resolveEasycom(vue.resolveDynamicComponent("u-button"), __easycom_3$6);
|
|
|
return vue.openBlock(), vue.createElementBlock("view", { class: "container" }, [
|
|
|
vue.createCommentVNode(' <view class="container">\r\n <button @click="initBluetooth" :disabled="isInitializing">初始化蓝牙</button>\r\n <button @click="startDiscovery" :disabled="isDiscovering || !isBluetoothOpened">开始搜索设备</button>\r\n <button @click="connectDevice" :disabled="!selectedDevice || isConnecting">连接设备</button>\r\n <button @click="startDataMonitor" :disabled="!isConnected">开始监听数据</button>\r\n <view v-if="scanData">扫描结果: {{ scanData }}</view>\r\n </view> '),
|
|
|
- vue.createVNode(_component_u_button, {
|
|
|
- type: "primary",
|
|
|
- onClick: $setup.goScan,
|
|
|
- text: "扫码"
|
|
|
- }),
|
|
|
+ vue.createCommentVNode(' <u-button type="primary" @click="goScan" text="扫码" /> '),
|
|
|
vue.createElementVNode("view", { class: "main-content" }, [
|
|
|
vue.createElementVNode("view", { class: "input-group" }, [
|
|
|
vue.createVNode(_component_u_input, {
|
|
|
@@ -18410,10 +18406,8 @@ This will fail in production.`);
|
|
|
return;
|
|
|
}
|
|
|
let isbns = orderDetail.value.detailVoList.map((item) => item.isbn);
|
|
|
- formatAppLog("log", "at pages/index/detail/index.vue:254", isbns.includes(isbn), "isbns");
|
|
|
if (isbns.includes(isbn)) {
|
|
|
let book = orderDetail.value.detailVoList.find((item) => item.isbn == isbn);
|
|
|
- formatAppLog("log", "at pages/index/detail/index.vue:258", orderDetail.value.detailVoList, book, "book");
|
|
|
if (book.auditCommentList.every((item) => item.sts == 1)) {
|
|
|
let text = `${isbn}已审核为良好`;
|
|
|
return uni.$u.ttsModule.speak(text);
|
|
|
@@ -18439,7 +18433,6 @@ This will fail in production.`);
|
|
|
function handleScanCode() {
|
|
|
uni.scanCode({
|
|
|
success: (res2) => {
|
|
|
- formatAppLog("log", "at pages/index/detail/index.vue:290", typeof res2.result, "res");
|
|
|
res2.result && handleScan(res2.result);
|
|
|
}
|
|
|
});
|
|
|
@@ -18651,24 +18644,29 @@ This will fail in production.`);
|
|
|
detail: {
|
|
|
type: Object,
|
|
|
default: () => ({})
|
|
|
+ },
|
|
|
+ auditList: {
|
|
|
+ type: Array,
|
|
|
+ default: () => []
|
|
|
}
|
|
|
},
|
|
|
emits: ["selected"],
|
|
|
setup(__props, { expose: __expose, emit: __emit }) {
|
|
|
const props2 = __props;
|
|
|
const auditCommentList = vue.ref([]);
|
|
|
- vue.watch(() => {
|
|
|
- var _a;
|
|
|
- return (_a = props2.detail) == null ? void 0 : _a.auditCommentList;
|
|
|
- }, (newVal) => {
|
|
|
- if (!newVal)
|
|
|
+ const initAuditList = (detail) => {
|
|
|
+ formatAppLog("log", "at pages/index/detail/components/AuditInfo.vue:51", detail, "detail");
|
|
|
+ if (!(detail == null ? void 0 : detail.auditCommentList))
|
|
|
return;
|
|
|
- auditCommentList.value = newVal.map((item) => ({
|
|
|
+ auditCommentList.value = detail.auditCommentList.map((item) => ({
|
|
|
...item,
|
|
|
- isbn: props2.detail.isbn,
|
|
|
+ isbn: detail.isbn,
|
|
|
comList: item.com ? typeof item.com === "string" ? item.com.split(",") : item.com : []
|
|
|
}));
|
|
|
- }, { immediate: true, deep: true });
|
|
|
+ };
|
|
|
+ vue.watch(() => props2.detail, () => {
|
|
|
+ initAuditList(props2.detail);
|
|
|
+ }, { deep: true, immediate: true });
|
|
|
const auditList = vue.ref([{ sts: 1, label: "品相良好" }, { sts: 2, label: "品相一般", disabled: true }, { sts: 3, label: "品相极差" }]);
|
|
|
const emit2 = __emit;
|
|
|
const radioClick = (audit, index2, sts) => {
|
|
|
@@ -18703,7 +18701,6 @@ This will fail in production.`);
|
|
|
idx: index2,
|
|
|
com: item.comList.join(",")
|
|
|
}));
|
|
|
- formatAppLog("log", "at pages/index/detail/components/AuditInfo.vue:92", list, "list");
|
|
|
return list;
|
|
|
};
|
|
|
const toggleReason = (audit, index2, item) => {
|
|
|
@@ -18716,13 +18713,14 @@ This will fail in production.`);
|
|
|
auditCommentList.value[index2] = audit;
|
|
|
};
|
|
|
__expose({
|
|
|
- formatReason
|
|
|
+ formatReason,
|
|
|
+ initAuditList
|
|
|
});
|
|
|
- const __returned__ = { props: props2, auditCommentList, auditList, emit: emit2, radioClick, getAuditCateNum, get reasonList() {
|
|
|
+ const __returned__ = { props: props2, auditCommentList, initAuditList, auditList, emit: emit2, radioClick, getAuditCateNum, get reasonList() {
|
|
|
return reasonList;
|
|
|
}, set reasonList(v) {
|
|
|
reasonList = v;
|
|
|
- }, formatReason, toggleReason, ref: vue.ref, watch: vue.watch };
|
|
|
+ }, formatReason, toggleReason, ref: vue.ref, watch: vue.watch, nextTick: vue.nextTick, onMounted: vue.onMounted };
|
|
|
Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
|
|
|
return __returned__;
|
|
|
}
|
|
|
@@ -18832,11 +18830,9 @@ This will fail in production.`);
|
|
|
const handleAuditSelected = (data) => {
|
|
|
auditData.value = data.map((item, index2) => {
|
|
|
item.idx = index2;
|
|
|
- formatAppLog("log", "at pages/index/detail/book-audit.vue:77", index2, item.com, "item.com", Array.isArray(item.com));
|
|
|
item.com = Array.isArray(item.com) ? item.com.join(",") : item.com;
|
|
|
return item;
|
|
|
});
|
|
|
- formatAppLog("log", "at pages/index/detail/book-audit.vue:81", auditData.value, "auditData.value");
|
|
|
};
|
|
|
const scannedBooks = vue.ref([]);
|
|
|
function checkIsbn(isbn) {
|
|
|
@@ -18930,12 +18926,18 @@ This will fail in production.`);
|
|
|
const checkUserId = vue.ref();
|
|
|
const orderId = vue.ref();
|
|
|
const orderDetail = vue.ref({});
|
|
|
+ let isbnScan = vue.ref("");
|
|
|
onLoad((options) => {
|
|
|
options.isbn && getBookInfo(options.isbn);
|
|
|
scannedBooks.value = [options.isbn];
|
|
|
+ isbnScan.value = options.isbn;
|
|
|
auditBook.value = uni.getStorageSync("auditBook");
|
|
|
orderId.value = options.orderId;
|
|
|
orderDetail.value = uni.getStorageSync("orderDetail");
|
|
|
+ vue.nextTick(() => {
|
|
|
+ var _a;
|
|
|
+ (_a = auditInfoRef.value) == null ? void 0 : _a.initAuditList(auditBook.value);
|
|
|
+ });
|
|
|
uni.$u.useGlobalEvent((e) => {
|
|
|
if (e.barcode) {
|
|
|
handleScan(e.barcode);
|
|
|
@@ -18944,11 +18946,21 @@ This will fail in production.`);
|
|
|
});
|
|
|
onShow(() => {
|
|
|
var _a;
|
|
|
- checkUserId.value = (_a = uni.getStorageSync("userInfo")) == null ? void 0 : _a.userId;
|
|
|
- auditBook.value = uni.getStorageSync("auditBook");
|
|
|
- orderDetail.value = uni.getStorageSync("orderDetail");
|
|
|
+ if (isbnScan.value) {
|
|
|
+ checkUserId.value = (_a = uni.getStorageSync("userInfo")) == null ? void 0 : _a.userId;
|
|
|
+ auditBook.value = uni.getStorageSync("auditBook");
|
|
|
+ orderDetail.value = uni.getStorageSync("orderDetail");
|
|
|
+ vue.nextTick(() => {
|
|
|
+ var _a2;
|
|
|
+ (_a2 = auditInfoRef.value) == null ? void 0 : _a2.initAuditList(auditBook.value);
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
- const __returned__ = { detail, getBookInfo, list, current, handleSectionChange, auditData, handleAuditSelected, scannedBooks, checkIsbn, handleScan, handleScanCode, auditInfoRef, handleAudit, auditBook, checkUserId, orderId, orderDetail, ref: vue.ref, get onLoad() {
|
|
|
+ const __returned__ = { detail, getBookInfo, list, current, handleSectionChange, auditData, handleAuditSelected, scannedBooks, checkIsbn, handleScan, handleScanCode, auditInfoRef, handleAudit, auditBook, checkUserId, orderId, orderDetail, get isbnScan() {
|
|
|
+ return isbnScan;
|
|
|
+ }, set isbnScan(v) {
|
|
|
+ isbnScan = v;
|
|
|
+ }, ref: vue.ref, nextTick: vue.nextTick, get onLoad() {
|
|
|
return onLoad;
|
|
|
}, get onShow() {
|
|
|
return onShow;
|
|
|
@@ -19052,7 +19064,7 @@ This will fail in production.`);
|
|
|
vue.createElementVNode(
|
|
|
"text",
|
|
|
{ class: "content" },
|
|
|
- "¥" + vue.toDisplayString($setup.auditBook.finalMoney),
|
|
|
+ "¥" + vue.toDisplayString($setup.auditBook.finalMoney || 0),
|
|
|
1
|
|
|
/* TEXT */
|
|
|
)
|
|
|
@@ -19066,17 +19078,20 @@ This will fail in production.`);
|
|
|
current: $setup.current,
|
|
|
onChange: $setup.handleSectionChange
|
|
|
}, null, 8, ["list", "current"]),
|
|
|
- $setup.current == 0 ? (vue.openBlock(), vue.createBlock($setup["AuditInfo"], {
|
|
|
- key: 0,
|
|
|
+ vue.withDirectives(vue.createVNode($setup["AuditInfo"], {
|
|
|
detail: $setup.auditBook,
|
|
|
+ auditList: $setup.auditBook.auditCommentList,
|
|
|
ref: "auditInfoRef"
|
|
|
- }, null, 8, ["detail"])) : vue.createCommentVNode("v-if", true),
|
|
|
- $setup.current == 2 ? (vue.openBlock(), vue.createBlock($setup["FileInfo"], {
|
|
|
- key: 1,
|
|
|
+ }, null, 8, ["detail", "auditList"]), [
|
|
|
+ [vue.vShow, $setup.current == 0]
|
|
|
+ ]),
|
|
|
+ vue.withDirectives(vue.createVNode($setup["FileInfo"], {
|
|
|
orderId: $setup.orderId,
|
|
|
annexType: 2,
|
|
|
isbn: $setup.auditBook.isbn
|
|
|
- }, null, 8, ["orderId", "isbn"])) : vue.createCommentVNode("v-if", true)
|
|
|
+ }, null, 8, ["orderId", "isbn"]), [
|
|
|
+ [vue.vShow, $setup.current == 2]
|
|
|
+ ])
|
|
|
]),
|
|
|
vue.createElementVNode("view", { class: "fixed-bottom" }, [
|
|
|
vue.createVNode(_component_u_button, {
|
|
|
@@ -25416,8 +25431,8 @@ This will fail in production.`);
|
|
|
};
|
|
|
const openScan = () => {
|
|
|
uni.scanCode({
|
|
|
- scanType: ["barCode"],
|
|
|
success: (res2) => {
|
|
|
+ waybillCode.value = res2.result;
|
|
|
getDetailByCode2(res2.result);
|
|
|
},
|
|
|
fail: (err) => {
|
|
|
@@ -25444,6 +25459,7 @@ This will fail in production.`);
|
|
|
vue.onMounted(() => {
|
|
|
uni.$u.useGlobalEvent((e) => {
|
|
|
if (e.barcode) {
|
|
|
+ waybillCode.value = e.barcode;
|
|
|
getDetailByCode2(e.barcode);
|
|
|
}
|
|
|
});
|
|
|
@@ -26780,7 +26796,7 @@ This will fail in production.`);
|
|
|
$setup.detail.orderId ? (vue.openBlock(), vue.createElementBlock("view", {
|
|
|
key: 1,
|
|
|
style: { "background-color": "#ffffff" },
|
|
|
- class: "pad-5 mt-20"
|
|
|
+ class: "pad-5 mt-20 content-info"
|
|
|
}, [
|
|
|
vue.createVNode(_component_u_tabs, {
|
|
|
list: $setup.list1,
|
|
|
@@ -30534,9 +30550,14 @@ This will fail in production.`);
|
|
|
}
|
|
|
function useGlobalEvent(onChange) {
|
|
|
var globalEvent = requireNativePlugin("globalEvent");
|
|
|
- globalEvent.addEventListener("iDataBarcodeEvent", function(e) {
|
|
|
+ const handler = function(e) {
|
|
|
onChange && onChange(e);
|
|
|
- });
|
|
|
+ };
|
|
|
+ globalEvent.removeEventListener("iDataBarcodeEvent", handler);
|
|
|
+ globalEvent.addEventListener("iDataBarcodeEvent", handler);
|
|
|
+ return () => {
|
|
|
+ globalEvent.removeEventListener("iDataBarcodeEvent", handler);
|
|
|
+ };
|
|
|
}
|
|
|
function useGlobalEventRemove() {
|
|
|
var globalEvent = requireNativePlugin("globalEvent");
|