From 06cd51f34f3a51e6ff848ae5b695a46dfc424200 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Thu, 17 Dec 2020 15:26:32 +0800
Subject: [PATCH] 订单块

---
 hive-app/pages/workbench/index.vue |  124 ++++++++++++++++++++++++++++++-----------
 1 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index d6b8d68..f861cb3 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -5,38 +5,48 @@
 		<view class="status_bar"></view>
 		<!-- #endif -->
 		<view class="header flex align-center justify-between">
-			<text class="font-18">HIVE</text>
+			<text class="font-18 dark-gray">HIVE</text>
 			<view>
-				<image class="header-icon mr-15" src="../../static/images/search.png"></image>
-				<image class="header-icon" src="../../static/images/add.png"></image>
+				<text class="icon gray iconfont iconsousuo mr-15"></text>
+				<text class="icon gray iconfont iconjiahao" @click.stop="isShow=!isShow"></text>
 			</view>
 		</view>
-		<view class="status-bar flex justify-between mt-15">
+		<popover class="popup-content" v-show="isShow">
+			<view class="popup-item flex align-center">
+				<text class="icon white iconfont iconjiahao 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-18 white">0</text>
-				<text class="font-16 white">预约</text>
+				<text class="font-17 white">0</text>
+				<text class="font-15 white mt-10">预约</text>
 			</view>
 			<view class="flex flex-v align-center">
-				<text class="font-18 white">2</text>
-				<text class="font-16 white">进行中</text>
+				<text class="font-17 white">2</text>
+				<text class="font-15 white mt-10">进行中</text>
 			</view>
 			<view class="flex flex-v align-center">
-				<text class="font-18 white">5</text>
-				<text class="font-16 white">代付款</text>
+				<text class="font-17 white">5</text>
+				<text class="font-15 white mt-10">代付款</text>
 			</view>
 			<view class="flex flex-v align-center">
-				<text class="font-18 white">15</text>
-				<text class="font-16 white">欠款</text>
+				<text class="font-17 white">15</text>
+				<text class="font-15 white mt-10">欠款</text>
 			</view>
 		</view>
 		<view class="content-item mt-10">
-			<text class="font-14 font-gray">订单</text>
+			<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>
@@ -51,7 +61,7 @@
 			</view>
 		</view>
 		<view class="content-item mt-10">
-			<text class="font-14 font-gray">项目/服务</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/sever1.png"></image>
@@ -72,7 +82,7 @@
 			</view>
 		</view>
 		<view class="content-item mt-10">
-			<text class="font-14 font-gray">代办</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>
@@ -89,7 +99,7 @@
 			</view>
 		</view>
 		<view class="content-item mt-10">
-			<text class="font-14 font-gray">仓库</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/warehouse1.png"></image>
@@ -102,7 +112,7 @@
 			</view>
 		</view>
 		<view class="content-item">
-			<text class="font-14 font-gray">报表</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/statement1.png"></image>
@@ -121,7 +131,7 @@
 					<text class="font-12 mt-10 font-dark">产品报表</text>
 				</view>
 			</view>
-			<view class="flex align-center mt-10">
+			<view class="flex align-center mt-15">
 				<view class="flex flex-v align-center list-item">
 					<image class="content-icon" src="../../static/images/statement5.png"></image>
 					<text class="font-12 mt-10 font-dark">库存预警</text>
@@ -136,38 +146,84 @@
 </template>
 
 <script>
+	import popover from "../../components/popover/index.vue"
+	export default{
+		components:{
+			popover
+		},
+		data(){
+			return{
+				isShow:false
+			}
+		},
+		onLoad() {
+			document.addEventListener('click', () => {
+				this.isShow = false
+			}, false)
+		},
+		methods:{
+			appear(){
+				
+			},
+			linkTo(val){
+				uni.navigateTo({
+					url:val
+				})
+			}
+		}
+	}
 </script>
 
 <style>
-	page{
-		background: #F8F8F8;
+	.icon {
+		font-size: 18px;
+		text-align: center;
+		font-family: texticons;
 	}
 	.container{
-		padding: 0 8px;
+		padding: 0 10px;
 	}
 	.header{
-		padding: 10px 5px;
+		padding: 12px 5px;
 	}
-	.header-icon{
-		width: 20px;
-		height: 20px;
-	}
-	.status-bar{
-		background-color: #518EFF;
-		padding: 16px 30px;
+	.condition{
+		background: #518EFF;
+		padding: 15px 30px;
 		border-radius: 4px;
 	}
 	.content-item{
 		background: #FFFFFF;
-		padding:16px;
+		padding: 15px 0;
 		border-radius: 4px;
 		margin: 10px 0;
+		box-shadow:0 6px 6px rgba(237,234,244,0.5);
+	}
+	.title{
+		font-size: 14px;
+		color: #666666;
+		padding-left: 15px;
+		padding-bottom: 5px;
 	}
 	.content-icon{
-		width: 32px;
-		height: 32px;
+		width: 30px;
+		height: 30px;
 	}
 	.list-item{
 		width: 25%;
 	}
+	.popup-content{
+		position: absolute;
+		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