From 164acabd9e14052cb730826f427ef9d353fd0529 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Mon, 21 Dec 2020 18:06:13 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/pages/workbench/index.vue | 85 +++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 51 deletions(-)
diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index dc8c55e..b98a465 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -21,23 +21,24 @@
<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>
- <text class="font-15 white mt-10">预约</text>
+ <view class="condition flex justify-around">
+ <view class="eyes">
+ <text class="iconfont iconyanjing2"></text>
+ <!-- <text class="iconfont iconbiyan"></text> -->
</view>
<view class="flex flex-v align-center">
- <text class="font-17 white">2</text>
- <text class="font-15 white mt-10">进行中</text>
+ <text class="font-17">¥ 1000</text>
+ <text>今日订单</text>
</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-17">¥ 100</text>
+ <text>今日消耗</text>
</view>
<view class="flex flex-v align-center">
- <text class="font-17 white">15</text>
- <text class="font-15 white mt-10">欠款</text>
+ <text class="font-17">¥ 90</text>
+ <text>手工提成</text>
</view>
+
</view>
<view class="content-item mt-10">
<text class="title">订单</text>
@@ -78,19 +79,19 @@
</navigator>
</view>
<view class="list-item">
- <navigator url="./" hover-class="none">
+ <navigator url="./serviceOrderList" 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="list-item">
- <navigator url="./" hover-class="none">
+ <navigator url="./serviceOrderList" 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="list-item">
- <navigator url="./" hover-class="none">
+ <navigator url="./serviceOrderList" hover-class="none">
<image class="content-icon" src="../../static/images/sever4.png"></image>
<text class="font-12 mt-10 font-dark">服务完成</text>
</navigator>
@@ -131,42 +132,11 @@
<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>
- <text class="font-12 mt-10 font-dark">库存查询</text>
+ <text class="font-12 mt-5 font-dark">库存查询</text>
</view>
<view class="flex flex-v align-center list-item">
<image class="content-icon" src="../../static/images/warehouse2.png"></image>
- <text class="font-12 mt-10 font-dark">盘点</text>
- </view>
- </view>
- </view>
- <view class="content-item">
- <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>
- <text class="font-12 mt-10 font-dark">排行榜</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement2.png"></image>
- <text class="font-12 mt-10 font-dark">员工业绩</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement3.png"></image>
- <text class="font-12 mt-10 font-dark">门店业绩</text>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement4.png"></image>
- <text class="font-12 mt-10 font-dark">产品报表</text>
- </view>
- </view>
- <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>
- </view>
- <view class="flex flex-v align-center list-item">
- <image class="content-icon" src="../../static/images/statement6.png"></image>
- <text class="font-12 mt-10 font-dark">客户流失预警</text>
+ <text class="font-12 mt-5 font-dark">盘点</text>
</view>
</view>
</view>
@@ -185,9 +155,9 @@
}
},
onLoad() {
- document.addEventListener('click', () => {
- this.isShow = false
- }, false)
+ // document.addEventListener('click', () => {
+ // this.isShow = false
+ // }, false)
},
methods:{
appear(){
@@ -218,9 +188,21 @@
padding: 12px 5px;
}
.condition{
+ position: relative;
background: #518EFF;
- padding: 15px 30px;
+ padding: 15px 20px;
border-radius: 4px;
+ font-size: 14px;
+ color: #FFFFFF;
+ line-height: 30px;
+ }
+ .condition .eyes{
+ position: absolute;
+ right: 10px;
+ top: 10px;
+ }
+ .condition .eyes .iconfont{
+ font-size: 18px;
}
.content-item{
background: #FFFFFF;
@@ -232,7 +214,7 @@
font-size: 14px;
color: #666666;
padding-left: 15px;
- padding-bottom: 5px;
+ padding-bottom: 10px;
}
.list-item{
width: 25%;
@@ -247,6 +229,7 @@
.popup-content{
position: absolute;
+ z-index: 99;
right: 9px;
top: 48px;
padding-left: 10px;
--
Gitblit v1.9.1