From 682ca9d7a7cd97ad02a9350b8cf8f931462c0a18 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Fri, 18 Dec 2020 15:47:17 +0800
Subject: [PATCH] gx

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

diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 963776b..dc8c55e 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>
@@ -32,7 +32,7 @@
 			</view>
 			<view class="flex flex-v align-center">
 				<text class="font-17 white">5</text>
-				<text class="font-15 white mt-10">代付款</text>
+				<text class="font-15 white mt-10">待付款</text>
 			</view>
 			<view class="flex flex-v align-center">
 				<text class="font-17 white">15</text>
@@ -42,59 +42,87 @@
 		<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">
-					<image class="content-icon" src="../../static/images/order1.png"></image>
-					<text class="font-12 mt-10 font-dark">新建订单</text>
+				<view class="list-item">
+					<navigator url="./selectCustomer" hover-class="none">
+						<image class="content-icon" src="../../static/images/order1.png"></image>
+						<text class="font-12 mt-10 font-dark">新建订单</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/order2.png"></image>
-					<text class="font-12 mt-10 font-dark">代付款</text>
+				<view class="list-item">
+					<navigator url="./orderList"  hover-class="none">
+						<image class="content-icon" src="../../static/images/order2.png"></image>
+						<text class="font-12 mt-10 font-dark">待付款</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/order3.png"></image>
-					<text class="font-12 mt-10 font-dark">已付款</text>
+				<view class="list-item">
+					<navigator url="./orderList"  hover-class="none">
+						<image class="content-icon" src="../../static/images/order3.png"></image>
+						<text class="font-12 mt-10 font-dark">已付款</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/order4.png"></image>
-					<text class="font-12 mt-10 font-dark">欠款</text>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/order4.png"></image>
+						<text class="font-12 mt-10 font-dark">领用</text>
+					</navigator>
 				</view>
 			</view>
 		</view>
 		<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">
-					<image class="content-icon" src="../../static/images/sever1.png"></image>
-					<text class="font-12 mt-10 font-dark">新建预约</text>
+				<view class="list-item">
+					<navigator url="./selectCustomer?type=2"  hover-class="none">
+						<image class="content-icon" src="../../static/images/order1.png"></image>
+						<text class="font-12 mt-10 font-dark">新建服务单</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/sever2.png"></image>
-					<text class="font-12 mt-10 font-dark">看板</text>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/sever2.png"></image>
+						<text class="font-12 mt-10 font-dark">待服务</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/sever3.png"></image>
-					<text class="font-12 mt-10 font-dark">待服务</text>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/sever3.png"></image>
+						<text class="font-12 mt-10 font-dark">服务中</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/sever4.png"></image>
-					<text class="font-12 mt-10 font-dark">服务完成</text>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/sever4.png"></image>
+						<text class="font-12 mt-10 font-dark">服务完成</text>
+					</navigator>
 				</view>
 			</view>
 		</view>
 		<view class="content-item mt-10">
-			<text class="title">代办</text>
+			<text class="title">待办</text>
 			<view class="flex align-center mt-10">
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/commission1.png"></image>
-					<text class="font-12 mt-10 font-dark">跟进</text>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/commission1.png"></image>
+						<text class="font-12 mt-10 font-dark">看板</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/commission2.png"></image>
-					<text class="font-12 mt-10 font-dark">日报</text>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/sever1.png"></image>
+						<text class="font-12 mt-10 font-dark">客户预约</text>
+					</navigator>
 				</view>
-				<view class="flex flex-v align-center list-item">
-					<image class="content-icon" src="../../static/images/commission3.png"></image>
-					<text class="font-12 mt-10 font-dark">通知</text>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/commission2.png"></image>
+						<text class="font-12 mt-10 font-dark">跟进记录</text>
+					</navigator>
+				</view>
+				<view class="list-item">
+					<navigator url="./"  hover-class="none">
+						<image class="content-icon" src="../../static/images/commission3.png"></image>
+						<text class="font-12 mt-10 font-dark">通知</text>
+					</navigator>
 				</view>
 			</view>
 		</view>
@@ -146,7 +174,11 @@
 </template>
 
 <script>
+	import popover from "../../components/popover/index.vue"
 	export default{
+		components:{
+			popover
+		},
 		data(){
 			return{
 				isShow:false
@@ -160,19 +192,24 @@
 		methods:{
 			appear(){
 				
+			},
+			linkTo(val){
+				uni.navigateTo({
+					url:val
+				})
 			}
 		}
 	}
 </script>
 
 <style>
+	page{
+		background: #F6F6F8;
+	}
 	.icon {
 		font-size: 18px;
 		text-align: center;
 		font-family: texticons;
-	}
-	page{
-		background: #F8F8F8;
 	}
 	.container{
 		padding: 0 10px;
@@ -181,7 +218,7 @@
 		padding: 12px 5px;
 	}
 	.condition{
-		background-color: #518EFF;
+		background: #518EFF;
 		padding: 15px 30px;
 		border-radius: 4px;
 	}
@@ -197,20 +234,30 @@
 		padding-left: 15px;
 		padding-bottom: 5px;
 	}
+	.list-item{
+		width: 25%;
+		text-align: center;
+	}
 	.content-icon{
 		width: 30px;
 		height: 30px;
+		display: block;
+		margin: 0 auto 10px;
 	}
-	.list-item{
-		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