From 385b96788df5178d39594a7a08f308cf7a313a21 Mon Sep 17 00:00:00 2001 From: wtq <2394975549@qq.com> Date: Tue, 9 Jun 2026 11:29:00 +0800 Subject: [PATCH] '!' --- package-lock.json | 38 ++++++++++++---- package.json | 2 +- src/pages/merchant/options/options.vue | 20 ++++----- .../childPages/component/orderListTop.vue | 45 +++++++++++++++++++ src/subPages/login/weixin.ts | 1 + src/subPages/login/wxLogin/wxLogin.ts | 1 + 6 files changed, 87 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf75248..4a6f018 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@dcloudio/uni-stacktracey": "3.0.0-3061820230117001", "@dcloudio/vite-plugin-uni": "3.0.0-3061820230117001", "@types/js-md5": "^0.4.3", - "@types/node": "^18.11.11", + "@types/node": "^25.5.2", "sass": "^1.56.1", "typescript": "^4.8.4", "vite": "3.2.4" @@ -1195,10 +1195,14 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.11.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz", - "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g==", - "devOptional": true + "version": "25.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.2.tgz", + "integrity": "sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.18.0" + } }, "node_modules/@vitejs/plugin-legacy": { "version": "2.3.1", @@ -3743,6 +3747,13 @@ "node": ">=4.2.0" } }, + "node_modules/undici-types": { + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", + "devOptional": true, + "license": "MIT" + }, "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz", @@ -4959,10 +4970,13 @@ "dev": true }, "@types/node": { - "version": "18.11.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz", - "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g==", - "devOptional": true + "version": "25.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.2.tgz", + "integrity": "sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==", + "devOptional": true, + "requires": { + "undici-types": "~7.18.0" + } }, "@vitejs/plugin-legacy": { "version": "2.3.1", @@ -6837,6 +6851,12 @@ "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "dev": true }, + "undici-types": { + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz", + "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==", + "devOptional": true + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz", diff --git a/package.json b/package.json index 30d41cd..28a9478 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@dcloudio/uni-stacktracey": "3.0.0-3061820230117001", "@dcloudio/vite-plugin-uni": "3.0.0-3061820230117001", "@types/js-md5": "^0.4.3", - "@types/node": "^18.11.11", + "@types/node": "^25.5.2", "sass": "^1.56.1", "typescript": "^4.8.4", "vite": "3.2.4" diff --git a/src/pages/merchant/options/options.vue b/src/pages/merchant/options/options.vue index a0e4bfa..8e076ec 100644 --- a/src/pages/merchant/options/options.vue +++ b/src/pages/merchant/options/options.vue @@ -68,11 +68,11 @@ const grindListData = ref([ icon: '/static/merchant-icon/2.png', title: '营业资质', }, - { - id: 3, - icon: '/static/merchant-icon/3.png', - title: '平台管理', - }, + // { + // id: 3, + // icon: '/static/merchant-icon/3.png', + // title: '平台管理', + // }, { id: 4, icon: '/static/merchant-icon/4.png', @@ -182,11 +182,11 @@ function grindData(title: number) { url: '/subPages/merchantChild/businessLicense/businessLicense', }) // 营业资质 break - case 3: - uni.navigateTo({ - url: '/subPages/merchantChild/platformM/platformM' - }) // 平台管理 - break + // case 3: + // uni.navigateTo({ + // url: '/subPages/merchantChild/platformM/platformM' + // }) // 平台管理 + // break case 4: uni.navigateTo({ url: `/subPages/merchantChild/bill/bill?billList=${JSON.stringify( diff --git a/src/pages/order-manager/childPages/component/orderListTop.vue b/src/pages/order-manager/childPages/component/orderListTop.vue index 033ddaa..b403488 100644 --- a/src/pages/order-manager/childPages/component/orderListTop.vue +++ b/src/pages/order-manager/childPages/component/orderListTop.vue @@ -11,6 +11,7 @@ 预计{{ expectedDeliveredTime }}前送达 + 急 @@ -183,6 +184,17 @@ const isCancelTime = computed(() => { ) }) +/** + * 是否显示急送 美团 饿百 + */ +const isShowRushOrder = computed(() => { + return (props.item.vendorID === 1 || props.item.vendorID === 3) + && props.item.status <=20 ? + (props.item.couponIDs && props.item.couponIDs.includes('11002') || props.item.couponIDs.includes('11003') ) + : false +}) + + /** * 是否显示预计送达时间 */ @@ -392,6 +404,24 @@ const isShow = computed(() => { } } + .rushOrder{ + height: 30px; + padding: 0 5px; + line-height: 30px; + background-color: rgba(245, 108, 108, .1); + border-color: rgba(245, 108, 108, .2); + color: #f56c6c; + font-size: 20px; + border-radius: 50%; + box-sizing: border-box; + // border: 1px solid rgba(64, 158, 255, .2); + border: 1px solid rgba(245, 108, 108, .2); + white-space: nowrap; + position: fixed; + left: 50%; + animation: blink 1.8s infinite; /* 1秒循环，无限播放 */ + } + .index-color { color: rgb(0, 0, 0); } @@ -435,6 +465,21 @@ const isShow = computed(() => { font-weight: bold; } } + +// /* 使用动画 */ +// .blink { +// width: 20% !important; +// margin-top: 10px; +// animation: blink 1.8s infinite; /* 1秒循环，无限播放 */ +// } + +/* 定义动画 */ +@keyframes blink { + 0% { opacity: 1; } + 50% { opacity: 0; } + 100% { opacity: 1; } +} + // 顶部标题 .order-title { display: flex; diff --git a/src/subPages/login/weixin.ts b/src/subPages/login/weixin.ts index 2863245..5be8a50 100644 --- a/src/subPages/login/weixin.ts +++ b/src/subPages/login/weixin.ts @@ -28,6 +28,7 @@ function weixinFn() { const activeItem: Ref = ref(0); onShow(() => { + setStorage('token','') store.commit('serveInfo/setIsAgreement', false) store.commit('serveInfo/setIsAgreementIf', false) }) diff --git a/src/subPages/login/wxLogin/wxLogin.ts b/src/subPages/login/wxLogin/wxLogin.ts index 50071bf..fc1970b 100644 --- a/src/subPages/login/wxLogin/wxLogin.ts +++ b/src/subPages/login/wxLogin/wxLogin.ts @@ -18,6 +18,7 @@ export default { setup() { onShow(() => { + setStorage('token','') store.commit('serveInfo/setIsAgreement', false) store.commit('serveInfo/setIsAgreementIf', false) })