From 80196ea911ac8cdc317cd55e1661eaa1dde1509c Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 11 Mar 2024 10:42:21 +0800
Subject: [PATCH] 1111

---
 pages/bind/bind_cloudCard.vue |  5 ++++-
 pages/good/goodsDetail.vue    |  2 ++
 pages/good/shoppCart.vue      | 12 ++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue
index f50f434..329f125 100644
--- a/pages/bind/bind_cloudCard.vue
+++ b/pages/bind/bind_cloudCard.vue
@@ -95,7 +95,7 @@
 				<text
 					style="margin-top: 16px;font-size: 18px;color: #101010;font-weight: 600;font-family: sans-serif;">温馨提示</text>
 				<text
-					style="margin-top: 12px;font-size: 14px;color: #333;padding-left: 30px;padding-right: 30px;">此卡已被领取，请核对转增信息。</text>
+					style="margin-top: 12px;font-size: 14px;color: #333;padding-left: 30px;padding-right: 30px;">您好，此卡已被领取。</text>
 
 				<text style="margin-top: 25px;margin-bottom: 20px;border: 1px #FF9900 solid; color: #FF9900;font-size: 14px;
 					border-radius: 20px;height: 40px; line-height: 40px;padding-left: 30px;padding-right: 30px;"
@@ -145,6 +145,9 @@
 		methods: {
 			colseDialog() {
 				this.showModal = false
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
 			},
 			itemClick(goodsSid) {
 				uni.navigateTo({
diff --git a/pages/good/goodsDetail.vue b/pages/good/goodsDetail.vue
index a05a1df..ebd875d 100644
--- a/pages/good/goodsDetail.vue
+++ b/pages/good/goodsDetail.vue
@@ -136,6 +136,8 @@
 		},
 		onLoad(options) {
 			this.page.sid = options.sid
+		},
+		onShow() {
 			this.request()
 		},
 		filters: {
diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue
index 064a97f..7d1e5b9 100644
--- a/pages/good/shoppCart.vue
+++ b/pages/good/shoppCart.vue
@@ -94,21 +94,21 @@
 				</view>
 
 				<view
-					style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;">
-
-
+					style=" width: 100%; box-sizing: border-box; padding-left: 50px;padding-right: 50px;
+					  display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 10px;margin-bottom: 20px;">
+				
 					<view
-						style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 40px 5px 15px; flex: 1;
+						style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 5px;height: 42px; flex: 1;
 					display: flex;flex-direction: row;align-items: center;border-top-left-radius: 25px; border-bottom-left-radius: 25px;">
 						<image src="../../static/shoppCart_icon.png" mode="aspectFill"
-							style="height: 20px;width: 20px;flex-shrink: 0;">
+							style="height: 20px;width: 20px;flex-shrink: 0;margin-left: 10px;">
 						</image>
 						<view style="display: flex;flex-direction: column;flex: 1;">
 							<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">￥{{page.price}}</text>
 							<text style="font-size: 10px;color: #666;margin-left: 10px; ">{{page.remarks}}</text>
 						</view>
 					</view>
-					<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px;
+					<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 0px 25px;height: 40px;line-height: 40px;
 					border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;"
 						@click="settlement()">结算</text>