From 58f944e74c0fc663ee78f962eff53395a09220da Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Fri, 25 Dec 2020 18:02:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

---
 hive-app/pages/workbench/confirmOrder.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/hive-app/pages/workbench/confirmOrder.vue b/hive-app/pages/workbench/confirmOrder.vue
index c45dd58..d7b9c6d 100644
--- a/hive-app/pages/workbench/confirmOrder.vue
+++ b/hive-app/pages/workbench/confirmOrder.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 确认订单 -->
 	<view class="container">
-		<view class="header flex align-center mt-10">
+		<view class="header flex align-center">
 			<image class="header-img" src="../../static/images/head-img.jpg"></image>
 			<view class="ml-10">
 				<view class="font-16">
@@ -12,16 +12,16 @@
 			</view>
 		</view>
 		<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="content-row flex justify-between align-center flex-1" v-for="item in list">
 				<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>
+						<text>{{item.name}}</text>
+						<text class="gray">×{{item.num}}</text>
 					</view>
 				</view>
 				<view>
-					<text>¥400.00</text>
+					<text>¥{{item.price}}</text>
 				</view>
 			</view>
 			<view class="content-row flex justify-between">
@@ -41,7 +41,12 @@
 <script>
 	export default{
 		data(){
-			return{}
+			return{
+				list: []
+			}
+		},
+		onLoad(options) {
+			this.list = JSON.parse(decodeURIComponent(options.list))
 		},
 		methods:{
 		}

--
Gitblit v1.9.1