From af97cef39ee968a454d3b2516090adff1273f397 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 21 Dec 2020 17:41:37 +0800
Subject: [PATCH] gx

---
 hive-app/pages/workbench/confirmOrder.vue |   79 ++++++++++++++++++++++-----------------
 1 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/hive-app/pages/workbench/confirmOrder.vue b/hive-app/pages/workbench/confirmOrder.vue
index 6eca592..fdc0db2 100644
--- a/hive-app/pages/workbench/confirmOrder.vue
+++ b/hive-app/pages/workbench/confirmOrder.vue
@@ -1,33 +1,40 @@
 <template>
 	<!-- 确认订单 -->
 	<view class="container">
-		<view class="header flex align-center justify-between">
-			<view>
-				<text class="font-16">李某</text>
-				<text class="font-16 ml-15">男</text>
-				<text class="font-16 ml-15">18岁</text>
-			</view>
-			<text class="font-16">15588886885</text>
-		</view>
-		<view class="content mt-20">
-			<view class="content-row flex align-center justify-between">
-				<text class="font-14">(项目) 肽妍氨基酸平衡基础洁面乳×1</text>
-				<text class="font-14">¥90,000</text>
-			</view>
-			<view class="content-row flex align-center justify-between">
-				<text class="font-14">(套餐) 肽妍氨基酸平衡基础洁面乳×1</text>
-				<text class="font-14">¥90,000</text>
-			</view>
-			<view class="content-row flex align-center justify-between">
-				<text class="font-14">(项目) 肽妍氨基酸平衡基础洁面乳×1</text>
-				<text class="font-14">¥90,000</text>
-			</view>
-			<view class="right mt-30">
-				<text class="font-16 mr-5">合计:</text>
-				<text class="font-16 red">¥270,000</text>
+		<view class="header flex align-center mt-10">
+			<image class="header-img" src="../../static/images/head-img.jpg"></image>
+			<view class="ml-10">
+				<view class="font-16">
+					<text>李某</text>
+					<text class="ml-20">15588881111</text>
+				</view>
+				<text class="font-14 gray mt-5">普通会员</text>
 			</view>
 		</view>
-		<button class="blue-btn btn" @click="linkTo('./submitSucceed')">提交订单</button>
+		<view class="content flex flex-v mt-10">
+			<view class="content-row flex justify-between align-center flex-1" v-for="item in 4">
+				<view class="flex align-center">
+					<image class="centent-img" mode="aspectFill" src="../../static/images/product.jpg"></image>
+					<view class="flex flex-v font-12 ml-10">
+						<text>[项目] 肽妍氨基酸平衡基础洁面乳</text>
+						<text class="gray">×1</text>
+					</view>
+				</view>
+				<view>
+					<text>¥400.00</text>
+				</view>
+			</view>
+			<view class="content-row flex justify-between">
+				<text class="blue">共5件商品</text>
+				<view class="flex align-center">
+					<text>合计:</text>
+					<text class="red ml-10">¥90,000.00</text>
+				</view>
+			</view>
+		</view>
+		<navigator url="./submitSucceed">
+			<button class="sticky-footer blue-btn">确认提交</button>
+		</navigator>
 	</view>
 </template>
 
@@ -37,11 +44,6 @@
 			return{}
 		},
 		methods:{
-			linkTo(val){
-				uni.navigateTo({
-					url:val
-				})
-			}
 		}
 	}
 </script>
@@ -49,6 +51,16 @@
 <style>
 	.container{
 		padding: 10px;
+	}
+	.header-img{
+		width: 48px;
+		height: 48px;
+		border-radius: 50%;
+	}
+	.centent-img{
+		width: 36px;
+		height: 36px;
+		border-radius: 4px;
 	}
 	.header{
 		border: 1px solid #EDEAF4;
@@ -66,10 +78,7 @@
 		border-bottom: 1px solid #EDEAF4;
 		padding: 10px 5px;
 	}
-	.btn{
-		position: absolute;
-		bottom: 10px;
-		left: 10px;
-		right: 10px;
+	.content-row:nth-last-child(1){
+		border: 0;
 	}
 </style>

--
Gitblit v1.9.1