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/selectService.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hive-app/pages/workbench/selectService.vue b/hive-app/pages/workbench/selectService.vue
index 3d432d7..a437d22 100644
--- a/hive-app/pages/workbench/selectService.vue
+++ b/hive-app/pages/workbench/selectService.vue
@@ -70,9 +70,7 @@
 				<button class="blue-btn btn mr-0">提交订单</button>
 			</navigator>
 		</view>
-		<uni-popup ref="popup" type="bottom">
-			<shopping-cart></shopping-cart>
-		</uni-popup>
+		<shopping-cart ref="shopCart"></shopping-cart>
 	</view>
 </template>
 
@@ -90,9 +88,14 @@
 			return{
 			}
 		},
+		onLoad(options) {
+			uni.setNavigationBarTitle({
+				title: '当前客户:' + options.vipName
+			});
+		},
 		methods:{
 			openShoppingCart(){
-				this.$refs.popup.open()
+				this.$refs.shopCart.show()
 			}
 		}
 	}

--
Gitblit v1.9.1