From 026545fd856b680f4b44eeaa74a89f75b188935c Mon Sep 17 00:00:00 2001
From: BigBoss <2280520255@qq.com>
Date: Thu, 30 Apr 2020 22:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                          |  6 ++++
 src/pages/confirmOrder/confirmOrder.vue | 60 ++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 5bb4fcc..07bf64e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,9 +1,15 @@
 {
 	"pages": [ 
+        {
+            "path" : "pages/confirmOrder/confirmOrder",
+            "style" : {
+				"navigationBarTitleText": "确认订单"}
+        },
 		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "商城一览"
+				// "enablePullDownRefresh":true
 			}
 		},
 		{
diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue
index 9ab7ab5..8068ac4 100644
--- a/src/pages/confirmOrder/confirmOrder.vue
+++ b/src/pages/confirmOrder/confirmOrder.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
 	<view class="wrap">
 		<view class="addAddress">
 			<view class="addIcon">
@@ -6,7 +6,7 @@
 			</view>
 			<view class="addressText">{{addAddress}}</view>
 			<image src="../../static/right.png" mode="aspectFill"></image>
-		</view>
+		</view>
 		<view class="content">
 			<view class="orderInfo">
 				<view class="title">
@@ -77,14 +77,14 @@
 					</view>
 				</view>
 			</view>
-			
+<!-- 			
 			<view class="checkBox">
 				<checkbox-group>
 					<label>
 						<checkbox color="#FF6B4A" value="isAnonymous" checked="true" />匿名购买
 					</label>
 				</checkbox-group>
-			</view>
+			</view> -->
 		</view>
 		<view class="footer">
 			<view class="footerLeft">实付金额:<text>￥{{total}}</text></view>
@@ -92,20 +92,20 @@
 				<view class="paybtn">立即支付</view>
 			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				addAddress :'添加收货地址',
 				count:1,
 				disabled:false,
 				total:120,
 				freight:0.00
-				// isAnonymous:
-			};
+				// isAnonymous:
+			};
 		},
 		methods:{
 			counter(isadd){
@@ -115,17 +115,17 @@
 					this.count <= 1? this.disabled = true:this.count--
 				}
 			}
-		}
-	}
-</script>
-
+		}
+	}
+</script>
+
 <style lang="scss">
 	.wrap{
 		height: 100vh;
 		background-color:#F2F2F2 ;
 		font-family: PingFangSC-Regular;
 		letter-spacing: -0.23px;
-	}
+	}
 	.addAddress{
 		background-color:#ffffff ;
 		box-sizing: border-box;
@@ -324,20 +324,20 @@
 				}
 			}
 		}
-		.checkBox{
-			height: 58rpx;
-			line-height: 58rpx;
-			width: 100%;
-			margin-top: 36rpx;
-			margin-left: 40rpx;
-			font-size: 12px;
-			color: #999999;
-		}
+		// .checkBox{
+		// 	height: 58rpx;
+		// 	line-height: 58rpx;
+		// 	width: 100%;
+		// 	margin-top: 36rpx;
+		// 	margin-left: 40rpx;
+		// 	font-size: 12px;
+		// 	color: #999999;
+		// }
 	}
 	.footer{
 		height: 112rpx;
 		width: 100%;
-		background-color: #ffffff;
+		background-color: #F2F2F2;
 		font-size: 16px;
 		display: flex;
 		justify-content: space-between;
@@ -372,5 +372,5 @@
 		}
 			
 	}
-	
-</style>
+	
+</style>
-- 
2.0.0