From 82c48f3b548145d0cb3c652c47ed4def1e3e4c77 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Fri, 18 Dec 2020 15:48:04 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/pages/workbench/index.vue | 203 ++++++++++++++++++++++++++++++--------------------
1 files changed, 122 insertions(+), 81 deletions(-)
diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 75dc807..dc8c55e 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -5,101 +5,129 @@
<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>
- <text class="icon mr-15"></text>
- <text class="icon" @click.stop="isShow=!isShow"></text>
+ <text class="icon gray iconfont iconsousuo mr-15"></text>
+ <text class="icon gray iconfont iconjia" @click.stop="isShow=!isShow"></text>
</view>
</view>
<popover class="popup-content" v-show="isShow">
- <view>
- <text class="icon mr-5"></text>
- <text>新增会员</text>
+ <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="mt-10">
- <text class="icon mr-5"></text>
- <text>扫一扫</text>
+ <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 mt-15">
+ <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">
- <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="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>
- <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="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>
- <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>
<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>
@@ -112,7 +140,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>
@@ -131,7 +159,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>
@@ -164,59 +192,72 @@
methods:{
appear(){
+ },
+ linkTo(val){
+ uni.navigateTo({
+ url:val
+ })
}
}
}
</script>
<style>
- @font-face {
- font-family: texticons;
- font-weight: normal;
- font-style: normal;
- src: url('//at.alicdn.com/t/font_2263696_lohq5qfkgkq.ttf') format('truetype');
+ page{
+ background: #F6F6F8;
}
.icon {
- width: 20px;
- height: 20px;
- color: #000000;
+ font-size: 18px;
text-align: center;
font-family: texticons;
- }
- page{
- background: #F8F8F8;
}
.container{
padding: 0 10px;
}
.header{
- padding: 10px 5px;
+ padding: 12px 5px;
}
.condition{
- background-color: #518EFF;
- padding: 16px 30px;
+ background: #518EFF;
+ padding: 15px 30px;
border-radius: 4px;
}
.content-item{
background: #FFFFFF;
- padding:16px;
+ padding: 15px 0;
border-radius: 4px;
margin: 10px 0;
}
- .content-icon{
- width: 32px;
- height: 32px;
+ .title{
+ font-size: 14px;
+ color: #666666;
+ 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;
+ }
+
.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