diff --git a/api/user.js b/api/user.js index 5a4f67e..246e395 100644 --- a/api/user.js +++ b/api/user.js @@ -2974,4 +2974,17 @@ export function postGoodsAllocation(data, loadingObj = {}) { }, loadingObj ); +} + +/** + * 获取运单 / 订单数据 + */ +export function postUploadSignPhoto(data, loadingObj = {}) { + return request({ + url: `logpm-trunkline/api/carsLoad/uploadSignPhoto`, + method: "post", + data + }, + loadingObj + ); } \ No newline at end of file diff --git a/compoment/BasicContainer/BasicContainer.vue b/compoment/BasicContainer/BasicContainer.vue index 81bf744..15c2806 100644 --- a/compoment/BasicContainer/BasicContainer.vue +++ b/compoment/BasicContainer/BasicContainer.vue @@ -1,8 +1,8 @@ + + + + + @@ -106,9 +112,11 @@ } from '@dcloudio/uni-app' import { postFinaSignOrderList, + postUploadSignPhoto } from '@/api/user.js' import { reactive, toRefs, ref, watchEffect, nextTick } from "vue"; import utils from '@/utils/utils.js'; + import functions from '@/utils/functions.js'; // 获取组件实例 const tip = ref(null) @@ -116,6 +124,9 @@ const date = ref([]) const basicContainer = ref(null) + // 上传图片 -- 弹窗 + const UploadImg = ref() + const option = { title: '直发商家未签收列表', haveData: true, @@ -136,7 +147,8 @@ total: 0, /** 滚动区高度 */ scrollHeight: '80vh', - tabBarCode: 10 + tabBarCode: 10, + imgFileList: [] }) onShow(async () => { @@ -186,7 +198,7 @@ // details.datatime=(uni as any).$u.timeFormat(date.value[0], 'yyyy-mm-dd')+' 至 '+(uni as any).$u.timeFormat(date.value[1], 'yyyy-mm-dd') } onLoad(() => { - date.value[0] = (uni as any).$u.timeFormat((new Date().valueOf() - 1000 * 60 * 60 * 24 * 3), 'yyyy-mm-dd') + date.value[0] = (uni as any).$u.timeFormat((new Date().valueOf() - 1000 * 60 * 60 * 24 * 7), 'yyyy-mm-dd') date.value[1] = (uni as any).$u.timeFormat((new Date().valueOf()), 'yyyy-mm-dd') details.current = 1 }) @@ -196,13 +208,17 @@ } async function initpage() { try { - const _code = details.tabBarCode + if (date.value.length === 0) { + utils.handleToast('请选择签收时间') + details.recordsList = [] + return + } let submitData = { pageNum: details.current, pageSize: details.size, - taskTime_start: date.value[0] || '', - taskTime_end: date.value[1] || '', + enterTimeStartStr: date.value[0] || '', + enterTimeEndStr: date.value[1] || '', // 签收状态 signStatus: details.tabBarCode } @@ -211,7 +227,6 @@ const { code, data } = response - console.log(response); if (code !== 200 && code !== details.tabBarCode) return if (details.current == 1) { details.recordsList = response.data.records @@ -273,6 +288,111 @@ date.value = [] basicContainer.value.startPullDownRefresh() } + + /** 显示上传图片弹窗 */ + const handleShowImg = async (item) => { + details.imgFileList = [] + + if (item.signPhotoList && item.signPhotoList.length > 0) { + for (let i = 0; i < item.signPhotoList.length; i++) { + const { photoUrl, id } = item.signPhotoList[i] + photoUrl && details.imgFileList.push({ url: photoUrl, id }) + } + } + + UploadImg.value.setDetails({ + title: '上传图片', + showPopUp: true, + async success() { + if (details.imgFileList.length === 0) return uni.showToast({ + icon: 'none', + title: '请上传图片再提交' + }) + + const submitData = { + signOrderId: item.id, + signPhotoList: [] + } + + for (let i = 0; i < details.imgFileList.length; i++) { + const value = details.imgFileList[i] + + // 存在id, 为已存在数据, 不做上传 + // if (value.id) continue + + submitData.signPhotoList.push({ + signOrderId: item.id, + photoType: 1, + photoUrl: value.url + }) + } + + const res = await postUploadSignPhoto(submitData) + + const { code } = res + + if (code !== 200) return + + UploadImg.value.details.showPopUp = false + + basicContainer.value.startPullDownRefresh() + } + }) + } + + /** 上传图片 */ + const handleUploadImg = async (event) => { + try { + uni.showLoading({ + title: '上传中', + mask: true + }) + + const writeArr = ['jpg', 'jpeg', 'png'] + const PromiseAll = [] + + for (let i = 0; i < event.file.length; i++) { + const item = event.file[i] + const type = item.name.split('.').slice(-1)[0] + + if (writeArr.indexOf(type) === -1) continue + + console.log('type :>> ', type); + + PromiseAll.push(functions.upfile(item.url)) + } + + + const res = await Promise.all(PromiseAll) + + console.log('res :>> ', res); + + for (let i = 0; i < res.length; i++) { + const response = res[i] + + const { link } = response + + if (!link) continue + + details.imgFileList.push({ url: link }) + } + } catch (err) { + console.log('err :>> ', err); + //TODO handle the exception + } finally { + uni.hideLoading() + } + + console.log('event :>> ', event); + + } + + /** 删除图片 */ + const deletePic = (event) => { + console.log('event :>> ', event); + + details.imgFileList.splice(event.index, 1) + } const { datatime, recordsList, show } = toRefs(details) @@ -458,8 +578,8 @@ } >view:nth-of-type(2) { - border: 2upx solid #f8113b; - color: #f8113b; + border: 2upx solid #69bd85; + color: #69bd85; } >view:nth-of-type(3) { @@ -504,4 +624,38 @@ color: #FFFFFF; } } + + + + + :deep(.u-upload__button) { + width: 4.5rem !important; + height: 4.5rem !important; + + .u-icon__icon { + font-size: 1.5rem !important; + line-height: 1.5rem !important; + } + } + + :deep(.u-upload__wrap__preview__image) { + width: 4.5rem !important; + height: 4.5rem !important; + + + } + + :deep(.u-upload__deletable) { + width: 36upx; + height: 36upx; + + .u-icon__icon { + font-size: 28upx !important; + line-height: 28upx !important; + } + } + + :deep(uni-movable-view) { + z-index: 99999; + } \ No newline at end of file diff --git a/pagesHome/pages/directGoMarketDetails/directGoMarketDetails.vue b/pagesHome/pages/directGoMarketDetails/directGoMarketDetails.vue index 8b845ed..87c37ef 100644 --- a/pagesHome/pages/directGoMarketDetails/directGoMarketDetails.vue +++ b/pagesHome/pages/directGoMarketDetails/directGoMarketDetails.vue @@ -504,10 +504,10 @@ details.datalist = details.orderStatus === 1 ? - details.signScanOrderList : + details.signScanOrderList || [] : details.orderStatus === 2 ? - details.signScanZeroOrderList : - details.exceptionList + details.signScanZeroOrderList || [] : + details.exceptionList || [] // for (let i = 0; i < 1000; i++) { // details.datalist.push({ orderCode: i, signPackageList: [] }) // } @@ -549,7 +549,7 @@ // 该包件是否已被卸车或签收 let returnContent = '' - for (let item of details.pageInfo.signScanOrderList) { + for (let item of details.signScanOrderList) { let isBreak = false for (let val of item.signPackageList) { if (_scanCode === val.orderPackageCode) { diff --git a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue index 0ea31c1..e8169bd 100644 --- a/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue +++ b/pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue @@ -723,7 +723,7 @@ const popUp_Details = ref(null) // 页面初始化执行回调 - onLoad((info) => { + onLoad(async (info) => { console.log('info :>> ', info); const infos = JSON.parse(info.info) console.log('object :>> ', JSON.parse(info.info)); @@ -731,6 +731,8 @@ details.pageType = infos.pageType details.pageInfos = infos + await nextTick() + basicContainer.value.startPullDownRefresh() }) onShow(async () => { @@ -755,8 +757,6 @@ // #endif // 初始化请求页面数据 // initPage() - await nextTick() - basicContainer.value.startPullDownRefresh() }) /** 请求页面数据 */ diff --git a/unpackage/debug/android_debug.apk b/unpackage/debug/android_debug.apk index 9a75394..27e380e 100644 Binary files a/unpackage/debug/android_debug.apk and b/unpackage/debug/android_debug.apk differ diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js index 99fade1..ae99c36 100644 --- a/unpackage/dist/dev/app-plus/app-config-service.js +++ b/unpackage/dist/dev/app-plus/app-config-service.js @@ -1,7 +1,7 @@ ;(function(){ let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[]; - const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"货无忧","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.08","entryPagePath":"pages/login/login","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#df8926","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","iconPath":"/static/TabberIcon/icon1.png","selectedIconPath":"/static/TabberIcon/icon1check.png","text":"工作台"},{"pagePath":"pages/taskList/taskList","iconPath":"/static/TabberIcon/icon2.png","selectedIconPath":"/static/TabberIcon/icon2check.png","text":"任务"},{"pagePath":"pages/user/user","iconPath":"/static/TabberIcon/icon5.png","selectedIconPath":"/static/TabberIcon/icon5check.png","text":"我的"}],"selectedIndex":0,"shown":true},"locales":{},"darkmode":false,"themeConfig":{}}; + const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"货无忧测试版","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.08","entryPagePath":"pages/login/login","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"tabBar":{"position":"bottom","color":"#999999","selectedColor":"#df8926","borderStyle":"black","blurEffect":"none","fontSize":"10px","iconWidth":"24px","spacing":"3px","height":"50px","backgroundColor":"#ffffff","list":[{"pagePath":"pages/index/index","iconPath":"/static/TabberIcon/icon1.png","selectedIconPath":"/static/TabberIcon/icon1check.png","text":"工作台"},{"pagePath":"pages/taskList/taskList","iconPath":"/static/TabberIcon/icon2.png","selectedIconPath":"/static/TabberIcon/icon2check.png","text":"任务"},{"pagePath":"pages/user/user","iconPath":"/static/TabberIcon/icon5.png","selectedIconPath":"/static/TabberIcon/icon5check.png","text":"我的"}],"selectedIndex":0,"shown":true},"locales":{},"darkmode":false,"themeConfig":{}}; const __uniRoutes = [{"path":"pages/login/login","meta":{"isQuit":true,"isEntry":true,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"登录","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/index/index","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":0,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"工作台","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/user/user","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":2,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"我的","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/news/news","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"消息","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/taskList/taskList","meta":{"isQuit":true,"isTabBar":true,"tabBarIndex":1,"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/reportForms/reportForms","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"报表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/pickingScan/pickingScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"拣货扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StowageList/StowageList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配载装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StowageListDetails/StowageListDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配载按件装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelayScanList/RelayScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"中转装车","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/codePlateBracket/codePlateBracket","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"码板打托","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/billsList/billsList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"提货批次","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PickUpLotList/PickUpLotList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"提货批次列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/TranNumber/TranNumber","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"车次","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/onLoadByScan/onLoadByScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"卸车扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"卸车扫描包件明细","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ArrivalList/ArrivalList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"到车列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"到车入库详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"卸分一体","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupScan/SelfPickupScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingScan/LoadingScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"装车扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/loadingRetention/loadingRetention","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"装车滞留","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplist/StockUplist","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUplistScandetails/StockUplistScandetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货列表扫码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownScan/DownScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signinScan/signinScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/directGoMarket/directGoMarket","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"待签收列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/directGoMarketDetails/directGoMarketDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"直发商家签收","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPScanList/SelfPScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SelfPickupDetails/SelfPickupDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"自提明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/LoadingDetails/LoadingDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配车明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配送客户扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerSign/CustomerSign","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户签收","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signOrderScan/signOrderScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/signPackageScan/signPackageScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收订单扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SignDetailScan/SignDetailScan","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"签收明细扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/setbarcode/setbarcode","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"配置包条码","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OfflineUpload/OfflineUpload","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"离线上传","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/createTask/createTask","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"创建任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ordersorting/ordersorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/lnventorysorting/lnventorysorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/scansorting/scansorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/peopleSorting/peopleSorting","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OrderSortingDetail/OrderSortingDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"继续分拣列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanSortingType/ScanSortingType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工分拣","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryType/inventoryType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品类型","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryDetail/inventoryDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描列表详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryDetailList/inventoryDetailList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描详情明细","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryenter/inventoryenter","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品录入","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/lnventorysortinglist/lnventorysortinglist","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"分拣列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanUpType/ScanUpType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/ScanUp/ScanUp","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"扫描上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelocationType/RelocationType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Relocation/Relocation","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleScanUpType/PeopleScanUpType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PeopleScanUp/PeopleScanUp","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"人工上架","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/PickingScanList/PickingScanList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"拣货列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Retention/Retention","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"滞留","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/MergeTray/MergeTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"合托","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/MergeTrayDetails/MergeTrayDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"合并托盘","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownGoodsType/DownGoodsType","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/DownGoods/DownGoods","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"下架扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SetPrice/SetPrice","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"设置服务费","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RemoveTray/RemoveTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"空置托盘","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/Check/Check","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"复核","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/createAddServe/createAddServe","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"创建增值服务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderDetail/orderDetail","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/RelocationAllocationId/RelocationAllocationId","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"移库库位","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderDetails/orderDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单详情","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/orderInquiry/orderInquiry","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/waybillInquiry/waybillInquiry","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"订单查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/storageInquiry/storageInquiry","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库位查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/trayInquiry/trayInquiry","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"托盘查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/inventoryInquiry/inventoryInquiry","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StorageLocationList/StorageLocationList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库存品查询","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/MaterialMaintenance/MaterialMaintenance","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"物料维护","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"客户托盘扫描","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/StockUpListZero/StockUpListZero","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"备货零担列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/SearchTray/SearchTray","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"按合同号盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/integral/integral","meta":{"enablePullDownRefresh":false,"onReachBottomDistance":1,"navigationBar":{"titleText":"积分指标","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/integralEdit/integralEdit","meta":{"enablePullDownRefresh":false,"onReachBottomDistance":1,"navigationBar":{"titleText":"指标编辑","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesHome/pages/integralMy/integralMy","meta":{"enablePullDownRefresh":false,"onReachBottomDistance":1,"navigationBar":{"titleText":"我的考核","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesUser/pages/about/about","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"关于我们","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesUser/pages/systemSettings/systemSettings","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"系统设置","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesUser/pages/securitySettings/securitySettings","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"安全设置","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/dynamicCheck/dynamicCheck","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"盘点任务","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/checkTaskList/checkTaskList","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"盘点任务列表","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"随机盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"库位盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/trayCheckDetails/trayCheckDetails","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"托盘盘点","style":"custom","type":"default"},"isNVue":false}},{"path":"pagesTask/pages/contracts/contracts","meta":{"enablePullDownRefresh":true,"onReachBottomDistance":1,"animationDuration":300,"animationType":"zoom-fade-out","pullToRefresh":{"support":true,"color":"#d3832a","style":"circle"},"navigationBar":{"titleText":"按合同号盘点","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute)); __uniConfig.styles=[];//styles __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 9ed2d06..bc3d383 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -2294,7 +2294,6 @@ if (uni.restoreGlobal) { code: 4e3 })); requestObj[_key] = params; - formatAppLog("log", "at utils/request.js:323", "_isRefreshToken :>> ", _isRefreshToken); if (_isRefreshToken._isRefreshToken) { await _isRefreshToken._isRefreshToken; return HandleRequest(params, _key, loadingObj); @@ -4321,6 +4320,16 @@ if (uni.restoreGlobal) { loadingObj ); } + function postUploadSignPhoto(data, loadingObj = {}) { + return service( + { + url: `logpm-trunkline/api/carsLoad/uploadSignPhoto`, + method: "post", + data + }, + loadingObj + ); + } var isVue2 = false; function set(target, key, val) { if (Array.isArray(target)) { @@ -6016,7 +6025,7 @@ This will fail in production if not fixed.`); HANDLE_ISSTORAGECODE }; }); - const _sfc_main$2k = /* @__PURE__ */ vue.defineComponent({ + const _sfc_main$2l = /* @__PURE__ */ vue.defineComponent({ __name: "login", setup(__props) { const { HANDLE_CLEARSTORAGE, HANDLE_GETSTORAGEINFO } = useStorageStore(); @@ -6346,7 +6355,7 @@ This will fail in production if not fixed.`); } return target; }; - const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$2k, [["__file", "D:/worksp/logpm/pages/login/login.vue"]]); + const PagesLoginLogin = /* @__PURE__ */ _export_sfc(_sfc_main$2l, [["__file", "D:/worksp/logpm/pages/login/login.vue"]]); const version$1 = "3"; { formatAppLog("log", "at uni_modules/uview-plus/libs/config/config.js:5", ` @@ -7906,7 +7915,7 @@ This will fail in production if not fixed.`); ...Upload$1, ...drawer }; - const props$l = { + const props$m = { props: { bgColor: { type: String, @@ -8044,9 +8053,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$2j = { + const _sfc_main$2k = { name: "u-status-bar", - mixins: [mpMixin$1, mixin$1, props$l], + mixins: [mpMixin$1, mixin$1, props$m], data() { return {}; }, @@ -8059,7 +8068,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$K(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$L(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -8073,7 +8082,7 @@ This will fail in production if not fixed.`); /* STYLE */ ); } - const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$2j, [["render", _sfc_render$K], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]); + const __easycom_1$3 = /* @__PURE__ */ _export_sfc(_sfc_main$2k, [["render", _sfc_render$L], ["__scopeId", "data-v-eb8e0cdd"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]); const icons = { "uicon-level": "", "uicon-column-line": "", @@ -8288,7 +8297,7 @@ This will fail in production if not fixed.`); "uicon-zh": "", "uicon-en": "" }; - const props$k = { + const props$l = { props: { // 图标类名 name: { @@ -8377,13 +8386,13 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$2i = { + const _sfc_main$2j = { name: "u-icon", data() { return {}; }, emits: ["click"], - mixins: [mpMixin$1, mixin$1, props$k], + mixins: [mpMixin$1, mixin$1, props$l], computed: { uClasses() { let classes = []; @@ -8427,7 +8436,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$J(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$K(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -8471,8 +8480,8 @@ This will fail in production if not fixed.`); /* CLASS */ ); } - const __easycom_0$6 = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["render", _sfc_render$J], ["__scopeId", "data-v-ac70166d"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]); - const props$j = { + const __easycom_0$6 = /* @__PURE__ */ _export_sfc(_sfc_main$2j, [["render", _sfc_render$K], ["__scopeId", "data-v-ac70166d"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-icon/u-icon.vue"]]); + const props$k = { props: { // 是否开启顶部安全区适配 safeAreaInsetTop: { @@ -8556,9 +8565,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$2h = { + const _sfc_main$2i = { name: "u-navbar", - mixins: [mpMixin$1, mixin$1, props$j], + mixins: [mpMixin$1, mixin$1, props$k], data() { return {}; }, @@ -8576,8 +8585,8 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) { - const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_1$2); + function _sfc_render$J(_ctx, _cache, $props, $setup, $data, $options) { + const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_1$3); const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); return vue.openBlock(), vue.createElementBlock("view", { class: "u-navbar" }, [ _ctx.fixed && _ctx.placeholder ? (vue.openBlock(), vue.createElementBlock( @@ -8688,7 +8697,7 @@ This will fail in production if not fixed.`); ) ]); } - const __easycom_0$5 = /* @__PURE__ */ _export_sfc(_sfc_main$2h, [["render", _sfc_render$I], ["__scopeId", "data-v-f631659b"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]); + const __easycom_0$5 = /* @__PURE__ */ _export_sfc(_sfc_main$2i, [["render", _sfc_render$J], ["__scopeId", "data-v-f631659b"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-navbar/u-navbar.vue"]]); function getImageCache(filePath, fileMd51) { return new Promise((resolve, reject) => { let fileMd5 = ""; @@ -8736,7 +8745,7 @@ This will fail in production if not fixed.`); } }); } - const _sfc_main$2g = /* @__PURE__ */ vue.defineComponent({ + const _sfc_main$2h = /* @__PURE__ */ vue.defineComponent({ __name: "index", setup(__props) { const storageStore = useStorageStore(); @@ -9149,8 +9158,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2g, [["__file", "D:/worksp/logpm/pages/index/index.vue"]]); - const _sfc_main$2f = /* @__PURE__ */ vue.defineComponent({ + const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2h, [["__file", "D:/worksp/logpm/pages/index/index.vue"]]); + const _sfc_main$2g = /* @__PURE__ */ vue.defineComponent({ __name: "user", setup(__props) { const storageStore = useStorageStore(); @@ -9481,8 +9490,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$2f, [["__file", "D:/worksp/logpm/pages/user/user.vue"]]); - const _sfc_main$2e = /* @__PURE__ */ vue.defineComponent({ + const PagesUserUser = /* @__PURE__ */ _export_sfc(_sfc_main$2g, [["__file", "D:/worksp/logpm/pages/user/user.vue"]]); + const _sfc_main$2f = /* @__PURE__ */ vue.defineComponent({ __name: "news", setup(__props) { onPullDownRefresh(() => { @@ -9545,8 +9554,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$2e, [["__file", "D:/worksp/logpm/pages/news/news.vue"]]); - const _sfc_main$2d = /* @__PURE__ */ vue.defineComponent({ + const PagesNewsNews = /* @__PURE__ */ _export_sfc(_sfc_main$2f, [["__file", "D:/worksp/logpm/pages/news/news.vue"]]); + const _sfc_main$2e = /* @__PURE__ */ vue.defineComponent({ __name: "taskList", setup(__props) { const tip = vue.ref(null); @@ -9658,8 +9667,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$2d, [["__file", "D:/worksp/logpm/pages/taskList/taskList.vue"]]); - const _sfc_main$2c = /* @__PURE__ */ vue.defineComponent({ + const PagesTaskListTaskList = /* @__PURE__ */ _export_sfc(_sfc_main$2e, [["__file", "D:/worksp/logpm/pages/taskList/taskList.vue"]]); + const _sfc_main$2d = /* @__PURE__ */ vue.defineComponent({ __name: "reportForms", setup(__props) { onPullDownRefresh(() => { @@ -9673,7 +9682,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$2c, [["__file", "D:/worksp/logpm/pages/reportForms/reportForms.vue"]]); + const PagesReportFormsReportForms = /* @__PURE__ */ _export_sfc(_sfc_main$2d, [["__file", "D:/worksp/logpm/pages/reportForms/reportForms.vue"]]); let calendar = { /** * 农历1900-2100的润大小信息表 @@ -10593,7 +10602,7 @@ This will fail in production if not fixed.`); solar2lunar: calendar.solar2lunar, lunar2solar: calendar.lunar2solar }; - const _sfc_main$2b = { + const _sfc_main$2c = { name: "lCalendar", model: { prop: "value", @@ -11006,7 +11015,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$H(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -11247,7 +11256,7 @@ This will fail in production if not fixed.`); /* NEED_HYDRATION */ ); } - const __easycom_6$2 = /* @__PURE__ */ _export_sfc(_sfc_main$2b, [["render", _sfc_render$H], ["__scopeId", "data-v-665735f1"], ["__file", "D:/worksp/logpm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]); + const __easycom_6$2 = /* @__PURE__ */ _export_sfc(_sfc_main$2c, [["render", _sfc_render$I], ["__scopeId", "data-v-665735f1"], ["__file", "D:/worksp/logpm/uni_modules/l-calendar/components/l-calendar/l-calendar.vue"]]); const useSearchInfoStore = defineStore("useSearchInfoStore", () => { const searchInfo = vue.ref({}); const HANDLE_EDIT_INFO = (pageName, info) => { @@ -11266,7 +11275,7 @@ This will fail in production if not fixed.`); HANDLE_CLEAR }; }); - const _sfc_main$2a = /* @__PURE__ */ vue.defineComponent({ + const _sfc_main$2b = /* @__PURE__ */ vue.defineComponent({ __name: "pickingScan", setup(__props) { const option = { @@ -11697,8 +11706,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$2a, [["__file", "D:/worksp/logpm/pagesHome/pages/pickingScan/pickingScan.vue"]]); - const _sfc_main$29 = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesPickingScanPickingScan = /* @__PURE__ */ _export_sfc(_sfc_main$2b, [["__file", "D:/worksp/logpm/pagesHome/pages/pickingScan/pickingScan.vue"]]); + const _sfc_main$2a = /* @__PURE__ */ vue.defineComponent({ __name: "StowageList", setup(__props) { const option = { @@ -12066,7 +12075,7 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStowageListStowageList = /* @__PURE__ */ _export_sfc(_sfc_main$29, [["__scopeId", "data-v-10679139"], ["__file", "D:/worksp/logpm/pagesHome/pages/StowageList/StowageList.vue"]]); + const PagesHomePagesStowageListStowageList = /* @__PURE__ */ _export_sfc(_sfc_main$2a, [["__scopeId", "data-v-10679139"], ["__file", "D:/worksp/logpm/pagesHome/pages/StowageList/StowageList.vue"]]); const useSystemSettingsStore = defineStore("useSystemSettingsStore", () => { const scanStateList = vue.reactive([{ title: "关闭", @@ -12086,7 +12095,7 @@ This will fail in production if not fixed.`); HANDLE_SCANSTATE }; }); - const _sfc_main$28 = /* @__PURE__ */ vue.defineComponent({ + const _sfc_main$29 = /* @__PURE__ */ vue.defineComponent({ __name: "StowageListDetails", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -12190,6 +12199,10 @@ This will fail in production if not fixed.`); if (code2 === 200) { details.pageInfo = data; details.datalist = details.orderStatus === 1 ? details.pageInfo.loadScanOrderList : details.orderStatus === 2 ? details.pageInfo.zeroList : details.pageInfo.exceptionList; + if (!details.isscan) + return; + utils.handleToast(details.pageInfo.realLoadingNumber); + details.isscan = false; } } catch (e2) { } finally { @@ -12200,7 +12213,7 @@ This will fail in production if not fixed.`); try { await initPageByOrder(); } catch (err) { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:416", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:420", "err :>> ", err); } finally { return null; } @@ -12223,7 +12236,7 @@ This will fail in production if not fixed.`); return res; }; const scanTray = async () => { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:469", "111 :>> ", 111); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:473", "111 :>> ", 111); const submitData = { trayCode: details.scancode, loadId: details.loadId @@ -12265,6 +12278,7 @@ This will fail in production if not fixed.`); title: "装车成功", icon: "none" }); + basicContainer.value.startPullDownRefresh(); TrayStowage.value.details.showPopUp = false; } catch (e2) { } finally { @@ -12286,12 +12300,13 @@ This will fail in production if not fixed.`); res = await scanOrder(); else if (Number(details.pageType) === 2) res = await scanTray(); - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:543", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:548", "res :>> ", res); if (res.code !== 200) return; + details.isscan = false; basicContainer.value.startPullDownRefresh(); } catch (err) { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:548", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:554", "err :>> ", err); } } const handleShowZeroStowage = async (_item) => { @@ -12323,7 +12338,7 @@ This will fail in production if not fixed.`); ZeroStowage.value.details.showPopUp = false; basicContainer.value.startPullDownRefresh(); } catch (err) { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:586", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:592", "err :>> ", err); } finally { uni.hideLoading(); } @@ -12331,7 +12346,7 @@ This will fail in production if not fixed.`); }); }; const handleDetails = async (item, index2, type2) => { - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:601", "item :>> ", item); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:607", "item :>> ", item); if (details.listcheckindex == index2) { details.listcheckindex = -1; } else { @@ -12345,8 +12360,8 @@ This will fail in production if not fixed.`); if (res.code !== 200) return; item.distributionAppParcelListVOS = res.data; - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:616", "item.distributionAppParcelListVOS :>> ", item.distributionAppParcelListVOS); - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:617", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:622", "item.distributionAppParcelListVOS :>> ", item.distributionAppParcelListVOS); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:623", "res :>> ", res); } catch (e2) { } finally { uni.hideLoading(); @@ -12358,13 +12373,13 @@ This will fail in production if not fixed.`); uni.showLoading({ mask: true }); - formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:633", "_item :>> ", _item); + formatAppLog("log", "at pagesHome/pages/StowageListDetails/StowageListDetails.vue:639", "_item :>> ", _item); const submitData = { orderCode: _item.orderCode, - carsLoadScanId: _item.id + carsLoadScanIds: _item.id }; if (type2 === 1) - submitData.carsLoadScanId = _item.loadScanId; + submitData.carsLoadScanIds = _item.loadScanId; const res = await postRemoveCarsLoadScan(submitData); if (res.code !== 200) return; @@ -13022,8 +13037,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStowageListDetailsStowageListDetails = /* @__PURE__ */ _export_sfc(_sfc_main$28, [["__scopeId", "data-v-66cbfd20"], ["__file", "D:/worksp/logpm/pagesHome/pages/StowageListDetails/StowageListDetails.vue"]]); - const _sfc_main$27 = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesStowageListDetailsStowageListDetails = /* @__PURE__ */ _export_sfc(_sfc_main$29, [["__scopeId", "data-v-66cbfd20"], ["__file", "D:/worksp/logpm/pagesHome/pages/StowageListDetails/StowageListDetails.vue"]]); + const _sfc_main$28 = /* @__PURE__ */ vue.defineComponent({ __name: "RelayScanList", setup(__props) { const option = { @@ -13402,8 +13417,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesRelayScanListRelayScanList = /* @__PURE__ */ _export_sfc(_sfc_main$27, [["__scopeId", "data-v-1bf48947"], ["__file", "D:/worksp/logpm/pagesHome/pages/RelayScanList/RelayScanList.vue"]]); - const _sfc_main$26 = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesRelayScanListRelayScanList = /* @__PURE__ */ _export_sfc(_sfc_main$28, [["__scopeId", "data-v-1bf48947"], ["__file", "D:/worksp/logpm/pagesHome/pages/RelayScanList/RelayScanList.vue"]]); + const _sfc_main$27 = /* @__PURE__ */ vue.defineComponent({ __name: "codePlateBracket", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -13782,8 +13797,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesCodePlateBracketCodePlateBracket = /* @__PURE__ */ _export_sfc(_sfc_main$26, [["__scopeId", "data-v-dd2e73fd"], ["__file", "D:/worksp/logpm/pagesHome/pages/codePlateBracket/codePlateBracket.vue"]]); - const _sfc_main$25 = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesCodePlateBracketCodePlateBracket = /* @__PURE__ */ _export_sfc(_sfc_main$27, [["__scopeId", "data-v-dd2e73fd"], ["__file", "D:/worksp/logpm/pagesHome/pages/codePlateBracket/codePlateBracket.vue"]]); + const _sfc_main$26 = /* @__PURE__ */ vue.defineComponent({ __name: "billsList", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -14017,8 +14032,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesBillsListBillsList = /* @__PURE__ */ _export_sfc(_sfc_main$25, [["__scopeId", "data-v-00dc6bff"], ["__file", "D:/worksp/logpm/pagesHome/pages/billsList/billsList.vue"]]); - const props$i = { + const PagesHomePagesBillsListBillsList = /* @__PURE__ */ _export_sfc(_sfc_main$26, [["__scopeId", "data-v-00dc6bff"], ["__file", "D:/worksp/logpm/pagesHome/pages/billsList/billsList.vue"]]); + const props$j = { props: { color: { type: String, @@ -14051,9 +14066,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$24 = { + const _sfc_main$25 = { name: "u-line", - mixins: [mpMixin$1, mixin$1, props$i], + mixins: [mpMixin$1, mixin$1, props$j], computed: { lineStyle() { const style = {}; @@ -14076,7 +14091,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$G(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$H(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createElementBlock( "view", { @@ -14088,8 +14103,8 @@ This will fail in production if not fixed.`); /* STYLE */ ); } - const __easycom_0$4 = /* @__PURE__ */ _export_sfc(_sfc_main$24, [["render", _sfc_render$G], ["__scopeId", "data-v-72791e59"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-line/u-line.vue"]]); - const props$h = { + const __easycom_0$4 = /* @__PURE__ */ _export_sfc(_sfc_main$25, [["render", _sfc_render$H], ["__scopeId", "data-v-72791e59"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-line/u-line.vue"]]); + const props$i = { props: { // 是否虚线 dashed: { @@ -14133,9 +14148,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$23 = { + const _sfc_main$24 = { name: "u-divider", - mixins: [mpMixin$1, mixin$1, props$h], + mixins: [mpMixin$1, mixin$1, props$i], computed: { textStyle() { const style = {}; @@ -14171,7 +14186,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$F(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$G(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_line = resolveEasycom(vue.resolveDynamicComponent("u-line"), __easycom_0$4); return vue.openBlock(), vue.createElementBlock( "view", @@ -14212,8 +14227,8 @@ This will fail in production if not fixed.`); /* STYLE */ ); } - const __easycom_0$3 = /* @__PURE__ */ _export_sfc(_sfc_main$23, [["render", _sfc_render$F], ["__scopeId", "data-v-ea022cee"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-divider/u-divider.vue"]]); - const _sfc_main$22 = /* @__PURE__ */ vue.defineComponent({ + const __easycom_0$3 = /* @__PURE__ */ _export_sfc(_sfc_main$24, [["render", _sfc_render$G], ["__scopeId", "data-v-ea022cee"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-divider/u-divider.vue"]]); + const _sfc_main$23 = /* @__PURE__ */ vue.defineComponent({ __name: "PickUpLotList", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -14568,8 +14583,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesPickUpLotListPickUpLotList = /* @__PURE__ */ _export_sfc(_sfc_main$22, [["__scopeId", "data-v-b098e5be"], ["__file", "D:/worksp/logpm/pagesHome/pages/PickUpLotList/PickUpLotList.vue"]]); - const _sfc_main$21 = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesPickUpLotListPickUpLotList = /* @__PURE__ */ _export_sfc(_sfc_main$23, [["__scopeId", "data-v-b098e5be"], ["__file", "D:/worksp/logpm/pagesHome/pages/PickUpLotList/PickUpLotList.vue"]]); + const _sfc_main$22 = /* @__PURE__ */ vue.defineComponent({ __name: "TranNumber", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -14873,8 +14888,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesTranNumberTranNumber = /* @__PURE__ */ _export_sfc(_sfc_main$21, [["__scopeId", "data-v-c2822baf"], ["__file", "D:/worksp/logpm/pagesHome/pages/TranNumber/TranNumber.vue"]]); - const _sfc_main$20 = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesTranNumberTranNumber = /* @__PURE__ */ _export_sfc(_sfc_main$22, [["__scopeId", "data-v-c2822baf"], ["__file", "D:/worksp/logpm/pagesHome/pages/TranNumber/TranNumber.vue"]]); + const _sfc_main$21 = /* @__PURE__ */ vue.defineComponent({ __name: "onLoadByScan", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -15329,9 +15344,9 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOnLoadByScanOnLoadByScan = /* @__PURE__ */ _export_sfc(_sfc_main$20, [["__scopeId", "data-v-370bddc9"], ["__file", "D:/worksp/logpm/pagesHome/pages/onLoadByScan/onLoadByScan.vue"]]); + const PagesHomePagesOnLoadByScanOnLoadByScan = /* @__PURE__ */ _export_sfc(_sfc_main$21, [["__scopeId", "data-v-370bddc9"], ["__file", "D:/worksp/logpm/pagesHome/pages/onLoadByScan/onLoadByScan.vue"]]); const _imports_0$4 = "/pagesHome/static/bgby.png"; - const _sfc_main$1$ = /* @__PURE__ */ vue.defineComponent({ + const _sfc_main$20 = /* @__PURE__ */ vue.defineComponent({ __name: "onLoadOrderDetails", setup(__props) { const option = vue.reactive({ @@ -15637,8 +15652,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesOnLoadOrderDetailsOnLoadOrderDetails = /* @__PURE__ */ _export_sfc(_sfc_main$1$, [["__scopeId", "data-v-edfe597a"], ["__file", "D:/worksp/logpm/pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue"]]); - const _sfc_main$1_ = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesOnLoadOrderDetailsOnLoadOrderDetails = /* @__PURE__ */ _export_sfc(_sfc_main$20, [["__scopeId", "data-v-edfe597a"], ["__file", "D:/worksp/logpm/pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue"]]); + const _sfc_main$1$ = /* @__PURE__ */ vue.defineComponent({ __name: "ArrivalList", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -16080,8 +16095,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesArrivalListArrivalList = /* @__PURE__ */ _export_sfc(_sfc_main$1_, [["__scopeId", "data-v-1bee7dd1"], ["__file", "D:/worksp/logpm/pagesHome/pages/ArrivalList/ArrivalList.vue"]]); - const _sfc_main$1Z = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesArrivalListArrivalList = /* @__PURE__ */ _export_sfc(_sfc_main$1$, [["__scopeId", "data-v-1bee7dd1"], ["__file", "D:/worksp/logpm/pagesHome/pages/ArrivalList/ArrivalList.vue"]]); + const _sfc_main$1_ = /* @__PURE__ */ vue.defineComponent({ __name: "VehicleArrivalDetails", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -16239,7 +16254,8 @@ This will fail in production if not fixed.`); try { const submitData = { orderPackageCode: _scanCode, - loadId: details.loadId + loadId: details.loadId, + incomingType: "6" }; let res = {}; if (details.page === "ArrivalList") @@ -16251,7 +16267,7 @@ This will fail in production if not fixed.`); basicContainer.value.startPullDownRefresh(); return res; } catch (err) { - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:563", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:564", "err :>> ", err); } }; const scanOrder = async () => { @@ -16280,11 +16296,7 @@ This will fail in production if not fixed.`); break; } if (returnContent) { - utils.ttsspke(returnContent); - uni.showToast({ - title: returnContent, - icon: "none" - }); + utils.handleToast(returnContent); return; } if (!isHave) { @@ -16296,7 +16308,8 @@ This will fail in production if not fixed.`); try { const submitData = { orderPackageCode: _scanCode, - loadId: details.loadId + loadId: details.loadId, + incomingType: "6" }; let res = {}; if (details.page === "ArrivalList") @@ -16309,7 +16322,7 @@ This will fail in production if not fixed.`); OrderStowage.value.details.showPopUp = false; basicContainer.value.startPullDownRefresh(); } catch (err) { - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:640", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:636", "err :>> ", err); } } }); @@ -16343,7 +16356,8 @@ This will fail in production if not fixed.`); const scanTray = async () => { const submitData = { trayCode: details.scancode, - loadId: details.loadId + loadId: details.loadId, + incomingType: "8" }; const res = await postFindUnloadTrayGoodsList(submitData); const { code: code2, data } = res; @@ -16384,7 +16398,7 @@ This will fail in production if not fixed.`); }); }; function scandata() { - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:732", "deta :>> ", details.pageType); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:729", "deta :>> ", details.pageType); if (Number(details.pageType) === 1) scanOrder(); else if (Number(details.pageType) === 2) @@ -16397,13 +16411,14 @@ This will fail in production if not fixed.`); title: "零担卸车", showPopUp: true, async success() { - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:748", "details.zeroInfo :>> ", details.zeroInfo); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:745", "details.zeroInfo :>> ", details.zeroInfo); const submitData = { loadId: details.loadId, waybillNo: details.zeroInfo.waybillNo, orderCode: details.zeroInfo.orderCode, productName: details.zeroInfo.orderPackageCode, - enterNum: details.zeroInfo.unloadNum + enterNum: details.zeroInfo.unloadNum, + incomingType: "7" }; let res = {}; if (details.page === "ArrivalList") @@ -17130,8 +17145,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesVehicleArrivalDetailsVehicleArrivalDetails = /* @__PURE__ */ _export_sfc(_sfc_main$1Z, [["__scopeId", "data-v-846c29fb"], ["__file", "D:/worksp/logpm/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue"]]); - const _sfc_main$1Y = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesVehicleArrivalDetailsVehicleArrivalDetails = /* @__PURE__ */ _export_sfc(_sfc_main$1_, [["__scopeId", "data-v-846c29fb"], ["__file", "D:/worksp/logpm/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue"]]); + const _sfc_main$1Z = /* @__PURE__ */ vue.defineComponent({ __name: "VehicleArrivalDetailsByTray", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -17190,9 +17205,9 @@ This will fail in production if not fixed.`); { type: 10, name: "服务号", src: "/pagesHome/static/scicon1.png" }, { type: 20, name: "订单自编码", src: "/pagesHome/static/scicon2.png" }, { type: 30, name: "商场", src: "/pagesHome/static/scicon3.png" }, - { type: 40, name: "客户", src: "/pagesHome/static/scicon4.png" }, - { type: 50, name: "仓库", src: "/pagesHome/static/scicon5.png" }, - { type: 60, name: "门店", src: "/pagesHome/static/scicon6.png" }, + { type: 50, name: "客户", src: "/pagesHome/static/scicon4.png" }, + { type: 60, name: "仓库", src: "/pagesHome/static/scicon5.png" }, + { type: 40, name: "门店", src: "/pagesHome/static/scicon6.png" }, { type: 100, name: "其他", src: "/pagesHome/static/scicon7.png" } ], /** 是否显示打托方式 */ @@ -17276,11 +17291,12 @@ This will fail in production if not fixed.`); trayType: details.trayInfo.trayType, isZero: 0, orderPackageCode: details.scancode, - enterNum: 1 + enterNum: 1, + incomingType: "9" }; const res = await postUnloadTrayAllOne(submitData); const { code: code2, data, msg } = res; - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:501", "msg :>> ", msg); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:502", "msg :>> ", msg); if (code2 !== 200) { if (msg) utils.handleToast(msg); @@ -17304,6 +17320,16 @@ This will fail in production if not fixed.`); return res; if (data.isHasData === 0) { details.trayInfo.trayCode = details.scancode; + for (let i2 = 0; i2 < details.scansortingType.length; i2++) { + const value = details.scansortingType[i2]; + for (let index2 = 0; index2 < data.data.length; index2++) { + const item = data.data[index2]; + if (item.dictValue === value.name) { + value.type = item.dictKey; + break; + } + } + } return details.isShowType = true; } else { details.info = data.data; @@ -17316,13 +17342,13 @@ This will fail in production if not fixed.`); _content = `${data.data.orderlNum}件, ${_item.dataCode}齐套`; else _content = data.data.orderlNum + "件"; - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:546", "_content :>> ", _content); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:561", "_content :>> ", _content); utils.handleToast(_content); details.orderCode = ""; } } } catch (err) { - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:556", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:571", "err :>> ", err); } finally { uni.hideLoading(); } @@ -17362,7 +17388,7 @@ This will fail in production if not fixed.`); let res = await warehouseTrayTypedeleteOrderCode(data); if (res.code !== 200) return; - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:607", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:622", "res :>> ", res); basicContainer.value.startPullDownRefresh(); tip.value.setisshow(false); }, @@ -17422,9 +17448,9 @@ This will fail in production if not fixed.`); }; const handleShowPalletize = (item) => { details.zeroForm = item; - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:676", "item.num :>> ", item.num); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:691", "item.num :>> ", item.num); details.zeroForm.unLoadNum = item.num; - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:678", "details.zeroForm :>> ", details.zeroForm); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:693", "details.zeroForm :>> ", details.zeroForm); ZeroPalletizeList.value.setDetails({ title: "零担打托", showPopUp: true, @@ -17438,11 +17464,12 @@ This will fail in production if not fixed.`); isZero: 1, waybillNo: details.zeroForm.waybillNo, orderCode: details.zeroForm.orderCode, - enterNum: details.zeroForm.unLoadNum + enterNum: details.zeroForm.unLoadNum, + incomingType: "9" }; const res = await postUnloadTrayAllOne(submitData); const { code: code2, data, msg } = res; - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:699", "msg :>> ", msg); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:715", "msg :>> ", msg); if (code2 !== 200) { if (msg) utils.handleToast(msg); @@ -17451,7 +17478,7 @@ This will fail in production if not fixed.`); details.orderCode = data.orders; basicContainer.value.startPullDownRefresh(); } catch (err) { - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:710", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:726", "err :>> ", err); } finally { ZeroPalletizeList.value.details.showPopUp = false; } @@ -17465,7 +17492,7 @@ This will fail in production if not fixed.`); let response2 = await warehouseTrayTypegetZeroOrderByWaybillCode(data); if (response2.code !== 200) return; - formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:727", response2); + formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue:743", response2); details.zeroStorageList = response2.data; for (let iterator of details.zeroStorageList) { iterator.number = 0; @@ -18200,7 +18227,7 @@ This will fail in production if not fixed.`); /* NEED_PATCH */ ), vue.createCommentVNode(" 选择打托方式 "), - vue.unref(details).isShowType ? (vue.openBlock(), vue.createElementBlock("scroll-view", { + vue.unref(details).isShowType ? (vue.openBlock(), vue.createElementBlock("view", { key: 0, class: "chooseTray-container", "scroll-y": "true" @@ -18240,8 +18267,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesVehicleArrivalDetailsByTrayVehicleArrivalDetailsByTray = /* @__PURE__ */ _export_sfc(_sfc_main$1Y, [["__scopeId", "data-v-33d3e9a1"], ["__file", "D:/worksp/logpm/pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue"]]); - const _sfc_main$1X = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesVehicleArrivalDetailsByTrayVehicleArrivalDetailsByTray = /* @__PURE__ */ _export_sfc(_sfc_main$1Z, [["__scopeId", "data-v-33d3e9a1"], ["__file", "D:/worksp/logpm/pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.vue"]]); + const _sfc_main$1Y = /* @__PURE__ */ vue.defineComponent({ __name: "SelfPickupScan", setup(__props) { const option = { @@ -18776,8 +18803,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$1X, [["__scopeId", "data-v-62fd4582"], ["__file", "D:/worksp/logpm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]); - const _sfc_main$1W = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesSelfPickupScanSelfPickupScan = /* @__PURE__ */ _export_sfc(_sfc_main$1Y, [["__scopeId", "data-v-62fd4582"], ["__file", "D:/worksp/logpm/pagesHome/pages/SelfPickupScan/SelfPickupScan.vue"]]); + const _sfc_main$1X = /* @__PURE__ */ vue.defineComponent({ __name: "LoadingScan", setup(__props) { const tip = vue.ref(null); @@ -19491,8 +19518,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1W, [["__file", "D:/worksp/logpm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]); - const props$g = { + const PagesHomePagesLoadingScanLoadingScan = /* @__PURE__ */ _export_sfc(_sfc_main$1X, [["__file", "D:/worksp/logpm/pagesHome/pages/LoadingScan/LoadingScan.vue"]]); + const props$h = { props: { // 搜索框形状，round-圆形，square-方形 shape: { @@ -19614,9 +19641,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1V = { + const _sfc_main$1W = { name: "u-search", - mixins: [mpMixin$1, mixin$1, props$g], + mixins: [mpMixin$1, mixin$1, props$h], data() { return { keyword: "", @@ -19702,7 +19729,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$E(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$F(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); return vue.openBlock(), vue.createElementBlock( "view", @@ -19796,8 +19823,8 @@ This will fail in production if not fixed.`); /* STYLE */ ); } - const __easycom_9$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1V, [["render", _sfc_render$E], ["__scopeId", "data-v-e082a34a"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-search/u-search.vue"]]); - const props$f = { + const __easycom_9$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1W, [["render", _sfc_render$F], ["__scopeId", "data-v-e082a34a"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-search/u-search.vue"]]); + const props$g = { props: { // 步进器标识符，在change回调返回 name: { @@ -19906,9 +19933,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1U = { + const _sfc_main$1V = { name: "u-number-box", - mixins: [mpMixin$1, mixin$1, props$f], + mixins: [mpMixin$1, mixin$1, props$g], data() { return { // 输入框实际操作的值 @@ -20119,7 +20146,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$D(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$E(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); return vue.openBlock(), vue.createElementBlock("view", { class: "u-number-box" }, [ _ctx.showMinus && _ctx.$slots.minus ? (vue.openBlock(), vue.createElementBlock( @@ -20215,8 +20242,8 @@ This will fail in production if not fixed.`); )) : vue.createCommentVNode("v-if", true) ]); } - const __easycom_2$3 = /* @__PURE__ */ _export_sfc(_sfc_main$1U, [["render", _sfc_render$D], ["__scopeId", "data-v-eb6f6237"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-number-box/u-number-box.vue"]]); - const props$e = { + const __easycom_2$3 = /* @__PURE__ */ _export_sfc(_sfc_main$1V, [["render", _sfc_render$E], ["__scopeId", "data-v-eb6f6237"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-number-box/u-number-box.vue"]]); + const props$f = { props: { // 是否显示组件 show: { @@ -20275,9 +20302,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1T = { + const _sfc_main$1U = { name: "u-loading-icon", - mixins: [mpMixin$1, mixin$1, props$e], + mixins: [mpMixin$1, mixin$1, props$f], data() { return { // Array.form可以通过一个伪数组对象创建指定长度的数组 @@ -20335,7 +20362,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$C(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$D(_ctx, _cache, $props, $setup, $data, $options) { return _ctx.show ? (vue.openBlock(), vue.createElementBlock( "view", { @@ -20398,8 +20425,8 @@ This will fail in production if not fixed.`); /* CLASS, STYLE */ )) : vue.createCommentVNode("v-if", true); } - const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1T, [["render", _sfc_render$C], ["__scopeId", "data-v-2af81691"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue"]]); - const props$d = { + const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1U, [["render", _sfc_render$D], ["__scopeId", "data-v-2af81691"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue"]]); + const props$e = { props: { // 是否展示组件 show: { @@ -20478,7 +20505,7 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1S = { + const _sfc_main$1T = { name: "u-transition", data() { return { @@ -20510,7 +20537,7 @@ This will fail in production if not fixed.`); } }, // 将mixin挂在到组件中，uni.$u.mixin实际上为一个vue格式对象 - mixins: [mpMixin$1, mixin$1, transition, props$d], + mixins: [mpMixin$1, mixin$1, transition, props$e], watch: { show: { handler(newVal) { @@ -20521,7 +20548,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$B(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$C(_ctx, _cache, $props, $setup, $data, $options) { return $data.inited ? (vue.openBlock(), vue.createElementBlock( "view", { @@ -20539,8 +20566,8 @@ This will fail in production if not fixed.`); /* CLASS, STYLE, NEED_HYDRATION */ )) : vue.createCommentVNode("v-if", true); } - const __easycom_4$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1S, [["render", _sfc_render$B], ["__scopeId", "data-v-5cec8177"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-transition/u-transition.vue"]]); - const props$c = { + const __easycom_4$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1T, [["render", _sfc_render$C], ["__scopeId", "data-v-5cec8177"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-transition/u-transition.vue"]]); + const props$d = { props: { // 是否显示遮罩 show: { @@ -20564,9 +20591,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1R = { + const _sfc_main$1S = { name: "u-overlay", - mixins: [mpMixin$1, mixin$1, props$c], + mixins: [mpMixin$1, mixin$1, props$d], computed: { overlayStyle() { const style = { @@ -20587,7 +20614,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$B(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_transition = resolveEasycom(vue.resolveDynamicComponent("u-transition"), __easycom_4$2); return vue.openBlock(), vue.createBlock(_component_u_transition, { show: _ctx.show, @@ -20603,8 +20630,8 @@ This will fail in production if not fixed.`); /* FORWARDED */ }, 8, ["show", "duration", "custom-style", "onClick"]); } - const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1R, [["render", _sfc_render$A], ["__scopeId", "data-v-9112bed9"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-overlay/u-overlay.vue"]]); - const props$b = { + const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1S, [["render", _sfc_render$B], ["__scopeId", "data-v-9112bed9"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-overlay/u-overlay.vue"]]); + const props$c = { props: { // 是否细边框 hairline: { @@ -20756,9 +20783,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1Q = { + const _sfc_main$1R = { name: "u-button", - mixins: [mpMixin$1, mixin$1, props$b], + mixins: [mpMixin$1, mixin$1, props$c], data() { return {}; }, @@ -20880,8 +20907,8 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$z(_ctx, _cache, $props, $setup, $data, $options) { - const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$1); + function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) { + const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$2); const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); return vue.openBlock(), vue.createElementBlock("button", { "hover-start-time": Number(_ctx.hoverStartTime), @@ -20958,8 +20985,8 @@ This will fail in production if not fixed.`); )) ], 46, ["hover-start-time", "hover-stay-time", "form-type", "open-type", "app-parameter", "hover-stop-propagation", "send-message-title", "send-message-path", "lang", "data-name", "session-from", "send-message-img", "show-message-card", "hover-class"]); } - const __easycom_4$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1Q, [["render", _sfc_render$z], ["__scopeId", "data-v-5ce41ee6"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-button/u-button.vue"]]); - const props$a = { + const __easycom_4$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1R, [["render", _sfc_render$A], ["__scopeId", "data-v-5ce41ee6"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-button/u-button.vue"]]); + const props$b = { props: { // 内置图标名称，或图片路径，建议绝对路径 icon: { @@ -21018,9 +21045,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1P = { + const _sfc_main$1Q = { name: "u-empty", - mixins: [mpMixin$1, mixin$1, props$a], + mixins: [mpMixin$1, mixin$1, props$b], data() { return { icons: { @@ -21062,7 +21089,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$y(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$z(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); return _ctx.show ? (vue.openBlock(), vue.createElementBlock( "view", @@ -21108,8 +21135,8 @@ This will fail in production if not fixed.`); /* STYLE */ )) : vue.createCommentVNode("v-if", true); } - const __easycom_7$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1P, [["render", _sfc_render$y], ["__scopeId", "data-v-8dd5928e"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-empty/u-empty.vue"]]); - const props$9 = { + const __easycom_7$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1Q, [["render", _sfc_render$z], ["__scopeId", "data-v-8dd5928e"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-empty/u-empty.vue"]]); + const props$a = { props: { // 标题 title: { @@ -21219,12 +21246,12 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1O = { + const _sfc_main$1P = { name: "u-cell", data() { return {}; }, - mixins: [mpMixin$1, mixin$1, props$9], + mixins: [mpMixin$1, mixin$1, props$a], computed: { titleTextStyle() { return uni.$u.addStyle(this.titleStyle); @@ -21244,7 +21271,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$x(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$y(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); const _component_u_line = resolveEasycom(vue.resolveDynamicComponent("u-line"), __easycom_0$4); return vue.openBlock(), vue.createElementBlock("view", { @@ -21337,8 +21364,8 @@ This will fail in production if not fixed.`); _ctx.border ? (vue.openBlock(), vue.createBlock(_component_u_line, { key: 0 })) : vue.createCommentVNode("v-if", true) ], 14, ["hover-class"]); } - const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1O, [["render", _sfc_render$x], ["__scopeId", "data-v-3fd6feca"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-cell/u-cell.vue"]]); - const props$8 = { + const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1P, [["render", _sfc_render$y], ["__scopeId", "data-v-3fd6feca"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-cell/u-cell.vue"]]); + const props$9 = { props: { // 标题 title: { @@ -21397,9 +21424,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1N = { + const _sfc_main$1O = { name: "u-collapse-item", - mixins: [mpMixin$1, mixin$1, props$8], + mixins: [mpMixin$1, mixin$1, props$9], data() { return { elId: uni.$u.guid(), @@ -21490,7 +21517,7 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$x(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_cell = resolveEasycom(vue.resolveDynamicComponent("u-cell"), __easycom_0$1); const _component_u_line = resolveEasycom(vue.resolveDynamicComponent("u-line"), __easycom_0$4); return vue.openBlock(), vue.createElementBlock("view", { class: "u-collapse-item" }, [ @@ -21537,8 +21564,8 @@ This will fail in production if not fixed.`); $data.parentData.border ? (vue.openBlock(), vue.createBlock(_component_u_line, { key: 0 })) : vue.createCommentVNode("v-if", true) ]); } - const __easycom_8$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1N, [["render", _sfc_render$w], ["__scopeId", "data-v-82f3baf9"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-collapse-item/u-collapse-item.vue"]]); - const props$7 = { + const __easycom_8$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1O, [["render", _sfc_render$x], ["__scopeId", "data-v-82f3baf9"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-collapse-item/u-collapse-item.vue"]]); + const props$8 = { props: { // 当前展开面板的name，非手风琴模式：[]，手风琴模式：string | number value: { @@ -21557,9 +21584,9 @@ This will fail in production if not fixed.`); } } }; - const _sfc_main$1M = { + const _sfc_main$1N = { name: "u-collapse", - mixins: [mpMixin$1, mixin$1, props$7], + mixins: [mpMixin$1, mixin$1, props$8], watch: { needInit() { this.init(); @@ -21615,15 +21642,15 @@ This will fail in production if not fixed.`); } } }; - function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) { + function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_line = resolveEasycom(vue.resolveDynamicComponent("u-line"), __easycom_0$4); return vue.openBlock(), vue.createElementBlock("view", { class: "u-collapse" }, [ _ctx.border ? (vue.openBlock(), vue.createBlock(_component_u_line, { key: 0 })) : vue.createCommentVNode("v-if", true), vue.renderSlot(_ctx.$slots, "default", {}, void 0, true) ]); } - const __easycom_9 = /* @__PURE__ */ _export_sfc(_sfc_main$1M, [["render", _sfc_render$v], ["__scopeId", "data-v-90f85a74"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-collapse/u-collapse.vue"]]); - const _sfc_main$1L = /* @__PURE__ */ vue.defineComponent({ + const __easycom_9 = /* @__PURE__ */ _export_sfc(_sfc_main$1N, [["render", _sfc_render$w], ["__scopeId", "data-v-90f85a74"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-collapse/u-collapse.vue"]]); + const _sfc_main$1M = /* @__PURE__ */ vue.defineComponent({ __name: "loadingRetention", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -21954,7 +21981,7 @@ This will fail in production if not fixed.`); const _component_u_navbar = resolveEasycom(vue.resolveDynamicComponent("u-navbar"), __easycom_0$5); const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_9$1); const _component_u_number_box = resolveEasycom(vue.resolveDynamicComponent("u-number-box"), __easycom_2$3); - const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$1); + const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$2); const _component_u_overlay = resolveEasycom(vue.resolveDynamicComponent("u-overlay"), __easycom_0$2); const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); const _component_u_button = resolveEasycom(vue.resolveDynamicComponent("u-button"), __easycom_4$1); @@ -22574,8 +22601,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesLoadingRetentionLoadingRetention = /* @__PURE__ */ _export_sfc(_sfc_main$1L, [["__scopeId", "data-v-0b4cf6ee"], ["__file", "D:/worksp/logpm/pagesHome/pages/loadingRetention/loadingRetention.vue"]]); - const _sfc_main$1K = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesLoadingRetentionLoadingRetention = /* @__PURE__ */ _export_sfc(_sfc_main$1M, [["__scopeId", "data-v-0b4cf6ee"], ["__file", "D:/worksp/logpm/pagesHome/pages/loadingRetention/loadingRetention.vue"]]); + const _sfc_main$1L = /* @__PURE__ */ vue.defineComponent({ __name: "StockUplist", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -23456,8 +23483,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$1K, [["__scopeId", "data-v-64d8d9ce"], ["__file", "D:/worksp/logpm/pagesHome/pages/StockUplist/StockUplist.vue"]]); - const _sfc_main$1J = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesStockUplistStockUplist = /* @__PURE__ */ _export_sfc(_sfc_main$1L, [["__scopeId", "data-v-64d8d9ce"], ["__file", "D:/worksp/logpm/pagesHome/pages/StockUplist/StockUplist.vue"]]); + const _sfc_main$1K = /* @__PURE__ */ vue.defineComponent({ __name: "StockUplistScandetails", setup(__props) { const { scanState } = storeToRefs(useSystemSettingsStore()); @@ -23869,8 +23896,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$1J, [["__file", "D:/worksp/logpm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]); - const _sfc_main$1I = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesStockUplistScandetailsStockUplistScandetails = /* @__PURE__ */ _export_sfc(_sfc_main$1K, [["__file", "D:/worksp/logpm/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue"]]); + const _sfc_main$1J = /* @__PURE__ */ vue.defineComponent({ __name: "DownScan", setup(__props) { onShow(() => { @@ -23899,8 +23926,8 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$1I, [["__file", "D:/worksp/logpm/pagesHome/pages/DownScan/DownScan.vue"]]); - const _sfc_main$1H = /* @__PURE__ */ vue.defineComponent({ + const PagesHomePagesDownScanDownScan = /* @__PURE__ */ _export_sfc(_sfc_main$1J, [["__file", "D:/worksp/logpm/pagesHome/pages/DownScan/DownScan.vue"]]); + const _sfc_main$1I = /* @__PURE__ */ vue.defineComponent({ __name: "signinScan", setup(__props) { const basicContainer = vue.ref(null); @@ -24326,7 +24353,547 @@ This will fail in production if not fixed.`); }; } }); - const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$1H, [["__file", "D:/worksp/logpm/pagesHome/pages/signinScan/signinScan.vue"]]); + const PagesHomePagesSigninScanSigninScan = /* @__PURE__ */ _export_sfc(_sfc_main$1I, [["__file", "D:/worksp/logpm/pagesHome/pages/signinScan/signinScan.vue"]]); + function pickExclude(obj, keys) { + if (!["[object Object]", "[object File]"].includes(Object.prototype.toString.call(obj))) { + return {}; + } + return Object.keys(obj).reduce((prev, key) => { + if (!keys.includes(key)) { + prev[key] = obj[key]; + } + return prev; + }, {}); + } + function formatImage(res) { + return res.tempFiles.map((item) => ({ + ...pickExclude(item, ["path"]), + type: "image", + url: item.path, + thumb: item.path, + size: item.size + })); + } + function formatVideo(res) { + return [ + { + ...pickExclude(res, ["tempFilePath", "thumbTempFilePath", "errMsg"]), + type: "video", + url: res.tempFilePath, + thumb: res.thumbTempFilePath, + size: res.size + } + ]; + } + function chooseFile({ + accept, + multiple, + capture, + compressed, + maxDuration, + sizeType, + camera, + maxCount + }) { + return new Promise((resolve, reject) => { + switch (accept) { + case "image": + uni.chooseImage({ + count: multiple ? Math.min(maxCount, 9) : 1, + sourceType: capture, + sizeType, + success: (res) => resolve(formatImage(res)), + fail: reject + }); + break; + case "video": + uni.chooseVideo({ + sourceType: capture, + compressed, + maxDuration, + camera, + success: (res) => resolve(formatVideo(res)), + fail: reject + }); + break; + } + }); + } + const mixinUp = { + watch: { + // 监听accept的变化，判断是否符合个平台要求 + // 只有微信小程序才支持选择媒体，文件类型，所以这里做一个判断提示 + accept: { + immediate: true, + handler(val) { + if (val === "all" || val === "media") { + uni.$u.error("只有微信小程序才支持把accept配置为all、media之一"); + } + if (val === "file") { + uni.$u.error("只有微信小程序和H5(HX2.9.9)才支持把accept配置为file"); + } + } + } + } + }; + const props$7 = { + props: { + // 接受的文件类型, 可选值为all media image file video + accept: { + type: String, + default: defprops.upload.accept + }, + // 图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头 + capture: { + type: [String, Array], + default: defprops.upload.capture + }, + // 当accept为video时生效，是否压缩视频，默认为true + compressed: { + type: Boolean, + default: defprops.upload.compressed + }, + // 当accept为video时生效，可选值为back或front + camera: { + type: String, + default: defprops.upload.camera + }, + // 当accept为video时生效，拍摄视频最长拍摄时间，单位秒 + maxDuration: { + type: Number, + default: defprops.upload.maxDuration + }, + // 上传区域的图标，只能内置图标 + uploadIcon: { + type: String, + default: defprops.upload.uploadIcon + }, + // 上传区域的图标的颜色，默认 + uploadIconColor: { + type: String, + default: defprops.upload.uploadIconColor + }, + // 是否开启文件读取前事件 + useBeforeRead: { + type: Boolean, + default: defprops.upload.useBeforeRead + }, + // 读取后的处理函数 + afterRead: { + type: Function, + default: null + }, + // 读取前的处理函数 + beforeRead: { + type: Function, + default: null + }, + // 是否显示组件自带的图片预览功能 + previewFullImage: { + type: Boolean, + default: defprops.upload.previewFullImage + }, + // 最大上传数量 + maxCount: { + type: [String, Number], + default: defprops.upload.maxCount + }, + // 是否启用 + disabled: { + type: Boolean, + default: defprops.upload.disabled + }, + // 预览上传的图片时的裁剪模式，和image组件mode属性一致 + imageMode: { + type: String, + default: defprops.upload.imageMode + }, + // 标识符，可以在回调函数的第二项参数中获取 + name: { + type: String, + default: defprops.upload.name + }, + // 所选的图片的尺寸, 可选值为original compressed + sizeType: { + type: Array, + default: defprops.upload.sizeType + }, + // 是否开启图片多选，部分安卓机型不支持 + multiple: { + type: Boolean, + default: defprops.upload.multiple + }, + // 是否展示删除按钮 + deletable: { + type: Boolean, + default: defprops.upload.deletable + }, + // 文件大小限制，单位为byte + maxSize: { + type: [String, Number], + default: defprops.upload.maxSize + }, + // 显示已上传的文件列表 + fileList: { + type: Array, + default: defprops.upload.fileList + }, + // 上传区域的提示文字 + uploadText: { + type: String, + default: defprops.upload.uploadText + }, + // 内部预览图片区域和选择图片按钮的区域宽度 + width: { + type: [String, Number], + default: defprops.upload.width + }, + // 内部预览图片区域和选择图片按钮的区域高度 + height: { + type: [String, Number], + default: defprops.upload.height + }, + // 是否在上传完成后展示预览图 + previewImage: { + type: Boolean, + default: defprops.upload.previewImage + } + } + }; + const _sfc_main$1H = { + name: "u-upload", + mixins: [mpMixin$1, mixin$1, mixinUp, props$7], + data() { + return { + lists: [], + isInCount: true + }; + }, + watch: { + // 监听文件列表的变化，重新整理内部数据 + fileList: { + immediate: true, + handler() { + this.formatFileList(); + }, + immediate: true, + deep: true + } + }, + emits: ["error", "beforeRead", "oversize", "afterRead", "delete", "clickPreview"], + methods: { + formatFileList() { + const { + fileList = [], + maxCount + } = this; + const lists = fileList.map( + (item) => Object.assign(Object.assign({}, item), { + // 如果item.url为本地选择的blob文件的话，无法判断其为video还是image，此处优先通过accept做判断处理 + isImage: this.accept === "image" || uni.$u.test.image(item.url || item.thumb), + isVideo: this.accept === "video" || uni.$u.test.video(item.url || item.thumb), + deletable: typeof item.deletable === "boolean" ? item.deletable : this.deletable + }) + ); + this.lists = lists; + this.isInCount = lists.length < maxCount; + }, + chooseFile() { + const { + maxCount, + multiple, + lists, + disabled + } = this; + if (disabled) + return; + let capture; + try { + capture = uni.$u.test.array(this.capture) ? this.capture : this.capture.split(","); + } catch (e2) { + capture = []; + } + chooseFile( + Object.assign({ + accept: this.accept, + multiple: this.multiple, + capture, + compressed: this.compressed, + maxDuration: this.maxDuration, + sizeType: this.sizeType, + camera: this.camera + }, { + maxCount: maxCount - lists.length + }) + ).then((res) => { + this.onBeforeRead(multiple ? res : res[0]); + }).catch((error2) => { + this.$emit("error", error2); + }); + }, + // 文件读取之前 + onBeforeRead(file2) { + const { + beforeRead, + useBeforeRead + } = this; + let res = true; + if (uni.$u.test.func(beforeRead)) { + res = beforeRead(file2, this.getDetail()); + } + if (useBeforeRead) { + res = new Promise((resolve, reject) => { + this.$emit( + "beforeRead", + Object.assign(Object.assign({ + file: file2 + }, this.getDetail()), { + callback: (ok) => { + ok ? resolve() : reject(); + } + }) + ); + }); + } + if (!res) { + return; + } + if (uni.$u.test.promise(res)) { + res.then((data) => this.onAfterRead(data || file2)); + } else { + this.onAfterRead(file2); + } + }, + getDetail(index2) { + return { + name: this.name, + index: index2 == null ? this.fileList.length : index2 + }; + }, + onAfterRead(file2) { + const { + maxSize, + afterRead + } = this; + const oversize = Array.isArray(file2) ? file2.some((item) => item.size > maxSize) : file2.size > maxSize; + if (oversize) { + this.$emit("oversize", Object.assign({ + file: file2 + }, this.getDetail())); + return; + } + if (typeof afterRead === "function") { + afterRead(file2, this.getDetail()); + } + this.$emit("afterRead", Object.assign({ + file: file2 + }, this.getDetail())); + }, + deleteItem(index2) { + this.$emit( + "delete", + Object.assign(Object.assign({}, this.getDetail(index2)), { + file: this.fileList[index2] + }) + ); + }, + // 预览图片 + onPreviewImage(item) { + if (!item.isImage || !this.previewFullImage) + return; + uni.previewImage({ + // 先filter找出为图片的item，再返回filter结果中的图片url + urls: this.lists.filter((item2) => this.accept === "image" || uni.$u.test.image(item2.url || item2.thumb)).map((item2) => item2.url || item2.thumb), + current: item.url || item.thumb, + fail() { + uni.$u.toast("预览图片失败"); + } + }); + }, + onPreviewVideo(event) { + if (!this.data.previewFullImage) + return; + const { + index: index2 + } = event.currentTarget.dataset; + const { + lists + } = this.data; + wx.previewMedia({ + sources: lists.filter((item) => isVideoFile(item)).map( + (item) => Object.assign(Object.assign({}, item), { + type: "video" + }) + ), + current: index2, + fail() { + uni.$u.toast("预览视频失败"); + } + }); + }, + onClickPreview(event) { + const { + index: index2 + } = event.currentTarget.dataset; + const item = this.data.lists[index2]; + this.$emit( + "clickPreview", + Object.assign(Object.assign({}, item), this.getDetail(index2)) + ); + } + } + }; + function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) { + const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); + const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$2); + return vue.openBlock(), vue.createElementBlock( + "view", + { + class: "u-upload", + style: vue.normalizeStyle([_ctx.$u.addStyle(_ctx.customStyle)]) + }, + [ + vue.createElementVNode("view", { class: "u-upload__wrap" }, [ + _ctx.previewImage ? (vue.openBlock(true), vue.createElementBlock( + vue.Fragment, + { key: 0 }, + vue.renderList($data.lists, (item, index2) => { + return vue.openBlock(), vue.createElementBlock("view", { + class: "u-upload__wrap__preview", + key: index2 + }, [ + item.isImage || item.type && item.type === "image" ? (vue.openBlock(), vue.createElementBlock("image", { + key: 0, + src: item.thumb || item.url, + mode: _ctx.imageMode, + class: "u-upload__wrap__preview__image", + onClick: ($event) => $options.onPreviewImage(item), + style: vue.normalizeStyle([{ + width: _ctx.$u.addUnit(_ctx.width), + height: _ctx.$u.addUnit(_ctx.height) + }]) + }, null, 12, ["src", "mode", "onClick"])) : (vue.openBlock(), vue.createElementBlock("view", { + key: 1, + class: "u-upload__wrap__preview__other" + }, [ + vue.createVNode(_component_u_icon, { + color: "#80CBF9", + size: "26", + name: item.isVideo || item.type && item.type === "video" ? "movie" : "folder" + }, null, 8, ["name"]), + vue.createElementVNode( + "text", + { class: "u-upload__wrap__preview__other__text" }, + vue.toDisplayString(item.isVideo || item.type && item.type === "video" ? "视频" : "文件"), + 1 + /* TEXT */ + ) + ])), + item.status === "uploading" || item.status === "failed" ? (vue.openBlock(), vue.createElementBlock("view", { + key: 2, + class: "u-upload__status" + }, [ + vue.createElementVNode("view", { class: "u-upload__status__icon" }, [ + item.status === "failed" ? (vue.openBlock(), vue.createBlock(_component_u_icon, { + key: 0, + name: "close-circle", + color: "#ffffff", + size: "25" + })) : (vue.openBlock(), vue.createBlock(_component_u_loading_icon, { + key: 1, + size: "22", + mode: "circle", + color: "#ffffff" + })) + ]), + item.message ? (vue.openBlock(), vue.createElementBlock( + "text", + { + key: 0, + class: "u-upload__status__message" + }, + vue.toDisplayString(item.message), + 1 + /* TEXT */ + )) : vue.createCommentVNode("v-if", true) + ])) : vue.createCommentVNode("v-if", true), + item.status !== "uploading" && (_ctx.deletable || item.deletable) ? (vue.openBlock(), vue.createElementBlock("view", { + key: 3, + class: "u-upload__deletable", + onClick: vue.withModifiers(($event) => $options.deleteItem(index2), ["stop"]) + }, [ + vue.createElementVNode("view", { class: "u-upload__deletable__icon" }, [ + vue.createVNode(_component_u_icon, { + name: "close", + color: "#ffffff", + size: "10" + }) + ]) + ], 8, ["onClick"])) : vue.createCommentVNode("v-if", true), + item.status === "success" ? (vue.openBlock(), vue.createElementBlock("view", { + key: 4, + class: "u-upload__success" + }, [ + vue.createElementVNode("view", { class: "u-upload__success__icon" }, [ + vue.createVNode(_component_u_icon, { + name: "checkmark", + color: "#ffffff", + size: "12" + }) + ]) + ])) : vue.createCommentVNode("v-if", true) + ]); + }), + 128 + /* KEYED_FRAGMENT */ + )) : vue.createCommentVNode("v-if", true), + $data.isInCount ? (vue.openBlock(), vue.createElementBlock( + vue.Fragment, + { key: 1 }, + [ + _ctx.$slots.default || _ctx.$slots.$default ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, + onClick: _cache[0] || (_cache[0] = (...args) => $options.chooseFile && $options.chooseFile(...args)) + }, [ + vue.renderSlot(_ctx.$slots, "default", {}, void 0, true) + ])) : (vue.openBlock(), vue.createElementBlock("view", { + key: 1, + class: vue.normalizeClass(["u-upload__button", [_ctx.disabled && "u-upload__button--disabled"]]), + "hover-class": !_ctx.disabled ? "u-upload__button--hover" : "", + "hover-stay-time": "150", + onClick: _cache[1] || (_cache[1] = (...args) => $options.chooseFile && $options.chooseFile(...args)), + style: vue.normalizeStyle([{ + width: _ctx.$u.addUnit(_ctx.width), + height: _ctx.$u.addUnit(_ctx.height) + }]) + }, [ + vue.createVNode(_component_u_icon, { + name: _ctx.uploadIcon, + size: "26", + color: _ctx.uploadIconColor + }, null, 8, ["name", "color"]), + _ctx.uploadText ? (vue.openBlock(), vue.createElementBlock( + "text", + { + key: 0, + class: "u-upload__button__text" + }, + vue.toDisplayString(_ctx.uploadText), + 1 + /* TEXT */ + )) : vue.createCommentVNode("v-if", true) + ], 14, ["hover-class"])) + ], + 64 + /* STABLE_FRAGMENT */ + )) : vue.createCommentVNode("v-if", true) + ]) + ], + 4 + /* STYLE */ + ); + } + const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1H, [["render", _sfc_render$v], ["__scopeId", "data-v-c8491d64"], ["__file", "D:/worksp/logpm/uni_modules/uview-plus/components/u-upload/u-upload.vue"]]); const _sfc_main$1G = /* @__PURE__ */ vue.defineComponent({ __name: "directGoMarket", setup(__props) { @@ -24334,6 +24901,7 @@ This will fail in production if not fixed.`); const tiplists = vue.ref(null); const date2 = vue.ref([]); const basicContainer = vue.ref(null); + const UploadImg = vue.ref(); const option = { title: "直发商家未签收列表", haveData: true, @@ -24352,7 +24920,8 @@ This will fail in production if not fixed.`); total: 0, /** 滚动区高度 */ scrollHeight: "80vh", - tabBarCode: 10 + tabBarCode: 10, + imgFileList: [] }); onShow(async () => { uni.$off("scancodedate"); @@ -24389,31 +24958,38 @@ This will fail in production if not fixed.`); } }); function onConfirm(e2) { - formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:181", e2); + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:193", e2); date2.value[0] = e2.startDate; date2.value[1] = e2.endDate; details.datatime = date2.value[0] + " 至 " + date2.value[1]; basicContainer.value.startPullDownRefresh(); } onLoad(() => { - date2.value[0] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd"); + date2.value[0] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 7, "yyyy-mm-dd"); date2.value[1] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd"); details.current = 1; }); + function showtime(value) { + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:206", value); + details.show = value; + } async function initpage() { try { - const _code = details.tabBarCode; + if (date2.value.length === 0) { + utils.handleToast("请选择签收时间"); + details.recordsList = []; + return; + } let submitData = { pageNum: details.current, pageSize: details.size, - taskTime_start: date2.value[0] || "", - taskTime_end: date2.value[1] || "", + enterTimeStartStr: date2.value[0] || "", + enterTimeEndStr: date2.value[1] || "", // 签收状态 signStatus: details.tabBarCode }; let response2 = await postFinaSignOrderList(submitData); const { code: code2, data } = response2; - formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:214", response2); if (code2 !== 200 && code2 !== details.tabBarCode) return; if (details.current == 1) { @@ -24440,13 +25016,13 @@ This will fail in production if not fixed.`); option.isEnd = false; return null; } catch (err) { - formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:243", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:258", "err :>> ", err); } finally { return null; } } function handleTabBarCode(code2) { - formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:253", "details :>> ", details); + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:268", "details :>> ", details); details.tabBarCode = code2; basicContainer.value.startPullDownRefresh(); } @@ -24455,9 +25031,91 @@ This will fail in production if not fixed.`); url: "/pagesHome/pages/directGoMarketDetails/directGoMarketDetails?id=" + item.id }); } + function cleartime() { + details.datatime = ""; + date2.value = []; + basicContainer.value.startPullDownRefresh(); + } + const handleShowImg = async (item) => { + details.imgFileList = []; + if (item.signPhotoList && item.signPhotoList.length > 0) { + for (let i2 = 0; i2 < item.signPhotoList.length; i2++) { + const { photoUrl, id } = item.signPhotoList[i2]; + photoUrl && details.imgFileList.push({ url: photoUrl, id }); + } + } + UploadImg.value.setDetails({ + title: "上传图片", + showPopUp: true, + async success() { + if (details.imgFileList.length === 0) + return uni.showToast({ + icon: "none", + title: "请上传图片再提交" + }); + const submitData = { + signOrderId: item.id, + signPhotoList: [] + }; + for (let i2 = 0; i2 < details.imgFileList.length; i2++) { + const value = details.imgFileList[i2]; + submitData.signPhotoList.push({ + signOrderId: item.id, + photoType: 1, + photoUrl: value.url + }); + } + const res = await postUploadSignPhoto(submitData); + const { code: code2 } = res; + if (code2 !== 200) + return; + UploadImg.value.details.showPopUp = false; + basicContainer.value.startPullDownRefresh(); + } + }); + }; + const handleUploadImg = async (event) => { + try { + uni.showLoading({ + title: "上传中", + mask: true + }); + const writeArr = ["jpg", "jpeg", "png"]; + const PromiseAll = []; + for (let i2 = 0; i2 < event.file.length; i2++) { + const item = event.file[i2]; + const type2 = item.name.split(".").slice(-1)[0]; + if (writeArr.indexOf(type2) === -1) + continue; + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:360", "type :>> ", type2); + PromiseAll.push(api.upfile(item.url)); + } + const res = await Promise.all(PromiseAll); + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:368", "res :>> ", res); + for (let i2 = 0; i2 < res.length; i2++) { + const response2 = res[i2]; + const { link } = response2; + if (!link) + continue; + details.imgFileList.push({ url: link }); + } + } catch (err) { + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:380", "err :>> ", err); + } finally { + uni.hideLoading(); + } + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:386", "event :>> ", event); + }; + const deletePic = (event) => { + formatAppLog("log", "at pagesHome/pages/directGoMarket/directGoMarket.vue:392", "event :>> ", event); + details.imgFileList.splice(event.index, 1); + }; const { datatime, recordsList, show } = vue.toRefs(details); return (_ctx, _cache) => { + const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); const _component_BasicContainer = vue.resolveComponent("BasicContainer"); + const _component_u_upload = resolveEasycom(vue.resolveDynamicComponent("u-upload"), __easycom_1$1); + const _component_PopUp = vue.resolveComponent("PopUp"); const _component_l_calendar = resolveEasycom(vue.resolveDynamicComponent("l-calendar"), __easycom_6$2); const _component_tiplist = vue.resolveComponent("tiplist"); const _component_tips = vue.resolveComponent("tips"); @@ -24497,23 +25155,42 @@ This will fail in production if not fixed.`); /* CLASS */ ) ]), - vue.createCommentVNode(` \r - 配车日期：\r - \r - \r - {{datatime|| '请选择时间'}}\r - \r - \r - \r - \r - \r - \r - \r - 查询\r - \r - `) + vue.createElementVNode("view", { class: "schbox" }, [ + vue.createElementVNode("view", null, "配车日期："), + vue.createElementVNode("view", { + onClick: _cache[4] || (_cache[4] = ($event) => showtime(true)), + class: "inputsr" + }, [ + vue.createElementVNode( + "view", + { class: "timeInput" }, + vue.toDisplayString(vue.unref(datatime) || "请选择时间"), + 1 + /* TEXT */ + ), + vue.createElementVNode("view", { + onClick: _cache[3] || (_cache[3] = vue.withModifiers(() => { + }, ["stop", "prevent"])) + }, [ + !vue.unref(datatime) ? (vue.openBlock(), vue.createBlock(_component_u_icon, { + key: 0, + onClick: _cache[2] || (_cache[2] = ($event) => showtime(true)), + style: { "margin-right": "10rpx" }, + name: "calendar", + color: "#999999", + size: "50" + })) : (vue.openBlock(), vue.createBlock(_component_u_icon, { + key: 1, + onClick: cleartime, + style: { "margin-right": "10rpx" }, + name: "close-circle", + color: "#999999", + size: "40" + })) + ]) + ]), + vue.createElementVNode("view", { onClick: init }, " 查询 ") + ]) ]), body: vue.withCtx(() => [ vue.createElementVNode( @@ -24634,7 +25311,11 @@ This will fail in production if not fixed.`); vue.createElementVNode("view", { class: "buts" }, [ vue.createElementVNode("view", { onClick: ($event) => goselscan(item) - }, "签收", 8, ["onClick"]) + }, "签收", 8, ["onClick"]), + vue.unref(details).tabBarCode === 20 ? (vue.openBlock(), vue.createElementBlock("view", { + key: 0, + onClick: ($event) => handleShowImg(item) + }, "签收图片", 8, ["onClick"])) : vue.createCommentVNode("v-if", true) ]) ]); }), @@ -24653,10 +25334,31 @@ This will fail in production if not fixed.`); 512 /* NEED_PATCH */ ), + vue.createVNode( + _component_PopUp, + { + ref_key: "UploadImg", + ref: UploadImg + }, + { + default: vue.withCtx(() => [ + vue.createVNode(_component_u_upload, { + fileList: vue.unref(details).imgFileList, + onAfterRead: handleUploadImg, + onDelete: deletePic, + multiple: "" + }, null, 8, ["fileList"]) + ]), + _: 1 + /* STABLE */ + }, + 512 + /* NEED_PATCH */ + ), vue.createCommentVNode(" 日期选择器 "), vue.createVNode(_component_l_calendar, { value: vue.unref(show), - "onUpdate:value": _cache[2] || (_cache[2] = ($event) => vue.isRef(show) ? show.value = $event : null), + "onUpdate:value": _cache[5] || (_cache[5] = ($event) => vue.isRef(show) ? show.value = $event : null), initStartDate: date2.value[0], initEndDate: date2.value[1], onHide: showCalendar, @@ -24846,7 +25548,7 @@ This will fail in production if not fixed.`); if (details.orderStatus === state) return; details.orderStatus = state; - details.datalist = details.orderStatus === 1 ? details.signScanOrderList : details.orderStatus === 2 ? details.signScanZeroOrderList : details.exceptionList; + details.datalist = details.orderStatus === 1 ? details.signScanOrderList || [] : details.orderStatus === 2 ? details.signScanZeroOrderList || [] : details.exceptionList || []; formatAppLog("log", "at pagesHome/pages/directGoMarketDetails/directGoMarketDetails.vue:516", "details.datalist :>> ", details.datalist); formatAppLog("log", "at pagesHome/pages/directGoMarketDetails/directGoMarketDetails.vue:517", "details.datalist.length :>> ", details.datalist.length); } @@ -24870,7 +25572,7 @@ This will fail in production if not fixed.`); let _scanCode = details.scancode; let isHave = false; let returnContent = ""; - for (let item of details.pageInfo.signScanOrderList) { + for (let item of details.signScanOrderList) { let isBreak = false; for (let val of item.signPackageList) { if (_scanCode === val.orderPackageCode) { @@ -51701,7 +52403,7 @@ This will fail in production if not fixed.`); } return (_ctx, _cache) => { const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); - const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$1); + const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$2); const _component_BasicContainer = vue.resolveComponent("BasicContainer"); const _component_tiplist = vue.resolveComponent("tiplist"); const _component_PopUp = vue.resolveComponent("PopUp"); @@ -52542,7 +53244,7 @@ This will fail in production if not fixed.`); }; return (_ctx, _cache) => { const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); - const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$1); + const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$2); const _component_BasicContainer = vue.resolveComponent("BasicContainer"); const _component_tiplist = vue.resolveComponent("tiplist"); const _component_PopUp = vue.resolveComponent("PopUp"); @@ -60719,16 +61421,16 @@ ${i3} extension } = opts; return new Promise((resolve, reject) => { - let chooseFile = uni.chooseFile; + let chooseFile2 = uni.chooseFile; if (typeof wx !== "undefined" && typeof wx.chooseMessageFile === "function") { - chooseFile = wx.chooseMessageFile; + chooseFile2 = wx.chooseMessageFile; } - if (typeof chooseFile !== "function") { + if (typeof chooseFile2 !== "function") { return reject({ errMsg: ERR_MSG_FAIL + " 请指定 type 类型，该平台仅支持选择 image 或 video。" }); } - chooseFile({ + chooseFile2({ type: "all", count, extension, @@ -63513,7 +64215,7 @@ ${i3} }; function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_overlay = resolveEasycom(vue.resolveDynamicComponent("u-overlay"), __easycom_0$2); - const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_1$2); + const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_1$3); const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$6); const _component_u_safe_bottom = resolveEasycom(vue.resolveDynamicComponent("u-safe-bottom"), __easycom_3); const _component_u_transition = resolveEasycom(vue.resolveDynamicComponent("u-transition"), __easycom_4$2); @@ -63701,7 +64403,7 @@ ${i3} }; function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) { const _component_u_line = resolveEasycom(vue.resolveDynamicComponent("u-line"), __easycom_0$4); - const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$1); + const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$2); const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_10); return vue.openBlock(), vue.createBlock(_component_u_popup, { mode: "center", @@ -66423,13 +67125,15 @@ ${i3} const popUp_RemoveTary = vue.ref(null); const popUp_RemoveAllocation = vue.ref(null); const popUp_Details = vue.ref(null); - onLoad((info) => { + onLoad(async (info) => { formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:727", "info :>> ", info); const infos = JSON.parse(info.info); formatAppLog("log", "at pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue:729", "object :>> ", JSON.parse(info.info)); option.title = infos.title; details.pageType = infos.pageType; details.pageInfos = infos; + await vue.nextTick(); + basicContainer.value.startPullDownRefresh(); }); onShow(async () => { uni.$off("scancodedate"); @@ -66444,8 +67148,6 @@ ${i3} scandata(); } }); - await vue.nextTick(); - basicContainer.value.startPullDownRefresh(); }); async function initPage() { try { @@ -76656,7 +77358,7 @@ ${i3} if (isEnd === void 0) isEnd = vue.ref(false); const pullDownRefreshInitPage = props2.option.pullDownRefreshInitPage || function() { - formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:63", "刷新"); + formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:64", "刷新"); }; const reachBottomInitPage = props2.option.reachBottomInitPage || function() { }; @@ -76676,7 +77378,7 @@ ${i3} title: "数据已加载完毕" }); } - formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:89", "antiShake :>> ", antiShake); + formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:90", "antiShake :>> ", antiShake); if (antiShake) { uni.hideLoading(); clearTimeout(antiShake); @@ -76697,18 +77399,15 @@ ${i3} await pullDownRefreshInitPage(); } catch (e2) { } finally { - const timer = setTimeout(() => { - uni.stopPullDownRefresh(); - clearTimeout(timer); - }, 300); + uni.stopPullDownRefresh(); } }); - function startPullDownRefresh() { - formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:131", "触发下拉"); + async function startPullDownRefresh() { + formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:132", "触发下拉"); uni.startPullDownRefresh(); } vue.watch(() => props2.option.haveData, () => { - formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:136", "11222 :>> ", 111); + formatAppLog("log", "at compoment/BasicContainer/BasicContainer.vue:138", "11222 :>> ", 111); }); __expose({ startPullDownRefresh }); return (_ctx, _cache) => { diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index 03c9a27..dcca190 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -5,7 +5,7 @@ "iPad" ], "id": "__UNI__EB22F37", - "name": "货无忧", + "name": "货无忧测试版", "version": { "name": "1.1.27", "code": 1127 @@ -99,12 +99,7 @@ "", "", "" - ], - "minSdkVersion": "", - "abiFilters": [ - "arm64-v8a" - ], - "targetSdkVersion": "" + ] }, "apple": { "dSYMs": false, diff --git a/utils/request.js b/utils/request.js index 551b6d0..e7e5f64 100644 --- a/utils/request.js +++ b/utils/request.js @@ -313,6 +313,7 @@ const service = async (params, loadingObj) => { } else isLogin = false console.log('params :>> ', params); const _key = params.url + JSON.stringify(params.data) + // 防止重复请求 if (requestObj[_key]) return new Promise(resolve => resolve({ code: 4000 @@ -320,7 +321,6 @@ const service = async (params, loadingObj) => { // 记录请求参数 requestObj[_key] = params // 如果正在刷新token则不请求, 等token刷新成功后再请求 - console.log('_isRefreshToken :>> ', _isRefreshToken); if (_isRefreshToken._isRefreshToken) { await _isRefreshToken._isRefreshToken return HandleRequest(params, _key, loadingObj) diff --git a/utils/style/common.scss b/utils/style/common.scss index df666a2..c14899f 100644 --- a/utils/style/common.scss +++ b/utils/style/common.scss @@ -20,6 +20,11 @@ justify-content: space-around; } +.align-center{ + display: flex; + align-items: center; +} + .flex1{ flex: 1; }