优化调整pdd购物

pages/shopping/pdd/components/list-card/list-card.vue

@@ -224,8 +224,7 @@ const toDetail = (id) => {
 .product-box {
     padding: 0 24rpx;
     padding-bottom: 14rpx;
-    margin-bottom: 10rpx;
+    // border-bottom: 1rpx solid #EFEFEF;
-    border-bottom: 1rpx solid #EFEFEF;
 
     .product-img-box {
         width: 148rpx;
@@ -328,6 +327,7 @@ const toDetail = (id) => {
     margin-bottom: 16rpx;
     padding: 0 16rpx;
     padding-bottom: 14rpx;
+    padding-top: 10rpx;
 
     &::after {
         content: "";
@@ -337,8 +337,20 @@ const toDetail = (id) => {
         right: 0;
         width: 100%;
         height: 1px;
-        transform: scaleY(0.3);
+        transform: scaleY(0.5);
-        background-color: #D2D2D2;
+        background-color: #EFEFEF;
+    }
+
+    &::before {
+        content: "";
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        width: 100%;
+        height: 1px;
+        transform: scaleY(0.5);
+        background-color: #EFEFEF;
     }
 
     .avatar-group {
@@ -474,13 +486,21 @@ const toDetail = (id) => {
     }
 
     .delivery-content {
+        display: flex;
+        align-items: center;
         font-size: 24rpx;
+        white-space: nowrap;
 
         .green-text {
             color: #2BB40C;
         }
 
         .gray-text {
+            flex: 1;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            width: 100px;
             color: #595959;
             margin-left: 10rpx;
         }

pages/shopping/pdd/list-index.vue

@@ -132,7 +132,29 @@ const buttonGroup = [
 				chooseImage();
 			}, 400);
 		}
-	},
+	}, {
+		name: "切换优惠券",
+		click: () => {
+			scrollIntoId.value = '';
+			setTimeout(() => {
+				scrollIntoId.value = 'bottom-anchor';
+			}, 50);
+			setTimeout(() => {
+				chooseImage();
+			}, 400);
+		}
+	}, {
+		name: "显示618活动券",
+		click: () => {
+			scrollIntoId.value = '';
+			setTimeout(() => {
+				scrollIntoId.value = 'bottom-anchor';
+			}, 50);
+			setTimeout(() => {
+				chooseImage();
+			}, 400);
+		}
+	}
 ]
 
 onLoad(() => {

pages/shopping/pdd/order-detail/order-detail.vue

@@ -259,7 +259,7 @@
 
 <script setup>
 import { ref, computed, getCurrentInstance } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
+import { onLoad, onShow } from '@dcloudio/uni-app';
 import { stringUtil } from '@/utils/common.js';
 import { util } from '@/utils/common.js';
 
@@ -275,14 +275,7 @@ const buttonGroup = [
 		}
 	}
 ]
-onLoad(() => {
+
-	proxy.$apiUserEvent('all', {
-		type: 'event',
-		key: 'shopping',
-		prefix: '.uni.other.',
-		value: '拼多多订单详情'
-	})
-})
 const isOrderInfoExpanded = ref(false);
 const order = ref({
 	orderType: 'wait_recv',
@@ -361,9 +354,20 @@ const payList = ref([
 	{ name: '云闪付', icon: '/static/image/shopping/pdd/pay/yunshanfu-blue.png' }
 ])
 
+const id = ref('')
 onLoad((option) => {
+	id.value = option.id
+	proxy.$apiUserEvent('all', {
+		type: 'event',
+		key: 'shopping',
+		prefix: '.uni.other.',
+		value: '拼多多订单详情'
+	})
+})
+
+onShow(() => {
 	const cacheList = uni.getStorageSync('pddOrderList');
-	order.value = cacheList.find(item => item.id == option.id);
+	order.value = cacheList.find(item => item.id == id.value);
 })
 
 
@@ -831,13 +835,12 @@ const selectPayMethod = (index) => {
 				align-items: center;
 				justify-content: center;
 				width: 76rpx;
-				height: 42rpx;
+				height: 40rpx;
 				border-radius: 8rpx;
 				border: 1rpx solid #9E9E9E;
 				font-weight: 400;
 				font-size: 26rpx;
 				color: #535353;
-				line-height: 26rpx;
 			}
 
 			.arrow {