From 82866ebd3adc7e88c2a64304abef04a775ed31c3 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Mon, 24 Feb 2025 18:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 140 +--------------------- package.json | 2 +- src/pages/order-details/index.vue | 77 ++++++------ src/pages/order-list/index.vue | 190 ++++++++++++++++++++++++++++-- src/services/order/index.js | 11 ++ 5 files changed, 232 insertions(+), 188 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33efd44..b3346ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,8 +24,6 @@ "@dcloudio/uni-mp-xhs": "3.0.0-4020420240722002", "@dcloudio/uni-quickapp-webview": "3.0.0-4020420240722002", "@vant/area-data": "^2.0.0", - "@vue-office/docx": "^1.6.3", - "@vue-office/pdf": "^2.0.10", "less": "^4.2.1", "less-loader": "^12.2.0", "lodash-es": "^4.17.21", @@ -33,9 +31,8 @@ "moment": "^2.30.1", "pinia": "^2.3.0", "pinia-plugin-persistedstate": "^4.1.3", - "vant": "^4.9.10", + "vant": "^4.9.17", "vue": "^3.4.21", - "vue-doc-preview": "^0.3.2", "vue-i18n": "^9.1.9" }, "devDependencies": { @@ -4961,40 +4958,6 @@ "vue": "^3.0.0" } }, - "node_modules/@vue-office/docx": { - "version": "1.6.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/@vue-office/docx/-/docx-1.6.3.tgz", - "integrity": "sha512-Cs+3CAaRBOWOiW4XAhTwwxJ0dy8cPIf6DqfNvYcD3YACiLwO4kuawLF2IAXxyijhbuOeoFsfvoVbOc16A/4bZA==", - "hasInstallScript": true, - "license": "MIT", - "peerDependencies": { - "@vue/composition-api": "^1.7.1", - "vue": "^2.0.0 || >=3.0.0", - "vue-demi": "^0.14.6" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, - "node_modules/@vue-office/pdf": { - "version": "2.0.10", - "resolved": "https://repo.huaweicloud.com/repository/npm/@vue-office/pdf/-/pdf-2.0.10.tgz", - "integrity": "sha512-yHVLrMAKpMPBkhBwofFyGEtEeJF0Zd7oGmf56Pe5aj/xObdRq3E1CIZqTqhWJNgHV8oLQqaX0vs4p5T1zq+GIA==", - "hasInstallScript": true, - "license": "MIT", - "peerDependencies": { - "@vue/composition-api": "^1.7.1", - "vue": "^2.0.0 || >=3.0.0", - "vue-demi": "^0.14.6" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, "node_modules/@vue/babel-helper-vue-transform-on": { "version": "1.2.5", "resolved": "https://repo.huaweicloud.com/repository/npm/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.5.tgz", @@ -5554,44 +5517,6 @@ "postcss": "^8.1.0" } }, - "node_modules/axios": { - "version": "0.18.1", - "resolved": "https://repo.huaweicloud.com/repository/npm/axios/-/axios-0.18.1.tgz", - "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", - "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410", - "license": "MIT", - "dependencies": { - "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" - } - }, - "node_modules/axios/node_modules/debug": { - "version": "3.1.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "license": "MIT", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/axios/node_modules/follow-redirects": { - "version": "1.5.10", - "resolved": "https://repo.huaweicloud.com/repository/npm/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "license": "MIT", - "dependencies": { - "debug": "=3.1.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/axios/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "license": "MIT" - }, "node_modules/babel-jest": { "version": "27.5.1", "resolved": "https://repo.huaweicloud.com/repository/npm/babel-jest/-/babel-jest-27.5.1.tgz", @@ -7933,17 +7858,6 @@ "node": ">= 0.4" } }, - "node_modules/highlight.js": { - "version": "9.18.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/highlight.js/-/highlight.js-9.18.5.tgz", - "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==", - "deprecated": "Support has ended for 9.x series. Upgrade to @latest", - "hasInstallScript": true, - "license": "BSD-3-Clause", - "engines": { - "node": "*" - } - }, "node_modules/hookable": { "version": "5.5.3", "resolved": "https://repo.huaweicloud.com/repository/npm/hookable/-/hookable-5.5.3.tgz", @@ -8231,29 +8145,6 @@ "node": ">=8" } }, - "node_modules/is-buffer": { - "version": "2.0.5", - "resolved": "https://repo.huaweicloud.com/repository/npm/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/is-core-module": { "version": "2.16.0", "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.16.0.tgz", @@ -9822,18 +9713,6 @@ "node": ">=4.0" } }, - "node_modules/marked": { - "version": "0.4.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/marked/-/marked-0.4.0.tgz", - "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==", - "license": "MIT", - "bin": { - "marked": "bin/marked" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/math-intrinsics": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/math-intrinsics/-/math-intrinsics-1.0.0.tgz", @@ -13006,9 +12885,9 @@ } }, "node_modules/vant": { - "version": "4.9.10", - "resolved": "https://repo.huaweicloud.com/repository/npm/vant/-/vant-4.9.10.tgz", - "integrity": "sha512-N+QwOuhDxrH2f6+kN05ot6DHBvaM0e1lcoXVvf12rad2KnlybPQ9gjm0d+R+Nz/zydZbe3Fz6bwTssHItri0sw==", + "version": "4.9.17", + "resolved": "https://registry.npmmirror.com/vant/-/vant-4.9.17.tgz", + "integrity": "sha512-so/plH9G4au9rUrqy7yLB1slmZqY2Ub3Gq8ckMSQXbUEwTzmViVjEDqh/hNck/XELxwL+gIy2hLXiSgVcf2EBQ==", "license": "MIT", "dependencies": { "@vant/popperjs": "^1.3.0", @@ -13196,17 +13075,6 @@ } } }, - "node_modules/vue-doc-preview": { - "version": "0.3.2", - "resolved": "https://repo.huaweicloud.com/repository/npm/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz", - "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==", - "license": "MIT", - "dependencies": { - "axios": "^0.18.0", - "highlight.js": "^9.12.0", - "marked": "^0.4.0" - } - }, "node_modules/vue-eslint-parser": { "version": "9.4.3", "resolved": "https://repo.huaweicloud.com/repository/npm/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz", diff --git a/package.json b/package.json index 1fca139..e26a937 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "moment": "^2.30.1", "pinia": "^2.3.0", "pinia-plugin-persistedstate": "^4.1.3", - "vant": "^4.9.10", + "vant": "^4.9.17", "vue": "^3.4.21", "vue-i18n": "^9.1.9" }, diff --git a/src/pages/order-details/index.vue b/src/pages/order-details/index.vue index 334dc4a..c1d785d 100644 --- a/src/pages/order-details/index.vue +++ b/src/pages/order-details/index.vue @@ -59,14 +59,14 @@ - - - - + + + @@ -89,7 +89,7 @@ import companyBg from '@/static/goods/company-bg.png' import TitleTip from '@/components/TitleTip/index' import { ref } from 'vue' import { editOrderDetailsAPI, getOverhaulAPI } from '@/services/order/index.js' -import { showImagePreview, } from 'vant' +import { showImagePreview,Steps, Step } from 'vant' import { onLoad } from '@dcloudio/uni-app' const orderDetailsList = ref([]) const orderDetails = ref({}) @@ -280,42 +280,22 @@ const getDescription = (desId) => { onLoad(async (options) => { const { data: res } = await editOrderDetailsAPI({ orderId: options?.orderId }) orderStatus.value = options?.orderStatus - if (orderStatus.value == 1) { - currentActive.value = 0 - } - if (orderStatus.value == 2) { - currentActive.value = 1 - stepList.value[0].title = '已接单' - } - if (orderStatus.value == 3) { - stepList.value[0].title = '已接单' - stepList.value[1].title = '已出库' - currentActive.value = 2 - } - if (orderStatus.value == 4) { - stepList.value[0].title = '已接单' - stepList.value[1].title = '已出库' - stepList.value[2].title = '已收货' - currentActive.value = 3 - } - if (orderStatus.value == 5) { - stepList.value[0].title = '已接单' - stepList.value[1].title = '已出库' - stepList.value[2].title = '已收货' - currentActive.value = 4 - } - if (orderStatus.value == 20) { - stepList.value[0].title = '已接单' - stepList.value[1].title = '已出库' - stepList.value[2].title = '已收货' - stepList.value[3].title = '租赁结束' - currentActive.value = 5 - } + console.log('xxxxxxxxxxx',orderStatus.value) - if (orderStatus.value == 99) { - currentActive.value = 6 - stepList.value[6].title = '订单取消' - } + // if (orderStatus.value == 1) { + // currentActive.value = 0 + // stepList.value = [ + // { + // title: '待接单', + // description: '', + // }, + // { + // title: '待出库', + // description: '', + // } + + // ] + // } console.log('xxxxxxxxxxx',stepList.value) orderDetails.value = res orderDetailsList.value = res.detailsList @@ -330,6 +310,7 @@ onLoad(async (options) => { diff --git a/src/pages/order-list/index.vue b/src/pages/order-list/index.vue index ded00e5..74e026a 100644 --- a/src/pages/order-list/index.vue +++ b/src/pages/order-list/index.vue @@ -146,12 +146,24 @@ class="primary-lease" style="margin-right: 6px" v-if=" - (item.orderStatus == 1 || item.orderStatus == 2) && + (item.orderStatus == 1 ) && orderQueryParams.flag " - @click.stop="onEditOrderStatus(item, parseInt(item.orderStatus))" + @click.stop="onEditOrderStatusTwo(item, parseInt(item.orderStatus))" > {{ initBtnText(item.orderStatus) }} + + + {{ "查看取件码" }} + {{ "确认收货" }} + + --> + + + + +
+ + +
+ + 关闭 +
+
+
+ + + +
+ + +
+ 提交 + 关闭 +
+
+