From 01a95d85a08291f14198af187d53042ae5708131 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Fri, 11 Dec 2020 14:22:51 +0800
Subject: [PATCH] gx
---
hive-app/App.vue | 1
hive-app/common/styles/index.css | 11 +++
hive-app/pages/workbench/index.vue | 66 ++++++++++-----------
hive-app/pages/member/index.vue | 21 ++++++
hive-app/components/searchBar/index.vue | 29 +++++++++
5 files changed, 92 insertions(+), 36 deletions(-)
diff --git a/hive-app/App.vue b/hive-app/App.vue
index 7146a3a..e8a22ac 100644
--- a/hive-app/App.vue
+++ b/hive-app/App.vue
@@ -15,4 +15,5 @@
<style>
/*每个页面公共css */
@import url("./common/styles/index");
+@import url("//at.alicdn.com/t/font_2263696_lohq5qfkgkq.css");
</style>
diff --git a/hive-app/common/styles/index.css b/hive-app/common/styles/index.css
index 07e9d42..a38b561 100644
--- a/hive-app/common/styles/index.css
+++ b/hive-app/common/styles/index.css
@@ -62,8 +62,14 @@
.font-14{
font-size: 14px;
}
+.font-15{
+ font-size: 15px;
+}
.font-16{
font-size: 16px;
+}
+.font-17{
+ font-size: 17px;
}
.font-18{
font-size: 18px;
@@ -79,7 +85,10 @@
.white{
color: #FFFFFF;
}
-.font-gray{
+.gray{
+ color: #999999;
+}
+.dark-gray{
color: #666666;
}
.font-dark{
diff --git a/hive-app/components/searchBar/index.vue b/hive-app/components/searchBar/index.vue
new file mode 100644
index 0000000..d39e91e
--- /dev/null
+++ b/hive-app/components/searchBar/index.vue
@@ -0,0 +1,29 @@
+<template>
+ <view class="search-group">
+ <text></text>
+ <input class="uni-input" confirm-type="search" placeholder="键盘右下角按钮显示为搜索" placeholder-class="placeholder" />
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ };
+ }
+ }
+</script>
+
+<style>
+ .search-group{
+ background: #F8F8F8;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding: 8px 15px;
+ border-radius: 30px;
+ }
+ .search-group input{
+ font-size: 14px;
+ }
+</style>
diff --git a/hive-app/pages/member/index.vue b/hive-app/pages/member/index.vue
index 4646a47..c25ef37 100644
--- a/hive-app/pages/member/index.vue
+++ b/hive-app/pages/member/index.vue
@@ -1,9 +1,28 @@
<template>
- <!-- 会员 -->
+ <view class="container">
+ <search-bar></search-bar>
+ </view>
</template>
<script>
+ import searchBar from '../../components/searchBar/index.vue';
+ export default {
+ components:{
+ searchBar
+ },
+ data() {
+ return {
+
+ };
+ },
+ methods:{
+
+ }
+ }
</script>
<style>
+ .container{
+ padding: 0 10px;
+ }
</style>
diff --git a/hive-app/pages/workbench/index.vue b/hive-app/pages/workbench/index.vue
index 89c2400..963776b 100644
--- a/hive-app/pages/workbench/index.vue
+++ b/hive-app/pages/workbench/index.vue
@@ -5,42 +5,42 @@
<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 iconjiahao" @click.stop="isShow=!isShow"></text>
</view>
<view class="popup-content" v-show="isShow">
<view>
- <text class="icon mr-5"></text>
+ <text class="icon iconfont iconjiahao mr-5"></text>
<text>新增会员</text>
</view>
<view class="mt-10">
- <text class="icon mr-5"></text>
+ <text class="icon iconfont iconsaomiao mr-5"></text>
<text>扫一扫</text>
</view>
</view>
</view>
- <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>
@@ -61,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>
@@ -82,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>
@@ -99,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>
@@ -112,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>
@@ -131,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>
@@ -166,16 +166,8 @@
</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');
- }
.icon {
- width: 20px;
- height: 20px;
- color: #000000;
+ font-size: 18px;
text-align: center;
font-family: texticons;
}
@@ -186,22 +178,28 @@
padding: 0 10px;
}
.header{
- padding: 10px 5px;
+ padding: 12px 5px;
}
.condition{
background-color: #518EFF;
- padding: 16px 30px;
+ padding: 15px 30px;
border-radius: 4px;
}
.content-item{
background: #FFFFFF;
- padding:16px;
+ padding: 15px 0;
border-radius: 4px;
margin: 10px 0;
}
+ .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%;
--
Gitblit v1.9.1