技师端新图

pages/index/index.rpx.css

@@ -10,6 +10,7 @@
     border-radius: 24rpx;
     background: #ffffff;
     margin-top: 34rpx;
+    background: linear-gradient(180deg, #FFFFFF 0%, #FFFCED 100%);
 }
 .profile{
     width: 112rpx;
@@ -21,7 +22,7 @@
     margin-top: 24rpx;
 }
 .tuniMsg{
-    width: 380rpx;
+    width: 165rpx;
     height: 160rpx;
     margin-left: 16rpx;
 }
@@ -30,53 +31,94 @@
     font-weight: 600;
     color: #333333;
     margin-top: 30rpx;
+    line-height: 52rpx;
 }
-.dizi{
-    font-size: 24rpx;
+.biaoqian{
+    background: #FFF6CE;
+    border-radius: 8rpx;
+    border: 2rpx solid #FFE05C;
+    padding: 6rpx 18rpx;
+    font-size: 20rpx;
     font-weight: 400;
     color: #333333;
-    margin-top: 30rpx;
 }
-.tab{
-    width: 384rpx;
-    height: 80rpx;
-    border-radius: 40rpx;
-    background: #ffffff;
-    margin-top: 30rpx;
+.tuni-right{
+    width: 365rpx;
+
 }
 
+.imgs{
+    width: 622rpx;
+    /*height: 624rpx;*/
+    margin-top: 16rpx;
+    border-radius: 15rpx;
+}
+.mmImgView{
+    float: left;
+    width: 308rpx;
+    height: 310rpx;
+    border-radius: 15rpx;
+    overflow: hidden;
+}
+.floatRight{
+    float:right;
+}
+.marginTop{
+    margin-top: 6rpx;
+}
+.mmImg{
+    width: 308rpx;
+    height: 310rpx;
+    border-radius: 8rpx;
+}
+.like{
+    width: 622rpx;
+    font-size: 28rpx;
+    font-weight: 400;
+    color: #333333;
+    line-height: 40rpx;
+    margin-top: 16rpx;
+}
 .serviceMsg{
     width: 686rpx;
-    padding-bottom: 100rpx;
     background: #FFFFFF;
     border-radius: 24rpx;
-    margin-top: 60rpx;
-    margin-bottom: 80rpx;
+    margin-top: 84rpx;
     position: relative;
+    margin-bottom: 60rpx;
+    padding-bottom: 38rpx;
 }
 
 .dakaIcon{
-    margin-top: 30rpx;
+    height: 40rpx;
+    margin-top: 46rpx;
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #93D21A;
+    line-height: 36rpx;
 }
 .dakaText{
-    margin-top: 20rpx;
+    margin-top: 10rpx;
     font-size: 20rpx;
     font-weight: 400;
     color: #333333;
 }
-.tabs{
-    width: 192rpx;
+.buttons{
+    margin-top: 16rpx;
+}
+.buttonItem{
+    width: 164rpx;
     height: 80rpx;
-    background: #FFFFFF;
+    background: #FFE05C;
     border-radius: 40rpx;
     border: 4rpx solid #FFFFFF;
-    box-sizing: border-box;
     text-align: center;
+    font-size: 24rpx;
+    font-weight: 600;
+    color: #333333;
     line-height: 80rpx;
 }
-.selectTabs{
-    background:#FFE05C ;
-}
+
 .serviceProfile{
     width: 160rpx;
     height: 160rpx;
@@ -85,16 +127,21 @@
     box-sizing: border-box;
 }
 .serviceInfo{
+    width: 622rpx;
     position: absolute;
     left: 32rpx;
-    top: -50rpx;
+    top: -60rpx;
+}
+.serviceInfo-rigth{
+    width: 465rpx;
+    padding-bottom: 20rpx;
 }
 .servicename{
     height: 52rpx;
     font-size: 36rpx;
     font-weight: 600;
     color: #333333;
-    margin-left: 20rpx;
+   padding: 0 20rpx;
     line-height: 64rpx;
     margin-bottom: 20rpx;
 }
@@ -104,8 +151,6 @@
     background: #FFF6CE;
     border-radius: 32rpx;
     line-height: 64rpx;
-    margin-bottom: 20rpx;
-    margin-left: 20rpx;
 }
 .tag text{
     margin-right: 10rpx;
@@ -116,137 +161,33 @@
      border-radius: 12rpx;
      text-align: center;
      background:   #FFAF36;
-     color: #FFFFFF;
+     color: red;
      font-size: 18rpx;
      margin-left: 20rpx;
-    margin-top: 32rpx;
+     margin-top: 32rpx;
+     line-height: 24rpx;
  }
 .hintCentent{
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #FFAF36;
-    margin-left: 16rpx;
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #FFFFFF;
     line-height: 88rpx;
+    margin-left: 20rpx;
 }
 .hintView{
     width: 622rpx;
     height: 88rpx;
-    background: #FFF7EA;
+    background: linear-gradient(180deg, #FF5C5C 0%, #E63A3A 100%);
     border-radius: 44rpx;
     border: 2rpx solid #FFFFFF;
-    margin-top: 24rpx;
-}
-.key{
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #999999;
-}
-.value{
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #333333;
-}
-.key1{
-    height: 60rpx;
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #333333;
-    line-height: 60rpx;
 }
+
+
 .leftBord{
     border-left: 2px solid #DDDDDD;
     padding-left: 30rpx;
     margin-left: 30rpx;
 }
-.value1{
-    height: 60rpx;
-    font-size: 36rpx;
-    font-weight: bold;
-    color: #ED569F;
-    line-height: 60rpx;
-}
-.value2{
-    height: 44rpx;
-    font-size: 28rpx;
-    font-family: DIN, DIN;
-    font-weight: 400;
-    color: #ED569F;
-    line-height: 44rpx;
-}
-.tag1{
-    width: 188rpx;
-    height: 80rpx;
-    background: #FFF6CE;
-    border-radius: 44rpx;
-
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #333333;
-    line-height: 80rpx;
-}
-.tag1 text{
-    margin-left: 10rpx;
-}
-.itemViewOut{
-    width: 638rpx;
-    margin-left: 24rpx;
-    padding: 24rpx 0;
-    border-top: 2rpx dashed #E7E7E7;
-}
-.itemViewOut:first-child{
-   border: none;
-}
-.itemView{
-    width: 592rpx;
-}
-.item{
-    margin-top: 16rpx;
-}
-.statusDesc{
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #FFAF36;
-}
-.statusDesc1{
-    font-size: 28rpx;
-    font-weight: 400;
-    color: #CCCCCC;
-}
-.grid{
-    width: 622rpx;
-    height: 136rpx;
-    margin-top: 40rpx;
-    border-top: 2rpx dashed #E7E7E7;
-    padding-top: 40rpx;
-}
-.grid-text{
-    height: 34rpx;
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #666666;
-    line-height: 34rpx;
-}
-.start{
-    width: 160rpx;
-    height: 160rpx;
-    border-radius: 80rpx;
-    background: #FFE05C;
-    border: 4rpx solid #FFFFFF;
-    box-sizing: border-box;
-    text-align: center;
-    position: absolute;
-    left: 263rpx;
-    bottom: -80rpx;
-}
-.start text{
-    width: 56rpx;
-    height: 80rpx;
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #333333;
-    line-height:40rpx;
-    margin-top: 40rpx;
-}
 .dataNull{
     width: 280rpx;
     height: 280rpx;

pages/index/index.vue

@@ -1,53 +1,89 @@
 <template>
 	<view class="page">
 		<uni-nav-bar  :fixed="true" background-color="#FFE05C" :border="false" :statusBar="true"  title="首页" />
-		<view class="flex-row tuni">
+		<view class="flex-row tuni ">
 			<image class="profile" :src="userInfo.avatar || '/static/logo.png'"></image>
-			<view class="tuniMsg flex-col">
-				<text class="name">{{userInfo.nickName}}</text>
-				<view class="flex-row dizi">
-					<u-icon name="/static/index/dizi.png" size="18"></u-icon>
-					<text>{{storeName || '请先报道打卡'}}</text>
+			<view class="tuniMsg">
+				<view class="name ">
+					<text >{{userInfo.nickName}}</text>
+				</view>
+				<view>
+					<text class="biaoqian ">高级技师</text>
 				</view>
 			</view>
-			<view class="flex-col " @click="userScanCode">
-				<view class="flex-row justify-center dakaIcon">
-					<u-icon name="/static/index/saoma.png" size="25"></u-icon>
+			<view class="flex-row justify-around tuni-right ">
+				<view class="flex-col " @click="userScanCode">
+					<view class="flex-row justify-center dakaIcon ">
+						<text>12</text>
+					</view>
+					<view class="flex-row justify-center dakaText ">
+						<text>预约人数</text>
+					</view>
+				</view>
+				<view class="flex-col " @click="userScanCode">
+					<view class="flex-row justify-center dakaIcon ">
+						<u-icon name="/static/index/erweima.png" size="35"></u-icon>
+					</view>
+					<view class="flex-row justify-center dakaText ">
+						<text>拓客二维码</text>
+					</view>
 				</view>
-				<view class="flex-row justify-center dakaText">
-					<text>报道打卡</text>
+				<view class="flex-col " @click="userScanCode">
+					<view class="flex-row justify-center dakaIcon ">
+						<u-icon name="/static/index/saoma.png" size="25"></u-icon>
+					</view>
+					<view class="flex-row justify-center dakaText ">
+						<text>报道打卡</text>
+					</view>
 				</view>
 			</view>
-		</view>
 
+		</view>
 
-		<view class="flex-row justify-center">
-			<view class="tab flex-row">
-				<view class="tabs" :class="{selectTabs: tabIndex === 0}" @click="clickTab(0)">
-					<text>服务中</text>
-				</view>
-				<view class="tabs" :class="{selectTabs: tabIndex === 1}" @click="clickTab(1)">
-					<text>待服务</text>
-				</view>
+		<view class="flex-row justify-around buttons">
+			<view class="buttonItem" @click="call" v-if="currService.callState=='2'">
+				<text>叫号</text>
+			</view>
+			<view class="buttonItem" @click="next" v-else>
+				<text>下一位</text>
+			</view>
+			<view class="buttonItem" @click="takePlace">
+				<text>已就位</text>
+			</view>
+			<view class="buttonItem"  @click="settle">
+				<text>结算</text>
+			</view>
+			<view class="buttonItem" @click="addService">
+				<text>添加服务</text>
 			</view>
 		</view>
 
-		<view v-if="tabIndex === 0" class="flex-row justify-center">
+		<view class="flex-row justify-center ">
 			<view class="serviceMsg " v-if="currService">
 				<view class="flex-row serviceInfo ">
 					<image class="serviceProfile" :src="currService.avatar || '/static/logo.png'"></image>
-					<view class="flex-col justify-end">
-						<view class="flex-row">
-							<text class="servicename">{{currService.serviceObjectName}}</text>
-							<view class="flex-row justify-center tag" @click="openSelectServiceObjectPopup">
-								<text>切换</text>
-								<u-icon name="/static/index/qiehuan.png" size="18"></u-icon>
+					<view class="flex-col justify-end serviceInfo-rigth ">
+						<view class="flex-row justify-between ">
+							<view class="flex-row">
+								<view class="flex-col justify-center ">
+									<text class="servicename">张辉</text>
+								</view>
+								<view class="flex-col justify-center ">
+									<text class="biaoqian">会员用户</text>
+								</view>
+							</view>
+
+							<view class="flex-col justify-center ">
+								<view class="flex-row justify-center  tag" @click="openSelectServiceObjectPopup">
+									<text>切换</text>
+									<u-icon name="/static/index/qiehuan.png" size="18"></u-icon>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view :style="{'height':'110rpx'}"></view>
-				<view class="flex-row justify-center " v-if="!currService.balanceFlag">
+				<view  :style="{'height':'120rpx'}"></view>
+				<view class="flex-row justify-center" v-if="!currService.balanceFlag">
 					<view class="flex-row hintView">
 						<view class="hint">
 							<text>!</text>
@@ -57,117 +93,21 @@
 						</view>
 					</view>
 				</view>
-				<view class="flex-col ">
-					<view class="flex-row justify-center itemViewOut " v-for="(item,index) in currService.childList" :key="index">
-						<view class="flex-col itemView " >
-							<view class="flex-row justify-between item">
-								<view class="flex-row">
-									<u-icon name="/static/index/jiandao.png" size="20"></u-icon>
-									<text class="key">服务项目：</text>
-									<text class="value">{{item.serviceProject}}</text>
-								</view>
-								<view class="flex-row statusDesc" :class="item.status ?'statusDesc':'statusDesc1'">
-									<text>{{item.statusDesc}}</text>
-								</view>
-							</view>
-							<view class="flex-row item">
-								<u-icon name="/static/index/riqi.png" size="20"></u-icon>
-								<text class="key">服务日期：</text>
-								<text class="value">{{item.serviceDate}}</text>
-							</view>
-							<view class="flex-row  item">
-								<view class="flex-row">
-									<u-icon name="/static/index/aixin.png" size="20"></u-icon>
-									<text class="key">服务人员：</text>
-									<text class="value">{{item.serviceUserName}}</text>
-								</view>
-							</view>
-
-							<view class="flex-row item">
-								<view class="flex-row">
-									<u-icon name="/static/index/shiduan.png" size="20"></u-icon>
-									<text class="key">服务时段：</text>
-									<text class="value">{{item.time}}</text>
-								</view>
-								<view class="flex-row leftBord">
-									<text class="key">服务费用：</text>
-									<text class="value2">￥{{item.serviceFee}}</text>
-								</view>
-							</view>
+				<view class="flex-row justify-center ">
+					<view class="imgs">
+						<view class="mmImgView" :class="{floatRight: (index+1) % 2==0,marginTop:index>1}" v-for="(i,index) in 5" :key="index">
+							<image class="mmImg" mode="widthFix" src="/static/mn1.webp"></image>
 						</view>
 					</view>
-				</view>
-				<view class="flex-row justify-center">
-					<view class="flex-col itemView">
-						<view class="flex-row justify-between">
 
-							<view class="flex-col justify-center">
-								<view class="flex-row">
-									<text class="key1">服务总金额：</text>
-									<text class="value1">￥{{currService.serviceFee}}</text>
-								</view>
-							</view>
-							<view class="flex-row justify-center tag1" v-if="currService.status == 1" @click="settle">
-								<u-icon name="/static/index/qianbao.png" size="18"></u-icon>
-								<text>去结算</text>
-							</view>
-						</view>
-					</view>
 				</view>
 
 				<view class="flex-row justify-center">
-					<view class="flex-row justify-around grid">
-						<view @click="connect">
-							<view class="flex-row justify-center">
-								<u-icon name="/static/index/jiaojieban.png" size="40"></u-icon>
-							</view>
-							<view class="flex-row justify-center">
-								<text class="grid-text">服务交接</text>
-							</view>
-						</view>
-						<view @click="addService">
-							<view class="flex-row justify-center">
-								<u-icon name="/static/index/jiandao.png" size="40"></u-icon>
-							</view>
-							<view class="flex-row justify-center">
-								<text class="grid-text">添加服务</text>
-							</view>
-						</view>
-						<view @click="call" v-if="currService.State=='2'">
-							<view class="flex-row justify-center">
-								<u-icon name="/static/index/naba.png" size="40"></u-icon>
-							</view>
-							<view class="flex-row justify-center">
-								<text class="grid-text">叫&nbsp;&nbsp;号</text>
-							</view>
-						</view>
-						<view @click="next" v-else>
-							<view class="flex-row justify-center">
-								<u-icon name="/static/index/xiayige.png" size="40"></u-icon>
-							</view>
-							<view class="flex-row justify-center">
-								<text class="grid-text">下一位</text>
-							</view>
-						</view>
-						<view @click="takePlace">
-							<view class="flex-row justify-center">
-								<u-icon name="/static/index/yijiuwei.png" size="40"></u-icon>
-							</view>
-							<view class="flex-row justify-center">
-								<text class="grid-text">已就位</text>
-							</view>
-						</view>
+					<view class="like">
+						<text>用户爱好用户爱好用户爱好用户爱好用户爱好用户爱好用户爱好用户爱好用户爱好用户爱好用户爱好</text>
 					</view>
 				</view>
 
-
-
-				<view class="flex-row justify-center start" @click="start" v-if="currService.status == 1">
-					<text>开始服务</text>
-				</view>
-				<view class="flex-row justify-center start" @click="end" v-if="currService.status == 6">
-					<text>结束服务</text>
-				</view>
 			</view>
 
 			<view class="flex-col" :style="{'height':sysHeight}" v-else>
@@ -179,10 +119,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="tabIndex === 1" :style="{'height':sysHeight}">
-			<mescroll-item :i="0" :index="0" :height="sysHeight">
-			</mescroll-item>
-		</view>
+
 
 		<uni-popup ref="addServicePopup" @change="popupChange" type="bottom">
 			<view class="addService">

pages/my/index.rpx.css

@@ -43,7 +43,7 @@
 }
 .statistics{
     width: 686rpx;
-    height: 308rpx;
+    height: 320rpx;
     background: #FFFFFF;
     box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(255,224,92,0.05);
     border-radius: 24rpx;
@@ -57,10 +57,22 @@
     margin-top: 20rpx;
 }
 .statisticsItem{
-    width: 50%;
+    width: 33%;
     height: 160rpx;
     margin-top: 40rpx;
-
+}
+.statisticsItemBorder{
+    border-left: 4rpx solid #EEEEEE;
+}
+.tuoke{
+    width: 686rpx;
+    height: 308rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 8rpx 16rpx 0rpx rgba(255,224,92,0.05);
+    background: linear-gradient(180deg, #FFFCED 0%, #FFFFFF 100%);
+    border-radius: 24rpx;
+    margin-top: 24rpx;
+    padding: 1rpx 0;
 }
 .statisticsKey{
     font-size: 24rpx;

pages/my/my.vue

@@ -17,7 +17,7 @@
 			</view>
 			<view class="statistics flex-col">
 				<view class="statisticsTitle">
-					<text >今日业绩统计</text>
+					<text >业绩统计</text>
 				</view>
 				<view class="flex-row justify-center ">
 					<view class="statisticsItem flex-col ">
@@ -25,18 +25,29 @@
 							<u-icon name="/static/my/fuwuNmber.png" size="28"></u-icon>
 						</view>
 						<view class="flex-row justify-center statisticsKey">
-							<text>总服务次数（次）</text>
+							<text>累计服务（次）</text>
 						</view>
 						<view class="flex-row justify-center statisticsValue">
 							<text>{{staticsData.serviceTotal || 0}}</text>
 						</view>
 					</view>
-					<view class="statisticsItem flex-col ">
+					<view class="statisticsItem statisticsItemBorder flex-col ">
+						<view class="flex-row justify-center">
+							<u-icon name="/static/my/jinriyeji.png" size="28"></u-icon>
+						</view>
+						<view class="flex-row justify-center statisticsKey">
+							<text>今日业绩（次）</text>
+						</view>
+						<view class="flex-row justify-center statisticsValue">
+							<text>{{staticsData.serviceTotal || 0}}</text>
+						</view>
+					</view>
+					<view class="statisticsItem statisticsItemBorder flex-col ">
 						<view class="flex-row justify-center">
-							<u-icon name="/static/my/fuwuTimeLong.png" size="28"></u-icon>
+							<u-icon name="/static/my/benyueyeji.png" size="28"></u-icon>
 						</view>
 						<view class="flex-row justify-center statisticsKey">
-							<text>总服务金额（元）</text>
+							<text>本业业绩（次）</text>
 						</view>
 						<view class="flex-row justify-center statisticsValue">
 							<text>{{staticsData.avgServiceTime || 0}}</text>
@@ -44,12 +55,44 @@
 					</view>
 				</view>
 			</view>
-			<view class="list">
-				<uni-list>
-					<uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="medium" :rightText="item.rightText" v-for="(item,index) in group1" :key="index"/>
-				</uni-list>
+
+			<view class="tuoke ">
+				<view class="statisticsTitle ">
+					<text >拓客统计</text>
+				</view>
+				<view class="flex-row justify-center ">
+					<view class="statisticsItem flex-col" :style="{'width':'50%'}">
+						<view class="flex-row justify-center">
+							<u-icon name="/static/my/jinrirenwu.png" size="28"></u-icon>
+						</view>
+						<view class="flex-row justify-center statisticsKey">
+							<text>今日任务</text>
+						</view>
+						<view class="flex-row justify-center statisticsValue">
+							<text>{{staticsData.serviceTotal || 0}}</text>
+						</view>
+					</view>
+
+					<view class="statisticsItem statisticsItemBorder flex-col" :style="{'width':'50%'}">
+						<view class="flex-row justify-center">
+							<u-icon name="/static/my/benyuerenwu.png" size="28"></u-icon>
+						</view>
+						<view class="flex-row justify-center statisticsKey">
+							<text>完成任务</text>
+						</view>
+						<view class="flex-row justify-center statisticsValue">
+							<text>{{staticsData.avgServiceTime || 0}}</text>
+						</view>
+					</view>
+				</view>
 			</view>
 
+<!--			<view class="list">-->
+<!--				<uni-list>-->
+<!--					<uni-list-item :to="item.to" :title="item.title" showArrow :thumb="item.thumb" thumb-size="medium" :rightText="item.rightText" v-for="(item,index) in group1" :key="index"/>-->
+<!--				</uni-list>-->
+<!--			</view>-->
+
 	</view>
 </template>