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

li-guang

2020-12-18 82c48f3b548145d0cb3c652c47ed4def1e3e4c77

 hive-app/pages/workbench/index.vue

@@ -8,13 +8,12 @@
         <text class="font-18 dark-gray">HIVE</text>
         <view>
            <text class="icon gray iconfont iconsousuo mr-15"></text>
            <text class="icon gray iconfont iconjiahao" @click.stop="isShow=!isShow"></text>
            <text class="icon gray iconfont iconjia" @click.stop="isShow=!isShow"></text>
         </view>
      </view>
      <popover class="popup-content" v-show="isShow">
         <view class="triangle"></view>
         <view class="popup-item flex align-center">
            <text class="icon white iconfont iconjiahao mr-5"></text>
            <text class="icon white iconfont iconjia mr-5"></text>
            <text class="white font-14 popup-content-text">新增会员</text>
         </view>
         <view class="popup-item flex align-center">
@@ -33,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>
@@ -43,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">
               <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>
@@ -176,6 +203,9 @@
</script>

<style>
   page{
      background: #F6F6F8;
   }
   .icon {
      font-size: 18px;
      text-align: center;
@@ -188,7 +218,7 @@
      padding: 12px 5px;
   }
   .condition{
      background-color: #518EFF;
      background: #518EFF;
      padding: 15px 30px;
      border-radius: 4px;
   }
@@ -197,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;
@@ -205,29 +234,24 @@
      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;
      top: 48px;
      padding-left: 10px;
   }
   .triangle{
      width: 0;
      height: 0;
      border-width: 0 10px 10px;
      border-style: solid;
      border-color: transparent transparent #4c4c4c;
      position: absolute;
      top:-8px;
      right: 5px;
   }
	
   .popup-content-text{
      width: 100%;
      border-bottom: 1px solid gray;