From 835da2c9cd9aa91cda6aa52fcd3866d26d97ecfe Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 9 Jan 2024 00:03:43 +0800
Subject: [PATCH] 2023-1-9

---
 pages/cloud/optionalCard.vue             | 8 ++++----
 pages/login/login.vue                    | 2 +-
 uni_modules/common-pay/pages/pay/pay.vue | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pages/cloud/optionalCard.vue b/pages/cloud/optionalCard.vue
index bf13b58..23087e0 100644
--- a/pages/cloud/optionalCard.vue
+++ b/pages/cloud/optionalCard.vue
@@ -1,6 +1,6 @@
 <template>
 
-	<view style="display: flex;flex-direction: column; height: 100%;box-sizing: border-box ;" id="page">
+	<view style="display: flex;flex-direction: column; height: 100%;box-sizing: border-box;" id="page">
 
 		<view class="top">
 			<NavBar ref="nav" navTitle="详情" :showIcon="true" :start-change-height="page.startHeight"
@@ -16,7 +16,7 @@
 
 
 				<view style="display: flex;flex-direction: column;
-			margin:20px 20px 0px 20px;padding-bottom: 20px; border-bottom: 2px #EFEFEF solid;">
+			margin:20px 20px 0px 20px;padding-bottom: 5px; border-bottom: 2px #EFEFEF solid;">
 
 					<view
 						style="display: flex;flex-direction: row;align-items: center; justify-content: space-between;">
@@ -35,7 +35,7 @@
 						</view>
 					</view>
 
-					<view style="margin-top: 10px;display: flex;flex-direction: row;align-items: center;">
+					<view style="margin-top: 10px;display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
 						<view style="color: #888;font-size: 12px;">您已经定制了</view>
 						<view style="color: #FF5006;font-size: 18px;">{{page.weight}}斤</view>
 						<view style="color: #888;font-size: 12px;">，满200斤可定制云菜窖</view>
@@ -191,7 +191,7 @@
 
 				let num = 0;
 				for (var i = 0; i < this.data.length; i++) {
-					num += Number(this.data[i].price) * Number(this.data[i].goodsNumber);
+					num += Number(this.data[i].jprice) * Number(this.data[i].goodsNumber)*  Number(this.data[i].weight);
 				}
 
 				console.log("num", num)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index cc1dbc7..999e112 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -64,7 +64,7 @@
 										console.log("人员sid", res.data.data.sid);
 										console.log("token", res.data.data.token);
 										uni.switchTab({
-											url: '/pages/home/cloudCard'
+											url: '/pages/home/pickUpCard'
 										})
 									}
 								} else {
diff --git a/uni_modules/common-pay/pages/pay/pay.vue b/uni_modules/common-pay/pages/pay/pay.vue
index f03729c..61b7470 100644
--- a/uni_modules/common-pay/pages/pay/pay.vue
+++ b/uni_modules/common-pay/pages/pay/pay.vue
@@ -223,10 +223,10 @@
 				return
 			}
 
-			if (this.page.real.length == 1) {
-				// 仅有一个选择时直接调用支付接口
-				this.createOrder()
-			}
+			// if (this.page.real.length == 1) {
+			// 	// 仅有一个选择时直接调用支付接口
+			// 	this.createOrder()
+			// }
 		}
 	}
 </script>