修改技师端样式

service-uniapp-technician/pages.json

@@ -1,15 +1,20 @@
 {
-	"pages": [{
+	"pages": [
+		{
+			"path": "pages/index/center",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "首页"
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/login/mobile",
 			"style": {
-				"navigationBarTitleText": "登陆"
 			}
 		},
 		{
@@ -27,57 +32,37 @@
 		{
 			"path": "pages/index/order",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "订单",
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "white"
-			}
-		},
-		{
-			"path": "pages/index/center",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的"
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/mine/nodes",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#4899a6"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/mine/recharge",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#4899a6"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/mine/settled",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#4899a6"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/mine/wallet",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#4299a9"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/mine/upload",
 			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarTextStyle": "black",
-				"navigationBarBackgroundColor": "white"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
@@ -170,23 +155,27 @@
 	},
 	"tabBar": {
 		"backgroundColor": "white",
-		"selectedColor": "#56CBA4",
-		"list": [{
-			"selectedIconPath": "/static/bar/hms.png",
-			"iconPath": "/static/bar/hm.png",
-			"pagePath": "pages/index/index",
-			"text": "首页"
-		}, {
-			"selectedIconPath": "/static/bar/tps.png",
-			"iconPath": "/static/bar/tp.png",
-			"pagePath": "pages/index/order",
-			"text": "订单"
-		}, {
-			"selectedIconPath": "/static/bar/wds.png",
-			"iconPath": "/static/bar/wd.png",
-			"pagePath": "pages/index/center",
-			"text": "我的"
-		}]
+		"selectedColor": "#EF8C94",
+		"list": [
+			{
+				"selectedIconPath": "/static/bar/hms.png",
+				"iconPath": "/static/bar/hm.png",
+				"pagePath": "pages/index/center",
+				"text": "首页"
+			},
+			{
+				"selectedIconPath": "/static/bar/wds.png",
+				"iconPath": "/static/bar/wd.png",
+				"pagePath": "pages/index/index",
+				"text": "接单大厅"
+			}, 
+			{
+				"selectedIconPath": "/static/bar/tps.png",
+				"iconPath": "/static/bar/tp.png",
+				"pagePath": "pages/index/order",
+				"text": "订单"
+			}
+		]
 	},
 	"uniIdRouter": {}
 }

service-uniapp-technician/pages/index/center.vue

@@ -9,27 +9,107 @@
 				<view style="padding: 10rpx 34rpx;">
 					<view class="nickname">{{ userInfo.title }}</view>
 					<view class="days">{{ userInfo.notes }}</view>
+					<view class="font-n" v-if="userInfo.realOk == 'Y'">已完成实名认证</view>
 				</view>
 			</view>
 			<view style="position: absolute; top: 96rpx;right: 32rpx;">
 				<image src="/static/icons/icon8.png" mode="aspectFit" style="width: 32rpx; height: 32rpx"></image>
 			</view>
 		</view>
+		
+		<view class="flex"
+		style="padding: 30rpx;">
+			<view style="
+			width: 13rpx;height: 30rpx;
+			background: #EF8C94;border-radius: 6rpx;"/>
+			<view class="head-title">总佣金</view>
+		</view>
 
 		<view class="one-card b-relative">
-			<view style="position: absolute; top: -65rpx;left: 0rpx;">
-				<image style="width: 675rpx;height: 200rpx;" src="/static/ms/tx.png"></image>
-				<view class="font-4">
-					<view>账号余额</view>
-					<view class="font-5">
-						<span style="font-size: 32rpx;margin-right: 10rpx">¥</span>{{ belece.money }}
-					</view>
+			<image style="width: 675rpx;height: 200rpx;" 
+			src="/static/ms/tx.png"></image>
+			<view class="font-4">
+				<view>总佣金</view>
+				<view class="font-5">
+					<span style="font-size: 32rpx;margin-right: 10rpx">¥</span>{{ belece.money }}
+				</view>
+			</view>
+			<view class="button-cz" @click="clickWallet">立即提现</view>
+		</view>
+		
+		<view class="flex"
+		style="padding: 30rpx;">
+			<view style="
+			width: 13rpx;height: 30rpx;
+			background: #EF8C94;border-radius: 6rpx;"/>
+			<view class="head-title">一键求救</view>
+		</view>
+		
+		<view class="Ask-for-help">
+			<view class=""
+			style="height: 270rpx;
+			margin: 10rpx;
+			flex: 1;background-color: #000;
+			position: relative;">
+				
+				<!-- 这里调用地图 -->
+				
+				<view style="position: absolute;
+				bottom: 0;
+				left: 0;
+				height: 50rpx;
+				width: 100%;
+				color: #FF6470;
+				font-size: 24rpx;
+				text-align: center;
+				line-height: 50rpx;
+				background-color: #EF8C9499;
+				">
+					实时获取你当前的位置
+				</view>
+			</view>
+			<view
+			style="height: 300rpx;flex: 1;font-size: 26rpx;">
+				<view style="background-color: #00000011;
+				color: #0E510D;
+				margin: 10rpx auto;width: 80%;padding: 10rpx;">
+					如果你遇到了让你感到不安全情况下，可点击下方
+				</view>
+				<view
+				style="width: 80%;margin: 20rpx auto;
+				background-color: #FF6470;padding: 20rpx 0;
+				color: #fff;text-align: center;
+				border-radius: 10rpx;">
+					一键求救
+				</view>
+				<view style="font-size: 22rpx;text-align: center;">
+					我们会立即发送您的求救位置
 				</view>
-				<view class="button-cz" @click="clickWallet">立即提现</view>
 			</view>
 		</view>
 		
-		<view class="two-card">
+		<view class="flex"
+		style="padding: 30rpx;">
+			<view style="
+			width: 13rpx;height: 30rpx;
+			background: #EF8C94;border-radius: 6rpx;"/>
+			<view class="head-title">请假日历</view>
+		</view>
+		
+		<van-calendar
+		title="请假日历"
+		color="rgb(255, 100, 112)"
+		:poppable="false"
+		type="multiple"
+		:default-date="defaultDate"
+		@select="onConfirm"
+		switch-mode="year-month"
+		:show-confirm="false"
+		:formatter="formatter"
+		:style="{ height: '500px' }"
+		/>
+		
+		<!-- <view class="two-card">
 			<view class="flex">
 				<view style="width: 10rpx;height: 30rpx;background: #4a9ca6;border-radius: 6rpx;"/>
 				<view class="head-title">常用功能</view>
@@ -65,7 +145,7 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		
 		
 		<configPopup
@@ -90,6 +170,7 @@
 				keyValue : 'phone',
 				config : [],
 				phone : '',
+				defaultDate : []
 			}
 		},
 		onShow() {
@@ -97,6 +178,20 @@
 			this.getConfig()
 		},
 		methods: {
+			formatter(day){
+				
+				this.defaultDate.forEach(n => {
+					if(day.date.getMonth() == n.getMonth()
+					&& day.date.getDate() == n.getDate()){
+						day.bottomInfo = '请假';
+					}
+				})
+				
+				return day
+			},
+			onConfirm(dates){
+				this.defaultDate = dates
+			},
 			getUserInfo() {
 				this.$api('giveTenInfo', {}, res => {
 					if (res.code == 200) {
@@ -152,14 +247,31 @@
 		background-color: #f5f5f5;
 	}
 	
+	.font-n {
+		height: 42rpx;
+		line-height: 42rpx;
+		font-size: 20rpx;
+		font-family: PingFang SC, PingFang SC-Medium;
+		font-weight: 500;
+		text-align: center;
+		color: #fdfaf8;
+	
+		width: 168rpx;
+		background: #4eed78;
+		border-radius: 8px;
+	
+		margin-top: 5rpx;
+		margin-left: 0rpx;
+	}
+	
 	.banner {
 		width: 100%;
-		height: calc(392rpx - 60rpx);
-		background: #fff;
+		/* height: calc(392rpx - 60rpx); */
+		/* background: #fff; */
 	}
 	.head-div{
 		width: calc(100vw - 72rpx);
-		height: 268rpx;
+		height: 168rpx;
 		padding: 72rpx 36rpx 0;
 		margin: 0 auto;
 	}
@@ -183,9 +295,8 @@
 	
 	.one-card{
 		width: 678rpx;
-		height: 116rpx;
 		border-radius: 16rpx;
-		margin: -30rpx auto 0;
+		margin: 0 auto 0;
 	}
 
 	.two-card{
@@ -254,15 +365,15 @@
 		width: 200rpx;
 		height: 58rpx;
 		line-height: 58rpx;
-		background: linear-gradient(182deg,#ffffff 2%, #a6fce3 88%);
+		background: linear-gradient(182deg,#ffffff 2%, #FFD8DC 88%);
 		border-radius: 30rpx;
-		box-shadow: 0 6rpx 12rpx 0 rgba(129,209,186,0.66);
+		box-shadow: 0 6rpx 12rpx 0 #ababab55;
 
 		font-size: 28rpx;
 		font-family: PingFang SC, PingFang SC-Bold;
 		font-weight: 700;
-		text-align: center;
-		color: #3fc791;
+		text-align: center; 
+		color: #EF8C94;
 
 		position: absolute;
 		top: 72rpx;
@@ -276,4 +387,10 @@
 		flex-direction: column;
 		align-items: center;
 	}
+	
+	.Ask-for-help{
+		background-color: #ffffff;
+		margin: 0 40rpx;
+		display: flex;
+	}
 </style>

service-uniapp-technician/pages/index/index.vue

@@ -17,25 +17,34 @@
 
 		<view style="width: 710rpx; margin: 40rpx auto 20rpx;">
 			<view class="b-relative">
-				<!-- <image src="/static/ms/settled.png" style="width: 710rpx;height: 310rpx;"></image>
-				<view class="banner-font-1">
-					<image style="width: 380rpx;height: 98rpx;" src="/static/ms/fontjszm.png" />
-				</view>
-				<view class="banner-font-2">打造专业的技术服务</view>
-				<view class="banner-button">立即联系我们>></view> -->
 				<van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
 					<van-swipe-item v-for="item in bannerList" :key="item.id">
 						<image class="banner-image" :src="item.image" mode="aspectFill"></image>
 					</van-swipe-item>
 				</van-swipe>
 			</view>
-
-			<view v-if="step === 1">
-				<view class="card-1 b-relative">
+			
+			<view class="flex rr" style="align-items: center;">
+				<uni-icons type="sound" size="50rpx" color="#FBA54F"></uni-icons>
+				<view class="xx" v-html="notice">
+				</view>
+				<!-- 长沙市刘师傅在服务过程中客户投诉“服务过程中有不文明的行为”,扣信用分5分罚款500元，公布三日望引以为戒！ -->
+			</view>
+			
+			<van-tabs v-model:active="active" 
+			color="#EF8C94"
+			@click-tab="onClickTab">
+			  <van-tab title="客户指定"></van-tab>
+			  <van-tab title="平台派单"></van-tab>
+			  <van-tab title="订单统计"></van-tab>
+			</van-tabs>
+
+			<view v-if="active === 2">
+				<!-- <view class="card-1 b-relative">
 					<span>订单待处理事项</span>
 					<span> {{ total }}</span>
 					<view class="button-1" @click="step=2">去处理</view>
-				</view>
+				</view> -->
 
 				<view class="card-2 b-relative ">
 					<view>本月订单统计</view>
@@ -46,38 +55,23 @@
 							<view class="font-n0">{{ item.size }}</view>
 							<view class="font-n1">{{ item.name }}</view>
 						</view>
-						<!-- <view class="card-item item-b">
-							<view class="font-n0">292</view>
-							<view class="font-n1">完成订单</view>
-						</view>
-						<view class="card-item item-c">
-							<view class="font-n0">292</view>
-							<view class="font-n1">完成订单</view>
-						</view>
-						<view class="card-item item-d">
-							<view class="font-n0">292</view>
-							<view class="font-n1">完成订单</view>
-						</view> -->
 					</view>
 				</view>
 			</view>
 
-			<view v-if="step === 2">
-				<view class="flex rr" style="align-items: center;">
-					<uni-icons type="sound" size="50rpx" color="#FBA54F"></uni-icons>
-					<view class="xx" v-html="notice">
-					</view>
-					<!-- 长沙市刘师傅在服务过程中客户投诉“服务过程中有不文明的行为”,扣信用分5分罚款500元，公布三日望引以为戒！ -->
-				</view>
+			<view v-if="active != 2">
 
-				<view class="flex" style="position: relative;">
+				<!-- <view class="flex" style="position: relative;">
 					<view class="button-1" style="top : 0;" @click="step=1">查看统计</view>
-				</view>
+				</view> -->
 
-				<view class="flex">
-					<view style="width: 8rpx;height: 34rpx;background: #60bda2;border-radius: 4rpx;margin: 8rpx 0;" />
+				<!-- <view class="flex"
+				style="padding: 10rpx;">
+					<view style="width: 8rpx;height: 34rpx;
+					background: #60bda2;border-radius: 4rpx;
+					margin: 8rpx 0;" />
 					<view class="tt">待确认订单</view>
-				</view>
+				</view> -->
 
 				<view v-if="orderList.length > 0" class="mt20">
 					<view class="item" v-for="(item, index) in orderList">
@@ -142,7 +136,8 @@
 				statistics: [],
 				cardColor: ['item-a', 'item-b', 'item-c', 'item-d'],
 				config: [],
-				notice: ''
+				notice: '',
+				active : 0,
 			}
 		},
 		onShow() {
@@ -154,6 +149,9 @@
 			this.initData()
 		},
 		methods: {
+			onClickTab(){
+				
+			},
 			getUserInfo() {
 				this.$api('giveTenInfo', {}, res => {
 					if (res.code == 200) {

service-uniapp-technician/pages/index/order.vue

@@ -1,16 +1,28 @@
 <template>
 	<view class="content">
+		
+		<view style="
+		background-color: #fff;
+		text-align: center;
+		padding: 20px;
+		font-weight: 900;
+		">
+			我的订单
+		</view>
+		
+		<van-tabs v-model:active="active"
+		color="#EF8C94"
+		@click-tab="onClickTab">
+			<van-tab title="全部"></van-tab>
+			<van-tab title="待确认"></van-tab>
+			<van-tab title="已完成"></van-tab>
+			<van-tab title="已取消"></van-tab>
+		</van-tabs>
 
 		<view style="width: 710rpx; margin: 40rpx auto 20rpx;">
 
-			<view class="flex rr" style="align-items: center;">
-				<uni-icons type="sound" size="50rpx" color="#FBA54F"></uni-icons>
-				<view class="xx" v-html="notice">
-				</view>
-				<!-- 长沙市刘师傅在服务过程中客户投诉“服务过程中有不文明的行为”,扣信用分5分罚款500元，公布三日望引以为戒！ -->
-			</view>
 
-			<view
+			<!-- <view
 				style="width: 670rpx;height: 80rpx;background-color: #fff; border-radius: 16rpx;padding: 15rpx 20rpx;">
 				<view class="flex-sb" style="line-height: 40rpx; font-size: 28rpx;">
 					<view :class="{'sb-w8' : true, select : item == selectDate}" @click="onSelectDate(item)"
@@ -22,34 +34,27 @@
 							{{ index == 0 ? '今' : index == 1 ? '明' : item.format('DD') }}
 						</view>
 					</view>
-					<!-- <view class="sb-w8" style="border-left: 1rpx solid #999;"><uni-icons type="list" size="34rpx"/></view> -->
+					<view class="sb-w8" style="border-left: 1rpx solid #999;"><uni-icons type="list" size="34rpx"/></view>
 				</view>
-				<!-- <view class="flex-sb" style="line-height: 48rpx;">
-					<view class="sb-w8" v-for="(item, index) in dateList">
-						{{ index == 0 ? '今' : index == 1 ? '明' : item.format('DD') }}
-					</view> -->
-
-				<!-- <view class="sb-w8" style="border-left: 1rpx solid #999;"><uni-icons type="down" size="34rpx"/></view> -->
-				<!-- </view> -->
-			</view>
+			</view> -->
 
 			<view class="flex-sb" style="margin-top: 20rpx;">
-				<view :class="{'status-card' : true, select : queryParams.state == 0}" @click="selectTenState(0)">
+				<view :class="{'status-card' : true, select : queryParams.state == 0}">
 					<view>
 						<view class="num">{{ completedQuantity }}</view>
-						<view>已完成</view>
+						<view>总接单数</view>
 					</view>
 				</view>
-				<view :class="{'status-card' : true, select : queryParams.state == 1}" @click="selectTenState(1)">
+				<view :class="{'status-card' : true, select : queryParams.state == 1}">
 					<view>
 						<view class="num">{{ confirmedQuantity }}</view>
-						<view>待确认</view>
+						<view>总佣金数额</view>
 					</view>
 				</view>
-				<view :class="{'status-card' : true, select : queryParams.state == 2}" @click="selectTenState(2)">
+				<view :class="{'status-card' : true, select : 2}">
 					<view>
 						<view class="num">{{ numberOfVisits }}</view>
-						<view>待上门</view>
+						<view>今日待上门</view>
 					</view>
 				</view>
 			</view>
@@ -149,7 +154,6 @@
 				dateList: [],
 				active: 0,
 				queryParams: {
-					state: 1,
 					pageNo: 1,
 					pageSize: 10
 				},
@@ -181,6 +185,7 @@
 			}
 		},
 		methods: {
+			onClickTab(){},
 			onLoad() {
 				this.queryParams.pageSize += 10
 				this.getOrderList()
@@ -292,7 +297,7 @@
 		height: 92rpx;
 		background-color: #fff;
 		border-radius: 16rpx;
-
+		font-size: 26rpx;
 		padding: 40rpx;
 		text-align: center;
 		color: #ccc;
@@ -399,7 +404,7 @@
 			}
 
 			.b2 {
-				background: linear-gradient(178deg, #4FD3BC, #60C285);
+				background-color: #EF8C94;
 				color: #fff;
 			}
 

service-uniapp-technician/pages/login/mobile.vue

@@ -93,10 +93,12 @@
 			},
 			//微信登录
 			toWxLogin(code) {
-				this.$api('wxTechnicianLogin', {
+				let data = {
 					code : this.yzmCode,
 					phone : this.phone
-				}, res=> {
+				}
+				console.log(data);
+				this.$api('wxTechnicianLogin', data, res=> {
 					if(res.code == 200){
 						uni.setStorageSync("token", res.result.token)
 						uni.setStorageSync("userInfo", JSON.stringify(res.result.userInfo))

service-uniapp-technician/pages/order/orderDetail.vue

@@ -1,11 +1,14 @@
 <template>
 	<view class="order">
-		<mNavbar title="订单详情" :leftClick="toLeft" style="background: linear-gradient(#4899a6, rgb(78 160 167));" />
+		<mNavbar title="订单详情" 
+		:leftClick="toLeft" 
+		style="background: #F1B8BD;" />
 		<view class="box">
 
 			<view class="title">
 				<view class="icon">
-					<uni-icons type="wallet-filled" color="#4899a6" size="15"></uni-icons>
+					<uni-icons type="wallet-filled" 
+					color="#FF6470" size="15"></uni-icons>
 				</view>
 				<view class="text">
 					<!-- 订单已完成 -->
@@ -76,7 +79,7 @@
 		<view class="info">
 			<view class="flex">
 				<view style="width: 8rpx;height: 30rpx;
-				background: #6fc6ad;border-radius: 6rpx;" />
+				background: #EF8C94;border-radius: 6rpx;" />
 				<view class="head-title">服务项目</view>
 			</view>
 
@@ -368,7 +371,7 @@
 
 <style scoped lang="scss">
 	.order {
-		background: linear-gradient(#4899a6, #6fc6ad, #6fc6ad);
+		background: #F1B8BD;
 		padding-bottom: 10px;
 	}
 
@@ -401,17 +404,17 @@
 		.inactive-icon.tip {
 			width: 6px;
 			height: 6px;
-			background-color: #fff;
+			background-color: #ffffff55;
 			border-radius: 3px;
 		}
 
 		.stepText.tip {
-			background-color: #b5d7d3;
+			background-color: #ffffff55;
 			padding: 3px 5px;
 			position: relative;
 			top: 50px;
 			border-radius: 5px;
-			color: #4899a6;
+			color: #EF8C94;
 			display: flex;
 			font-size: 10px;
 		}
@@ -422,7 +425,7 @@
 			left: 50%;
 			transform: translate(-50%, 0);
 			border-top: 7px solid transparent;
-			border-bottom: 7px solid #b5d7d3;
+			border-bottom: 7px solid #ffffff55;
 			border-left: 7px solid transparent;
 			border-right: 7px solid transparent;
 		}
@@ -473,7 +476,7 @@
 			.cancel-btn {
 				color: #fff;
 				padding: 10rpx 50rpx;
-				background-color: #ffb300;
+				background-color: #FF6470;
 				border-radius: 30rpx;
 				font-size: 25rpx;
 				margin: 0 10rpx;
@@ -700,8 +703,8 @@
 		}
 
 		.btn-x {
-			color: #6fc6ad;
-			border: 1px solid #6fc6ad;
+			color: #EF8C94;
+			border: 1px solid #EF8C94;
 			padding: 10rpx 20rpx;
 			border-radius: 30rpx;
 		}
@@ -711,8 +714,8 @@
 			justify-content: center;
 
 			.btn {
-				color: #6fc6ad;
-				border: 1px solid #6fc6ad;
+				color: #EF8C94;
+				border: 1px solid #EF8C94;
 				padding: 10rpx 20rpx;
 				border-radius: 30rpx;
 			}

service-uniapp-technician/uni.css

@@ -291,7 +291,7 @@
 
 /* vant样式 */
 :root{
-	--van-primary-color : #60bda2 !important;
+	--van-primary-color : #EF8C94 !important;
 	/* --primary-two-color : #60bda2 !important; */
 }