From 4cb7784d4a0aac850a3eecb5ba11f27c9d54963f Mon Sep 17 00:00:00 2001
From: tangxinyue <524779910@qq.com>
Date: Thu, 21 May 2026 16:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A4=96=E5=8D=96=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/nav-bar/nav-bar.vue | 2 +-
main.js | 2 +-
pages.json | 8 +
.../about-this-iphone/about-this-iphone.vue | 27 +-
.../add-shangou-order/add-shangou-order.vue | 1493 +++++++++++++++++
.../taobao/components/list-card/list-card.vue | 284 +++-
pages/shopping/taobao/json/order.json | 929 +++++++++-
pages/shopping/taobao/list-index.vue | 29 +-
.../shangou-order-detail.vue | 304 ++--
static/image/shopping/taobao/daocha.png | Bin 0 -> 1720 bytes
static/image/shopping/taobao/shangou.png | Bin 0 -> 5105 bytes
.../shopping/taobao/tuikuanchenggong.png | Bin 0 -> 1005 bytes
.../shopping/taobao/waimai/deliveryPhoto1.png | Bin 0 -> 21135 bytes
.../shopping/taobao/waimai/deliveryPhoto2.png | Bin 0 -> 34131 bytes
static/image/shopping/taobao/waimai/map2.png | Bin 0 -> 136182 bytes
static/image/watermarkBG.png | Bin 7094 -> 9790 bytes
16 files changed, 2823 insertions(+), 255 deletions(-)
create mode 100644 pages/shopping/taobao/add-shangou-order/add-shangou-order.vue
create mode 100644 static/image/shopping/taobao/daocha.png
create mode 100644 static/image/shopping/taobao/shangou.png
create mode 100644 static/image/shopping/taobao/tuikuanchenggong.png
create mode 100644 static/image/shopping/taobao/waimai/deliveryPhoto1.png
create mode 100644 static/image/shopping/taobao/waimai/deliveryPhoto2.png
create mode 100644 static/image/shopping/taobao/waimai/map2.png
diff --git a/components/nav-bar/nav-bar.vue b/components/nav-bar/nav-bar.vue
index 8b9b2fd..26cb799 100644
--- a/components/nav-bar/nav-bar.vue
+++ b/components/nav-bar/nav-bar.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/main.js b/main.js
index 90b19b2..bfbed21 100644
--- a/main.js
+++ b/main.js
@@ -29,7 +29,7 @@ export function createApp() {
app.config.globalProperties.$system = plus.os.name;
// #endif
app.config.globalProperties.$systemInfo = systemInfo
- uni.setStorageSync('version', '1.0.5.sp3')
+ uni.setStorageSync('version', '1.0.5.sp4')
app.config.globalProperties.$version = uni.getStorageSync('version')
app.use(globalMethods);
return {
diff --git a/pages.json b/pages.json
index f3af044..6431d01 100644
--- a/pages.json
+++ b/pages.json
@@ -108,6 +108,14 @@
"navigationBarTitleText": "淘宝闪购订单详情",
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "taobao/add-shangou-order/add-shangou-order",
+ "style" :
+ {
+ "navigationBarTitleText" : "添加淘宝闪购订单详情",
+ "navigationStyle": "custom"
+ }
}
]
},
diff --git a/pages/other/about-this-iphone/about-this-iphone.vue b/pages/other/about-this-iphone/about-this-iphone.vue
index a80c1b1..345b65e 100644
--- a/pages/other/about-this-iphone/about-this-iphone.vue
+++ b/pages/other/about-this-iphone/about-this-iphone.vue
@@ -1,7 +1,7 @@
-
+
@@ -13,7 +13,7 @@
-
+
@@ -143,6 +143,8 @@ const defaultData = [
const listData = ref([]);
const statusBarHeight = ref(0);
+const isAndroid = ref(false);
+
onShow(() => {
// #ifdef APP-PLUS
util.setAndroidSystemBarColor('#F2F1F6')
@@ -166,6 +168,10 @@ onMounted(() => {
const systemInfo = uni.getSystemInfoSync();
statusBarHeight.value = systemInfo.statusBarHeight || 0;
+ if (systemInfo.osName === 'android' || systemInfo.platform === 'android') {
+ isAndroid.value = true;
+ }
+
const cached = uni.getStorageSync(CACHE_KEY);
if (cached) {
try {
@@ -250,6 +256,20 @@ const confirmModal = () => {
}
}
+/* 安卓手机降级:取消复杂的渐变、滤镜与遮罩,直接使用纯色 */
+.custom-nav-bar.android-nav {
+ opacity: 1 !important;
+ background: #F2F1F6 !important;
+ backdrop-filter: none !important;
+ -webkit-backdrop-filter: none !important;
+ mask-image: none !important;
+ -webkit-mask-image: none !important;
+
+ .nav-content {
+ padding-bottom: 10rpx !important;
+ }
+}
+
.nav-placeholder {
width: 100%;
padding-top: 146rpx;
@@ -267,8 +287,8 @@ const confirmModal = () => {
.info-container {
padding: 30rpx;
+ padding-top: 0;
padding-bottom: 60rpx;
- margin-top: 60rpx;
}
.info-group {
@@ -323,6 +343,7 @@ const confirmModal = () => {
line-height: 32rpx;
margin-bottom: 16rpx;
color: #85858A;
+ font-weight: 500;
}
.custom-modal-mask {
diff --git a/pages/shopping/taobao/add-shangou-order/add-shangou-order.vue b/pages/shopping/taobao/add-shangou-order/add-shangou-order.vue
new file mode 100644
index 0000000..97af1e1
--- /dev/null
+++ b/pages/shopping/taobao/add-shangou-order/add-shangou-order.vue
@@ -0,0 +1,1493 @@
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 骑手正在按序送货
+ 前方剩余
+
+ ,约
+ 送达
+
+
+
+
+
+
+
+
+ 待支付,剩余
+
+
+
+ {{
+ order.remainingPayTime }}
+
+
+
+
+
+
+
+
+
+ 预计
+
+
+
+ {{ order.deliveryTime
+ }}
+
+
+
+
+
+
+ 送至
+
+
+
+
+
+ 送达图片
+
+ +
+
+
+
+
+
+
+
+ 服务
+
+ 超20分钟免单-生效中
+ 若超时,即{{ timeoutDelivery }}后送达赔4元可叠加红包
+
+
+
+
+ 配送地图
+
+
+
+
+
+
+
+
+ 去支付 ¥
+
+
+
+
+
+
+
+
+
+
+ (
+
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ¥
+
+
+
+
+
+ 原价 ¥
+
+
+
+
+
+
+
+ + 添加商品
+
+
+
+
+
+
+
+
+
+ 实付¥
+
+
+
+ ¥
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 价格明细
+
+
+ 总优惠
+ ¥
+
+
+ 实付¥
+
+
+
+
+
+
+
+ {{ detail.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ info.label
+ }}
+
+
+
+
+ onDeliveryInfoChange(e, index)"
+ class="flex-1" :disabled="order.statusType === 'wait_pay'">
+
+ {{ info.value || '请选择送达时间'
+ }}
+
+
+
+
+
+
+
+ onOrderTimeChange(e, index)" class="flex-1">
+
+ {{ info.value || '请选择时间'
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/shopping/taobao/components/list-card/list-card.vue b/pages/shopping/taobao/components/list-card/list-card.vue
index 1d8997a..39da94a 100644
--- a/pages/shopping/taobao/components/list-card/list-card.vue
+++ b/pages/shopping/taobao/components/list-card/list-card.vue
@@ -4,72 +4,154 @@
@touchstart="handleTouchStart($event, item)" @touchmove="handleTouchMove" @touchend="handleTouchEnd">
+
+
+
+
+
+
+
+ {{ getTruncatedTitle(item, index, goods, gIdx) }}
+ {{ goods.specs }}
+
+
+
+ ¥
+ {{ goods.price }}
+ x{{ goods.count || 1 }}
+
+
+
+
+ {{ goods.tags }}
+
+
+
+
+
+
+ 评价将帮助70人
+
+
+
+
+ 差评
+
+
+ 中评
+
+
+ 好评
+
+
+
+
+
+
+
+ 退款成功
+
+
+ {{ item.statusDesc }}
+
+
+
+
+
+
-
+
+
+
+
+ 预计 {{ item.deliveryTime || '14:15-14:45' }}
+ 送达
+ 下单时间 {{ item.orderInfo?.[8]?.value }}
+
+
+
+
+
订单即将关闭,建议尽快付款
@@ -87,32 +169,35 @@
-
+
退款成功
{{ item.statusDesc }}
- 共{{ getTotalCount(item.goodsList) }}件商品
- 实付款
+ 共{{
+ getTotalCount(item.goodsList) }}件{{ item.orderType === 'waimai' ? ' (含包装/配送费)' : '商品' }}
+ 实付款
¥
{{ Number(
- item.totalPrice).toFixed(2).split(".")[0] }}
+ item.priceDetail?.actualPay || item.totalPrice || 0).toFixed(2).split(".")[0] }}
.{{ Number(
- item.totalPrice).toFixed(2).split(".")[1] }}
+ item.priceDetail?.actualPay || item.totalPrice || 0).toFixed(2).split(".")[1] }}
-
+ @longpress="onItemLongPress" :currentFilter="currentFilter" />
{
- uni.showToast({
- title: '开发中,敬请期待',
- icon: 'none'
+ uni.navigateTo({
+ url: '/pages/shopping/taobao/add-shangou-order/add-shangou-order'
});
}
}, {
@@ -303,11 +302,11 @@ const displayList = computed(() => {
}
}
- // 3. 时间降序排列逻辑 (创建时间 || 申请时间)
+ // 3. 时间降序排列逻辑 (创建时间 || 申请时间 || 下单时间)
list.sort((a, b) => {
const getTime = (order) => {
if (!order.orderInfo) return '';
- const create = order.orderInfo.find(i => i.key === 'createTime')?.value;
+ const create = order.orderInfo.find(i => i.key === 'createTime' || i.label === '下单时间')?.value;
const apply = order.orderInfo.find(i => i.key === 'applyTime')?.value;
return create || apply || '';
};
@@ -555,7 +554,11 @@ const switchFilter = (index) => {
};
const goDetail = (item) => {
- util.goPage(`/pages/shopping/taobao/shopping-order-detail/shopping-order-detail?id=${item.id}`)
+ if (item.orderType === 'waimai') {
+ util.goPage(`/pages/shopping/taobao/shangou-order-detail/shangou-order-detail?id=${item.id}`)
+ } else {
+ util.goPage(`/pages/shopping/taobao/shopping-order-detail/shopping-order-detail?id=${item.id}`)
+ }
}
/**
@@ -587,9 +590,15 @@ const handleMenuAction = (action) => {
if (!item) return;
if (action === 'edit') {
- uni.navigateTo({
- url: `/pages/shopping/taobao/add-shopping-order/add-shopping-order?id=${item.id}&isEdit=true`
- });
+ if (item.orderType === 'waimai') {
+ uni.navigateTo({
+ url: `/pages/shopping/taobao/add-shangou-order/add-shangou-order?id=${item.id}&isEdit=true`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/shopping/taobao/add-shopping-order/add-shopping-order?id=${item.id}&isEdit=true`
+ });
+ }
} else if (action === 'delete') {
uni.showModal({
title: '提示',
diff --git a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
index baccc22..890cb11 100644
--- a/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
+++ b/pages/shopping/taobao/shangou-order-detail/shangou-order-detail.vue
@@ -1,8 +1,9 @@
-
+
@@ -25,13 +26,17 @@
-
-
+
+
+
骑手正在按序送货
- 前方剩余2单,约11分钟送达
+ 前方剩余{{ order.orderQty }},约{{
+ order.surplusDeliveryTime }}送达
@@ -65,7 +70,7 @@
- 待支付,剩余15:00
+ 待支付,剩余{{ order.remainingPayTime }}
{{ order.statusType == 'success' ? '订单已送达' : '订单已取消' }}
@@ -81,13 +86,13 @@
预计
- 16:32-16:47
+ {{ order.deliveryTime }}
送至
- 金星哈哈哈哈哈哈哈和和哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈 王总(女士) 12563259856
+ {{order.orderInfo.find(item => item.label === '收货信息')?.value || ''}}
修改
@@ -95,7 +100,7 @@
-
+
服务
超20分钟免单-生效中
- 若超时,即11:57后送达赔4元可叠加红包
+ 若超时,即{{ timeoutDelivery }}后送达赔4元可叠加红包
- 去支付 ¥15.6
+ 去支付 ¥{{ order.priceDetail.actualPay }}
支持更多支付方式
@@ -144,23 +149,22 @@
-
- {{ orderData.shopName }}
+ {{ order.shopName }}({{ order.location }})
-
+
-
- 共{{ orderData.goodsList.length }}件
+ 共{{ order.goodsList.length }}件
-
+
@@ -177,7 +181,7 @@
-
+
{{ fee.name }}
+ v-for="(comp, index) in order.compensations" :key="'comp-' + index">
{{ comp.name }}
-
+
价格明细
-
总优惠
¥
- {{ orderData.priceDetail.totalDiscount }}
+ {{ order.priceDetail.totalDiscount }}
实付¥{{
- orderData.priceDetail.actualPay }}
+ order.priceDetail.actualPay }}
-
-
- {{ detail.name }}
- {{
- detail.value
- }}
-
+
+
+
+ {{ detail.name }}
+ {{
+ detail.value
+ }}
+
+
+
-
+
+
{{ info.label
}}
@@ -257,87 +264,113 @@
|
复制
+
+ |
+ 申请
+
-
+
+
-
+
订单信息
-
+
+
+ 常见问题
+
+ 少送餐品
+ 餐品撒漏
+ 未收到餐品
+
+
+
+
+
+