Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

li-guang

2020-12-18 82c48f3b548145d0cb3c652c47ed4def1e3e4c77

Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

 hive-app/common/styles/index.css

@@ -45,6 +45,9 @@
    margin-right: 20px;
}

.mb-0{
    margin-bottom: 0!important;
}
.mb-5{
    margin-bottom: 5px;
}
@@ -172,7 +175,7 @@
    text-align: center;
}
.right{
    text-align: end;
    text-align: right;
}

/* 默认蓝色按钮 */
@@ -213,6 +216,13 @@
    border: 2px solid #518EFF;
    color: #518EFF;
}
.small-btn{
    width: 100px;
    line-height: 32px;
    font-size: 14px;
    border-radius: 20px;
    text-align: center;
}

/* 固定底部 */
.sticky-footer{

 hive-app/components/searchBar/index.vue

@@ -7,7 +7,11 @@

<script>
    export default {
        props:["placeholder"],
        props:{
            placeholder: {
                default: '输入会员姓名、手机号、编号查询'
            }
        },
        data() {
            return {
            };

 hive-app/pages.json

@@ -191,6 +191,17 @@
            }
        },
        {
            "path": "pages/workbench/selectService",
            "style": {
                "navigationBarTitleText": "当前客户:李某",
                "navigationBarBackgroundColor":"#FFFFFF",
                "navigationBarTextStyle":"black",
                "app-plus":{
                    "scrollIndicator": "none"
                }
            }
        },
        {
            "path": "pages/workbench/productDetail/index",
            "style": {
                "transparentTitle": "always",

 hive-app/pages/member/index.vue

@@ -1,6 +1,9 @@
<template>
    <view class="container">
        <search-bar :placeholder=placeholder></search-bar>
        <!-- #ifndef H5 -->
        <view class="status_bar"></view>
        <!-- #endif -->
        <search-bar></search-bar>
        <view class="sort-wrap">
            <view @click="filterCustom(1)">
                <text>本月到店次数</text>
@@ -50,7 +53,6 @@
        },
        data() {
            return {
                placeholder:"请输入会员姓名、手机号、编号查询",
                colors: ['#CCC6B4', '#C0CCB4', '#B4C2CC', '#BEB4CC', '#B4CCBE', '#B4CCCA', '#CCB4C6', '#CCB4B4'],
                filterType: 1,
                filterList: [],

 hive-app/pages/mine/knowledge.vue

@@ -1,9 +1,6 @@
<template>
    <!-- 知识库 -->
    <view class="container flex">
        <!-- #ifndef H5 -->
        <view class="status_bar"></view>
        <!-- #endif -->
        <scroll-view class="list-left" scroll-y>
            <view v-for="(item,index) in list" class="list-left-row" @click="active(index)" :class="activeIndex==index?'active':''">
                <text class="font-14 gray"  @click="show(item)">{{item.primaryTitle}}</text>

 hive-app/pages/workbench/customerInfo.vue

@@ -1,42 +1,42 @@
<template>
    <!-- 客户信息 -->
    <view class="container">
        <view class="flex flex-v align-center">
            <image class="header-img" src="../../static/images/head-img.jpg"></image>
            <text class="font-16 mt-10">李某</text>
        <view class="header">
            <image class="avatar" src="../../static/images/head-img.jpg"></image>
            <text>李某</text>
        </view>
        <view class="mt-20">
            <view class="list-row flex justify-between">
        <view>
            <view class="list-row">
                <text class="font-14">手机号码</text>
                <text class="font-14 gray">15569218888</text>
            </view>
            <view class="list-row flex justify-between">
            <view class="list-row">
                <text class="font-14">会员级别</text>
                <text class="font-14 gray">普通会员</text>
            </view>
            <view class="list-row flex justify-between">
            <view class="list-row">
                <text class="font-14">卡号</text>
                <text class="font-14 gray">Q232</text>
            </view>
            <view class="list-row flex justify-between">
            <view class="list-row">
                <text class="font-14">总余额</text>
                <text class="font-14 gray">￥2,323</text>
            </view>
            <view class="list-row flex justify-between">
            <view class="list-row">
                <text class="font-14">赠送余额</text>
                <text class="font-14 gray">￥1,323</text>
            </view>
            <view class="list-row flex justify-between">
            <view class="list-row">
                <text class="font-14">剩余积分</text>
                <text class="font-14 gray">123</text>
            </view>
            <view class="list-row flex justify-between">
            <view class="list-row">
                <text class="font-14">所属门店</text>
                <text class="font-14 gray">东莞店</text>
            </view>
        </view>
        <navigator url="./selectProduct/index">
            <button class="blue-btn btn">下一步</button>
        <navigator :url="url">
            <button class="blue-btn sticky-footer">下一步</button>
        </navigator>
    </view>
</template>
@@ -44,9 +44,19 @@
<script>
    export default{
        data(){
            return{}
            return{
                url: './selectProduct/index',
            }
        },
        onLoad(options) {
            if(options.type==1){
                this.url = './selectProduct/index';
            } else {
                this.url = './selectService';
            }
        },
        methods:{
			
        }
    }
</script>
@@ -55,20 +65,24 @@
    .container{
        padding: 0 10px;
    }
    .header-img{
    .header{
        text-align: center;
        padding: 20px 0;
        font-size: 16px;
        color: #333333;
    }
    .avatar{
        width: 60px;
        height: 60px;
        display: block;
        margin: 0 auto 10px;
        border-radius: 50%;
    }
    .list-row{
        display: flex;
        justify-content: space-between;
        align-items: center;
        border-bottom: 1px solid #EDEAF4;
        padding: 5px 0;
        margin-top: 10px;
    }
    .btn{
        position: absolute;
        bottom: 10px;
        left: 10px;
        right: 10px;
        padding: 14px 0;
    }
</style>

 hive-app/pages/workbench/index.vue

@@ -32,7 +32,7 @@
            </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-15 white mt-10">待付款</text>
            </view>
            <view class="flex flex-v align-center">
                <text class="font-17 white">15</text>
@@ -42,59 +42,87 @@
        <view class="content-item mt-10">
            <text class="title">订单</text>
            <view class="flex align-center mt-10">
                <view class="flex flex-v align-center list-item" @click="linkTo('./selectCustomer')">
                    <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" @click="linkTo('./orderList')">
                    <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="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="title">代办</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>
@@ -199,7 +227,6 @@
        padding: 15px 0;
        border-radius: 4px;
        margin: 10px 0;
        box-shadow:0 6px 6px rgba(237,234,244,0.5);
    }
    .title{
        font-size: 14px;
@@ -207,13 +234,17 @@
        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;
    }
    .list-item{
        width: 25%;
    }
	
    .popup-content{
        position: absolute;
        right: 9px;

 hive-app/pages/workbench/orderList.vue

@@ -1,10 +1,9 @@
<template>
    <!-- 订单列表 -->
    <view>
        <!-- #ifndef H5 -->
        <view class="status_bar"></view>
        <!-- #endif -->
        <search-bar :placeholder=placeholder class="header-input"></search-bar>
        <view class="header">
            <search-bar class="mb-0"></search-bar>
        </view>
        <view>
            <h-tabs
                class="tab"
@@ -14,33 +13,35 @@
                    activeColor: '#518EFF',
                    underLineColor: '#518EFF',
                    underLineHeight: 4,
                    fontSize: '30',
                    fontSize: '28',
                    underLineWidth: 60,
                }"
            />
            <view class="order">
                <view class="flex justify-between order-number">
                    <text class="font-14">订单号: N202012123556</text>
                    <text class="font-14 blue">待付款</text>
                </view>
                <view class="flex justify-between order-content">
                    <view class="flex flex-v">
                        <text class="font-12">李某某</text>
                        <text class="font-12 gray mt-10">2020-12-15 18:11:01</text>
            <view class="list">
                <view class="list-item" v-for="item in 4">
                    <view class="list-header">
                        <text>订单号: N202012123556</text>
                        <text class="blue">待付款</text>
                    </view>
                    <view class="flex flex-v">
                        <text class="font-12">应付金额</text>
                        <text class="font-12 mt-10">实付金额</text>
                        <text class="font-12 mt-10">欠款总额</text>
                    <view class="list-content">
                        <view class="flex flex-v">
                            <text class="font-bold font-16">李某某</text>
                            <text class="gray">2020-12-15 18:11:01</text>
                        </view>
                        <view class="flex flex-v">
                            <text>应付金额</text>
                            <text>实付金额</text>
                            <text>欠款总额</text>
                        </view>
                        <view class="flex flex-v right">
                            <text>￥ 8000.00</text>
                            <text>￥ 0.00</text>
                            <text>￥ 8000.00</text>
                        </view>
                    </view>
                    <view class="flex flex-v">
                        <text class="font-12">￥ 8000.00</text>
                        <text class="font-12 mt-10">￥ 0.00</text>
                        <text class="font-12 mt-10">￥ 8000.00</text>
                    <view class="list-footer">
                        <text class="blue-btn small-btn">取消订单</text>
                    </view>
                </view>
                <view class="flex justify-end">
                    <button class="blue-btn small-btn">取消订单</button>
                </view>
            </view>
            <view class="order">
@@ -82,7 +83,6 @@
        },
        data() {
          return {
            placeholder:"输入会员姓名、手机号、编号查询",
            tabs:[
                {
                    state: 1,
@@ -90,7 +90,7 @@
                },
                {
                    state: 2,
                    name: '代付款'
                    name: '待付款'
                },
                {
                    state: 3,
@@ -107,32 +107,41 @@
</script>

<style>
    .header-input{
        margin: 0 10px;
    page{
        background: #F6F6F8;
    }
    .header{
        padding: 10px;
        background: #FFFFFF;
    }
    .tab{
        background: #FFFFFF;
        border-bottom: 1px solid #EDEAF4;
        border-radius: 4px;
        box-shadow:0 6px 6px rgba(237,234,244,0.5);
    }
    .order{
        border: 1px solid #EDEAF4;
    .list-item{
        background: #FFFFFF;
        border-radius: 4px;
        box-shadow:0 6px 6px rgba(237,234,244,0.5);
        margin: 10px;
        padding: 0 6px;
        color: #3a3f3f;
    }
    .order-number{
        padding: 10px 6px;
    .list-header{
        display: flex;
        justify-content: space-between;
        padding: 12px 15px;
        font-size: 15px;
        border-bottom: 1px solid #EDEAF4;
    }
    .order-content{
        padding: 15px 6px;
        border-bottom: 1px solid #EDEAF4;
    .list-content{
        display: flex;
        justify-content: space-between;
        padding: 12px 15px;
        font-size: 14px;
        line-height: 28px;
    }
    .small-btn{
        width: 100px;
        margin: 10px 0;
        line-height: 30px;
    .list-footer{
        display: flex;
        justify-content: flex-end;
        padding: 10px 15px;
        border-top: 1px solid #EDEAF4;
    }
</style>

 hive-app/pages/workbench/selectCustomer.vue

@@ -1,8 +1,8 @@
<template>
    <view class="container">
        <search-bar :placeholder=placeholder></search-bar>
        <view class="flex justify-between" @click="linkTo('./customerInfo')">
            <view class="flex-1 mr-10">
        <search-bar placeholder="客户姓名、手机、卡号、拼音"></search-bar>
        <view class="flex justify-between">
            <navigator :url="'./customerInfo?type='+type" hover-class="none"  class="flex-1 mr-10">
                <view class="member-list flex align-center" v-for="(item, index) in 15">
                    <text class="first-name" :style="{background: caculateBgcolor(index)}">李</text>
                    <view class="flex-1 flex align-center justify-between member-list-con">
@@ -16,7 +16,7 @@
                        </view>
                    </view>
                </view>
            </view>
            </navigator>
            <indexed-list></indexed-list>
        </view>
    </view>
@@ -32,19 +32,18 @@
        },
        data() {
            return {
                placeholder:"客户姓名、手机、卡号、拼音",
                colors: ['#CCC6B4', '#C0CCB4', '#B4C2CC', '#BEB4CC', '#B4CCBE', '#B4CCCA', '#CCB4C6', '#CCB4B4'],
                filterType: 1,
                type: 1 ,//1新建订单 2新建服务单
                colors: ['#CCC6B4', '#C0CCB4', '#B4C2CC', '#BEB4CC', '#B4CCBE', '#B4CCCA', '#CCB4C6', '#CCB4B4']
            };
        },
        onLoad(options) {
            if(options.type){
                this.type = options.type;
            }
        },
        methods:{
            caculateBgcolor(index){
                return this.colors[index%8];
            },
            linkTo(val){
                uni.navigateTo({
                    url:val
                })
            },
        }
    }

 hive-app/pages/workbench/selectProduct.vue

New file
@@ -0,0 +1,136 @@
<template>
    <!-- 当前客户 -->
    <view class="container">
        <search-bar placeholder="商品名称、编号、拼音" class="ml-10 mr-10"></search-bar>
        <view class="list flex">
            <scroll-view class="list-left" scroll-y>
                <view v-for="(item,index) in list" class="list-left-row" @click="active(index)" :class="select==index?'active':''">
                    <text class="font-14">{{item}}</text>
                </view>
            </scroll-view>
            <scroll-view class="list-right" scroll-y>
                <view class="flex flex-v list-right-row">
                    <text class="flex justify-start font-14">肽妍氨基酸平衡基础洁面乳</text>
                    <text class="flex justify-start font-14 red mt-10">￥400.00</text>
                    <view class="flex align-center justify-end mt-10">
                        <text class="iconfont iconjian blue-outline-btn-circle mr-10"></text>
                        <text>1</text>
                        <text class="iconfont iconjia blue-btn-circle ml-10"></text>
                    </view>
                </view>
                <view class="flex flex-v list-right-row">
                    <text class="flex justify-start font-14">肽妍氨基酸平衡基础洁面乳</text>
                    <text class="flex justify-start font-14 red mt-10">￥400.00</text>
                    <view class="flex align-center justify-end mt-10">
                        <text class="iconfont iconjian blue-outline-btn-circle mr-10"></text>
                        <text>1</text>
                        <text class="iconfont iconjia blue-btn-circle ml-10"></text>
                    </view>
                </view>
            </scroll-view>
        </view>
        <view class="shopping flex align-center justify-between">
            <view class="flex align-center">
                <view class="shopping-icon iconfont iconicongouwuche gray">
                    <view class="shopping-icon-num flex align-center justify-center">
                        <text class="font-10">19</text>
                    </view>
                </view>
                <text class="font-14 blue ml-10">¥110.00</text>
            </view>
            <button class="blue-btn btn mr-0" @click="linkTo('./confirmOrder')">提交订单</button>
        </view>
    </view>
</template>

<script>
    import searchBar from '../../components/searchBar/index.vue';
    export default {
        components:{
            searchBar
        },
        data(){
            return{
                list:['院装产品','美容套餐','美容客装','美容试装','头皮院装'],
                select:'0'
            }
        },
        methods:{
            linkTo(val){
                uni.navigateTo({
                    url:val
                })
            },
            active(index){
                this.select=index
            }
        }
    }
</script>

<style>
    page{
        height: 100%;
    }
    .container{
        display: flex;
        flex-direction: column;
        height: 100%;
        padding: 10px 0 0;
        box-sizing: border-box;
    }
    .list{
        flex: 1;
    }
    .list-left{
        width: 25%;
        height: 100%;
        text-align: center;
        background: #F6F6F8;
        border-radius: 4px;
    }
    .list-right{
        width: 75%;
        text-align: center;
        padding: 0px 10px;
    }
    .list-left-row{
        padding: 10px;
        color: #8c9fad;
    }
    .active{
        background: #FFFFFF;
        color: #000000;
    }
    .list-right-row{
        border: 1px solid #EDEAF4;
        box-shadow:0 6px 6px rgba(237,234,244,0.5);
        border-radius: 4px;
        padding: 10px;
    }
    .list-right-row:not(:first-child){
        margin-top: 10px;
    }
    .shopping{
        padding: 20px 10px;
    }
    .shopping-icon{
        font-size: 28px;
        position: relative;
    }
    .shopping-icon-num{
        width: 20px;
        height: 20px;
        background: #518EFF;
        border-radius: 50%;
        color: #FFFFFF;
        position: absolute;
        right: -10px;
        top: -10px;
    }
    .btn{
        border-radius: 20px;
        line-height: 30px;
        font-size: 14px;
    }
</style>

 hive-app/pages/workbench/selectService.vue

New file
@@ -0,0 +1,11 @@
<template>
    <view>
        <text>选择套餐</text>
    </view>
</template>

<script>
</script>

<style>
</style>

 hive-app/pages/workbench/submitSucceed.vue

@@ -4,8 +4,12 @@
        <image class="img" mode="aspectFit" src="../../static/images/succeed.png"></image>
        <text class="font-16">提交成功请到前台付款</text>
        <view class="sticky-footer">
            <button class="blue-btn btn">查看详情</button>
            <button class="white-btn btn mt-15">返回首页</button>
            <navigator url="./orderList">
                <button class="blue-btn btn">查看详情</button>
            </navigator>
            <navigator url="./index" open-type="switchTab">
                <button class="white-btn btn mt-15">返回首页</button>
            </navigator>
        </view>
    </view>
</template>