From c25e12565ad5c737692f9af61ffd1f965f4491bd Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Thu, 24 Dec 2020 16:09:48 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/manager/index.vue | 20
hive-app/pages/member/addLabel.vue | 67 ++++
hive-app/pages/member/projectPlan.vue | 2
hive-app/pages/manager/analyse.vue | 9
hive-app/static/images/small-medal1.png | 0
hive-app/App.vue | 2
hive-app/pages.json | 145 +++++++++
hive-app/static/images/medal2.png | 0
hive-app/static/images/ranking.png | 0
hive-app/static/images/small-medal3.png | 0
hive-app/static/iconfont/iconfont.ttf | 0
hive-app/pages/manager/companyReports.vue | 114 +++++++
hive-app/pages/manager/counselorRanking.vue | 147 +++++++++
hive-app/pages/manager/storeReport.vue | 205 ++++++++++++
hive-app/pages/manager/hint.vue | 30 +
hive-app/pages/member/editMember.vue | 4
hive-app/static/images/crown.png | 0
hive-app/static/images/medal1.png | 0
hive-app/static/images/small-medal2.png | 0
hive-app/pages/login/index.vue | 58 +++
hive-app/common/styles/index.css | 3
hive-app/static/iconfont/iconfont.css | 30 +
hive-app/static/images/medal3.png | 0
hive-app/pages/manager/storeRanking.vue | 109 ++++++
24 files changed, 912 insertions(+), 33 deletions(-)
diff --git a/hive-app/App.vue b/hive-app/App.vue
index a501543..e6fe3b7 100644
--- a/hive-app/App.vue
+++ b/hive-app/App.vue
@@ -16,5 +16,5 @@
/*每个页面公共css */
@import url("./common/styles/index");
@import url("./static/iconfont/iconfont.css");
-@import url("//at.alicdn.com/t/font_2263696_rvcb5as2o0r.css");
+@import url("//at.alicdn.com/t/font_2263696_ohajb1pq6k.css");
</style>
diff --git a/hive-app/common/styles/index.css b/hive-app/common/styles/index.css
index ddf03c4..ad5ff48 100644
--- a/hive-app/common/styles/index.css
+++ b/hive-app/common/styles/index.css
@@ -33,6 +33,9 @@
.ml-20{
margin-left: 20px;
}
+.ml-30{
+ margin-left: 30px;
+}
.mr-0{
margin-right: 0;
diff --git a/hive-app/pages.json b/hive-app/pages.json
index e2ab8de..ecfc1ef 100644
--- a/hive-app/pages.json
+++ b/hive-app/pages.json
@@ -286,6 +286,151 @@
"scrollIndicator": "none"
}
}
+ },
+ {
+ "path": "pages/manager/storeRanking",
+ "style": {
+ "navigationBarTitleText": "门店业绩排行榜",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none",
+ "titleNView": {
+ "buttons": [
+ {
+ "text": "\ue6aa",
+ "fontSrc": "/static/iconfont/iconfont.ttf",
+ "fontSize": "16px",
+ "width":"25px",
+ "float":"right"
+ },
+ {
+ "text":"月榜",
+ "fontSize": "14px"
+ }
+ ]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/manager/counselorRanking",
+ "style": {
+ "navigationBarTitleText": "业绩排行榜",
+ "navigationBarBackgroundColor":"#518EFF",
+ "navigationBarTextStyle":"white",
+ "app-plus":{
+ "scrollIndicator": "none",
+ "titleNView": {
+ "buttons": [
+ {
+ "text": "\ue6aa",
+ "fontSrc": "/static/iconfont/iconfont.ttf",
+ "fontSize": "16px",
+ "width":"25px",
+ "float":"right"
+ },
+ {
+ "text":"月榜",
+ "fontSize": "14px"
+ }
+ ]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/member/addLabel",
+ "style": {
+ "navigationBarTitleText": "添加标签",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none",
+ "titleNView": {
+ "buttons": [
+ {
+ "text":"确认",
+ "fontSize": "14px",
+ "width":"35px"
+ }
+ ]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/manager/companyReports",
+ "style": {
+ "navigationBarTitleText": "公司经营报表",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
+ "path": "pages/manager/storeReport",
+ "style": {
+ "navigationBarTitleText": "门店经营报表",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none",
+ "titleNView": {
+ "buttons": [
+ {
+ "text": "\ue663",
+ "fontSrc": "/static/iconfont/iconfont.ttf",
+ "fontSize": "16px",
+ "width":"25px",
+ "float":"right"
+ },
+ {
+ "text": "\ue65e",
+ "fontSrc": "/static/iconfont/iconfont.ttf",
+ "fontSize": "16px",
+ "width":"25px",
+ "float":"right"
+ }
+ ]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/manager/hint",
+ "style": {
+ "navigationBarTitleText": "提示",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
+ "path": "pages/manager/analyse",
+ "style": {
+ "navigationBarTitleText": "专项分析",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none",
+ "titleNView": {
+ "buttons": [
+ {
+ "text": "\ue65e",
+ "fontSrc": "/static/iconfont/iconfont.ttf",
+ "fontSize": "16px",
+ "width":"25px",
+ "float":"right"
+ }
+ ]
+ }
+ }
+ }
}
],
"globalStyle": {
diff --git a/hive-app/pages/login/index.vue b/hive-app/pages/login/index.vue
index 5fd2660..83a4788 100644
--- a/hive-app/pages/login/index.vue
+++ b/hive-app/pages/login/index.vue
@@ -1,9 +1,24 @@
<template>
<!-- 登录 -->
<view>
- <view class="login-box">
- <input v-model="username" placeholder="输入账号" class="login-input" maxlength="60"/>
- <input v-model="password" placeholder="输入密码" class="login-input mt-20" maxlength="60"/>
+ <!-- #ifndef H5 -->
+ <view class="status_bar"></view>
+ <!-- #endif -->
+ <view class="login-header flex flex-v align-center">
+ <view class="login-img"></view>
+ <text class="font-20 white mt-10">蜂巢美业</text>
+ </view>
+ <view class="login-box center">
+ <text class="font-20 blue font-bold">登录</text>
+ <input v-model="username" placeholder="请输入账号" placeholder-class="placeholder" class="input-group-row left mt-20" maxlength="60"/>
+ <view class="input-group-row">
+ <input v-model="password" placeholder="请输入密码" placeholder-class="placeholder" class="input-left" maxlength="60"/>
+ <text class="iconfont iconyanjing font-14 gray"></text>
+ </view>
+ <view class="right mt-5">
+ <text class="font-14 blue">忘记密码?</text>
+ </view>
+
<button :disabled="isDisabled" class="blue-btn mt-20" @click="login">登录</button>
</view>
</view>
@@ -64,19 +79,42 @@
</script>
<style>
- .login-box{
- padding: 30px;
- box-sizing: border-box;
- width: 100%;
- position: absolute;
- bottom: 40px;
+ .status_bar{
+ background: #518EFF;
}
- .login-input{
+ .login-header{
+ background: #518EFF;
+ border-bottom-left-radius: 20px;
+ border-bottom-right-radius: 20px;
+ padding: 60px 0 80px;
+ }
+ .login-img{
+ width: 72px;
+ height: 72px;
+ background: #FFFFFF;
+ border-radius: 8px;
+ }
+ .login-box{
+ background: #FFFFFF;
+ padding:20px;
+ box-sizing: border-box;
+ position: absolute;
+ left: 10px;
+ right: 10px;
+ bottom: 150px;
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ box-shadow:0 6px 6px rgba(237,234,244,0.5);
+ }
+ /* .login-input{
border: 1px solid #ABB1CC;
border-radius: 20px;
text-align: center;
padding: 10px 0;
font-size: 14px;
+ } */
+ .input-left{
+ text-align: left;
}
.blue-btn{
background: #2483ff;
diff --git a/hive-app/pages/manager/analyse.vue b/hive-app/pages/manager/analyse.vue
new file mode 100644
index 0000000..956183c
--- /dev/null
+++ b/hive-app/pages/manager/analyse.vue
@@ -0,0 +1,9 @@
+<template>
+ <!-- 专项分析 -->
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/hive-app/pages/manager/companyReports.vue b/hive-app/pages/manager/companyReports.vue
new file mode 100644
index 0000000..e29512f
--- /dev/null
+++ b/hive-app/pages/manager/companyReports.vue
@@ -0,0 +1,114 @@
+<template>
+ <!-- 公司经营报表 -->
+ <view>
+ <view>
+ <h-tabs
+ class="tab"
+ :tabData="tabs"
+ :config="{
+ color: '#abb1cc',
+ activeColor: '#518EFF',
+ underLineColor: '#518EFF',
+ underLineHeight: 6,
+ fontSize: '28',
+ underLineWidth: 60,
+ }"
+ />
+ </view>
+ <view>
+ <view class="content-box">
+ <view class="content-box-header">
+ <text class="font-16">2020年12月24日</text>
+ </view>
+ <view class="font-14">
+ <view class="content-box-row flex justify-between">
+ <text>营业收入</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>现金收入</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>盈划扣</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>本金消耗</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>赠送消耗</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>现金退款</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>卡项回归</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>欠款</text>
+ <text>￥12,122</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import HTabs from "@/components/liuyuno-tabs/liuyuno-tabs.vue";
+ export default {
+ components: {
+ HTabs
+ },
+ data() {
+ return {
+ tabs:[
+ {
+ state: 1,
+ name: '每日'
+ },
+ {
+ state: 2,
+ name: '每月'
+ },
+ {
+ state: 3,
+ name: '专项'
+ }
+ ],
+ }
+ }
+ }
+</script>
+
+<style>
+ page{
+ background: #F6F6F8;
+ }
+ .tab{
+ background: #FFFFFF;
+ border-bottom: #EDEAF4;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ box-shadow:0 6px 6px rgba(237,234,244,0.5);
+ }
+ .content-box{
+ background: #FFFFFF;
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ margin: 10px 10px 0;
+ padding: 10px;
+ }
+ .content-box-header{
+ border-bottom: 1px solid #EDEAF4;
+ padding: 0 5px 10px;
+ }
+ .content-box-row{
+ padding: 10px 5px 0;
+ }
+</style>
diff --git a/hive-app/pages/manager/counselorRanking.vue b/hive-app/pages/manager/counselorRanking.vue
new file mode 100644
index 0000000..484efd5
--- /dev/null
+++ b/hive-app/pages/manager/counselorRanking.vue
@@ -0,0 +1,147 @@
+<template>
+ <!-- 顾问排行榜 -->
+ <view>
+ <!-- #ifndef H5 -->
+ <view class="status_bar"></view>
+ <!-- #endif -->
+ <view class="drop-down gray font-12" v-show="isShow">
+ <view class="drop-down-row center" v-for="item in Crunchies">
+ <text>{{item}}</text>
+ </view>
+ </view>
+ <view class="header flex justify-around">
+ <view class="flex flex-v align-center mt-20">
+ <view class="img-box flex align-center justify-center">
+ <image class="header-img" src="../../static/images/head-img.jpg"></image>
+ <image class="ranking-img" mode="widthFix" src="../../static/images/small-medal2.png"></image>
+ </view>
+ <text class="font-12 white mt-5">妍妍</text>
+ <text class="font-16 white mt-5">￥9,020</text>
+ </view>
+ <view class="flex flex-v align-center">
+ <view class="img-box flex align-center justify-center">
+ <image class="header-img" src="../../static/images/head-img.jpg"></image>
+ <image class="ranking-img" mode="widthFix" src="../../static/images/small-medal1.png"></image>
+ <image class="crown-img" mode="widthFix" src="../../static/images/crown.png"></image>
+ </view>
+ <text class="font-12 white mt-5">倩倩</text>
+ <text class="font-16 white mt-5">￥12,020</text>
+ </view>
+ <view class="flex flex-v align-center mt-20">
+ <view class="img-box flex align-center justify-center">
+ <image class="header-img" src="../../static/images/head-img.jpg"></image>
+ <image class="ranking-img" mode="widthFix" src="../../static/images/small-medal3.png"></image>
+ </view>
+ <text class="font-12 white mt-5">雯雯</text>
+ <text class="font-16 white mt-5">￥6,020</text>
+ </view>
+ </view>
+ <view class="content">
+ <view class="content-row flex align-center justify-between">
+ <view class="flex align-center">
+ <image class="content-img ml-30" src="../../static/images/head-img.jpg"></image>
+ <view class="ml-20 flex flex-v">
+ <text class="font-14">我的</text>
+ <text class="font-12 gray mt-5">第32名</text>
+ </view>
+ </view>
+ <text>￥6,020</text>
+ </view>
+ </view>
+ <view class="content">
+ <view class="content-row flex align-center justify-between" v-for="item in 4">
+ <view class="flex align-center">
+ <text class="font-16">4</text>
+ <image class="content-img ml-20" src="../../static/images/head-img.jpg"></image>
+ <text class="font-14 ml-20">冯丽妍</text>
+ </view>
+ <text>￥6,020</text>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default{
+ data(){
+ return{
+ isShow:false,
+ Crunchies:['年榜','月榜','日榜']
+ }
+ },
+ methods:{
+ onNavigationBarButtonTap(e) {
+ this.isShow=!this.isShow
+ },
+ }
+ }
+</script>
+
+<style>
+ .header{
+ background: #518EFF;
+ border-bottom-left-radius: 20px;
+ border-bottom-right-radius: 20px;
+ padding: 15px 0;
+ }
+ .img-box{
+ width: 72px;
+ height: 72px;
+ position: relative;
+ border-radius: 50%;
+ background: #a8c6ff;
+ }
+ .header-img{
+ width: 64px;
+ height: 64px;
+ border-radius: 50%;
+ }
+ .ranking-img{
+ width: 18px;
+ position: absolute;
+ bottom: 0;
+ left: 45px;
+ }
+ .crown-img{
+ width: 35px;
+ position: absolute;
+ top: -15px;
+ left: 40px;
+ }
+ .content{
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ box-shadow:0 6px 6px rgba(237,234,244,0.5);
+ margin: 10px;
+ padding: 0 15px;
+ }
+ .content-row{
+ border-bottom: 1px solid #EDEAF4;
+ padding: 10px 0;
+ }
+ .content-row:nth-last-child(1){
+ border: 0;
+ }
+ .content-img{
+ width: 48px;
+ height: 48px;
+ border-radius: 50%;
+ }
+ .drop-down{
+ width: 56px;
+ background: #FFFFFF;
+ border-radius: 4px;
+ padding: 0 5px;
+ position: absolute;
+ right: 15px;
+ top: -10px;
+ z-index: 999;
+ }
+ .drop-down-row{
+ border-bottom: 1px solid #EDEAF4;
+ padding: 5px 0;
+ }
+ .drop-down-row:nth-last-child(1){
+ border: 0;
+ }
+</style>
diff --git a/hive-app/pages/manager/hint.vue b/hive-app/pages/manager/hint.vue
new file mode 100644
index 0000000..0d7d8ce
--- /dev/null
+++ b/hive-app/pages/manager/hint.vue
@@ -0,0 +1,30 @@
+<template>
+ <!-- 提示 -->
+ <view>
+ <view class="content-row flex align-center">
+ <text class="font-20">1</text>
+ <text class="font-14 ml-10">营业收入为所有订单的应收金额之和，包含储蓄卡充 值金额，包含欠款。</text>
+ </view>
+ <view class="content-row flex align-center">
+ <text class="font-20">2</text>
+ <text class="font-14 ml-10">现金收入为所有订单中使用现金或相等现金的支付方 式支付的订单应付金额之和，包含欠款。</text>
+ </view>
+ </view>
+</template>
+
+<script>
+</script>
+
+<style>
+ page{
+ background: #F6F6F8;
+ }
+ .content-row{
+ background: #FFFFFF;
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ box-shadow:0 6px 6px rgba(237,234,244,0.5);
+ padding: 10px;
+ margin: 10px 10px 0;
+ }
+</style>
diff --git a/hive-app/pages/manager/index.vue b/hive-app/pages/manager/index.vue
index f86dbe6..14ced02 100644
--- a/hive-app/pages/manager/index.vue
+++ b/hive-app/pages/manager/index.vue
@@ -5,31 +5,31 @@
<view class="content-item">
<text class="title">排行榜</text>
<view class="flex align-center mt-10">
- <view class="flex flex-v align-center list-item">
+ <navigator url="./storeRanking" class="flex flex-v align-center list-item" hover-class="none">
<image class="content-icon" src="../../static/images/statement1.png"></image>
<text class="font-12 font-dark">门店业绩排行榜</text>
- </view>
- <view class="flex flex-v align-center list-item">
+ </navigator>
+ <navigator url="./counselorRanking" hover-class="none" class="flex flex-v align-center list-item">
<image class="content-icon" src="../../static/images/statement2.png"></image>
<text class="font-12 font-dark">顾问业绩排行榜</text>
- </view>
- <view class="flex flex-v align-center list-item">
+ </navigator>
+ <navigator url="./beautyTherapistsRanking" hover-class="none" class="flex flex-v align-center list-item">
<image class="content-icon" src="../../static/images/statement3.png"></image>
<text class="font-12 font-dark">美疗师业绩排行榜</text>
- </view>
+ </navigator>
</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">
+ <navigator url="./companyReports" hover-class="none" class="flex flex-v align-center list-item">
<image class="content-icon" src="../../static/images/statement4.png"></image>
<text class="font-12 font-dark">公司经营报表</text>
- </view>
- <view class="flex flex-v align-center list-item">
+ </navigator>
+ <navigator url="./storeReport" hover-class="none" class="flex flex-v align-center list-item">
<image class="content-icon" src="../../static/images/statement5.png"></image>
<text class="font-12 font-dark">门店经营报表</text>
- </view>
+ </navigator>
<view class="flex flex-v align-center list-item">
<image class="content-icon" src="../../static/images/statement6.png"></image>
<text class="font-12 font-dark">员工经营报表</text>
diff --git a/hive-app/pages/manager/storeRanking.vue b/hive-app/pages/manager/storeRanking.vue
new file mode 100644
index 0000000..fd92084
--- /dev/null
+++ b/hive-app/pages/manager/storeRanking.vue
@@ -0,0 +1,109 @@
+<template>
+ <!-- 门店排行榜 -->
+ <view>
+ <view class="header flex justify-end">
+ <view class="flex flex-v">
+ <text class="font-16 white">总计</text>
+ <text class="font-20 white mt-10">￥180，8088</text>
+ </view>
+ </view>
+ <view>
+ <h-tabs
+ class="tab"
+ :tabData="tabs"
+ :config="{
+ color: '#abb1cc',
+ activeColor: '#518EFF',
+ underLineColor: '#518EFF',
+ underLineHeight: 6,
+ fontSize: '28',
+ underLineWidth: 60,
+ }"
+ />
+ </view>
+ <view class="content">
+ <view class="content-row flex justify-between mt-10">
+ <view class="flex align-center content-row-left">
+ <image class="row-img" src="../../static/images/head-img.jpg"></image>
+ <view class="flex flex-v ml-10">
+ <text class="font-16">时光秘境会所</text>
+ <text class="font-14 gray mt-10">￥23，960</text>
+ </view>
+ </view>
+ <image class="medal" mode="widthFix" src="../../static/images/medal1.png"></image>
+ </view>
+ <view class="content-row flex justify-between mt-10">
+ <view class="flex align-center content-row-left">
+ <image class="row-img" src="../../static/images/head-img.jpg"></image>
+ <view class="flex flex-v ml-10">
+ <text class="font-16">时光秘境会所</text>
+ <text class="font-14 gray mt-10">￥23，960</text>
+ </view>
+ </view>
+ <image class="medal" mode="widthFix" src="../../static/images/medal2.png"></image>
+ </view>
+ <view class="content-row flex justify-between mt-10">
+ <view class="flex align-center content-row-left">
+ <image class="row-img" src="../../static/images/head-img.jpg"></image>
+ <view class="flex flex-v ml-10">
+ <text class="font-16">时光秘境会所</text>
+ <text class="font-14 gray mt-10">￥23，960</text>
+ </view>
+ </view>
+ <image class="medal" mode="widthFix" src="../../static/images/medal3.png"></image>
+ </view>
+ </view>
+
+ </view>
+</template>
+
+<script>
+ import HTabs from "@/components/liuyuno-tabs/liuyuno-tabs.vue";
+ export default {
+ components: {
+ HTabs
+ },
+ data() {
+ return {
+ tabs:[
+ {
+ state: 1,
+ name: '销售榜'
+ },
+ {
+ state: 2,
+ name: '消耗榜'
+ }
+ ],
+ }
+ }
+ }
+</script>
+
+<style>
+ .header{
+ background: url(../../static/images/ranking.png) no-repeat;
+ background-size: 100% 100%;
+ padding: 30px;
+ }
+ .content{
+ padding: 0 10px;
+ }
+ .content-row{
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ box-shadow:0 6px 6px rgba(237,234,244,0.5);
+ padding: 0 10px;
+ }
+ .content-row-left{
+ padding: 10px 0;
+ }
+ .medal{
+ width: 36px;
+ }
+ .row-img{
+ width: 64px;
+ height: 64px;
+ border-radius: 50%;
+ }
+</style>
diff --git a/hive-app/pages/manager/storeReport.vue b/hive-app/pages/manager/storeReport.vue
new file mode 100644
index 0000000..8cbd73a
--- /dev/null
+++ b/hive-app/pages/manager/storeReport.vue
@@ -0,0 +1,205 @@
+<template>
+ <!-- 门店经营报表 -->
+ <view>
+ <view class="store-box" v-show="isShow">
+ <view class="store-box-row font-12 gray">
+ <text>广州天河店</text>
+ </view>
+ <view class="store-box-row font-12 gray">
+ <text>长沙五一店</text>
+ </view>
+ <view class="store-box-row font-12 gray">
+ <text>深圳南山店</text>
+ </view>
+ </view>
+ <view>
+ <h-tabs
+ class="tab"
+ :tabData="tabs"
+ :config="{
+ color: '#abb1cc',
+ activeColor: '#518EFF',
+ underLineColor: '#518EFF',
+ underLineHeight: 6,
+ fontSize: '28',
+ underLineWidth: 60,
+ }"
+ @tabClick="tabClick($event)"
+ />
+ </view>
+ <view v-if="tabIndex==0">
+ <view class="content-box">
+ <view class="content-box-header">
+ <text class="font-16">2020年12月24日</text>
+ </view>
+ <view class="font-14">
+ <view class="content-box-row flex justify-between">
+ <text>营业收入</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>现金收入</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>盈划扣</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>本金消耗</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>赠送消耗</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>现金退款</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>卡项回归</text>
+ <text>￥12,122</text>
+ </view>
+ <view class="content-box-row flex justify-between">
+ <text>欠款</text>
+ <text>￥12,122</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view v-if="tabIndex==2">
+ <view class="content-box">
+ <navigator url="./analyse" hover-class="none" class="content-row">
+ <text>营业收入</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </navigator>
+ <view class="content-row">
+ <text>现金收入</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </view>
+ <view class="content-row">
+ <text>盈划扣</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </view>
+ <view class="content-row">
+ <text>本金消耗</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </view>
+ <view class="content-row">
+ <text>赠送消耗</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </view>
+ <view class="content-row">
+ <text>现金退款</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </view>
+ <view class="content-row">
+ <text>卡项回归</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </view>
+ <view class="content-row">
+ <text>欠款</text>
+ <text class="iconfont iconarrow-backimg gray"></text>
+ </view>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import HTabs from "@/components/liuyuno-tabs/liuyuno-tabs.vue";
+ export default {
+ components: {
+ HTabs
+ },
+ data() {
+ return {
+ tabs:[
+ {
+ state: 1,
+ name: '每日'
+ },
+ {
+ state: 2,
+ name: '每月'
+ },
+ {
+ state: 3,
+ name: '专项'
+ }
+ ],
+ isShow:false,
+ tabIndex:0
+ }
+ },
+ methods:{
+ onNavigationBarButtonTap(e){
+ if(e.index==0){
+ uni.navigateTo({
+ url:"./hint"
+ })
+ }
+ if(e.index==1){
+ this.isShow=!this.isShow
+ }
+ },
+ tabClick(index){
+ this.tabIndex=index
+ }
+ }
+ }
+</script>
+
+<style>
+ page{
+ background: #F6F6F8;
+ }
+ .tab{
+ background: #FFFFFF;
+ border-bottom: #EDEAF4;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ box-shadow:0 6px 6px rgba(237,234,244,0.5);
+ }
+ .content-box{
+ background: #FFFFFF;
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ margin: 10px 10px 0;
+ padding: 10px;
+ }
+ .content-box-header{
+ border-bottom: 1px solid #EDEAF4;
+ padding: 0 5px 10px;
+ }
+ .content-box-row{
+ padding: 10px 5px 0;
+ }
+ .store-box{
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ background: #FFFFFF;
+ position: absolute;
+ top: -10px;
+ right: 38px;
+ padding: 0 10px;
+ z-index: 999;
+ }
+ .store-box-row{
+ border-bottom: 1px solid #EDEAF4;
+ padding: 5px 0;
+ }
+ .store-box-row:nth-last-child(1){
+ border: 0;
+ }
+ .content-row{
+ border-bottom: 1px solid #EDEAF4;
+ padding: 10px 5px;
+ display: flex;
+ justify-content: space-between;
+ }
+ .content-row:nth-last-child(1){
+ border: 0;
+ }
+</style>
diff --git a/hive-app/pages/member/addLabel.vue b/hive-app/pages/member/addLabel.vue
new file mode 100644
index 0000000..2655fb7
--- /dev/null
+++ b/hive-app/pages/member/addLabel.vue
@@ -0,0 +1,67 @@
+<template>
+ <!-- 添加标签 -->
+ <view>
+ <search-bar placeholder="搜索标签名称" class="ml-10 mr-10"></search-bar>
+ <view class="font-14 content">
+ <view class="content-title">
+ <text>常用标签</text>
+ </view>
+ <view>
+ <checkbox-group>
+ <label v-for="(item,index) in list" class="flex align-center">
+ <view class="ml-10">
+ <checkbox color="#518EFF"></checkbox>
+ </view>
+ <view class="ml-10 checkbox-text">{{item.name}}</view>
+ </label>
+ </checkbox-group>
+ </view>
+ </view>
+ <button class="sticky-footer blue-btn">创建标签</button>
+ </view>
+</template>
+
+<script>
+ import searchBar from '../../components/searchBar/index.vue';
+ export default {
+ components:{
+ searchBar
+ },
+ data(){
+ return{
+ list:[
+ {name:'痘坑'},
+ {name:'美白'},
+ {name:'祛斑'},
+ {name:'瘦身'},
+ {name:'祛痘'},
+ {name:'塑性'},
+ {name:'双眼皮'},
+ {name:'白富美'},
+ {name:'轻度色斑'},
+ {name:'瘦脸'},
+ {name:'减肥美白'},
+ {name:'胎记'}
+ ]
+ }
+ }
+ }
+</script>
+
+<style>
+ .content{
+ margin-bottom: 60px;
+ }
+ .content-title{
+ background: #F2F2F2;
+ padding: 10px;
+ }
+ .checkbox-text{
+ width: 100%;
+ padding: 10px 0;
+ border-bottom: 1px solid #EDEAF4;
+ }
+ .sticky-footer{
+ bottom: 10px;
+ }
+</style>
diff --git a/hive-app/pages/member/editMember.vue b/hive-app/pages/member/editMember.vue
index d86f5d4..938a04f 100644
--- a/hive-app/pages/member/editMember.vue
+++ b/hive-app/pages/member/editMember.vue
@@ -66,12 +66,12 @@
<text class="label">备注</text>
<input name="remark" v-model="formData.remark" maxlength="60" type="text" placeholder="请填写备注" placeholder-class='placeholder'/>
</view>
- <view class="input-group-row">
+ <navigator url="./addLabel" hover-class="none" class="input-group-row">
<text class="label">标签</text>
<view class="right-text">
<!-- <text class="tag">大方<text class="iconfont iconguanbi gray"></text></text> -->
</view>
- </view>
+ </navigator>
<button form-type="submit" :disabled="isDisabled" class="blue-btn sticky-footer">保存</button>
</form>
<region ref="simpleAddress" @onConfirm="addressChange" themeColor="#518EFF" cancelColor="#8c9fad"></region>
diff --git a/hive-app/pages/member/projectPlan.vue b/hive-app/pages/member/projectPlan.vue
index 9468108..fb8c228 100644
--- a/hive-app/pages/member/projectPlan.vue
+++ b/hive-app/pages/member/projectPlan.vue
@@ -13,7 +13,7 @@
activeColor: '#518EFF',
underLineColor: '#518EFF',
underLineHeight: 6,
- fontSize: '30',
+ fontSize: '28',
underLineWidth: 60,
}"
/>
diff --git a/hive-app/static/iconfont/iconfont.css b/hive-app/static/iconfont/iconfont.css
index 4c45fb8..cc124d3 100644
--- a/hive-app/static/iconfont/iconfont.css
+++ b/hive-app/static/iconfont/iconfont.css
@@ -1,23 +1,35 @@
@font-face {
font-family: 'iconfont'; /* project id 2263696 */
- src: url('https://at.alicdn.com/t/font_2263696_8byfwqqh6c.eot');
- src: url('https://at.alicdn.com/t/font_2263696_8byfwqqh6c.eot?#iefix') format('embedded-opentype'),
- url('https://at.alicdn.com/t/font_2263696_8byfwqqh6c.woff2') format('woff2'),
- url('https://at.alicdn.com/t/font_2263696_8byfwqqh6c.woff') format('woff'),
- url('https://at.alicdn.com/t/font_2263696_8byfwqqh6c.ttf') format('truetype'),
- url('https://at.alicdn.com/t/font_2263696_8byfwqqh6c.svg#iconfont') format('svg');
+ src: url('https://at.alicdn.com/t/font_2263696_ohajb1pq6k.eot');
+ src: url('https://at.alicdn.com/t/font_2263696_ohajb1pq6k.eot?#iefix') format('embedded-opentype'),
+ url('https://at.alicdn.com/t/font_2263696_ohajb1pq6k.woff2') format('woff2'),
+ url('https://at.alicdn.com/t/font_2263696_ohajb1pq6k.woff') format('woff'),
+ url('https://at.alicdn.com/t/font_2263696_ohajb1pq6k.ttf') format('truetype'),
+ url('https://at.alicdn.com/t/font_2263696_ohajb1pq6k.svg#iconfont') format('svg');
}
.iconfont {
font-family: "iconfont" !important;
- font-size: 16px;
+ font-size: 18px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
-.icondian3:before {
- content: "\e609";
+.iconshaixuan1:before {
+ content: "\e65e";
+}
+
+.iconwenhao1:before {
+ content: "\e663";
+}
+
+.iconchanpin:before {
+ content: "\e612";
+}
+
+.icondd:before {
+ content: "\e604";
}
.iconshafa:before {
diff --git a/hive-app/static/iconfont/iconfont.ttf b/hive-app/static/iconfont/iconfont.ttf
index 8124c6d..e84a49a 100644
--- a/hive-app/static/iconfont/iconfont.ttf
+++ b/hive-app/static/iconfont/iconfont.ttf
Binary files differ
diff --git a/hive-app/static/images/crown.png b/hive-app/static/images/crown.png
new file mode 100644
index 0000000..981bf90
--- /dev/null
+++ b/hive-app/static/images/crown.png
Binary files differ
diff --git a/hive-app/static/images/medal1.png b/hive-app/static/images/medal1.png
new file mode 100644
index 0000000..819b5c6
--- /dev/null
+++ b/hive-app/static/images/medal1.png
Binary files differ
diff --git a/hive-app/static/images/medal2.png b/hive-app/static/images/medal2.png
new file mode 100644
index 0000000..dd50541
--- /dev/null
+++ b/hive-app/static/images/medal2.png
Binary files differ
diff --git a/hive-app/static/images/medal3.png b/hive-app/static/images/medal3.png
new file mode 100644
index 0000000..071c477
--- /dev/null
+++ b/hive-app/static/images/medal3.png
Binary files differ
diff --git a/hive-app/static/images/ranking.png b/hive-app/static/images/ranking.png
new file mode 100644
index 0000000..641bc96
--- /dev/null
+++ b/hive-app/static/images/ranking.png
Binary files differ
diff --git a/hive-app/static/images/small-medal1.png b/hive-app/static/images/small-medal1.png
new file mode 100644
index 0000000..636145e
--- /dev/null
+++ b/hive-app/static/images/small-medal1.png
Binary files differ
diff --git a/hive-app/static/images/small-medal2.png b/hive-app/static/images/small-medal2.png
new file mode 100644
index 0000000..fb206a0
--- /dev/null
+++ b/hive-app/static/images/small-medal2.png
Binary files differ
diff --git a/hive-app/static/images/small-medal3.png b/hive-app/static/images/small-medal3.png
new file mode 100644
index 0000000..f23c30f
--- /dev/null
+++ b/hive-app/static/images/small-medal3.png
Binary files differ
--
Gitblit v1.9.1