上传

service-uniapp-client/.env

@@ -5,9 +5,9 @@
 #VITE_REDIRECT_URI=http://tairoudj.natapp1.cc
 
 # 生产环境
-VITE_GLOB_API=https://tai-testapi.sanhemovie.com/massage-api
-VITE_REDIRECT_URI=https://tai-testh5.sanhemovie.com
+VITE_GLOB_API=https://admin.yixuandaojia.com/massage-api-three
+VITE_REDIRECT_URI=https://h5.yixuandaojia.com
 
 
-VITE_APPID=wxe934cebcbc89d869
+VITE_APPID=wxe36bd1a3deea74a3
 VITE_MAP_KEY=V5RBZ-QRK63-JAO3B-RLSOB-FLWJF-DVFGH

service-uniapp-client/components/address/redactAddress.vue

@@ -73,10 +73,10 @@
 			width: 90%;
 			height: 80rpx;
 			border-radius: 40rpx;
-			color: white;
 			font-size: 28rpx;
 			margin: 0rpx auto;
-			background: linear-gradient(180deg, #6FDFBE, #5AC796);
+			background: linear-gradient(178deg, #ffe6ed, #ecb978);
+			color: #6e3009;
 		}
 
 		image {

service-uniapp-client/components/payOrder/selectAddressPopup.vue

@@ -132,7 +132,7 @@
 	.box {
 		width: 100%;
 		height: 100%;
-		background: linear-gradient(#57CAA0, #55B16E);
+		background: #ecb978;
 		box-sizing: border-box;
 		padding: 40rpx 40rpx 140rpx 40rpx;
 
@@ -247,7 +247,8 @@
 			color: white;
 			text-align: center;
 			font-size: 28rpx;
-			background: linear-gradient(180deg, #6FDFBE, #5AC796);
+			background: #6e3009;
+			color: #fff;
 		}
 	}
 	

service-uniapp-client/components/payOrder/selectCouponPopup.vue

@@ -96,7 +96,7 @@
 .box{
 	width: 100%;
 	height: 100%;
-	background: linear-gradient(#57CAA0, #55B16E);
+	background: #ecb978;
 	box-sizing: border-box;
 	padding: 40rpx;
 	.title{

service-uniapp-client/components/payOrder/selectTechnicianPopup.vue

@@ -94,7 +94,7 @@
 .box{
 	width: 100%;
 	height: 100%;
-	background: linear-gradient(#57CAA0, #55B16E);
+	background: #ecb978;
 	box-sizing: border-box;
 	padding: 40rpx;
 	.title{

service-uniapp-client/components/payOrder/selectTime.vue

@@ -121,7 +121,7 @@
 .box{
 	width: 100%;
 	height: 100%;
-	background: linear-gradient(#57CAA0, #55B16E);
+	background: #ecb978;
 	box-sizing: border-box;
 	padding: 40rpx;
 	.title{
@@ -146,7 +146,7 @@
 			}
 			.act{
 				background-color: #fff;
-				color: #55B16E;
+				color: #6e3009;
 				border-radius: 10rpx;
 			}
 		}
@@ -177,7 +177,7 @@
 				}
 				
 				.status{
-					color: #56BD86;
+					color: #6e3009;
 				}
 				&.no{
 					background-color: #E4E4E4;
@@ -190,7 +190,7 @@
 		}
 		.act{
 			background-color: #fff;
-			color: #55B16E;
+			color: #6e3009;
 			border-radius: 10rpx;
 		}
 	}

service-uniapp-client/components/selectTechnicianCompoents.vue

@@ -165,12 +165,12 @@
 				position: absolute;
 				left: 10%;
 				bottom: -15rpx;
-				background: #55CCA7;
 				width: 80%;
-				color: white;
 				font-size: 22rpx;
 				height: 35rpx;
 				border-radius: 5rpx;
+				background: linear-gradient(178deg, #ffe6ed, #ecb978);
+				color: $uni-color;
 			}
 		}
 
@@ -194,21 +194,21 @@
 					}
 
 					.btn {
-						border: 1px solid #55CCA7;
-						color: #55CCA7;
 						font-size: 20rpx;
 						padding: 5rpx;
 						border-radius: 5rpx;
+						background: linear-gradient(178deg, #ffe6ed, #ecb978);
+						color: $uni-color;
 					}
 				}
 
 				.appointed-time {
 					width: 40%;
-					background: #E7FDF7;
 					height: 40rpx;
 					border-radius: 22.5rpx;
 					font-size: 20rpx;
-					color: #5DB9A3;
+					background: $uni-color;
+					color: #fff;
 
 					.capsule {
 						display: flex;
@@ -221,9 +221,9 @@
 							justify-content: center;
 							width: 50%;
 							height: 100%;
-							color: white;
 							border-radius: 20rpx;
-							background: #52CFB0;
+							background: linear-gradient(178deg, #ffe6ed, #ecb978);
+							color: $uni-color;
 						}
 
 						.today {
@@ -274,9 +274,9 @@
 					height: 50rpx;
 					width: 160rpx;
 					border-radius: 40rpx;
-					color: white;
-					background: linear-gradient(170deg, #53CEAC, #5AC796);
 					font-size: 24rpx;
+					background: linear-gradient(178deg, #ffe6ed, #ecb978);
+					color: $uni-color;
 				}
 
 				.notAvailable {

service-uniapp-client/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "秦柔到家",
+    "name" : "宜轩到家",
     "appid" : "__UNI__1EF9D8C",
     "description" : "",
     "versionName" : "1.0.0",

service-uniapp-client/pages.json

@@ -184,7 +184,7 @@
 	},
 	"tabBar": {
 		"backgroundColor": "white",
-		"selectedColor": "#56CBA4",
+		"selectedColor": "#ecb978",
 		"list": [
 			{
 				"selectedIconPath": "/static/bar/hms.png",

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

@@ -107,6 +107,10 @@
 
 			<van-empty v-else image="/static/empty/data.png" image-size="400rpx" description="暂无项目" />
 
+			<view class="copyToken"
+			@click="copyToken">
+				复制token
+			</view>
 		</view>
 
 		<selectArea :show="showAeraPro" @close="closeAreaPro" @select="selectArea"></selectArea>
@@ -144,6 +148,17 @@
 			this.getLocation()
 		},
 		methods: {
+			copyToken(){
+				uni.setClipboardData({
+					data: uni.getStorageSync('token'),
+					success: () => {
+						uni.showToast({
+							title: 'token复制成功',
+							icon: 'none'
+						})
+					}
+				})
+			},
 			//list列表滑动到底部自动新增数据列表
 			onLoad() {
 				this.queryParams.pageSize += 10;
@@ -532,4 +547,7 @@
 			}
 		}
 	}
+	.copyToken{
+		padding: 100rpx;
+	}
 </style>

service-uniapp-client/pages/login/login.vue

@@ -192,7 +192,6 @@
 	.a5 {
 		width: 568rpx;
 		height: 90rpx;
-		background: #51d0b4;
 		border-radius: 16rpx;
 
 		margin: 0 auto;
@@ -202,7 +201,8 @@
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
+		background: linear-gradient(178deg, #ffe6ed, #ecb978);
+		color: #6e3009;
 	}
 
 	.a6 {
@@ -219,7 +219,7 @@
 	}
 
 	.a6 .agreement {
-		color: #6FDFBE;
+		color: #6e3009;
 	}
 
 	.a7 {
@@ -233,8 +233,8 @@
 	}
 
 	.a8 {
-		background-color: #6FDFBE;
 		border: none;
-		color: #fff;
+		background: linear-gradient(178deg, #ffe6ed, #ecb978);
+		color: #6e3009;
 	}
 </style>

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

@@ -150,7 +150,7 @@
 	.input-m.active {
 		width: 90rpx;
 		height: 130rpx;
-		border: 3rpx solid #51d0b4;
+		border: 3rpx solid #6e3009;
 	}
 
 	.b3 {
@@ -162,7 +162,7 @@
 	}
 
 	.b3 span {
-		color: #51D0B4;
+		color: #6e3009;
 	}
 
 	.b4 {
@@ -170,15 +170,15 @@
 		height: 90rpx;
 		line-height: 90rpx;
 		border-radius: 46rpx;
-		background: #51d0b4;
 
 		font-size: 28rpx;
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
 
 		margin: 94rpx auto;
+		background: linear-gradient(178deg, #ffe6ed, #ecb978);
+		color: #6e3009;
 	}
 
 
@@ -248,7 +248,6 @@
 		width: 556rpx;
 		height: 90rpx;
 		line-height: 90rpx;
-		background: #51d0b4;
 		border-radius: 46px;
 
 		margin: 60rpx auto;
@@ -257,6 +256,7 @@
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
+		background: linear-gradient(178deg, #ffe6ed, #ecb978);
+		color: #6e3009;
 	}
 </style>

service-uniapp-client/pages/mine/address.vue

@@ -456,10 +456,10 @@
 				width: 85%;
 				height: 80rpx;
 				border-radius: 40rpx;
-				color: white;
 				text-align: center;
 				font-size: 28rpx;
-				background: linear-gradient(180deg, #6FDFBE, #5AC796);
+				background: linear-gradient(178deg, #ffe6ed, #ecb978);
+				color: #6e3009;
 			}
 		}
 	}

service-uniapp-client/pages/mine/collect.vue

@@ -208,11 +208,11 @@
 								bottom: -13rpx;
 								width: 70%;
 								height: 40rpx;
-								background: #60C285;
 								border-radius: 10rpx;
-								color: white;
 								transform: translate(-50%);
-
+								
+								background: linear-gradient(178deg, #ffe6ed, #ecb978);
+								color: $uni-color;
 								.desc {
 									font-size: 18rpx;
 								}
@@ -281,7 +281,8 @@
 							border-radius: 22.5rpx;
 							font-size: 20rpx;
 							color: #5DB9A3;
-
+							background: $uni-color;
+							color: #fff;
 							.capsule {
 								display: flex;
 								height: 100%;
@@ -293,9 +294,9 @@
 									justify-content: center;
 									width: 50%;
 									height: 100%;
-									color: white;
 									border-radius: 20rpx;
-									background: #52CFB0;
+									background: linear-gradient(178deg, #ffe6ed, #ecb978);
+									color: $uni-color;
 								}
 
 								.today {
@@ -369,8 +370,8 @@
 							height: 60rpx;
 							width: 180rpx;
 							border-radius: 40rpx;
-							color: white;
-							background: linear-gradient(170deg, #53CEAC, #5AC796);
+							background: linear-gradient(178deg, #ffe6ed, #ecb978);
+							color: $uni-color;
 						}
 
 						.notAvailable {

service-uniapp-client/pages/mine/coupon.vue

@@ -101,8 +101,8 @@
 <style scoped lang="scss">
 .btn{
 	padding: 0px 30rpx;
-	background-color: #4FD3BC;
-	color: #fff;
+	background: linear-gradient(178deg, #ffe6ed, #ecb978);
+	color: #6e3009;
 	font-size: 22rpx;
 	margin-left: 20rpx;
 	font-size: 20rpx;

service-uniapp-client/pages/mine/phoneDetail.vue

@@ -153,8 +153,8 @@
 					height: 60rpx;
 					border-radius: 30rpx;
 					padding: 0rpx 30rpx;
-					background: #5AC796;
-					color: white;
+					background: linear-gradient(178deg, #ffe6ed, #ecb978);
+					color: #6e3009;
 				}
 				
 				.forbidden{
@@ -195,11 +195,11 @@
 					width: 95%;
 					height: 80rpx;
 					border-radius: 40rpx;
-					color: white;
 					text-align: center;
 					line-height: 80rpx;
 					font-size: 28rpx;
-					background: linear-gradient(180deg, #6FDFBE, #5AC796);
+					background: linear-gradient(178deg, #ffe6ed, #ecb978);
+					color: #6e3009;
 				}
 			}
 		}

service-uniapp-client/pages/mine/settled - 副本.vue

@@ -0,0 +1,323 @@
+<template>
+	<view class="content">
+
+		<view class="banner"></view>
+
+		<view class="b-relative" style="width: 710rpx;height: 310rpx; margin: -174rpx auto 0;">
+			<image src="/static/ms/settled.png" style="width: 710rpx;height: 310rpx;"></image>
+			<view class="banner-font">
+				<image style="width: 380rpx;height: 98rpx;" src="/static/ms/fontjszm.png"></image>
+			</view>
+			<view class="font-3">打造专业的技术服务</view>
+			<view class="banner-button">立即联系我们>></view>
+		</view>
+
+		<view>
+			<view class="item-card">
+				<view class="item-line flex">
+					<view class="before"></view>
+					<view class="label">技师姓名</view>
+					<input placeholder="请输入姓名" v-model="technician.name" />
+				</view>
+				<view class="item-line flex">
+					<view class="before"></view>
+					<view class="label">技师性别</view>
+					<van-radio-group v-model="technician.sex" direction="horizontal">
+					  <van-radio name="男">男</van-radio>
+					  <van-radio name="女">女</van-radio>
+					</van-radio-group>
+				</view>
+				<view class="item-line flex">
+					<view class="before"></view>
+					<view class="label">联系方式</view>
+					<input placeholder="请输入联系方式" v-model="technician.phone" />
+				</view>
+				<view class="item-line flex">
+					<view class="before"></view>
+					<view class="label">技师年龄</view>
+					<input placeholder="请输入技师年龄" type="number" v-model.number="technician.age" />
+				</view>
+				<view class="item-line flex">
+					<view class="before"></view>
+					<view class="label">意向城市</view>
+					<input placeholder="请输入意向工作城市" v-model="technician.city" />
+				</view>
+				<view class="item-line flex">
+					<view class="before"></view>
+					<view class="label" style="width: 100%">请上传本人近期照片</view>
+				</view>
+				<view v-if="!technician.image" @click="fileUploads" class="upload">
+					<uni-icons type="plusempty" size="80rpx" color="#37bea7"/>
+				</view>
+				<view v-else @click="fileUploads" class="upload b-relative">
+					<image class="upload-img" :src="technician.image" mode="aspectFill"></image>
+				</view>
+			</view>
+		</view>
+
+		<view class="b-fiexd">
+			<view @click="addOrUpdateMsgTer" class="button-submit">提交</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import OSS from "ali-oss"
+	import { v4 as uuidv4 } from 'uuid';
+	import { showDialog } from 'vant';
+
+	export default {
+		data() {
+			return {
+				technician: {
+					id : '',
+					name : '',
+					sex : '男',
+					phone : '',
+					age : '',
+					city : '',
+					image : '',
+					phone : ''
+				},
+				imgs : []
+			}
+		},
+		onShow(){
+			this.getTenFans()
+		},
+		methods: {
+			getUserInfo() {		//获取用户信息
+				this.$api('getUserInfo', {}, res => {
+					if (res.code == 200) {
+						this.userInfo = res.result;
+					}
+				})
+			},
+			addOrUpdateMsgTer() {		//新增修改技师入驻信息
+				let isOk = this.parameterVerification()
+				if(!isOk.auth){
+					return uni.showToast({
+						title : isOk.title,
+						icon : 'none'
+					})
+				}
+				this.$api('addOrUpdateMsgTer', this.technician, res => {
+					if (res.code == 200) {
+						showDialog({
+						  title: this.technician.id ? '修改入驻' : '技师入驻',
+						  message: this.technician.id ? '技师入驻修改成功' : '技师入驻提交成功',
+						}).then(() => {
+						  uni.switchTab({
+						  	url: '/pages/index/index'
+						  })
+						});
+					}
+				})
+			},
+			parameterVerification(){		//验证用户参数合法性
+				let { name , sex , phone , age , city , image } = this.technician
+				if(name.trim() == ''){
+					return { title : '请填写技师姓名' , auth : false }
+				}else if(sex.trim() == ''){
+					return { title : '请选择性别' , auth : false }
+				}else if(phone.trim() == ''){
+					return { title : '请填写手机号' , auth : false }
+				}else if(!age){
+					return { title : '请填写年龄' , auth : false }
+				}else if(city.trim() == ''){
+					return { title : '请填写意向城市' , auth : false }
+				}else if(image.trim() == ''){
+					return { title : '请上传近期照片' , auth : false }
+				}else if(phone.trim() != ''){
+					if(!this.$utils.verificationPhone(phone)){
+						return { title : '手机号格式不合法' , auth : false }
+					}
+				}
+				return { title : '验证通过' , auth : true }
+			},
+			fileUploads() { //上传文件
+				uni.chooseImage({
+					count: 1, // 默认9，设置为1表示单选  
+					sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有  
+					sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 
+					
+					success: (res) => {
+						let resultPromise = [];
+						
+						//上传单张图片逻辑
+						this.uploadFileToOSS(res.tempFiles[0]).then(imgPath => {
+							this.technician.image = imgPath;
+						})
+					}
+				});
+			},
+			getTenFans(){		//获取我推荐的技师记录
+				this.$api('getTenFans', {}, res => {
+					if (res.code == 200) {
+						if(res.result.length > 0){
+							let { id , name , sex , age , city , image , phone } = res.result[0];
+							this.technician = { id ,name , sex , age , city , image , phone }
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	body {
+		background-color: #f5f5f5;
+	}
+
+	.banner {
+		width: 100vw;
+		height: calc(392rpx - 160rpx);
+		background: linear-gradient(38deg, #4899a6 44%, #60bda2 100%);
+	}
+
+
+	.banner-font {
+		width: 292rpx;
+		height: 142rpx;
+		font-size: 72rpx;
+		line-height: 66rpx;
+		font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+		font-weight: 400;
+		text-align: left;
+		color: #ffffff;
+		letter-spacing: -1;
+		text-shadow: 0px 6px 6px 0px rgba(0, 165, 141, 0.70);
+
+		position: absolute;
+		left: 52rpx;
+		top: 34rpx;
+	}
+
+	.font-3 {
+		height: 28rpx;
+		line-height: 28rpx;
+		font-size: 24rpx;
+		font-family: PingFang SC, PingFang SC-Regular;
+		font-weight: 400;
+		text-align: left;
+		color: #ffffff;
+
+		text-shadow: 0 4rpx 6rpx 0 rgba(0, 165, 141, 0.70);
+		position: absolute;
+		left: 52rpx;
+		top: 138rpx;
+	}
+
+	.banner-button {
+		width: 240rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		background: #ffdb75;
+		border-radius: 24rpx;
+		box-shadow: 0 6rpx 6rpx 0 rgba(17, 106, 93, 0.23);
+
+		position: absolute;
+		left: 52rpx;
+		top: 220rpx;
+
+		font-size: 24rpx;
+		font-family: PingFang SC, PingFang SC-Bold;
+		font-weight: 700;
+		text-align: center;
+		color: #26c591;
+	}
+
+
+	.item-card {
+		width: calc(710rpx - 40rpx);
+		height: 840rpx;
+		background: #ffffff;
+		border-radius: 16rpx;
+
+		margin: 40rpx auto 20rpx;
+		padding: 1rpx 20rpx;
+	}
+
+	.item-line {
+		height: 60rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC, PingFang SC-Bold;
+		font-weight: 700;
+		text-align: left;
+		color: #333333;
+		margin-top: 40rpx;
+	}
+
+	.item-line .before {
+		content: "";
+		width: 8rpx;
+		height: 30rpx;
+		background: #4fd3bc;
+		border-radius: 4rpx;
+		margin-right: 10rpx;
+		margin-top: 15rpx;
+	}
+
+	.item-line .label {
+		display: flex;
+		align-items: center;
+		width: 152rpx;
+		height: 60rpx;
+	}
+
+	.item-line input {
+		width: 456rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		background: #f5f5f5;
+		border-radius: 12rpx;
+
+		font-size: 24rpx;
+		font-family: PingFang SC, PingFang SC-Medium;
+		font-weight: 500;
+		text-align: left;
+		color: #939393;
+
+		padding: 0 20rpx;
+	}
+
+	.upload {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 200rpx;
+		height: 200rpx;
+		background: rgba(245, 245, 245, 0.82);
+		border: 2rpx dashed #99dcd0;
+		border-radius: 16rpx;
+
+		margin: 10rpx 12rpx;
+	}
+	
+	.upload-img{
+		width: calc(100% - 4rpx);
+		height: calc(100% - 4rpx);
+		border: 2rpx dashed #ccc;
+		margin: 2rpx;
+	}
+
+	.button-submit {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 596rpx;
+		height: 90rpx;
+		background: linear-gradient(180deg, #6fdfbe, #5ac796);
+		border-radius: 46rpx;
+
+		margin: 20rpx auto;
+
+		font-size: 28rpx;
+		font-family: PingFang SC, PingFang SC-Regular;
+		font-weight: 400;
+		text-align: center;
+		color: #ffffff;
+	}
+</style>

service-uniapp-client/pages/mine/settled.vue

@@ -1,12 +1,17 @@
 <template>
-	<view class="content">
+	<view class="content" style="padding-bottom: 90rpx;">
+		
+		<mNavbar
+		:leftClick="toLeft"
+		/>
 
 		<view class="banner"></view>
 
 		<view class="b-relative" style="width: 710rpx;height: 310rpx; margin: -174rpx auto 0;">
-			<image src="/static/ms/settled.png" style="width: 710rpx;height: 310rpx;"></image>
+			<image src="/static/ms/1120.jpg" style="width: 710rpx;height: 310rpx;
+			border-radius: 20rpx;"></image>
 			<view class="banner-font">
-				<image style="width: 380rpx;height: 98rpx;" src="/static/ms/fontjszm.png"></image>
+				技师招募
 			</view>
 			<view class="font-3">打造专业的技术服务</view>
 			<view class="banner-button">立即联系我们>></view>
@@ -22,10 +27,7 @@
 				<view class="item-line flex">
 					<view class="before"></view>
 					<view class="label">技师性别</view>
-					<van-radio-group v-model="technician.sex" direction="horizontal">
-					  <van-radio name="男">男</van-radio>
-					  <van-radio name="女">女</van-radio>
-					</van-radio-group>
+					<input placeholder="请选择性别"  v-model="technician.sex"/>
 				</view>
 				<view class="item-line flex">
 					<view class="before"></view>
@@ -46,8 +48,9 @@
 					<view class="before"></view>
 					<view class="label" style="width: 100%">请上传本人近期照片</view>
 				</view>
-				<view v-if="!technician.image" @click="fileUploads" class="upload">
-					<uni-icons type="plusempty" size="80rpx" color="#37bea7"/>
+				<view v-if="!technician.image" @click="fileUploads" class="upload b-relative">
+					<uni-icons type="plusempty" size="80rpx" color="#6e3009"
+						style="position: absolute; top: 50rpx; left: 60rpx;" />
 				</view>
 				<view v-else @click="fileUploads" class="upload b-relative">
 					<image class="upload-img" :src="technician.image" mode="aspectFill"></image>
@@ -65,26 +68,35 @@
 <script>
 	import OSS from "ali-oss"
 	import { v4 as uuidv4 } from 'uuid';
-	import { showDialog } from 'vant';
 
+	import mNavbar from '@/components/base/m-navbar.vue'
 	export default {
+		components : {
+			mNavbar
+		},
 		data() {
 			return {
 				technician: {
-					id : '',
 					name : '',
-					sex : '男',
+					sex : '',
 					phone : '',
 					age : '',
 					city : '',
-					image : '',
-					phone : ''
+					image : ''
+				},
+				ossOption: {
+					region : 'oss-cn-shenzhen',
+					accessKey: 'LTAI5tMan18fjJPUtr3Aim2W',
+					secretKey: 'lhALqqgYijc115wY8c1KfTYkbSnq5I',
+					endpoint: 'oss-cn-shenzhen.aliyuncs.com',
+					bucketName: 'mangoimageapplet',
+					staticDomain: 'https://dianpin-img.xzaiyp.top'
 				},
 				imgs : []
 			}
 		},
 		onShow(){
-			this.getTenFans()
+			
 		},
 		methods: {
 			getUserInfo() {		//获取用户信息
@@ -104,13 +116,19 @@
 				}
 				this.$api('addOrUpdateMsgTer', this.technician, res => {
 					if (res.code == 200) {
-						showDialog({
-						  title: this.technician.id ? '修改入驻' : '技师入驻',
-						  message: this.technician.id ? '技师入驻修改成功' : '技师入驻提交成功',
-						}).then(() => {
-						  uni.switchTab({
-						  	url: '/pages/index/index'
-						  })
+						uni.showModal({
+							title: '技师入驻',
+							content: '技师入驻提交成功',
+							confirmText : '确认',
+							cancelText : '取消',
+							showCancel: false,//没有取消按钮的弹框
+							success: function (res) {
+								if (res.confirm) {
+									uni.switchTab({
+										url: '/pages/index/center'
+									})
+								} else if (res.cancel) {}
+							}
 						});
 					}
 				})
@@ -118,21 +136,21 @@
 			parameterVerification(){		//验证用户参数合法性
 				let { name , sex , phone , age , city , image } = this.technician
 				if(name.trim() == ''){
-					return { title : '请填写技师姓名' , auth : false }
+					return { title : '请填写用户名' , auth : false }
 				}else if(sex.trim() == ''){
 					return { title : '请选择性别' , auth : false }
 				}else if(phone.trim() == ''){
 					return { title : '请填写手机号' , auth : false }
-				}else if(!age){
-					return { title : '请填写年龄' , auth : false }
+				}else if(phone){
+					if(!/^1(3|4[0-9]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9\d)\d{8}$/.test(phone)){
+						return { title : '手机号格式不合法' , auth : false }
+					}
+				}else if(age){
+					return { title : '请填写手机号' , auth : false }
 				}else if(city.trim() == ''){
 					return { title : '请填写意向城市' , auth : false }
 				}else if(image.trim() == ''){
 					return { title : '请上传近期照片' , auth : false }
-				}else if(phone.trim() != ''){
-					if(!this.$utils.verificationPhone(phone)){
-						return { title : '手机号格式不合法' , auth : false }
-					}
 				}
 				return { title : '验证通过' , auth : true }
 			},
@@ -145,6 +163,14 @@
 					success: (res) => {
 						let resultPromise = [];
 						
+						//上传多张图片逻辑
+						// res.tempFiles.forEach(file => {
+						// 	resultPromise.push(this.uploadFileToOSS(file));
+						// })
+						// Promise.all(resultPromise).then(imgPathArr => {
+						// 	this.imgs = imgPathArr
+						// })
+						
 						//上传单张图片逻辑
 						this.uploadFileToOSS(res.tempFiles[0]).then(imgPath => {
 							this.technician.image = imgPath;
@@ -152,49 +178,43 @@
 					}
 				});
 			},
-			getTenFans(){		//获取我推荐的技师记录
-				this.$api('getTenFans', {}, res => {
-					if (res.code == 200) {
-						if(res.result.length > 0){
-							let { id , name , sex , age , city , image , phone } = res.result[0];
-							this.technician = { id ,name , sex , age , city , image , phone }
-						}
-					}
+			toLeft(){
+				uni.switchTab({
+					url: '/pages/index/center'
 				})
 			}
 		}
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
 	body {
 		background-color: #f5f5f5;
 	}
-
+	
 	.banner {
 		width: 100vw;
 		height: calc(392rpx - 160rpx);
-		background: linear-gradient(38deg, #4899a6 44%, #60bda2 100%);
+		background: linear-gradient(to right, #ecb978, #ffe6ed);
+		color: $uni-color;
 	}
-
-
+	
+	
 	.banner-font {
-		width: 292rpx;
+		width: 692rpx;
 		height: 142rpx;
 		font-size: 72rpx;
 		line-height: 66rpx;
-		font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-		font-weight: 400;
+		font-weight: 900;
 		text-align: left;
 		color: #ffffff;
-		letter-spacing: -1;
-		text-shadow: 0px 6px 6px 0px rgba(0, 165, 141, 0.70);
-
+		letter-spacing: 20rpx;
 		position: absolute;
-		left: 52rpx;
-		top: 34rpx;
+		left: 0;
+		text-align: center;
+		top: 84rpx;
 	}
-
+	
 	.font-3 {
 		height: 28rpx;
 		line-height: 28rpx;
@@ -203,13 +223,13 @@
 		font-weight: 400;
 		text-align: left;
 		color: #ffffff;
-
+	
 		text-shadow: 0 4rpx 6rpx 0 rgba(0, 165, 141, 0.70);
 		position: absolute;
 		left: 52rpx;
-		top: 138rpx;
+		top: 228rpx;
 	}
-
+	
 	.banner-button {
 		width: 240rpx;
 		height: 56rpx;
@@ -217,29 +237,29 @@
 		background: #ffdb75;
 		border-radius: 24rpx;
 		box-shadow: 0 6rpx 6rpx 0 rgba(17, 106, 93, 0.23);
-
+	
 		position: absolute;
-		left: 52rpx;
+		right: 52rpx;
 		top: 220rpx;
-
+	
 		font-size: 24rpx;
 		font-family: PingFang SC, PingFang SC-Bold;
 		font-weight: 700;
 		text-align: center;
-		color: #26c591;
+		color: $uni-color;
 	}
-
-
+	
+	
 	.item-card {
 		width: calc(710rpx - 40rpx);
 		height: 840rpx;
 		background: #ffffff;
 		border-radius: 16rpx;
-
+	
 		margin: 40rpx auto 20rpx;
 		padding: 1rpx 20rpx;
 	}
-
+	
 	.item-line {
 		height: 60rpx;
 		font-size: 28rpx;
@@ -249,50 +269,50 @@
 		color: #333333;
 		margin-top: 40rpx;
 	}
-
+	
 	.item-line .before {
 		content: "";
 		width: 8rpx;
 		height: 30rpx;
-		background: #4fd3bc;
+		background: $uni-color;
 		border-radius: 4rpx;
 		margin-right: 10rpx;
 		margin-top: 15rpx;
 	}
-
+	
 	.item-line .label {
 		display: flex;
 		align-items: center;
 		width: 152rpx;
 		height: 60rpx;
 	}
-
+	
 	.item-line input {
 		width: 456rpx;
 		height: 60rpx;
 		line-height: 60rpx;
 		background: #f5f5f5;
 		border-radius: 12rpx;
-
+	
 		font-size: 24rpx;
 		font-family: PingFang SC, PingFang SC-Medium;
 		font-weight: 500;
 		text-align: left;
 		color: #939393;
-
+	
 		padding: 0 20rpx;
 	}
-
+	
 	.upload {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		width: 200rpx;
 		height: 200rpx;
-		background: rgba(245, 245, 245, 0.82);
-		border: 2rpx dashed #99dcd0;
+		background: rgba($uni-color, 0.22);
+		border: 2rpx dashed $uni-color;
 		border-radius: 16rpx;
-
+	
 		margin: 10rpx 12rpx;
 	}
 	
@@ -302,22 +322,22 @@
 		border: 2rpx dashed #ccc;
 		margin: 2rpx;
 	}
-
+	
 	.button-submit {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		width: 596rpx;
 		height: 90rpx;
-		background: linear-gradient(180deg, #6fdfbe, #5ac796);
 		border-radius: 46rpx;
-
+	
 		margin: 20rpx auto;
-
+	
 		font-size: 28rpx;
 		font-family: PingFang SC, PingFang SC-Regular;
 		font-weight: 400;
 		text-align: center;
-		color: #ffffff;
+		background: $uni-bg-color;
+		color: $uni-color;
 	}
 </style>

service-uniapp-client/pages/mine/wallet.vue

@@ -4,7 +4,8 @@
 		<view class="banner" />
 
 		<view class="b-relative center font-m">
-			<image src="/static/ms/w.png" />
+			<!-- <image src="/static/ms/w.png" /> -->
+			<image src="/static/ms/1120.jpg" />
 			<view class="title" style="position: absolute; top: 40rpx; left: 40rpx">
 				<view style="line-height: 40rpx; font-size: 28rpx">账号余额</view>
 				<view style="line-height: 60rpx; font-size: 40rpx">￥{{ userInfo.price }}</view>
@@ -26,7 +27,7 @@
 						<view style="font-size: 20px;">{{ item.money }}</view>
 						<text>元</text>
 						<!-- <view class="top-label-box-two">{{ item.discount == 0 ? "不享优惠" : `享${item.discount}折优惠`}}</view> -->
-						<view style="font-size: 12px; color: #47D594; margin-left: 20rpx;">送{{ item.sendMoney }}.00元
+						<view style="font-size: 12px; color: #6e3009; margin-left: 20rpx;">送{{ item.sendMoney }}.00元
 						</view>
 					</view>
 					<view style="font-size: 10px; margin-top: 40rpx;">{{ item.remarks }}</view>
@@ -204,7 +205,7 @@
 	.banner {
 		width: 100vw;
 		height: 256rpx;
-		background: #cfece7;
+		background: linear-gradient(to right, #ecb978, #ffe6ed);
 	}
 
 	.center {
@@ -276,7 +277,9 @@
 		width: 96%;
 		margin-left: 2%;
 		height: 200rpx;
-		background-image: url(/static/ms/cz.png);
+		/* background-image: url(/static/ms/cz.png); */
+		background: linear-gradient(178deg, #ffe6ed, #ecb978);;
+		color: #6e3009;
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		overflow: hidden;
@@ -298,7 +301,7 @@
 		top: 0;
 		width: 100%;
 		height: 100%;
-		background: url('../../static/ms/select.png');
+		background: url('../../static/ms/select.png?x=1');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 	}
@@ -352,9 +355,9 @@
 		width: 85%;
 		height: 80rpx;
 		border-radius: 40rpx;
-		color: white;
+		color: #6e3009;
 		font-size: 28rpx;
-		background: linear-gradient(180deg, #6FDFBE, #5AC796);
+		background: linear-gradient(178deg, #ffe6ed, #ecb978);
 	}
 
 	@media all and (min-width: 961px) {

service-uniapp-client/pages/order/payOrder.vue

@@ -47,7 +47,7 @@
 
 				<van-cell title="服务技师">
 
-					<text style="color: #4899a6;">{{ technicianDetail.title }}</text>
+					<text style="color: #6e3009;">{{ technicianDetail.title }}</text>
 
 					<template #icon>
 						<image class="icon" src="../../static/payOrder/1.png" mode="aspectFill"></image>
@@ -57,7 +57,7 @@
 
 				<van-cell title="服务时间" is-Link @click="onServiceTime">
 					
-					<text style="color: #4899a6;">
+					<text style="color: #6e3009;">
 						{{ time.timeName ? (dateObj.format('MM-DD') + ' ' + time.timeName) : '' }}
 					</text>
 					
@@ -69,7 +69,7 @@
 
 				<van-cell title="出行方式">
 					<text style="color: #fff;
-					background-color: #6fc6ad;
+					background-color: #6e3009;
 					padding: 5px 10px;
 					border-radius: 5px;
 					font-size: 12px;">出租车</text>
@@ -88,7 +88,7 @@
 				<view class="mileage">
 					<view class="top">
 						全程共
-						<text style="color: #4899a6;
+						<text style="color: #6e3009;
 						font-size: 16px;">{{ distance || 0}}</text>
 						公里
 					</view>
@@ -141,8 +141,8 @@
 				
 				<van-cell title="优惠劵" is-Link @click="selectCouponPopupShow = true">
 					
-					<text v-if="coupon.money" style="color: #4899a6;">优惠 {{ coupon.money }}￥</text>
-					<text v-else style="color: #4899a6;">{{ couponNum == 0 ? '无' : `${couponNum}张` }}</text>
+					<text v-if="coupon.money" style="color: #6e3009;">优惠 {{ coupon.money }}￥</text>
+					<text v-else style="color: #6e3009;">{{ couponNum == 0 ? '无' : `${couponNum}张` }}</text>
 					
 					<template #icon>
 						<image class="icon" src="../../static/payOrder/5.png" mode=""></image>
@@ -499,7 +499,8 @@
 			position: absolute;
 			width: 100%;
 			height: 100px;
-			background: linear-gradient(to right, #4899a6, #6fc6ad);
+			background: linear-gradient(to right, #ecb978, #ffe6ed);
+			// color: $uni-color;
 		}
 
 		.box {
@@ -624,7 +625,7 @@
 				.top {
 					padding: 5px 10px;
 					padding-left: 25px;
-					background-color: #A1D9CC99;
+					background-color: rgba($uni-color, 0.2);
 					font-size: 12px;
 					position: relative;
 				}
@@ -635,7 +636,7 @@
 					display: block;
 					width: 8px;
 					height: 8px;
-					background-color: #6fc6ad;
+					background-color: $uni-color;
 					top: 50%;
 					left: 10px;
 					transform: translate(0, -40%);
@@ -644,7 +645,7 @@
 
 				.info {
 					padding: 10px;
-					background-color: #ECFFFB;
+					background-color: rgba($uni-color, 0.1);
 					color: #888;
 					font-size: 11px;
 					line-height: 20px;
@@ -680,8 +681,6 @@
 			}
 
 			.btn {
-				background: linear-gradient(178deg, #4FD3BC, #60C285);
-				color: white;
 				width: 120px;
 				height: 45px;
 				border-radius: 23px;
@@ -689,6 +688,9 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
+				
+				background: linear-gradient(178deg, #ecb978, #ffe6ed);
+				color: $uni-color;
 			}
 		}
 	}

service-uniapp-client/pages/technician/subscribeService.vue

@@ -367,10 +367,10 @@
 				width: 90%;
 				height: 80rpx;
 				margin: 0 auto;
-				background: #49B369;
 				border-radius: 42.5rpx;
-				color: white;
 				font-size: 28rpx;
+				background: linear-gradient(178deg, #ffe6ed, #ecb978);
+				color: $uni-color;
 			}
 		}
 	}

service-uniapp-client/pages/technician/technicianDetail.vue

@@ -711,8 +711,8 @@
 						height: 60rpx;
 						width: 170rpx;
 						border-radius: 40rpx;
-						color: white;
-						background: linear-gradient(170deg, #53CEAC, #5AC796);
+						background: linear-gradient(178deg, #ffe6ed, #ecb978);
+						color: $uni-color;
 					}
 
 					.notAvailable {
@@ -755,8 +755,8 @@
 					height: 50rpx;
 					width: 170rpx;
 					border-radius: 40rpx;
-					color: white;
-					background: linear-gradient(170deg, #53CEAC, #5AC796);
+					background: linear-gradient(178deg, #ffe6ed, #ecb978);
+					color: $uni-color;
 				}
 			}
 		}

service-uniapp-client/uni.css

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

service-uniapp-client/utils/Share.js

@@ -12,7 +12,7 @@ function share() { //微信分享
 				nonceStr,
 				signature,
 				timestamp
-			} = res.result
+			} = res.result || {}
 			window.jWeixin.config({
 				debug: false,
 				appId: appId,

service-uniapp-technician/.env

@@ -6,7 +6,7 @@ VITE_REDIRECT_URI=http://tairoudj.natapp1.cc
 
 
 # 生产环境
-VITE_GLOB_API=https://tai-testapi.sanhemovie.com/massage-api
+VITE_GLOB_API=https://admin.yixuandaojia.com/massage-api-three
 #VITE_REDIRECT_URI=https://tai-testh5.sanhemovie.com
 
 

service-uniapp-technician/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "秦柔到家",
+    "name" : "宜轩到家",
     "appid" : "__UNI__A35F936",
     "description" : "",
     "versionName" : "1.0.0",

service-uniapp-technician/pages.json

@@ -122,7 +122,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "anmo.com",
+		"navigationBarTitleText": "宜轩到家",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		"navigationStyle": "custom",
@@ -176,7 +176,7 @@
 	},
 	"tabBar": {
 		"backgroundColor": "white",
-		"selectedColor": "#56CBA4",
+		"selectedColor": "#ecb978",
 		"list": [{
 			"selectedIconPath": "/static/bar/hms.png",
 			"iconPath": "/static/bar/hm.png",

service-uniapp-technician/pages/mine/upload.vue

@@ -104,13 +104,14 @@ export default {
 			}
 		},
 		deleteImage(index){
+			let self = this
 			uni.showModal({
 			    title: '确认删除这张照片吗',
 				confirmText : '确认',
 				cancelText : '取消',
 			    success: function (res) {
 			        if (res.confirm) {
-			            this.list.splice(index, 1)
+			            self.list.splice(index, 1)
 			        } else if (res.cancel) {}
 			    }
 			});

service-uniapp-technician/plugins/upload.js

@@ -18,6 +18,17 @@ function uploadFileToOSS(file) {
 			// bucket: 'mangoimageapplet',
 			// endpoint:'oss-cn-shenzhen.aliyuncs.com'
 			
+			//桶的地址
+			// region: 'oss-cn-hangzhou',
+			// //id		
+			// accessKeyId:'LTAI5tDL3dP95KCoepUtqRZX',
+			// //密钥
+			// accessKeySecret:'WHUemsg4V9xyZUWRU9WvqwJjTcwe2u',
+			// //桶的名字
+			// bucket: 'daohomeimage',
+			// endpoint:'oss-cn-hangzhou.aliyuncs.com',
+			
+			
 			//桶的地址
 			region: 'oss-cn-guangzhou',						
 			//id					
@@ -27,6 +38,7 @@ function uploadFileToOSS(file) {
 			//桶的名字
 			bucket: 'zhuoqiu-image',
 			endpoint:'oss-cn-guangzhou.aliyuncs.com',	
+			
 		});
 		
 		// 设置文件名和文件目录
@@ -41,6 +53,7 @@ function uploadFileToOSS(file) {
 			}
 		}).then(res => {
 			uni.hideLoading();
+			// resolve('https://image.yixuandaojia.com/' + res.name);
 			resolve('https://tennis-oss.xzaiyp.top/' + res.name);
 		}).catch(err => {
 			uni.hideLoading();