From e6aa5f29ed5c01f124903bbfca7e3c20f3f55baf Mon Sep 17 00:00:00 2001
From: tangxinyue <524779910@qq.com>
Date: Mon, 27 Apr 2026 09:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=AC=E4=B8=9C=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=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       |  83 ++++++++-
 main.js                                       |  14 +-
 .../shopping/jingdong/add-order/add-order.vue |   2 +-
 .../jingdong/add-waimai/add-waimai.vue        |   2 +-
 pages/shopping/jingdong/json/order.json       |   2 +-
 pages/shopping/jingdong/list-index.vue        |  18 +-
 .../jingdong/order-detail/order-detail.vue    | 166 ++++++++++++++----
 .../waimai-order-detail.vue                   |   8 +-
 .../image/shopping/jingdong/detail/help.png   | Bin 802 -> 769 bytes
 .../jingdong/product/shopping/iphone.png      | Bin 8584 -> 7517 bytes
 static/image/shopping/jingdong/waimai.png     | Bin 2358 -> 1973 bytes
 11 files changed, 232 insertions(+), 63 deletions(-)

diff --git a/components/shopping/jingdong/shopping-card.vue b/components/shopping/jingdong/shopping-card.vue
index 1ff0168..ae17725 100644
--- a/components/shopping/jingdong/shopping-card.vue
+++ b/components/shopping/jingdong/shopping-card.vue
@@ -3,8 +3,14 @@
         <!-- Header -->
         <view class="card-header">
             <view class="shop-info">
-                <view class="tag self-tag" v-if="item.shopType === 'self'">自营</view>
-                <view class="tag waimai-tag" v-if="item.shopType === 'waimai'">外卖</view>
+                <!-- <view class="">
+
+                </view> -->
+                <image v-if="item.shopType === 'self'" style="width: 50rpx;margin-right: 12rpx;border-radius: 4rpx;"
+                    src="/static/image/shopping/jingdong/detail/ziyin.png" mode="widthFix"></image>
+                <image v-if="item.shopType === 'waimai'" style="width: 50rpx;margin-right: 8rpx;border-radius: 4rpx;"
+                    src="/static/image/shopping/jingdong/waimai/waimai.png" mode="widthFix"></image>
+                <!-- <view class="tag waimai-tag">外卖</view> -->
                 <image class="jd-tag" v-if="item.shopType === 'jd'" src="/static/image/shopping/jingdong/JD.png">
                 </image>
                 <text class="shop-name">{{ item.shopName }}</text>
@@ -72,7 +78,8 @@
             <template v-else>
                 <image class="product-img" :src="item.image" mode="aspectFill"></image>
                 <view class="product-info">
-                    <text class="product-title">{{ item.title }}</text>
+                    <text class="product-title" :class="{ 'shopping-title': item.shopType !== 'waimai' }">{{
+                        truncatedTitle }}</text>
                     <text class="product-desc" v-if="item.desc">{{ item.desc }}</text>
                     <view class="product-tags" v-if="item.tags && item.tags.length">
                         <text class="tag" v-for="(tag, index) in item.tags" :key="index">{{ tag }}</text>
@@ -83,7 +90,8 @@
                 :class="{ 'flex-1': item.products && item.products.length === 1 }">
                 <view class="product-info flex-1">
                     <template v-if="item.products && item.products.length === 1">
-                        <text class="product-title">{{ item.products[0].title }}</text>
+                        <text class="product-title" :class="{ 'shopping-title': item.shopType !== 'waimai' }">{{
+                            truncatedTitle }}</text>
                         <text class="product-desc" v-if="item.products[0].desc">{{ item.products[0].desc }}</text>
                         <view class="product-tags" v-if="item.products[0].service">
                             <text class="tag">{{ item.products[0].service }}</text>
@@ -131,7 +139,7 @@
             </template>
             <template v-else-if="item.promoType === 'text'">
                 <text class="promo-text text-basic">本单可享 <text class="highlight">{{ item.promoHighlight
-                        }}</text>，快去支付吧~</text>
+                }}</text>，快去支付吧~</text>
             </template>
             <template v-else>
                 <text class="promo-text text-basic">当笔订单返现成功到账，<text style="color: #E31700;">点击领取</text></text>
@@ -157,7 +165,7 @@
 </template>
 
 <script setup>
-import { defineProps, computed, defineEmits } from 'vue';
+import { defineProps, defineEmits, ref, onMounted, watch, getCurrentInstance } from 'vue';
 
 const props = defineProps({
     item: {
@@ -173,6 +181,62 @@ const onLongPress = (e) => {
     emit('longpress', { event: e, item: props.item });
 };
 
+// --- JS 标题截断逻辑开始 ---
+const instance = getCurrentInstance();
+const truncatedTitle = ref('');
+
+const calculateFitTitle = () => {
+    const originalTitle = props.item.products?.[0]?.title || props.item.title || '';
+    if (props.item.shopType === 'waimai') {
+        truncatedTitle.value = originalTitle;
+        return;
+    }
+
+    setTimeout(() => {
+        const query = uni.createSelectorQuery().in(instance);
+        // 测量所在的容器宽度
+        query.select('.product-info').boundingClientRect(res => {
+            if (res && res.width) {
+                const containerWidth = res.width;
+                const fontSize = uni.upx2px(26); // 26rpx 对应的像素大小
+
+                let currentWidth = 0;
+                let cutIndex = 0;
+                let found = false;
+
+                for (let i = 0; i < originalTitle.length; i++) {
+                    const char = originalTitle[i];
+                    const charCode = char.charCodeAt(0);
+                    let weight = 1;
+
+                    if (charCode <= 255) {
+                        if (/[A-Z]/.test(char)) weight = 0.7;
+                        else if (/[a-z]/.test(char)) weight = 0.5;
+                        else if (/[0-9]/.test(char)) weight = 0.55;
+                        else if (char === ' ') weight = 0.25;
+                        else weight = 0.5;
+                    }
+
+                    currentWidth += weight * fontSize;
+
+                    if (currentWidth > containerWidth - uni.upx2px(4)) {
+                        cutIndex = i;
+                        found = true;
+                        break;
+                    }
+                }
+                truncatedTitle.value = found ? originalTitle.slice(0, cutIndex - 1) : originalTitle;
+            } else {
+                truncatedTitle.value = originalTitle;
+            }
+        }).exec();
+    }, 200);
+};
+
+onMounted(calculateFitTitle);
+watch(() => props.item, calculateFitTitle, { deep: true, immediate: true });
+// --- JS 标题截断逻辑结束 ---
+
 const formatWaimaiStatusDesc = (desc) => {
     if (!desc || !desc.includes(':')) return desc;
     const parts = desc.split(':');
@@ -533,8 +597,13 @@ const getButtons = (shopType, status, item) => {
                 color: #1A1A1A;
                 line-height: 36rpx;
                 // white-space: nowrap;
-                text-overflow: hidden;
+                text-overflow: clip;
                 overflow: hidden;
+
+                &.shopping-title {
+                    width: 100%;
+                    white-space: nowrap;
+                }
             }
 
             .product-desc {
diff --git a/main.js b/main.js
index 5ba41b0..d1c4ae7 100644
--- a/main.js
+++ b/main.js
@@ -16,18 +16,20 @@ app.$mount()
 import {
 	createSSRApp
 } from 'vue'
-import {
-	store,
-	useStore
-} from './store'
 export function createApp() {
 	const app = createSSRApp(App)
 	// 从缓存读取系统信息（已在App.vue中获取）
 	app.config.globalProperties.$pageData = pageData
-	const systemInfo = uni.getStorageSync('systemInfo') || {}
+	let systemInfo = uni.getStorageSync('systemInfo') || {}
+	if (!systemInfo.platform) {
+		systemInfo = uni.getSystemInfoSync() || {}
+	}
 	app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android'
+	// #ifdef APP-PLUS
+	app.config.globalProperties.$system = plus.os.name;
+	// #endif
 	app.config.globalProperties.$systemInfo = systemInfo
-	uni.setStorageSync('version', '1.0.4.sp13')
+	uni.setStorageSync('version', '1.0.4.sp17')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 	app.use(globalMethods);
 	return {
diff --git a/pages/shopping/jingdong/add-order/add-order.vue b/pages/shopping/jingdong/add-order/add-order.vue
index 66ccd8c..ca9041f 100644
--- a/pages/shopping/jingdong/add-order/add-order.vue
+++ b/pages/shopping/jingdong/add-order/add-order.vue
@@ -1036,7 +1036,7 @@ async function onConfirm() {
 	});
 	setTimeout(() => {
 		uni.navigateBack();
-	}, 1500);
+	}, 500);
 }
 
 const onShopTypeChange = (e) => {
diff --git a/pages/shopping/jingdong/add-waimai/add-waimai.vue b/pages/shopping/jingdong/add-waimai/add-waimai.vue
index 0de966c..09d9347 100644
--- a/pages/shopping/jingdong/add-waimai/add-waimai.vue
+++ b/pages/shopping/jingdong/add-waimai/add-waimai.vue
@@ -1186,7 +1186,7 @@ const onConfirm = () => {
 	});
 	setTimeout(() => {
 		uni.navigateBack();
-	}, 1500);
+	}, 500);
 }
 </script>
 
diff --git a/pages/shopping/jingdong/json/order.json b/pages/shopping/jingdong/json/order.json
index 96a9150..def4bfe 100644
--- a/pages/shopping/jingdong/json/order.json
+++ b/pages/shopping/jingdong/json/order.json
@@ -1070,7 +1070,7 @@
                     "name": "五粮液",
                     "title": "五粮液 普五 第八代 浓香型白酒 52度 500ml*2瓶",
                     "desc": "500ml*2礼盒装；浓香型",
-                    "service": "211限时达",
+                    "service": "七天无理由退货 ",
                     "price": "1099.00",
                     "count": "2"
                 }
diff --git a/pages/shopping/jingdong/list-index.vue b/pages/shopping/jingdong/list-index.vue
index ff6850d..263f3ca 100644
--- a/pages/shopping/jingdong/list-index.vue
+++ b/pages/shopping/jingdong/list-index.vue
@@ -25,9 +25,10 @@
 		<view class="tab-list">
 			<view class="tab-item" v-for="(item, index) in tabList" :key="index"
 				:class="{ active: currentTab === index }" @click="switchTab(index)">
-				<text class="title">{{ item.name }}</text>
+				<view class="title">{{ item.name }}</view>
 				<view class="line" v-if="currentTab === index"></view>
-				<image v-if="item.icon" class="badge-icon" :src="item.icon" mode="heightFix"></image>
+				<image v-if="item.icon" class="badge-icon" :class="{ 'android-m-top': $system == 'Android' }"
+					:src="item.icon" mode="heightFix"></image>
 			</view>
 		</view>
 		<view class="filter-wrapper">
@@ -756,14 +757,14 @@ const mockOrderList = ref([]);
 	.tab-item {
 		position: relative;
 		display: flex;
-		align-items: center;
+		align-items: flex-start;
 		margin-right: 58rpx;
 
 		.title {
 			font-size: 28rpx;
 			color: #1A1A1A;
 			font-weight: 700;
-			line-height: 28rpx;
+			line-height: 16px !important;
 		}
 
 		&.active {
@@ -790,10 +791,13 @@ const mockOrderList = ref([]);
 		}
 
 		.badge-icon {
-			position: relative;
-			top: 0;
 			margin-left: 2rpx;
-			height: 32rpx;
+			width: 30px;
+			height: 16px;
+
+			&.android-m-top {
+				margin-top: -3rpx;
+			}
 		}
 	}
 }
diff --git a/pages/shopping/jingdong/order-detail/order-detail.vue b/pages/shopping/jingdong/order-detail/order-detail.vue
index 134bf0a..ca5e5e8 100644
--- a/pages/shopping/jingdong/order-detail/order-detail.vue
+++ b/pages/shopping/jingdong/order-detail/order-detail.vue
@@ -167,7 +167,7 @@
 					</image>
 					<text class="title">{{ order.shopName }}</text>
 				</view>
-				<uni-icons class="right-icon" size="14" color="#1A1A1A" type="right"></uni-icons>
+				<uni-icons class="right-icon" size="12" color="#1A1A1A" type="right"></uni-icons>
 			</view>
 			<view class="product-info">
 				<view class="image-box">
@@ -176,26 +176,45 @@
 				</view>
 				<view class="info-box">
 					<view class="name">{{ order.products && order.products[0]?.title }}</view>
-					<view class="desc">{{ order.products && order.products[0]?.desc }}</view>
+					<view style="margin-top: 16rpx;" class=" w100 flex flex-justify-between">
+						<view class="flex-1" style="position: relative; overflow: hidden;">
+							<text id="desc-visible" class="desc"
+								:style="{ 'max-height': isDescExpanded ? 'none' : '32rpx' }"
+								style="display: block; text-overflow: clip;">
+								{{ order.products && order.products[0]?.desc }}
+							</text>
+							<!-- 测量层：必须继承 desc 类以同步样式 -->
+							<view id="desc-measure" class="desc desc-measure"
+								style="position: absolute; top: 0; left: 0; visibility: hidden; pointer-events: none; width: 100%; max-height: none;">
+								{{ order.products && order.products[0]?.desc }}
+							</view>
+						</view>
+						<uni-icons v-if="hasDescOverflow" :type="isDescExpanded ? 'up' : 'down'" size="12"
+							color="#87868E" style="flex-shrink: 0;"
+							@click="isDescExpanded = !isDescExpanded"></uni-icons>
+					</view>
 					<view class="tag">{{ order.products && order.products[0]?.service }}</view>
 				</view>
 				<view class="price-box">
-					<view v-if="(order.status != '等待付款' && order.status != '已取消') && order.discount > 0"
-						class="flex-center" style="display: inline-block;">
-						<image style="width: 22rpx;height: 22rpx;margin-right: 4rpx;"
-							src="/static/image/shopping/jingdong/detail/help.png">
-						</image>
-						<text
-							style="font-size: 22rpx;height: 22rpx;color: #87868E;font-weight: 300;line-height: 22rpx;margin-right: 2rpx;">到手价</text>
+					<view class="flex-align-center">
+						<view v-if="(order.status != '等待付款' && order.status != '已取消') && order.discount > 0"
+							class="flex-center" style="display: inline-flex;">
+							<image style="width: 11px;height: 11px;margin-right: 4rpx;"
+								src="/static/image/shopping/jingdong/detail/help.png">
+							</image>
+							<text
+								style="font-size: 22rpx;height: 22rpx;color: #87868E;font-weight: 300;line-height: 22rpx;margin-right: 2rpx;">到手价</text>
+						</view>
+						<text class="price wx-font-medium">￥{{
+							order.status == '等待付款' || order.status == '已取消' ?
+								Number(order.products[0]?.price).toFixed(2) :
+								Number(order.products[0]?.price - order.discount).toFixed(2)
+						}}</text>
 					</view>
-					<text class="price wx-font-medium">￥{{
-						order.status == '等待付款' || order.status == '已取消' ?
-							Number(order.products[0]?.price).toFixed(2) :
-							Number(order.products[0]?.price - order.discount).toFixed(2)
-					}}</text>
+
 					<view v-if="(order.status != '等待付款' && order.status != '已取消') && order.discount > 0"
 						class="wx-font-medium"
-						style="margin-top: 2rpx;text-align: right;color: #87868E;font-weight: 500;">
+						style="margin-top: 6rpx;text-align: right;color: #87868E;font-weight: 500;">
 						<text style="font-size: 24rpx;">￥{{ Number(order.products[0]?.price).toFixed(2) }}</text>
 					</view>
 				</view>
@@ -218,7 +237,7 @@
 				</view>
 			</view>
 			<view v-else class="btn-box">
-				<view class="btn" :class="{ red: btn == '送朋友' }" v-for="btn in btnList">
+				<view class="btn" :class="{ red: btn == '送朋友' }" v-for="(btn, index) in btnList" :key="index">
 					<image v-if="btn == '送朋友'" class="icon" src="/static/image/shopping/jingdong/detail/gift.png">
 					</image>
 					{{ btn }}
@@ -249,7 +268,7 @@
 
 				</view>
 				<view class="order-info">
-					<view class="item flex-justify-between" v-for="item in order.orderInfo"
+					<view class="item flex-justify-between" v-for="(item, index) in order.orderInfo" :key="index"
 						v-show="isOrderInfoExpanded || ['订单编号', '支付方式'].includes(item.label)"
 						@click="onClickItemInfo(item)">
 						<text class="label shrink-0 flex-align-center" style="color: #87868E;font-size: 26rpx;">{{
@@ -271,7 +290,7 @@
 					</view>
 				</view>
 				<view class="delivery-info" v-if="isOrderInfoExpanded">
-					<view class="item flex-justify-between" v-for="item in order.sendType"
+					<view class="item flex-justify-between" v-for="(item, index) in order.sendType" :key="index"
 						@click="onClickItemInfo(item)">
 						<text class="label shrink-0" style="color: #87868E;font-size: 26rpx;">{{ item.label }}</text>
 						<view class="flex-1 flex-align-center"
@@ -315,7 +334,7 @@
 				</view>
 			</view>
 			<view class="order-info">
-				<view class="item flex-justify-between" v-for="item in order.orderInfo"
+				<view class="item flex-justify-between" v-for="(item, index) in order.orderInfo" :key="index"
 					v-show="isOrderInfoExpanded || ['订单编号', '支付方式', '发票类型'].includes(item.label)"
 					@click="onClickItemInfo(item)">
 					<text class="label shrink-0" style="color: #87868E;font-size: 26rpx;">{{ item.label }}</text>
@@ -334,7 +353,7 @@
 				</view>
 			</view>
 			<view class="delivery-info" v-if="isOrderInfoExpanded">
-				<view class="item flex-justify-between" v-for="item in order.sendType" @click="onClickItemInfo(item)">
+				<view class="item flex-justify-between" v-for="(item, index) in order.sendType" :key="index" @click="onClickItemInfo(item)">
 					<text class="label shrink-0" style="color: #87868E;font-size: 26rpx;">{{ item.label }}</text>
 					<view class="flex-1 flex-align-center"
 						style="justify-content: flex-end;width: 300rpx;overflow-x: auto;margin-left: 20rpx;">
@@ -433,17 +452,21 @@
 			</view>
 		</template>
 
-		<view class="fixed-bottom flex-align-center flex-justify-between">
-			<text>{{ bottomText }}</text>
-			<view class="btn-box">
-				<view v-if="order.status == '等待付款'" class="big-btn ">立即支付<text class="wx-font-medium money">¥69</text>
-				</view>
-				<view v-else class="flex-align-center w00">
-					<view v-for="btn in bottomBtns" :key="btn" class="bottom-btn " :class="{ red: btn == '再次购买' }">
-						{{ btn }}
+		<view class="fixed-bottom ">
+			<view class="flex-align-center flex-justify-between w100">
+				<text>{{ bottomText }}</text>
+				<view class="btn-box">
+					<view v-if="order.status == '等待付款'" class="big-btn ">立即支付<text
+							class="wx-font-medium money">¥69</text>
+					</view>
+					<view v-else class="flex-align-center w00">
+						<view v-for="btn in bottomBtns" :key="btn" class="bottom-btn " :class="{ red: btn == '再次购买' }">
+							{{ btn }}
+						</view>
 					</view>
 				</view>
 			</view>
+
 		</view>
 		<view class="placeholder"></view>
 		<!-- 水印 -->
@@ -458,7 +481,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onUnmounted, watch } from 'vue';
+import { ref, computed, onUnmounted, watch, onMounted, getCurrentInstance, reactive } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { util } from '@/utils/common.js';
 
@@ -473,6 +496,10 @@ const buttonGroup = [
 	},
 ]
 
+const data = reactive({
+	id: 1
+})
+
 /**
  * 模拟订单列表
  */
@@ -491,6 +518,7 @@ const bottomBtns = computed(() => {
 	} else if (order.value.status == '已取消') {
 		return ['再次购买']
 	}
+	return [];
 })
 
 const bottomText = computed(() => {
@@ -521,6 +549,7 @@ const order = ref({});
 onLoad((options) => {
 	console.log('详情页参数:', options);
 	const id = options.id;
+	data.id = id
 	if (!id) return;
 
 	// 1. 优先从本地缓存查找
@@ -612,6 +641,27 @@ onShow(() => {
 		plus.navigator.setStatusBarStyle("dark");
 	}, 500);
 	// #endif
+
+	// 1. 优先从本地缓存查找
+	const cachedList = uni.getStorageSync('jingdongShopping') || [];
+	let target = cachedList.find(item => String(item.id) === String(data.id));
+
+	// 2. 如果缓存没有，再从静态 mock 列表查找
+	if (!target) {
+		target = mockOrderList.value.find(item => String(item.id) === String(data.id));
+	}
+
+	if (target) {
+		order.value = target;
+		console.log('成功匹配订单数据:', order.value);
+
+		// 如果是等待付款状态，启动倒计时
+		if (order.value.status === '等待付款' && order.value.statusDesc) {
+			initCountdown();
+		}
+	} else {
+		console.error('未找到指定的订单数据, ID:', data.id);
+	}
 })
 
 // 手机号脱敏处理 (增强容错版)
@@ -628,6 +678,45 @@ const formattedPhone = computed(() => {
 
 // 订单信息展开状态 (进入页面默认收起)
 const isOrderInfoExpanded = ref(false);
+
+const isDescExpanded = ref(false);
+const hasDescOverflow = ref(false);
+
+const instance = getCurrentInstance();
+const checkDescOverflow = () => {
+	// 增加延迟，确保容器宽度计算完成
+	setTimeout(() => {
+		const query = uni.createSelectorQuery().in(instance);
+		query.select('#desc-visible').boundingClientRect();
+		query.select('#desc-measure').boundingClientRect();
+		query.exec(res => {
+			if (res && res[0] && res[1]) {
+				const visibleH = res[0].height;
+				const measureH = res[1].height;
+				console.log('溢出检测高度对比:', visibleH, measureH);
+				// 如果测量全高明显大于单行限高，则认为溢出
+				if (measureH > visibleH + 1) {
+					hasDescOverflow.value = true;
+				} else {
+					hasDescOverflow.value = false;
+				}
+			}
+		});
+	}, 100);
+};
+
+onMounted(() => {
+	if (order.value?.products?.[0]?.desc) {
+		checkDescOverflow();
+	}
+});
+
+// 监听订单描述变化重新检测
+watch(() => order.value?.products?.[0]?.desc, (newVal) => {
+	if (newVal) {
+		checkDescOverflow();
+	}
+});
 </script>
 
 <style>
@@ -707,6 +796,7 @@ const isOrderInfoExpanded = ref(false);
 		color: #8C8C8C;
 		font-size: 26rpx;
 		line-height: 42rpx;
+		margin-left: 42rpx;
 	}
 
 	.edit-btn {
@@ -1043,12 +1133,12 @@ const isOrderInfoExpanded = ref(false);
 	.title-box {
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
+		// justify-content: space-between;
 
 		.left-box {
 			display: flex;
 			align-items: center;
-			flex: 1;
+			// flex: 1;
 
 			.img {
 				width: 50rpx;
@@ -1071,7 +1161,7 @@ const isOrderInfoExpanded = ref(false);
 
 
 		.right-icon {
-			margin-left: 12rpx;
+			// margin-left: 12rpx;
 		}
 	}
 
@@ -1104,13 +1194,11 @@ const isOrderInfoExpanded = ref(false);
 			}
 
 			.desc {
-				margin-top: 16rpx;
 				font-size: 22rpx;
 				color: #87868E;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
+				line-height: 32rpx;
 				overflow: hidden;
+				text-overflow: clip;
 			}
 
 			.tag {
@@ -1124,6 +1212,7 @@ const isOrderInfoExpanded = ref(false);
 			font-weight: 500;
 			font-size: 28rpx;
 			color: #1A1A1A;
+			line-height: 28rpx;
 
 			.price {
 				font-size: 700;
@@ -1253,10 +1342,14 @@ const isOrderInfoExpanded = ref(false);
 	.tag-box {
 		margin-top: 32rpx;
 		overflow: hidden;
+		overflow-x: scroll;
+		scrollbar-width: none;
+		-ms-overflow-style: none;
 
 		.tag {
 			background-color: #F5F6FA;
 			border-radius: 16rpx;
+			white-space: nowrap;
 			height: 68rpx;
 			line-height: 68rpx;
 			font-size: 26rpx;
@@ -1417,6 +1510,7 @@ const isOrderInfoExpanded = ref(false);
 	min-height: 90rpx;
 	min-height: calc(90rpx + env(safe-area-inset-bottom));
 	min-height: calc(90rpx + constant(safe-area-inset-bottom));
+	padding-bottom: 16rpx;
 	background-color: #FFFFFF;
 	border-top: 0.5px solid #F2F2F2;
 
diff --git a/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail.vue b/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail.vue
index a8f2c51..1b8c441 100644
--- a/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail.vue
+++ b/pages/shopping/jingdong/waimai-order-detail/waimai-order-detail.vue
@@ -200,7 +200,7 @@
 				</image>
 				<text class="title">{{ order.shopName }}</text>
 			</view>
-			<uni-icons class="right-icon" size="14" color="#1A1A1A" type="right"></uni-icons>
+			<uni-icons class="right-icon" size="12" color="#1A1A1A" type="right"></uni-icons>
 		</view>
 		<view class="product-info flex-align-center" v-for="(item, i) in order.products" :key="i">
 			<view class="image-box shrink-0">
@@ -657,7 +657,7 @@ const loadOrderDetail = (id) => {
 
 
 .right-icon-box {
-	margin-right: 12rpx;
+	// margin-right: 12rpx;
 
 	.icon {
 		width: 40rpx;
@@ -1025,12 +1025,12 @@ page {
 	.title-box {
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
+		// justify-content: space-between;
 
 		.left-box {
 			display: flex;
 			align-items: center;
-			flex: 1;
+			// flex: 1;
 
 			.img {
 				width: 50rpx;
diff --git a/static/image/shopping/jingdong/detail/help.png b/static/image/shopping/jingdong/detail/help.png
index 369aba3ddbfae9cb584fc406de0abe94cf39583b..6b24786a48bebfc41aea02d826d45989ddbd4e7e 100644
GIT binary patch
delta 756
zcmV<Q0t@}327v~U8Gi-<0039y!fyZo00DDSM?wIu&K&6g000DYLP=Bz2nYy#2xN!=
z00OH?L_t(oh0U1JQQSZbhCl7_9;X9$09V2JDgY|T(ZOy73>A1g;8Fol0j2^>1#t&)
z8nE(UnfMNKXPbkGX7<7MuJo_8(*CkALGnD$fJ{V|KmwfEr+?Z;sj4qP5ke@&>Xnhk
z*CKKaq`lX5ZzR3ZNu{bkffz!lXM-3pey^$zw$o~0e(IcCs_GiZdSI^hdFEXZF~%J5
z_P9~in<2w{Hjvl`Ivvq_A4Y+&#g7*6N>x`=j1TC`MC8`IS(?7B@VGaq{sAadb@34Z
z03n1zRTn@3oPU}AZJYgvUI+^B{puseha|@MXlG?BG_Rhp^z#;i%VProFufJv^E_W~
zfv|IMYZI>yrPN#rA=Ik6q7D1?76|h|YB@c+$ix`68xw$3zy?S=Z#YBsgVqZ-Q+762
zIy;>=oSlW#3ecy7VOPu>_vVf4q^oQqvYD#Pdq1k|4}XcOK8VN#kU0@K1!$V)X|BSV
zQqXRGDKW-hK;pgsK1GA&d`i2k5JI@0iXz7N8>mj~=9_yK5+HHTeVe(y2F~1E5Z?Qh
zi1-mx4}o~C6UqL$pC$=VJD~g@K-55z=Xp9}(b2^0B|zy^wM)(Hz`CP~b8bnSSud`a
zujgM0!ha|rK;i7ds(_2H3Q3;liFv*XAry{*3uUUPYP8}tN;*5n#@iGPA#BVW>nYx7
zn&ywK8(nAm<OzuM>7CL0TVqy>&$v;IJUs)c5#EA6y)$n_AQh3jV*{WK!`%>hdUF-W
z7@vD=`|=nbF%R6?VJyA(i~jdFl;1dDX+7t&#cl8-08$G<*7Y5`bH;XH(K@gx2QalP
z=<31v4s1tJzk32GL}b%6&C`3msCn=lxUkoiZQxzzc95P~Vev+Wr*`FgjgJPg1E~8y
macYORZ@2_%yNf3MpZE(<-fiX<fhutT0000<MNUMnLSTX@lxAuG

literal 802
zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv3?vh*jADV*)c~ImS0MfW|NjOs*uQ`Oq)C&y
zySt}Oo!Z&i+27wkZQ8WHzP>3_rc9VH0muN#0vSMYAbaA(i9J0%Kt^wGFHjsJ0+fO%
z05Tu|&IPImiU3KV2r|GW0#poChAE4z7Z-cW-Qt-*kGYiu`2{mDGO@6*bMx>D2nq>{
zOUuY9sHkda>-+lqhlEGQCS+!1my}g5TD)rg=Iz^e?Aw3%$k7ugPhYxn<Ier(uU@}>
z|LNQJAHV<n6RDo0!@$6}&C|s(#Nu@Al<Tva3<O&F*Sw2zP<eHWRl9@rjjlw<hrjZf
z`eCXGGk4GYbN`IzK4Zprie5`{&u!1Kf1Tah)3My+<u%0x(#MO!Of2}m#=Nl!jIGLv
zQLl`gG&Sh3P4(-vCiYFS&!k+}eXuU_-&-<cbz6S;q>0N;e!3#R;=7LR4xJ8x+1e9M
z9zAi-<jbFv-#3@k=>K`Qf7-K5uMb)sXIC*yh~Az0P*pMHPAZo`Y5tMUJ#p*j#2mit
zn$q?>eve{6%Cwe47mq|UJ!WncGx=cm%2B#Dii<nGYt=uOb<VzL!n`5^-rQYxO!((n
znQHfEoK?9WTi)ax)ajgmsZ(gu(G5?l8P-<x+diB9hutaiY(mhdMvaShw;ca6U*s^E
zaQFvvq8#@Gov<DO*{9kjk1J<1uBdjKq`u;B#i1uBF1sphEzw?RpSAmLv%sl$R_qL+
zY3<j423|cbVq|OjzxLKwas67WkJa1fo|Kw?l6$?rUi0x|E12t}`rdjU{l;s0=JMXj
z){o9cn8aK=>-KHi&Tr?^7B4w5X^#3=!_U*My5!{f$;&bCD$+@JZf;(>eBRRTnN8Q`
jzr9(Ox2;p;pL~4-uf_SN2ifle(*%R3tDnm{r-UW|ij|8=

diff --git a/static/image/shopping/jingdong/product/shopping/iphone.png b/static/image/shopping/jingdong/product/shopping/iphone.png
index 1cb39fea919bdc8ea36ad721b4903b7de52fe0c7..2d72e21a82a1729d5c11f843a6e1558282953b0e 100644
GIT binary patch
delta 7046
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
Y=QL3H_80TOL1I=HA9C!9;m^|l04a;?c>n+a

literal 8584
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

diff --git a/static/image/shopping/jingdong/waimai.png b/static/image/shopping/jingdong/waimai.png
index 12bee92d4918951d54029daa0bb55f0b75f5fa91..048b4ff56ac7bd9cd5f531b60f54cb6947142738 100644
GIT binary patch
delta 1960
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

delta 2348
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
S2=O}r0000<MNUMnLSTYmPN*XQ