From aaa767b2054fdbe7f60b9d1fdc7a8ad3b25d6c90 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Thu, 17 Dec 2020 16:37:31 +0800
Subject: [PATCH] gx

---
 hive-app/pages/workbench/index.vue |   59 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 963776b..58ad2ef 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -8,19 +8,19 @@
 			<text class="font-18 dark-gray">HIVE</text>
 			<view>
 				<text class="icon gray iconfont iconsousuo mr-15"></text>
-				<text class="icon gray iconfont iconjiahao" @click.stop="isShow=!isShow"></text>
-			</view>
-			<view class="popup-content" v-show="isShow">
-				<view>
-					<text class="icon iconfont iconjiahao mr-5"></text>
-					<text>新增会员</text>
-				</view>
-				<view class="mt-10">
-					<text class="icon iconfont iconsaomiao mr-5"></text>
-					<text>扫一扫</text>
-				</view>
+				<text class="icon gray iconfont iconjia" @click.stop="isShow=!isShow"></text>
 			</view>
 		</view>
+		<popover class="popup-content" v-show="isShow">
+			<view class="popup-item flex align-center">
+				<text class="icon white iconfont iconjia mr-5"></text>
+				<text class="white font-14 popup-content-text">新增会员</text>
+			</view>
+			<view class="popup-item flex align-center">
+				<text class="icon white iconfont iconsaomiao mr-5"></text>
+				<text class="white font-14 popup-content-text">扫一扫</text>
+			</view>
+		</popover>
 		<view class="condition flex justify-between">
 			<view class="flex flex-v align-center">
 				<text class="font-17 white">0</text>
@@ -42,11 +42,11 @@
 		<view class="content-item mt-10">
 			<text class="title">订单</text>
 			<view class="flex align-center mt-10">
-				<view class="flex flex-v align-center list-item">
+				<view class="flex flex-v align-center list-item" @click="linkTo('./selectCustomer')">
 					<image class="content-icon" src="../../static/images/order1.png"></image>
 					<text class="font-12 mt-10 font-dark">新建订单</text>
 				</view>
-				<view class="flex flex-v align-center list-item">
+				<view class="flex flex-v align-center list-item" @click="linkTo('./orderList')">
 					<image class="content-icon" src="../../static/images/order2.png"></image>
 					<text class="font-12 mt-10 font-dark">代付款</text>
 				</view>
@@ -146,7 +146,11 @@
 </template>
 
 <script>
+	import popover from "../../components/popover/index.vue"
 	export default{
+		components:{
+			popover
+		},
 		data(){
 			return{
 				isShow:false
@@ -160,6 +164,11 @@
 		methods:{
 			appear(){
 				
+			},
+			linkTo(val){
+				uni.navigateTo({
+					url:val
+				})
 			}
 		}
 	}
@@ -171,9 +180,6 @@
 		text-align: center;
 		font-family: texticons;
 	}
-	page{
-		background: #F8F8F8;
-	}
 	.container{
 		padding: 0 10px;
 	}
@@ -181,7 +187,7 @@
 		padding: 12px 5px;
 	}
 	.condition{
-		background-color: #518EFF;
+		background: #518EFF;
 		padding: 15px 30px;
 		border-radius: 4px;
 	}
@@ -190,6 +196,7 @@
 		padding: 15px 0;
 		border-radius: 4px;
 		margin: 10px 0;
+		box-shadow:0 6px 6px rgba(237,234,244,0.5);
 	}
 	.title{
 		font-size: 14px;
@@ -205,12 +212,18 @@
 		width: 25%;
 	}
 	.popup-content{
-		background: #FFFFFF;
-		border: 1px solid #ABB1CC;
-		padding: 10px;
-		border-radius: 4px;
 		position: absolute;
-		right: 10px;
-		top: 35px;
+		right: 9px;
+		top: 48px;
+		padding-left: 10px;
+	}
+	
+	.popup-content-text{
+		width: 100%;
+		border-bottom: 1px solid gray;
+		padding: 10px 10px 10px 0;
+	}
+	.popup-content .popup-item:nth-last-of-type(1) .popup-content-text{
+		border-bottom: 0;
 	}
 </style>

--
Gitblit v1.9.1