From e876fed618abd4237b9818424b72d01e24f8908c Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 01 八月 2024 16:22:17 +0800
Subject: [PATCH] update

---
 sub_pages/customer/shopping/confirm.vue |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 0827637..777dd9a 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -126,7 +126,9 @@
 				}
 
 				if (!this.address.id) {
-					this.$message.showToast('请选择收货地址')
+					this.$message.showToast('请选择收货地址',{
+						duration: 2000
+					})
 					return
 				}
 				this.dto.addressId = this.address.id
@@ -170,9 +172,11 @@
 											await tmp.$store.dispatch('sign_add', 'shopping')
 											uni.navigateBack()
 										},
-										fail(err) {
+										async fail(err) {
 											console.error('pay fail', err)
 											tmp.$message.showToast('支付失败')
+											await tmp.$store.dispatch('sign_add', 'shopping')
+											uni.navigateBack()
 										}
 									})
 
@@ -201,8 +205,8 @@
 		</view>
 		<view>
 			<view class="flower-container m-t-12 br-4 p10">
-				<view class="shopping-item m-b-20" v-for="(item,index) of dto.flowers" :key="index">
-					<u-divider v-if="index>0"></u-divider>
+				<view class="shopping-item " v-for="(item,index) of dto.flowers" :key="index">
+					<!-- <view class="line-gray" v-if></view> -->
 					<view class="sup-title flex">
 						<image class="icon-dp img100 m-r-10" src="/static/common/icon-dp.png"></image>
 						<view>{{ item.supplierName || '-' }}</view>
@@ -338,6 +342,8 @@
 			background-color: #ffffff;
 			left: 0rpx;
 			padding: 20rpx;
+			z-index: 99;
+			z-index: 11;
 			right: 0rpx;
 			bottom: 0rpx;
 		}
@@ -346,7 +352,7 @@
 			background-color: #ffffff;
 
 			.shopping-item {
-				padding: 28rpx 22rpx;
+				padding: 10rpx 22rpx;
 				position: relative;
 
 				.sup-title {
@@ -422,6 +428,7 @@
 			background-color: #ffffff;
 
 			.transform-list {
+				overflow-x: scroll;
 				.transform-item {
 					background: rgba(225, 240, 231, 0.38);
 					border-radius: 8rpx;
@@ -435,6 +442,7 @@
 					margin-right: auto;
 					max-width: 32%;
 					width: 130rpx;
+					min-width: 130rpx;
 
 					.title {
 						font-weight: 400;

--
Gitblit v1.9.3