From c7a434a24d8291d71f5a9529de4edbf48bcf4e49 Mon Sep 17 00:00:00 2001 From: tangxinyue <524779910@qq.com> Date: Fri, 10 Apr 2026 14:08:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shopping/jingdong/list-index.vue | 336 +++++++++++++++++- .../jingdong/order-detail/order-detail.vue | 130 +++++-- 2 files changed, 443 insertions(+), 23 deletions(-) diff --git a/pages/shopping/jingdong/list-index.vue b/pages/shopping/jingdong/list-index.vue index 79752a5..1c11e35 100644 --- a/pages/shopping/jingdong/list-index.vue +++ b/pages/shopping/jingdong/list-index.vue @@ -1,6 +1,8 @@ + + + \ No newline at end of file diff --git a/pages/shopping/jingdong/json/order.json b/pages/shopping/jingdong/json/order.json index 7f87681..b14a29d 100644 --- a/pages/shopping/jingdong/json/order.json +++ b/pages/shopping/jingdong/json/order.json @@ -395,5 +395,323 @@ "label": "已取消", "key": "yiquxiao" } + ], + "waimaiClassfiy": { + "weizhifu": { + "id": "123211111", + "type": "weizhifu", + "shopType": "waimai", + "shopName": "", + "status": "等待付款", + "statusDesc": "29分钟", + "deliveryTime": "11:17-11:32", + "address": "", + "phone": "", + "consignee": "", + "discountCarriage": "", + "carriage": "", + "products": [ + { + "image": "", + "title": "", + "desc": "一人份", + "price": "", + "count": "数量x1" + } + ], + "productsInfo": { + "cutleryCount": "商家按餐量提供", + "deliveryPreference": "允许敲门/按门铃;允许发短信", + "outOfStock": "缺货时与我电话沟通" + }, + "orderInfo": [ + { + "label": "订单编号", + "key": "orderNumber", + "value": "", + "type": "number" + }, + { + "label": "交易快照", + "key": "transactionSnapshot", + "value": "发生交易争执时,可作为判断依据" + }, + { + "label": "支付方式", + "key": "paymentMethod", + "value": "微信支付", + "type": "text" + }, + { + "label": "下单时间", + "key": "orderTime", + "value": "", + "type": "time" + } + ], + "promoType": "text", + "promoHighlight": "近90天600+人回购" + }, + "beicanzhong": { + "id": 9632554, + "shopType": "waimai", + "type": "beicanzhong", + "shopName": "安野屋 (AARYE) 京...", + "status": "骑手到店取餐中", + "trackingTitle": "10: 22-10: 55", + "trackingDesc": "骑手已到店,大王", + "trackingTime": "2026-03-10 15: 14: 30", + "products": [ + { + "image": "/static/image/shopping/jingdong/product1.png", + "title": "超值哈哈哈哈哈哈哈哈哈哈哈哈哈哈好热 少糖", + "desc": "不支持7天无理由退货", + "service": "", + "tags": [], + "price": "69.00", + "count": "1", + } + ], + "productsInfo": { + "cutleryCount": "商家按餐量提供", + "deliveryPreference": "允许敲门/按门铃;允许发短信", + "outOfStock": "缺货时与我电话沟通" + }, + "orderInfo": [ + { + "label": "订单编号", + "key": "orderNumber", + "value": "", + "type": "number" + }, + { + "label": "交易快照", + "key": "transactionSnapshot", + "value": "发生交易争执时,可作为判断依据" + }, + { + "label": "下单时间", + "key": "orderTime", + "value": "", + "type": "time" + }, + { + "label": "支付时间", + "key": "paymentTime", + "value": "", + "type": "time" + }, + { + "label": "支付方式", + "key": "paymentMethod", + "value": "微信支付", + "type": "text" + }, + { + "label": "如遇缺货", + "key": "outOfStock", + "value": "缺货时与我电话沟通", + "type": "text" + } + ] + }, + "qvcanzhong": { + "id": "63254112", + "shopType": "waimai", + "type": "qvcanzhong", + "shopName": "安野屋 (AARYE) 京...", + "status": "商家备餐中", + "trackingTitle": "10: 22-10: 55", + "trackingDesc": "商家已接单,商品备餐中", + "trackingTime": "2026-03-10 15: 14: 30", + "products": [ + { + "image": "/static/image/shopping/jingdong/product1.png", + "title": "超值哈哈哈哈哈哈哈哈哈哈哈哈哈哈好热 少糖", + "desc": "不支持7天无理由退货", + "service": "", + "tags": [], + "price": "69.00", + "count": "1" + } + ], + "productsInfo": { + "cutleryCount": "商家按餐量提供", + "deliveryPreference": "允许敲门/按门铃;允许发短信", + "outOfStock": "缺货时与我电话沟通" + }, + "orderInfo": [ + { + "label": "订单编号", + "key": "orderNumber", + "value": "", + "type": "number" + }, + { + "label": "交易快照", + "key": "transactionSnapshot", + "value": "发生交易争执时,可作为判断依据" + }, + { + "label": "下单时间", + "key": "orderTime", + "value": "", + "type": "time" + }, + { + "label": "支付时间", + "key": "paymentTime", + "value": "", + "type": "time" + }, + { + "label": "送达时间", + "key": "paymentMethod", + "value": "微信支付", + "type": "time" + }, + { + "label": "如遇缺货", + "key": "outOfStock", + "value": "缺货时与我电话沟通", + "type": "text" + } + ], + }, + "yiwancheng": { + "id": 78456211, + "shopType": "waimai", + "type": "yiwancheng", + "shopName": "瑞幸咖啡", + "status": "完成", + "statusColor": "gray", + "products": [ + { + "image": "/static/image/shopping/jingdong/product1.png", + "title": "多肉桃桃哈哈哈哈哈哈哈哈哈哈好和和好", + "desc": "不支持7天无理由退货", + "service": "", + "tags": [], + "price": "69.00", + "count": "1" + } + ], + "productsInfo": { + "cutleryCount": "商家按餐量提供", + "deliveryPreference": "允许敲门/按门铃;允许发短信", + "outOfStock": "缺货时与我电话沟通" + }, + "orderInfo": [ + { + "label": "订单编号", + "key": "orderNumber", + "value": "", + "type": "number" + }, + { + "label": "交易快照", + "key": "transactionSnapshot", + "value": "发生交易争执时,可作为判断依据" + }, + { + "label": "下单时间", + "key": "orderTime", + "value": "", + "type": "time" + }, + { + "label": "支付时间", + "key": "paymentTime", + "value": "", + "type": "time" + }, + { + "label": "支付方式", + "key": "paymentMethod", + "value": "微信支付", + "type": "text" + }, + { + "label": "如遇缺货", + "key": "outOfStock", + "value": "缺货时与我电话沟通", + "type": "text" + } + ], + "promoType": "coupon", + "promoText": "恭喜您获得3元京东购物券", + "promoAction": "去领券" + }, + "yiquxiao": { + "id": "52322221", + "shopType": "waimai", + "type": "yiquxiao", + "shopName": "瑞幸咖啡", + "status": "已取消", + "statusColor": "gray", + "products": [ + { + "image": "/static/image/shopping/jingdong/product1.png", + "title": "多肉桃桃哈哈哈哈哈哈哈哈哈哈好和和好", + "desc": "不支持7天无理由退货", + "tags": [], + "service": "", + "price": "69.00", + "count": "1" + } + ], + "productsInfo": { + "cutleryCount": "商家按餐量提供", + "deliveryPreference": "允许敲门/按门铃;允许发短信", + "outOfStock": "缺货时与我电话沟通" + }, + "orderInfo": [ + { + "label": "订单编号", + "key": "orderNumber", + "value": "", + "type": "number" + }, + { + "label": "交易快照", + "key": "transactionSnapshot", + "value": "发生交易争执时,可作为判断依据" + }, + { + "label": "下单时间", + "key": "orderTime", + "value": "", + "type": "time" + }, + { + "label": "支付时间", + "key": "paymentTime", + "value": "", + "type": "time" + } + ] + } + }, + "waimaiType": [ + { + "label": "未支付", + "key": "weizhifu" + }, + { + "label": "备餐中", + "key": "beicanzhong" + }, + { + "label": "取餐中", + "key": "qvcanzhong" + }, + { + "label": "已完成", + "key": "yiwancheng" + }, + { + "label": "取消", + "key": "yiquxiao" + } ] } \ No newline at end of file diff --git a/pages/shopping/jingdong/list-index.vue b/pages/shopping/jingdong/list-index.vue index a296671..7865469 100644 --- a/pages/shopping/jingdong/list-index.vue +++ b/pages/shopping/jingdong/list-index.vue @@ -112,6 +112,7 @@ import { ref, computed, onMounted, getCurrentInstance } from 'vue'; import { onShow } from '@dcloudio/uni-app'; import ShoppingCard from '@/components/shopping/jingdong/shopping-card.vue'; import { util } from '@/utils/common.js'; +import { shoppingType, waimaiType } from './json/order.json'; const showActionMenu = ref(false); const actionMenuState = ref({ x: 0, y: 0, item: null }); @@ -134,9 +135,12 @@ const buttonGroup = [ }, { name: "新增秒送订单", click: () => { - uni.showToast({ - title: '开发中,敬请期待', - icon: 'none' + // uni.showToast({ + // title: '开发中,敬请期待', + // icon: 'none' + // }); + uni.navigateTo({ + url: '/pages/shopping/jingdong/add-waimai/add-waimai' }); } }, @@ -198,7 +202,9 @@ const handleCardClick = (item) => { url: '/pages/shopping/jingdong/order-detail/order-detail?id=' + item.id }); } else { - + uni.navigateTo({ + url: '/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail?id=' + item.id + }); } }; @@ -525,6 +531,36 @@ const tabList = ref([ const switchTab = (index) => { if (tabList.value[index].disabled) return; currentTab.value = index; + // 重置筛选 + currentFilter.value = -1; + // 动态更新筛选项 + updateFilterList(); +}; + +/** + * 根据当前Tab更新筛选项列表 + */ +const updateFilterList = () => { + if (currentTab.value === 1) { // 购物 + filterList.value = shoppingType.map(item => ({ + name: item.label, + key: item.key + })); + } else if (currentTab.value === 2) { // 秒送 (外卖) + filterList.value = waimaiType.map(item => ({ + name: item.label, + key: item.key + })); + } else { // 全部或服务 + filterList.value = [ + { name: '待付款' }, + { name: '待收货' }, + { name: '待使用', disabled: false }, + { name: '已完成' }, + { name: '待评价' }, + { name: '已取消' } + ]; + } }; const currentFilter = ref(-1); @@ -582,13 +618,33 @@ const filteredOrderList = computed(() => { if (currentFilter.value === -1) { result = baseList; } else { - const filterName = filterList.value[currentFilter.value].name; + const filterItem = filterList.value[currentFilter.value]; + const filterName = filterItem.name; + const filterKey = filterItem.key; + result = baseList.filter(item => { + // 如果有 key,优先使用 key 匹配 (适用于外卖或已定义的购物类型) + if (filterKey) { + if (item.shopType === 'waimai') { + if (filterKey === 'weizhifu') return item.status === '等待付款'; + if (filterKey === 'beicanzhong') return item.status === '商家备餐中' || item.status === '骑手到店取餐中'; + if (filterKey === 'qvcanzhong') return item.status === '取餐中' || item.status === '商家备餐中' || item.status === '骑手到店取餐中'; + if (filterKey === 'yiwancheng') return item.status === '完成' || item.status === '已完成'; + if (filterKey === 'yiquxiao') return item.status === '已取消'; + } + // 购物类型 key 匹配 + if (filterKey === 'dengdaifukuan') return item.status === '等待付款'; + if (filterKey === 'zhengzaichuku') return item.status === '正在出库' || item.status === '仓库处理中'; + if (filterKey === 'yiqianshou' || filterKey === 'wancheng') return item.status === '完成' || item.status === '已签收'; + if (filterKey === 'yiquxiao') return item.status === '已取消'; + } + + // 兜底使用原来基于名称的模糊模糊逻辑 if (filterName === '待付款') return item.status === '等待付款'; - if (filterName === '待收货') return item.status === '正在出库' || item.status === '待收货' || item.status === '运输中' || item.status === '已发货' || item.status === '商家备餐中' || item.status === '骑手到店取餐中'; + if (filterName === '待收货') return ['正在出库', '待收货', '运输中', '已发货', '商家备餐中', '骑手到店取餐中', '仓库处理中'].includes(item.status); if (filterName === '待使用') return item.status === '待使用'; - if (filterName === '已完成') return item.status === '完成' || item.status === '已完成' || item.status === '已签收'; - if (filterName === '待评价') return item.status === '待评价' || item.status === '完成' || item.status === '已完成'; + if (filterName === '已完成') return ['完成', '已完成', '已签收'].includes(item.status); + if (filterName === '待评价') return ['待评价', '完成', '已完成'].includes(item.status); if (filterName === '已取消') return item.status === '已取消'; return true; }); diff --git a/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail.vue b/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail.vue new file mode 100644 index 0000000..724e098 --- /dev/null +++ b/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail.vue @@ -0,0 +1,484 @@ + + + + + + + diff --git a/static/image/shopping/jingdong/waimai/beican.png b/static/image/shopping/jingdong/waimai/beican.png new file mode 100644 index 0000000000000000000000000000000000000000..bda1d09110c9128488bc17de7fe1c05c6b3810d6 GIT binary patch literal 2486 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 Ao&W#< literal 0 HcmV?d00001 diff --git a/static/image/shopping/jingdong/waimai/fenxiang.png b/static/image/shopping/jingdong/waimai/fenxiang.png new file mode 100644 index 0000000000000000000000000000000000000000..7ee3e8a5c22d090e68594b6ecae9704bb3bd6f0e GIT binary patch literal 727 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 NJzf1=);T3K0RV@K;aC6w literal 0 HcmV?d00001 diff --git a/static/image/shopping/jingdong/waimai/qianshou.png b/static/image/shopping/jingdong/waimai/qianshou.png new file mode 100644 index 0000000000000000000000000000000000000000..c0c3ebbbc245b94245368dc6ad63f218b79e1ca6 GIT binary patch literal 1677 zcmYk6dpOg39LJ|f4bc)Rx;UqUS)E#Eb1IT-$)O!X<#LoRNOevZB_XFrWw{NxY#7Te zhFsdhXrrxRX0s`0$k@zWDjS(7#rf5qr>FPx`hLHk&-?RvzJGi_&-0DoK0ZG2_RZUGdiPD50cvKbnwpvdULF|K^t2jy zQnmWS!ors?UzQ5Qd!)eN5!XC1ULdVy%fYJ+jn*2QnVH)_5r{obuAaw&u14LC!{?V$ zC{^`MjMnbHp^-_|)UjpSS7c9Y$da;8{n1ySg%YUC^OS zOAP(m(;zDsw!rdwqTyqXeZUz{!B}jA1p8-)g2&^ zX;0457`O4JIs?a^m)pH$cMBc#Y>PXp&)wZ*9x^eGgB3N0Sv&7fsqr*(i6MM!OnwHQ z;zd^%56f=0RJ6-;OAZPXB9ursXq`RE!2J}s2zBFAo6ZBw+g{ZIt8M1O?NBV-w zR`Hr$^H%*qi*P0f$$Hxm4Yxd37!cg&#hc&Dikf8hpjKbhI$|f8Kf#U|8N@wG_%EJc zJ6;$jwZO?mNqUNH+|Loq*YfA-qYalNkl0B#Vp$u#?fBxHhfXdT65&VMe6#Z8g~FA{ zfTeq((J^=T45;STBn;Q;EKBT?by#|y{BXq)dwIzU5?{T$#$?5mY>U&BP#3~Eu6Kp; z;f#C@b6?cvOR3h($mA%nOtd~OVQv5w*Ic?q?VzRa;!lqvJ{dYZ!PmBR`DxqSfPbm` zuihDpyR1KUtovm=C)_LC-}u$0<1M*(qvv?LSEug#6&jj0mWy4`&zYfye^>P4(gk2A zZb?|Il!GppE>V{$?ANyRuN$JYUcY&d$=?89;-;CkR}M~GnAjMQY1T9HB4UTW{r<$T z#EpcxQ2hZMuV9`l&iA_Gc`9edznK26$(V wf{1HFQtMwJs00}!c3xRz9k1FCiE*4Uw2HeUInyr21K$hC6^%hv9Sn^9ALby+!vFvP literal 0 HcmV?d00001 diff --git a/static/image/shopping/jingdong/waimai/qvcan.png b/static/image/shopping/jingdong/waimai/qvcan.png new file mode 100644 index 0000000000000000000000000000000000000000..a3eafeff5b2c603245896e89e231814d7be5fb1b GIT binary patch literal 2473 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 literal 0 HcmV?d00001 diff --git a/static/image/shopping/jingdong/waimai/waimai.png b/static/image/shopping/jingdong/waimai/waimai.png new file mode 100644 index 0000000000000000000000000000000000000000..8f27230b260c7ea411c4e153cfc746b9c876728b GIT binary patch literal 1601 zcmXZbc|6p47zglSUaMkeeslch`YF4XP7~eQlGcWjBScLJA#`Ae0lC=!|M=fBf{BSdg<+q@upKZ_4w&dO05;kY z8v{6DV*zJu9B>vJ?}AMLT(OCO8#W0z2jDpFSdKgHCg6cf20U@Mfb+Q97jP*TaH$t@ zsh4o6UO287j^_v)U@i{^GoM3!z2tGFyAmoMO^TP1?VTAl}e115g0Jx4XxK1dFAc!If#ZiP3 zHlZYnAdVu6qlu-_gwhydSqz~JWGwN19I-r}Se`(vNFY`w604Gk)f`gIO=8VWQtd5b z-7Qjm3h4omN@@VOq(*>8YU05XK1srdB?6K}05=17U}+jjng%}v?!qlX_)$9iI0J6K zM{du8+q1|W*>FcTxig0>%OyX_BX{MKy9>xq3jxa0B61HPqR2&Lc`>CID4{$rr6_4EJQJ|4F+C+QZM0+El zy=kV6HPgnWwDE_uw-0F(Kns215q%P9rN3*XPd%njx6$9X)8BW{XMj%n?03klj6N$v zJ^)XUIiL&qvm5yfc#3=kdXP_m9QoXf{QV42|MFaYUZK9w_x;j#c?%J6d1_Z}t&XGM zZT2T?TU%%6mIq#Vji69ymYK1U-I0z`{-lG#8g6GN<*+Uqi~8biqjQSRIJ9`GG2 zLhI+$ll>syxdV9EF7M(xlS__S{ifXu$xUVo<@F-NXpMnX@@sMMrG(Ol-C{RAB5JhM5(1oyO7r)0^AGDwpjI zMO8l!l&Gq?d#ePLRE0W8FD|;a?{D+LbRAXJD6X1WUamx3rYH3kda-Wys0paDSyfZK zw%WF^avLLj{aIv#jsWYj?##r10m+u~^=UuPg=xwQ+VR&R#U1*u*efzQE@mc7;4xcr(4P!koQK(?T9Q4xU92%pO(JLEJRzoUX zEY=3`N$)qNY%=dUFFx*Ri6&YZSnm612G^oO-i90uV4$x|vEEvx%Ph{_Ah2M5xkk5} z{|ghfE1eliV^I#;=^n8MW1A;BTAIvM4H^r_*ErM+o9fMPW(4jt4eC3!v@&K8_+Wpp zRuyT7Iydz5+teG~8*;C#nGHE6?RX&Hi}v&i4XEa-35E`Sv`p!OR=2zwc}93?cw3s* z&yMi>aB0UFeU17&wEOV6q5+!@}^jZ$s7Euv$PVCd(s3>ZV4W5I5{L zveYzW($GaaWry=Zl_!lJg~4I-YM^@_>r zo?Xpbk~)efG_$IQ_8zvfvN^tFH7EAwvF8G>`;7G3s0;_E(zYDcKap1!mYuo0Ws0fg jwo;d!xZC)) Date: Wed, 15 Apr 2026 18:38:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E7=A7=92=E9=80=81=E5=A4=96=E5=8D=96=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shopping/jingdong/shopping-card.vue | 27 +- pages/balance/index.vue | 3 +- .../video-group-chat/video-group-chat.vue | 42 +- .../jingdong/add-waimai/add-waimai.vue | 476 +++++++- pages/shopping/jingdong/json/order.json | 60 +- pages/shopping/jingdong/list-index.vue | 38 +- .../jingdong/order-detail/order-detail.vue | 7 +- .../waimai-order-detail.vue | 1011 ++++++++++++++++- .../image/shopping/jingdong/waimai/back.png | Bin 0 -> 1047 bytes .../shopping/jingdong/waimai/baozhang.png | Bin 0 -> 1664 bytes static/image/shopping/jingdong/waimai/bg.png | Bin 0 -> 24491 bytes .../waimai/shop-recoomend/style-1.png | Bin 0 -> 147119 bytes .../waimai/shop-recoomend/style-2.png | Bin 0 -> 123922 bytes 13 files changed, 1560 insertions(+), 104 deletions(-) create mode 100644 static/image/shopping/jingdong/waimai/back.png create mode 100644 static/image/shopping/jingdong/waimai/baozhang.png create mode 100644 static/image/shopping/jingdong/waimai/bg.png create mode 100644 static/image/shopping/jingdong/waimai/shop-recoomend/style-1.png create mode 100644 static/image/shopping/jingdong/waimai/shop-recoomend/style-2.png diff --git a/components/shopping/jingdong/shopping-card.vue b/components/shopping/jingdong/shopping-card.vue index 6d294f8..099691b 100644 --- a/components/shopping/jingdong/shopping-card.vue +++ b/components/shopping/jingdong/shopping-card.vue @@ -14,7 +14,9 @@ - {{ formatStatusDesc(item.statusDesc) }} + {{ + item.shopType != 'waimai' ? formatStatusDesc(item.statusDesc) : + formatWaimaiStatusDesc(item.statusDesc) }} {{ @@ -87,7 +89,11 @@ - {{ safeFormatPrice(item) }} + {{ item.shopType === 'waimai' ? + (item.totalPrice ? Number(item.totalPrice).toFixed(2) : '0.00') + : + safeFormatPrice(item) + }} 共{{ @@ -119,7 +125,7 @@