From 7d6d45ce3a82a9253594658afdb35c5c5fb67463 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 8 May 2024 18:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E8=BD=BD=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/host.js | 4 +- manifest.json | 4 +- node_modules/.package-lock.json | 113 ------------------ node_modules/.yarn-integrity | 40 ++----- package.json | 37 +++--- .../StowageListDetails/StowageListDetails.vue | 18 +-- .../pagesHome/pages/Retention/Retention.css | 2 +- unpackage/dist/dev/app-plus/app-service.js | 63 ++++------ unpackage/dist/dev/app-plus/manifest.json | 4 +- yarn.lock | 97 +++++++-------- 10 files changed, 115 insertions(+), 267 deletions(-) delete mode 100644 node_modules/.package-lock.json diff --git a/config/host.js b/config/host.js index eb94920..69a5202 100644 --- a/config/host.js +++ b/config/host.js @@ -4,11 +4,11 @@ * 测试域名 * */ //测试域名s -const devhost = 'http://test.api.huo5you.com/' +// const devhost = 'http://test.api.huo5you.com/' // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy -// const devhost = 'http://192.168.3.12:13000/' +const devhost = 'http://192.168.3.12:13000/' // xiaohei // const devhost = 'http://192.168.3.18:13000/' // tjj diff --git a/manifest.json b/manifest.json index f11d090..d821c19 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "货无忧", "appid" : "__UNI__EB22F37", "description" : "", - "versionName" : "1.1.30", - "versionCode" : 1130, + "versionName" : "1.1.31", + "versionCode" : 1131, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json deleted file mode 100644 index 3c72b4f..0000000 --- a/node_modules/.package-lock.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "name": "自定义下拉选择", - "version": "1.0.2", - "lockfileVersion": 3, - "requires": true, - "packages": { - "node_modules/@vue/devtools-api": { - "version": "6.5.1", - "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz", - "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==" - }, - "node_modules/clipboard": { - "version": "2.0.11", - "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", - "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", - "dependencies": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, - "node_modules/dayjs": { - "version": "1.11.10", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz", - "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" - }, - "node_modules/delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" - }, - "node_modules/good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", - "dependencies": { - "delegate": "^3.1.2" - } - }, - "node_modules/pinia": { - "version": "2.1.7", - "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz", - "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==", - "dependencies": { - "@vue/devtools-api": "^6.5.0", - "vue-demi": ">=0.14.5" - }, - "peerDependencies": { - "@vue/composition-api": "^1.4.0", - "typescript": ">=4.4.4", - "vue": "^2.6.14 || ^3.3.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - }, - "typescript": { - "optional": true - } - } - }, - "node_modules/select": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", - "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" - }, - "node_modules/tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - }, - "node_modules/uview-plus": { - "version": "3.1.38", - "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.1.38.tgz", - "integrity": "sha512-sdEkDBdqhBuzJVDXR4ApzchtdZjaen2jK23h0Mp5VSLngWEPiOmWDwSBu66ZHbnM9n4xTzfip6t6cGRFhvIGRA==", - "dependencies": { - "clipboard": "^2.0.11", - "dayjs": "^1.11.3" - }, - "engines": { - "HBuilderX": "^3.1.0" - } - }, - "node_modules/vue": { - "version": "2.6.14", - "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz", - "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==", - "peer": true - }, - "node_modules/vue-demi": { - "version": "0.14.6", - "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.6.tgz", - "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", - "hasInstallScript": true, - "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^3.0.0-0 || ^2.6.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - } - } -} diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 2012222..2d705f5 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -6,36 +6,20 @@ "flags": [], "linkedModules": [], "topLevelPatterns": [ - "@rollup/plugin-commonjs@^25.0.1", - "clipboard@^2.0.11", - "dayjs@^1.11.8" + "pinia@^2.1.7", + "uview-plus@^3.1.38" ], "lockfileEntries": { - "@jridgewell/sourcemap-codec@^1.4.13": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32", - "@rollup/plugin-commonjs@^25.0.1": "https://registry.npmmirror.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.2.tgz#7ed37d00a12fc7fdd3aadba5fa0de52f2372bbbb", - "@rollup/pluginutils@^5.0.1": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33", - "@types/estree@*": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194", - "@types/estree@^1.0.0": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194", - "balanced-match@^1.0.0": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee", - "brace-expansion@^2.0.1": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae", - "clipboard@^2.0.11": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5", - "commondir@^1.0.1": "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b", - "dayjs@^1.11.8": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.8.tgz#4282f139c8c19dd6d0c7bd571e30c2d0ba7698ea", - "delegate@^3.1.2": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166", - "estree-walker@^2.0.2": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac", - "fs.realpath@^1.0.0": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f", - "glob@^8.0.3": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e", - "good-listener@^1.2.2": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50", - "inflight@^1.0.4": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9", - "inherits@2": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c", - "is-reference@1.2.1": "https://registry.npmmirror.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7", - "magic-string@^0.27.0": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3", - "minimatch@^5.0.1": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96", - "once@^1.3.0": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1", - "picomatch@^2.3.1": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42", - "select@^1.1.2": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d", - "tiny-emitter@^2.0.0": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423", - "wrappy@1": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + "@vue/devtools-api@^6.5.0": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz", + "clipboard@^2.0.11": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", + "dayjs@^1.11.3": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz", + "delegate@^3.1.2": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", + "good-listener@^1.2.2": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", + "pinia@^2.1.7": "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz", + "select@^1.1.2": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", + "tiny-emitter@^2.0.0": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "uview-plus@^3.1.38": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.1.38.tgz", + "vue-demi@>=0.14.5": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.6.tgz" }, "files": [], "artifacts": {} diff --git a/package.json b/package.json index fe915f8..6328792 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,19 @@ { - "id": "cus-selects-fan", - "name": "自定义下拉选择", - "displayName": "自定义下拉选择", - "version": "1.0.2", - "description": "自定义下拉选择 可以清除选择，可以模糊搜素，可以精准搜索", - "keywords": [ - "自定义下拉选择" - ], - "dcloudext": { - "category": [ - "前端组件", - "通用组件" - ] - }, - "dependencies": { - "pinia": "^2.1.7", - "uview-plus": "^3.1.38" - } -} + "id": "cus-selects-fan", + "displayName": "自定义下拉选择", + "version": "1.0.2", + "description": "自定义下拉选择 可以清除选择，可以模糊搜素，可以精准搜索", + "keywords": [ + "自定义下拉选择" + ], + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ] + }, + "dependencies": { + "pinia": "^2.1.7", + "uview-plus": "^3.1.38" + } +} \ No newline at end of file diff --git a/pagesHome/pages/StowageListDetails/StowageListDetails.vue b/pagesHome/pages/StowageListDetails/StowageListDetails.vue index b850956..f1473ff 100644 --- a/pagesHome/pages/StowageListDetails/StowageListDetails.vue +++ b/pagesHome/pages/StowageListDetails/StowageListDetails.vue @@ -457,11 +457,11 @@ loadId: details.loadId } const res = await postLoadingScan(submitData) - if (res.msg) { - // #ifdef APP - utils.ttsspke(res.msg) - // #endif - } + // if (res.msg) { + // // #ifdef APP + // utils.ttsspke(res.msg) + // // #endif + // } return res } @@ -507,10 +507,10 @@ const res = await postLoadingTray(submitInfo) if (res.code !== 200) return - uni.showToast({ - title: '装车成功', - icon: 'none' - }) + // uni.showToast({ + // title: '装车成功', + // icon: 'none' + // }) basicContainer.value.startPullDownRefresh() TrayStowage.value.details.showPopUp = false } catch (e) { diff --git a/unpackage/dist/build/app-plus/pagesHome/pages/Retention/Retention.css b/unpackage/dist/build/app-plus/pagesHome/pages/Retention/Retention.css index b665cec..0c2ea71 100644 --- a/unpackage/dist/build/app-plus/pagesHome/pages/Retention/Retention.css +++ b/unpackage/dist/build/app-plus/pagesHome/pages/Retention/Retention.css @@ -1 +1 @@ -.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.butys{display:flex;align-items:center;margin-top:.625rem;justify-content:space-around}.butys>.conf{width:10rem;height:3.125rem;border-radius:.625rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff;background-color:#d3832a}.butys>.qut{width:10rem;height:3.125rem;border-radius:.625rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#5a6875;background-color:#fff}.scvm{width:100%;height:74vh;margin-top:.625rem}.scvm .itembox{width:21.4375rem;border-radius:.625rem;padding:0 .625rem;box-sizing:border-box;background-color:#fff;margin:auto;margin-bottom:.625rem}.scvm .itembox>.topon1{display:flex;align-items:center;justify-content:space-between;padding:.625rem .3125rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvm .itembox>.topon1>uni-view:nth-of-type(1){width:1.5625rem;height:1.5625rem;background:#178AF220;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:.875rem;font-weight:500;color:#178af2}.scvm .itembox>.topon1>uni-view:nth-of-type(2){display:flex;align-items:center}.scvm .itembox>.topon1>uni-view:nth-of-type(2)>uni-view{width:4.25rem;height:2rem;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:.875rem;font-weight:400;color:#90a0af;background-color:#f5f5f6;margin-right:.625rem}.scvm .itembox>.topon1>uni-view:nth-of-type(2) .xzc{background-color:#178af2!important;color:#fff!important}.scvm .itembox>.topon1>uni-view:nth-of-type(2) .xze{background-color:#f8544b!important;color:#fff!important}.scvm .itembox>.topon1>uni-view:nth-of-type(2)>uni-image{width:1rem;height:1rem}.scvm .itembox>.topon2{display:flex;align-items:center;justify-content:flex-start;padding:.625rem .3125rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvm .itembox>.topon2>uni-image{width:1rem;height:1rem;margin-right:.625rem}.scvm .itembox>.topon2>uni-view{font-size:.875rem;font-weight:400;color:#020b18}.topbox{width:100%;padding:.625rem 1rem;box-sizing:border-box;background-color:#fff}.topbox>.scanbox{display:flex;align-items:center;width:21.4375rem;height:2.5rem;background:#F5F5F6;border-radius:.25rem;box-sizing:border-box;padding:.625rem .9375rem;font-size:.875rem;color:#020b18}.topbox>.scanbox>uni-image{width:1rem;height:1rem;margin-right:.375rem}.topbox>.scanbox>uni-input{font-size:.875rem}.topbox .viewboxs{display:flex;align-items:center;justify-content:space-between;margin-top:.625rem}.topbox .viewboxs>uni-view{font-size:.9375rem;font-weight:400;color:#020b18}.topbox .viewboxs .siz{font-size:.875rem} +.u-status-bar[data-v-31491727]{width:100%}uni-view[data-v-5c79ae5e],uni-scroll-view[data-v-5c79ae5e],uni-swiper-item[data-v-5c79ae5e]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-5c79ae5e]{display:flex;align-items:center}.u-icon--left[data-v-5c79ae5e]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-5c79ae5e]{flex-direction:row;align-items:center}.u-icon--top[data-v-5c79ae5e]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-5c79ae5e]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-5c79ae5e]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-5c79ae5e]{color:#3c9cff}.u-icon__icon--success[data-v-5c79ae5e]{color:#5ac725}.u-icon__icon--error[data-v-5c79ae5e]{color:#f56c6c}.u-icon__icon--warning[data-v-5c79ae5e]{color:#f9ae3d}.u-icon__icon--info[data-v-5c79ae5e]{color:#909399}.u-icon__img[data-v-5c79ae5e]{height:auto;will-change:transform}.u-icon__label[data-v-5c79ae5e]{line-height:1}uni-view[data-v-917ffc31],uni-scroll-view[data-v-917ffc31],uni-swiper-item[data-v-917ffc31]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-917ffc31]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-917ffc31]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-917ffc31],.u-navbar__content__right[data-v-917ffc31]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-917ffc31]{left:0}.u-navbar__content__left--hover[data-v-917ffc31]{opacity:.7}.u-navbar__content__left__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-917ffc31]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-917ffc31]{right:0}.u-navbar__content__right__text[data-v-917ffc31]{font-size:15px;margin-left:3px}.flex{display:flex}.flex-c-c{display:flex;align-items:center;justify-content:center}.flex-c-sb{display:flex;align-items:center;justify-content:space-between}.flex-c-sa{display:flex;align-items:center;justify-content:space-around}.align-center{display:flex;align-items:center}.flex1{flex:1}.flexnone{flex:none}.mt10{margin-top:.3125rem}.mt20{margin-top:.625rem}.ml10{margin-left:.3125rem}.ml20{margin-left:.625rem}.mb10{margin-bottom:.3125rem}.mb20{margin-bottom:.625rem}.mr10{margin-right:.3125rem}.mr20{margin-right:.625rem}.pd10{padding:.3125rem}.pd15{padding:.46875rem}.pd20{padding:.625rem}.w100{width:100%}.h100{height:100%}.text-center{text-align:center}.text-start{text-align:start}.text-end{text-align:end}.fwb{font-weight:700}.rem-1{font-size:1rem}.rem-0-8{font-size:.8rem}.rem-0-9{font-size:.9rem}.rem-1-5{font-size:1.5rem}.primaryColor{color:#172e60}.primaryColorIm{color:#172e60!important}.butys{display:flex;align-items:center;margin-top:.625rem;justify-content:space-around}.butys>.conf{width:10rem;height:3.125rem;border-radius:.625rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff;background-color:#d3832a}.butys>.qut{width:10rem;height:3.125rem;border-radius:.625rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#5a6875;background-color:#fff}.scvm{width:100%;height:74vh;margin-top:.625rem}.scvm .itembox{width:21.4375rem;border-radius:.625rem;padding:0 .625rem;box-sizing:border-box;background-color:#fff;margin:auto;margin-bottom:.625rem}.scvm .itembox>.topon1{display:flex;align-items:center;justify-content:space-between;padding:.625rem .3125rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvm .itembox>.topon1>uni-view:nth-of-type(1){width:1.5625rem;height:1.5625rem;background:#178AF220;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:.875rem;font-weight:500;color:#178af2}.scvm .itembox>.topon1>uni-view:nth-of-type(2){display:flex;align-items:center}.scvm .itembox>.topon1>uni-view:nth-of-type(2)>uni-view{width:4.25rem;height:2rem;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:.875rem;font-weight:400;color:#90a0af;background-color:#f5f5f6;margin-right:.625rem}.scvm .itembox>.topon1>uni-view:nth-of-type(2) .xzc{background-color:#178af2!important;color:#fff!important}.scvm .itembox>.topon1>uni-view:nth-of-type(2) .xze{background-color:#f8544b!important;color:#fff!important}.scvm .itembox>.topon1>uni-view:nth-of-type(2)>uni-image{width:1rem;height:1rem}.scvm .itembox>.topon2{display:flex;align-items:center;justify-content:flex-start;padding:.625rem .3125rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvm .itembox>.topon2>uni-image{width:1rem;height:1rem;margin-right:.625rem}.scvm .itembox>.topon2>uni-view{font-size:.875rem;font-weight:400;color:#020b18}.topbox{width:100%;padding:.625rem 1rem;box-sizing:border-box;background-color:#fff}.topbox>.scanbox{display:flex;align-items:center;width:21.4375rem;height:2.5rem;background:#F5F5F6;border-radius:.25rem;box-sizing:border-box;padding:.625rem .9375rem;font-size:.875rem;color:#020b18}.topbox>.scanbox>uni-image{width:1rem;height:1rem;margin-right:.375rem}.topbox>.scanbox>uni-input{font-size:.875rem}.topbox .viewboxs{display:flex;align-items:center;justify-content:space-between;margin-top:.625rem}.topbox .viewboxs>uni-view{font-size:.9375rem;font-weight:400;color:#020b18}.topbox .viewboxs .siz{font-size:.875rem}.button{padding:.625rem 1.25rem;background:var(--subjectColor);color:#fff;border-radius:.3125rem} diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 996f51e..a7a2381 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -1809,7 +1809,7 @@ if (uni.restoreGlobal) { }; }; const Base64$1 = new Base64(); - const devhost = "http://192.168.3.14:13000/"; + const devhost = "http://192.168.3.12:13000/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; @@ -9670,14 +9670,14 @@ This will fail in production if not fixed.`); }); async function init() { let tabber = uni.getStorageSync("taskMenu"); - formatAppLog("log", "at pages/taskList/taskList.vue:63", "tabber :>> ", tabber); + formatAppLog("log", "at pages/taskList/taskList.vue:61", "tabber :>> ", tabber); if (tabber) { details.tablist = tabber; return; } let res = await appMenuroutes({}); - formatAppLog("log", "at pages/taskList/taskList.vue:69", res, "-------------"); - formatAppLog("log", "at pages/taskList/taskList.vue:70", "刷新后"); + formatAppLog("log", "at pages/taskList/taskList.vue:67", res, "-------------"); + formatAppLog("log", "at pages/taskList/taskList.vue:68", "刷新后"); if (res.code == 200) { getimgcache(res.data); } else { @@ -9688,7 +9688,7 @@ This will fail in production if not fixed.`); } } async function getimgcache(data) { - formatAppLog("log", "at pages/taskList/taskList.vue:84", "data :>> ", data); + formatAppLog("log", "at pages/taskList/taskList.vue:82", "data :>> ", data); let maxarr = []; if (!data[0]) return; @@ -9722,7 +9722,7 @@ This will fail in production if not fixed.`); }; if (item.children) { for (let ite of item.children) { - formatAppLog("log", "at pages/taskList/taskList.vue:126", "getImageCache(ite.source) :>> ", getImageCache(ite.source)); + formatAppLog("log", "at pages/taskList/taskList.vue:124", "getImageCache(ite.source) :>> ", getImageCache(ite.source)); let result = null; if (ite.source != null) { result = await getImageCache(ite.source); @@ -9735,7 +9735,7 @@ This will fail in production if not fixed.`); arr.minilist.push(obj); } } else { - formatAppLog("log", "at pages/taskList/taskList.vue:142", "getImageCache(item.source) :>> ", getImageCache(item.source)); + formatAppLog("log", "at pages/taskList/taskList.vue:140", "getImageCache(item.source) :>> ", getImageCache(item.source)); let result = null; if (item.source != null) { result = await getImageCache(item.source); @@ -9751,7 +9751,7 @@ This will fail in production if not fixed.`); } uni.setStorageSync("taskMenu", _taskArr); details.tablist = _taskArr; - formatAppLog("log", "at pages/taskList/taskList.vue:161", details.tablist); + formatAppLog("log", "at pages/taskList/taskList.vue:159", details.tablist); } const { tablist } = vue.toRefs(details); return (_ctx, _cache) => { @@ -12716,14 +12716,11 @@ This will fail in production if not fixed.`); } const handleShowImg = async (item) => { formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:261", "item :>> ", item); - await postFindFinanceList({ loadId: item.id }); + const res = await postFindFinanceList({ loadId: item.id }); + const { code: code2, data } = res; + if (code2 !== 200) + return; 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, @@ -12733,24 +12730,17 @@ This will fail in production if not fixed.`); icon: "none", title: "请上传图片再提交" }); + formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:279", "details.imgFileList :>> ", details.imgFileList); const submitData = { - signOrderId: item.id, - signPhotoList: [] + loadId: item.id, + url: details.imgFileList.map((val) => val.url).join(",") }; - 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 res2 = await postAddContractByLoadId(submitData); - const { code: code2 } = res2; - if (code2 !== 200) + const { code: code22, msg } = res2; + if (code22 !== 200) return; + utils.handleToast(msg); UploadImg.value.details.showPopUp = false; - basicContainer.value.startPullDownRefresh(); } }); }; @@ -12767,11 +12757,11 @@ This will fail in production if not fixed.`); const type2 = item.name.split(".").slice(-1)[0]; if (writeArr.indexOf(type2) === -1) continue; - formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:330", "type :>> ", type2); + formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:318", "type :>> ", type2); PromiseAll.push(api.upfile(item.url)); } const res = await Promise.all(PromiseAll); - formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:338", "res :>> ", res); + formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:326", "res :>> ", res); for (let i2 = 0; i2 < res.length; i2++) { const response2 = res[i2]; const { link } = response2; @@ -12780,14 +12770,14 @@ This will fail in production if not fixed.`); details.imgFileList.push({ url: link }); } } catch (err) { - formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:350", "err :>> ", err); + formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:338", "err :>> ", err); } finally { uni.hideLoading(); } - formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:356", "event :>> ", event); + formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:344", "event :>> ", event); }; const deletePic = (event) => { - formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:362", "event :>> ", event); + formatAppLog("log", "at pagesHome/pages/StowageList/StowageList.vue:350", "event :>> ", event); details.imgFileList.splice(event.index, 1); }; function cleartime() { @@ -13706,9 +13696,6 @@ This will fail in production if not fixed.`); loadId: details.loadId }; const res = await postLoadingScan(submitData); - if (res.msg) { - utils.ttsspke(res.msg); - } return res; }; const scanTray = async () => { @@ -13750,10 +13737,6 @@ This will fail in production if not fixed.`); const res2 = await postLoadingTray(submitInfo); if (res2.code !== 200) return; - uni.showToast({ - title: "装车成功", - icon: "none" - }); basicContainer.value.startPullDownRefresh(); TrayStowage.value.details.showPopUp = false; } catch (e2) { diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index 93e53c9..32275cb 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -7,8 +7,8 @@ "id": "__UNI__EB22F37", "name": "货无忧", "version": { - "name": "1.1.30", - "code": 1130 + "name": "1.1.31", + "code": 1131 }, "description": "", "developer": { diff --git a/yarn.lock b/yarn.lock index 59bb267..acd15c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,68 +3,63 @@ "@vue/devtools-api@^6.5.0": - "integrity" "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==" - "resolved" "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz" - "version" "6.5.1" + version "6.5.1" + resolved "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz" + integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA== -"clipboard@^2.0.11": - "integrity" "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==" - "resolved" "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz" - "version" "2.0.11" +clipboard@^2.0.11: + version "2.0.11" + resolved "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz" + integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw== dependencies: - "good-listener" "^1.2.2" - "select" "^1.1.2" - "tiny-emitter" "^2.0.0" + good-listener "^1.2.2" + select "^1.1.2" + tiny-emitter "^2.0.0" -"dayjs@^1.11.3": - "integrity" "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" - "resolved" "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz" - "version" "1.11.10" +dayjs@^1.11.3: + version "1.11.10" + resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz" + integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== -"delegate@^3.1.2": - "integrity" "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" - "resolved" "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz" - "version" "3.2.0" +delegate@^3.1.2: + version "3.2.0" + resolved "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz" + integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== -"good-listener@^1.2.2": - "integrity" "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==" - "resolved" "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz" - "version" "1.2.2" +good-listener@^1.2.2: + version "1.2.2" + resolved "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz" + integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw== dependencies: - "delegate" "^3.1.2" + delegate "^3.1.2" -"pinia@^2.1.7": - "integrity" "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==" - "resolved" "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz" - "version" "2.1.7" +pinia@^2.1.7: + version "2.1.7" + resolved "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz" + integrity sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ== dependencies: "@vue/devtools-api" "^6.5.0" - "vue-demi" ">=0.14.5" + vue-demi ">=0.14.5" -"select@^1.1.2": - "integrity" "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" - "resolved" "https://registry.npmmirror.com/select/-/select-1.1.2.tgz" - "version" "1.1.2" +select@^1.1.2: + version "1.1.2" + resolved "https://registry.npmmirror.com/select/-/select-1.1.2.tgz" + integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA== -"tiny-emitter@^2.0.0": - "integrity" "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - "resolved" "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz" - "version" "2.1.0" +tiny-emitter@^2.0.0: + version "2.1.0" + resolved "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz" + integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== -"uview-plus@^3.1.38": - "integrity" "sha512-sdEkDBdqhBuzJVDXR4ApzchtdZjaen2jK23h0Mp5VSLngWEPiOmWDwSBu66ZHbnM9n4xTzfip6t6cGRFhvIGRA==" - "resolved" "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.1.38.tgz" - "version" "3.1.38" +uview-plus@^3.1.38: + version "3.1.38" + resolved "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.1.38.tgz" + integrity sha512-sdEkDBdqhBuzJVDXR4ApzchtdZjaen2jK23h0Mp5VSLngWEPiOmWDwSBu66ZHbnM9n4xTzfip6t6cGRFhvIGRA== dependencies: - "clipboard" "^2.0.11" - "dayjs" "^1.11.3" + clipboard "^2.0.11" + dayjs "^1.11.3" -"vue-demi@>=0.14.5": - "integrity" "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==" - "resolved" "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.6.tgz" - "version" "0.14.6" - -"vue@^2.6.14 || ^3.3.0", "vue@^3.0.0-0 || ^2.6.0": - "integrity" "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" - "resolved" "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz" - "version" "2.6.14" +vue-demi@>=0.14.5: + version "0.14.6" + resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.6.tgz" + integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==