From 4b80ef278bce475c0748717f4b5ffb8bb4df298b Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Wed, 30 Dec 2020 10:40:51 +0800
Subject: [PATCH] gx
---
hive-app/pages/workbench/followRecords.vue | 114 ++++++++++++++++
hive-app/pages/login/index.vue | 4
hive-app/App.vue | 2
hive-app/pages.json | 62 ++++++++
hive-app/pages/workbench/board.vue | 172 ++++++++++++++++++++++++
hive-app/pages/login/forgetPassword.vue | 30 ++++
hive-app/pages/login/newPassword.vue | 24 +++
7 files changed, 405 insertions(+), 3 deletions(-)
diff --git a/hive-app/App.vue b/hive-app/App.vue
index 19f1c8c..ea625a7 100644
--- a/hive-app/App.vue
+++ b/hive-app/App.vue
@@ -20,5 +20,5 @@
/*每个页面公共css */
@import url("./common/styles/index");
@import url("./static/iconfont/iconfont.css");
-@import url("//at.alicdn.com/t/font_2263696_ne5dppf1il.css");
+@import url("//at.alicdn.com/t/font_2263696_bah4ajyfqa6.css");
</style>
diff --git a/hive-app/pages.json b/hive-app/pages.json
index c3c5237..47e8178 100644
--- a/hive-app/pages.json
+++ b/hive-app/pages.json
@@ -480,6 +480,68 @@
"scrollIndicator": "none"
}
}
+ },
+ {
+ "path": "pages/workbench/board",
+ "style": {
+ "navigationBarTitleText": "看板",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
+ "path": "pages/workbench/followRecords",
+ "style": {
+ "navigationBarTitleText": "跟进记录",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none",
+ "titleNView": {
+ "buttons": [
+ {
+ "text": "\ue620",
+ "fontSrc": "/static/iconfont/iconfont.ttf",
+ "fontSize": "16px",
+ "width":"25px",
+ "float":"right"
+ },
+ {
+ "text": "\ue75e",
+ "fontSrc": "/static/iconfont/iconfont.ttf",
+ "fontSize": "16px",
+ "width":"25px",
+ "float":"right"
+ }
+ ]
+ }
+ }
+ }
+ },
+ {
+ "path": "pages/login/forgetPassword",
+ "style": {
+ "navigationBarTitleText": "忘记密码",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
+ },
+ {
+ "path": "pages/login/newPassword",
+ "style": {
+ "navigationBarTitleText": "输入新密码",
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "navigationBarTextStyle":"black",
+ "app-plus":{
+ "scrollIndicator": "none"
+ }
+ }
}
],
"globalStyle": {
diff --git a/hive-app/pages/login/forgetPassword.vue b/hive-app/pages/login/forgetPassword.vue
new file mode 100644
index 0000000..d2b99f7
--- /dev/null
+++ b/hive-app/pages/login/forgetPassword.vue
@@ -0,0 +1,30 @@
+<template>
+ <!-- 忘记密码 -->
+ <view>
+ <view class="input-box">
+ <input placeholder="请输入手机号码" placeholder-class="placeholder" class="input-group-row"/>
+ <view class="flex mt-10">
+ <input placeholder="请输入验证码" placeholder-class="placeholder" class="input-group-row flex-1"/>
+ <button class="btn blue-btn">获取验证码</button>
+ </view>
+ </view>
+ <navigator url="./newPassword" hover-class="none" class="next">
+ <button class="blue-btn">下一步</button>
+ </navigator>
+ </view>
+</template>
+
+<script>
+</script>
+
+<style>
+ .input-box{
+ margin: 40px 20px;
+ }
+ .btn{
+ margin: 0;
+ }
+ .next{
+ margin: 60px 20px;
+ }
+</style>
diff --git a/hive-app/pages/login/index.vue b/hive-app/pages/login/index.vue
index a7614f8..141a80c 100644
--- a/hive-app/pages/login/index.vue
+++ b/hive-app/pages/login/index.vue
@@ -25,9 +25,9 @@
<text @click="isHidePwd=true" class="iconfont iconyanjing1 gray"></text>
</view>
</template>
- <view class="forget-pwd">
+ <navigator class="forget-pwd" url="./forgetPassword" hover-class="none">
<text>忘记密码?</text>
- </view>
+ </navigator>
<button :disabled="isDisabled" class="blue-btn" @click="login">登录</button>
</view>
</view>
diff --git a/hive-app/pages/login/newPassword.vue b/hive-app/pages/login/newPassword.vue
new file mode 100644
index 0000000..1a61713
--- /dev/null
+++ b/hive-app/pages/login/newPassword.vue
@@ -0,0 +1,24 @@
+<template>
+ <!-- 新密码 -->
+ <view>
+ <view class="input-box">
+ <input placeholder="请输入新密码" placeholder-class="placeholder" class="input-group-row"/>
+ <input placeholder="请确认密码" placeholder-class="placeholder" class="input-group-row"/>
+ </view>
+ <navigator url="./" hover-class="none" class="next">
+ <button class="blue-btn">提交</button>
+ </navigator>
+ </view>
+</template>
+
+<script>
+</script>
+
+<style>
+ .input-box{
+ margin: 40px 20px;
+ }
+ .next{
+ margin: 60px 20px;
+ }
+</style>
diff --git a/hive-app/pages/workbench/board.vue b/hive-app/pages/workbench/board.vue
new file mode 100644
index 0000000..77d5f94
--- /dev/null
+++ b/hive-app/pages/workbench/board.vue
@@ -0,0 +1,172 @@
+<template>
+ <!-- 看板 -->
+ <view>
+ <view class="content">
+ <view class="content-time font-16 flex align-center">
+ <text>预约时间</text>
+ <text class="blue ml-10">2020-12-25</text>
+ </view>
+ <view class="content-condition font-12 flex align-center justify-around mt-20">
+ <view class="content-condition-item center item-white">
+ <text>未上班</text>
+ </view>
+ <view class="content-condition-item center item-green">
+ <text>可预约</text>
+ </view>
+ <view class="content-condition-item center item-pink">
+ <text>已预约</text>
+ </view>
+ <view class="content-condition-item center item-blue">
+ <text>服务中</text>
+ </view>
+ <view class="content-condition-item center item-yellow">
+ <text>服务结束</text>
+ </view>
+ </view>
+ <view class="itme-box mt-20">
+ <scroll-view scroll-x="true" class="h-table">
+ <view class="h-tr h-thead">
+ <view class="h-td center">姓名</view>
+ <view class="h-td center">10:00</view>
+ <view class="h-td center">10:30</view>
+ <view class="h-td center">11:00</view>
+ <view class="h-td center">11:30</view>
+ <view class="h-td center">12:00</view>
+ <view class="h-td center">12:30</view>
+ <view class="h-td center">13:00</view>
+ <view class="h-td center">13:30</view>
+ </view>
+ <view class="h-tr">
+ <view class="h-td center">周晓</view>
+ <view class="h-td font-12 flex flex-v item-yellow" style="min-width: 240px;">
+ <view>
+ <view class="flex">
+ <view class="flex align-center">
+ <text class="iconfont iconnvshi mr-5"></text>
+ <text>于倩</text>
+ </view>
+ <view class="flex align-center ml-10">
+ <text class="iconfont iconzhong mr-5"></text>
+ <text>90分钟</text>
+ </view>
+ </view>
+ <view class="flex align-center mt-5">
+ <text class="iconfont iconxiangmu mr-5"></text>
+ <text>脸部抗衰护理</text>
+ </view>
+ <view class="flex align-center mt-5">
+ <text class="iconfont iconshafa mr-5"></text>
+ <text>VIP-2 (星海店)</text>
+ </view>
+ </view>
+ </view>
+ <view class="h-td"></view>
+ </view>
+ <view class="h-tr">
+ <view class="h-td">陈沾</view>
+ <view class="h-td item-green"></view>
+ </view>
+ <view class="h-tr">
+ <view class="h-td">古秋燕</view>
+ <view class="h-td"></view>
+ </view>
+ <view class="h-tr">
+ <view class="h-td">彭艳芳</view>
+ <view class="h-td"></view>
+ </view>
+ </scroll-view>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default{
+ components: {
+
+ },
+ data(){
+ return{
+ }
+ }
+ }
+</script>
+
+<style>
+ page{
+ background: #F6F6F8;
+ }
+ .content{
+ background: #FFFFFF;
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ box-shadow:0 6px 6px rgba(237,234,244,0.5);
+ margin: 10px;
+ padding: 10px 0;
+ }
+ .content-time{
+ padding: 0 10px;
+ }
+ .content-condition-item{
+ width: 60px;
+ border: 1px solid #EDEAF4;
+ border-radius: 4px;
+ line-height: 24px;
+ }
+ .item-white{
+ background: #fafafa;
+ }
+ .item-green{
+ background: #ECF7E6;
+ }
+ .item-pink{
+ background: #FDEDF0;
+ }
+ .item-blue{
+ background: #BAD8FD;
+ }
+ .item-yellow{
+ background: #F8ECDA;
+ }
+
+
+ .itme-box{
+ background: #FFFFFF;
+ }
+ /* 表格样式开始 */
+
+ /* 行 */
+ .h-tr{
+ box-sizing: border-box;
+ display: flex;
+ /* align-items: stretch; */
+ align-content: center;
+ border-color: #EDEAF4;
+ border-style: solid;
+ border-width: 0;
+ border-top-width: 1px;
+ border-left-width: 1px;
+ /* border-bottom-width: 1px; */
+ color: #111111;
+ }
+ .h-tr:nth-last-child(1){
+ border-bottom-width: 1px;
+ }
+ /* 单元格 */
+ .h-td{
+ min-width: 80px;
+ box-sizing: border-box;
+ padding: 3px;
+ border-color: #EDEAF4;
+ border-style: solid;
+ border-width: 0;
+ border-right-width: 1px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ /* 表头 */
+ .h-thead{
+ background-color: #FFFFFF;
+ }
+</style>
diff --git a/hive-app/pages/workbench/followRecords.vue b/hive-app/pages/workbench/followRecords.vue
new file mode 100644
index 0000000..830dbf4
--- /dev/null
+++ b/hive-app/pages/workbench/followRecords.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,
+ }"
+ @tabClick="tabClick($event)"
+ />
+ </view>
+ <view class="content-row font-14" v-for="item in 2">
+ <view class="flex align-center">
+ <image class="header-img" src="../../static/images/default-avatar.png"></image>
+ <view class="flex flex-v ml-10">
+ <text>杨明</text>
+ <text>2020-12 12:34</text>
+ </view>
+ </view>
+ <view class="mt-10">
+ <text>截图服务了杨姐,她的面部比较干燥暗沉色斑较多,约下次来做一个面部护理</text>
+ </view>
+ <view class="mt-10">
+ <image class="content-img mr-10" src="../../static/images/banner.jpg"></image>
+ <image class="content-img" src="../../static/images/banner.jpg"></image>
+ </view>
+ <view class="flex align-center justify-between mt-5">
+ <text>客户:杨依依</text>
+ <view class="flex align-center">
+ <text class="iconfont iconzhong mr-5"></text>
+ <text>2020-12-31 12:34</text>
+ </view>
+ </view>
+ <view class="mt-5">
+ <text>订单:面部护理等</text>
+ </view>
+ <view class="right mt-5">
+ <text class="iconfont iconxin"></text>
+ <text class="iconfont iconliuyan1 ml-20"></text>
+ </view>
+ <view class="content-row-notes flex align-center blue">
+ <text class="iconfont iconxin mr-10"></text>
+ <text>李贝,拉拉</text>
+ </view>
+ <view class="content-row-notes flex align-center blue">
+ <text>李贝: 好的,继续跟进</text>
+ </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;
+ }
+ .header-img{
+ width: 45px;
+ height: 45px;
+ border-radius: 50%;
+ }
+ .content-row{
+ background: #FFFFFF;
+ padding: 10px;
+ margin-top: 10px;
+ }
+ .content-img{
+ width: 80px;
+ height: 80px;
+ border-radius: 4px;
+ }
+ .content-row-notes{
+ line-height: 20px;
+ background: #F6F6F8;
+ padding: 5px;
+ margin-top: 10px;
+ }
+</style>
--
Gitblit v1.9.1