上传

service-uniapp-client/.env

@@ -1,7 +1,7 @@
 
 
 # 开发环境
-#VITE_GLOB_API=http://h5.xzaiyp.top/massage-api
+#VITE_GLOB_API=http://h5.xzaiyp.top/massage-api-three
 #VITE_REDIRECT_URI=http://tairoudj.natapp1.cc
 
 # 生产环境

service-uniapp-client/mixins/order.js

@@ -1,4 +1,5 @@
 import { showConfirmDialog } from 'vant';
+import { showDialog } from 'vant';
 	
 	
 export default {
@@ -39,17 +40,33 @@ export default {
 		
 		//立即支付
 		toPayOrder(item) {
-			this.$api('immediatelyPay', {
+			
+			let data = {
 				addressId: item.addressId,
-				couponId: item.couponId,
 				orderId: item.id,
 				payType: item.payType,
 				remark: item.remark,
 				serviceTime: item.serviceTime
-			}, res => {
+			}
+			
+			// if(item.couponId){
+			// 	data.couponId = couponId
+			// }
+			
+			this.$api('immediatelyPay', data, res => {
 				if (res.code == 200) {
-					this.$wxPay(res, this.getOrderList, this.getOrderList)
+					if (item.payType == 1) {		//余额支付
+						showDialog({
+							title: '支付成功',
+							message: '订单支付成功!请前往订单查看',
+						}).then(() => {
+							this.active = 2
+						});
+					}else{
+						this.$wxPay(res, this.getOrderList, this.getOrderList)
+					}
 				}
+				this.getOrderList()
 			})
 		},
 	}

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

@@ -43,7 +43,7 @@
 				</van-swipe>
 			</view> -->
 			
-			<view class="search">
+			<!-- <view class="search">
 			
 				<view @click="showSelectArea" class="left-area">
 					<image src="@/static/home/address-icon.png"></image>
@@ -63,7 +63,7 @@
 					</view>
 				</view>
 			
-			</view>
+			</view> -->
 
 			<view v-if="projectList.length > 0" class="server-list">
 				<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" ref="list"
@@ -107,10 +107,7 @@
 
 			<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>

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

@@ -66,7 +66,7 @@
 						<view class="b1" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 3">
 							再来一单
 						</view>
-						<view class="b2" @click.stop="toEvaluate(item.id,item.projectId,item.technicianId)" v-if="item.state == 3">
+						<view class="b2" @click.stop="toEvaluate(item.id,item.projectId,item.technicianId)" v-if="item.state == 3 && item.evaluated != 1">
 							立即评价
 						</view>
 						<view class="b2" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 4">

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

@@ -14,7 +14,7 @@
 					
 					<view class="center-area">
 						<image src="@/static/home/search-icon.png"></image>
-						<van-field v-model="queryParams.title" :clearable="true" @clear="clearKey" center placeholder="请输入技师" />
+						<van-field v-model="queryParams.title"  :clearable="true" @clear="clearKey" center placeholder="请输入技师" />
 					</view>
 					
 					<view class="right-area">
@@ -63,8 +63,8 @@
 			}
 		},
 		onShow() {
-			this.getTechnicianList()
 			this.initUserArea()
+			this.getTechnicianList()
 		},
 		methods: {
 			//list列表滑动到底部自动新增数据列表
@@ -102,8 +102,12 @@
 				this.area = area;
 				this.showAeraPro = false;
 				
+				this.queryParams.county = area
+				
 				//更新所在地区
 				this.updateSessionPositon(area)
+				
+				this.getTechnicianList()
 			},
 			
 			//显示选择地区
@@ -124,6 +128,7 @@
 				if(!sessionStorage.getItem('position')) return this.getLocation()		//获取(详细地址，包括省市区)
 				let positionInfo = JSON.parse(sessionStorage.getItem('position'))
 				this.area = positionInfo.addressDetail.district
+				this.queryParams.county = this.area
 			},
 			
 			//计算距离

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

@@ -21,8 +21,8 @@
 						<view @click="toNodes">
 							<text>粉丝</text>
 						</view>
-						<view @click="toWithdraw">
-							<text>提现</text>
+						<view>
+							<text v-if="userInfo.isDai =='Y'" @click="toWithdraw">提现</text>
 						</view>
 						<view @click="showQrcode">
 							<text>二维码</text>
@@ -87,6 +87,13 @@
 				this.$api('getUserInfo', {}, res => {
 					if (res.code == 200) {
 						this.userInfo = res.result;
+						if(this.userInfo.isDai == 'Y'){
+							this.tabs = [
+								{ title : '费用明细' },
+								{ title : '提现记录' },
+								{ title : '收益记录' }
+							]
+						}
 					}
 				})
 			},

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

@@ -142,7 +142,7 @@
 				}else if(phone.trim() == ''){
 					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)){
+					if(!/^1\d{10}$/.test(phone)){
 						return { title : '手机号格式不合法' , auth : false }
 					}
 				}else if(age){

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

@@ -12,9 +12,9 @@
 			</view>
 			<view class="font-menu flex flex-sb">
 				<view @click="toRunningWater(0)">充值记录</view>
-				<view @click="toRunningWater(1)">提现记录</view>
+				<view @click="toRunningWater(1)" v-if="userInfo.isDai =='Y'">提现记录</view>
 				<view @click="toRunningWater(2)">下单记录</view>
-				<view @click="toRunningWater(3)">佣金记录</view>
+				<view @click="toRunningWater(3)" v-if="userInfo.isDai =='Y'">佣金记录</view>
 			</view>
 		</view>
 

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

@@ -75,7 +75,7 @@
 				uni.navigateTo({
 					url: '/pages/mine/distribution'
 				})
-			},
+			}, 
 			getConfig() { //获取配置信息
 				this.$api('getConfig', {}, res => {
 					if (res.code == 200) {

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

@@ -373,7 +373,7 @@
 							this.$wxPay(res,this.paySusscess,this.paySusscess)
 						}
 					}else{		//不管订单是否支付成功，直接跳订单页面
-						this.paySusscess()
+						this.paySusscess(1)
 					}
 				})
 			},
@@ -409,7 +409,7 @@
 				this.count = this.price - item.money
 			},
 			
-			//显示选择地址弹框
+			//选择地址
 			selectAddress(item) {
 				if(!item.latitude && !item.longitude){		//判断地址信息有没有经纬度信息，避免出现距离计算出现问题
 					this.selectAddressPopupShow = false
@@ -454,8 +454,10 @@
 				// 		this.initPrice()
 				// 	}
 				// })
-				if(this.$route.query.setKmOpen=='Y'){		//是否打开了假距离
-					this.distance = this.$route.query.distance
+				
+				
+				if(this.technicianDetail.setKmOpen=='Y'){		//是否打开了假距离
+					this.distance = this.technicianDetail.setKm
 				}else{
 					this.distance = Position.calculateDistance(this.address.latitude, this.address.longitude, this.technicianDetail.latitude, this.technicianDetail.longitude)
 				}
@@ -475,9 +477,9 @@
 			},
 			
 			//支付成功(跳转订单)
-			paySusscess(){
+			paySusscess(index = 2){
 				uni.reLaunch({
-				  url: '/pages/index/order?active=2'
+				  url: '/pages/index/order?active=' + index
 				})
 			},
 			

service-uniapp-client/plugins/utils.js

@@ -57,7 +57,7 @@ function verificationAll(data){
 
 //验证手机号是否合法
 function verificationPhone(phone){
-	if(!/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(phone)){
+	if(!/^1\d{10}$/.test(phone)){
 		return false
 	}
 	return true

service-uniapp-technician/.env

@@ -1,7 +1,7 @@
 
 
 # 开发环境
-#VITE_GLOB_API=http://h5.xzaiyp.top/massage-api
+#VITE_GLOB_API=http://h5.xzaiyp.top/massage-api-three
 VITE_REDIRECT_URI=http://tairoudj.natapp1.cc
 
 

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

@@ -138,7 +138,8 @@
 	}
 
 	.input-m{
-		width: 96rpx;
+		width: 146rpx;
+		// width: 96rpx;
 		height: 136rpx;
 		background: #f8f8f8;
 		border-radius: 16rpx;
@@ -153,8 +154,6 @@
 	}
 
 	.input-m.active{
-		width: 90rpx;
-		height: 130rpx;
 		border: 3rpx solid $uni-color;
 	}
 

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

@@ -143,7 +143,7 @@
 				}else if(phone.trim() == ''){
 					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)){
+					if(!/^1\d{10}$/.test(phone)){
 						return { title : '手机号格式不合法' , auth : false }
 					}
 				}else if(age){

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

@@ -4,7 +4,7 @@
 		<view class="banner" />
 
 		<view class="b-relative center font-m">
-			<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">{{ belece.money }}</view>
@@ -20,19 +20,23 @@
 		<view class="from-body">
 			<view>我要提现</view>
 			<view class="from-line">
-				<input placeholder="请输入提现金额" />
+				<input placeholder="请输入提现金额" v-model="form.price"/>
 			</view>
+			<!-- <view class="from-line">
+				<input placeholder="请输入姓名" v-model="form.name"/>
+			</view> -->
+			<!-- <view class="from-line">
+				<input placeholder="请输入电话" v-model="form.phone"/>
+			</view> -->
 			<view class="from-line">
-				<input placeholder="请输入姓名" />
+				<input placeholder="请输入开户行" v-model="form.bank"/>
 			</view>
 			<view class="from-line">
-				<input placeholder="请输入开户行" />
+				<input placeholder="请输入银行卡卡号" v-model="form.card"/>
 			</view>
-			<view class="from-line">
-				<input placeholder="请输入银行卡卡号" />
-			</view>
-			<view class="mt56">提现说明</view>
-			<view style="line-height: 45rpx; font-size: 24rpx;color: #666666;" v-html="notice">
+			<!-- <view class="mt56">提现说明</view> -->
+			<view style="line-height: 45rpx; font-size: 24rpx;color: #666666;" 
+			v-html="notice">
 			</view>
 				<!-- <p>1、本次提现必须通过银行卡提现，暂不支持其他途径。</p>
 				<p>2、如若遇到24小时提现未到账，请联系客服。</p> -->
@@ -40,7 +44,8 @@
 
 
 		<view class="b-fiexd">
-			<view class="button-submit">提交</view>
+			<view class="button-submit"
+			@click="submit">提交</view>
 		</view>
 
 	</view>
@@ -57,7 +62,7 @@
 				config : [],
 				notice : '',
 				form : {
-					
+					type : 1
 				},
 				userInfo : {},
 				belece : {}
@@ -86,7 +91,7 @@
 				this.$api('getConfig', {} ,res => {
 					if(res.code == 200){
 						res.result.forEach(n => {
-							if(n.keyValue == 'orderInstructions'){
+							if(n.keyValue == 'withdraw'){
 								this.notice = n.content
 							}
 						})
@@ -94,8 +99,43 @@
 					}
 				})
 			},
-			submit(){
+			submit(){ //立即提现
+				let isOk = this.parameterVerification();
+				if(isOk && !isOk.auth){
+					return uni.showToast({
+						title : isOk.title,
+						icon : 'none'
+					})
+				}
+				this.$api('giveWithdrawal', this.form, res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '提现成功',
+							icon: 'none'
+						})
+						setTimeout(uni.navigateBack, 1000, -1)
+					}
+				})
+			},
+			parameterVerification(){		//验证用户参数合法性
+				let { price , bank , card, phone } = this.form
+				
+				// if(!phone){
+				// 	return { title : '请填写联系电话' , auth : false }
+				// }
 				
+				if(!price){
+					return { title : '请填写提现金额' , auth : false }
+				}else if(price <= 0){
+					return { title : '提现金额必须大于0' , auth : false }
+				}else if(price > this.belece.money){
+					return { title : '提现金额大于余额' , auth : false }
+				}else if(bank.trim() == ''){
+					return { title : '请填写开户行' , auth : false }
+				}else if(card.trim() == ''){
+					return { title : '请填写卡号' , auth : false }
+				}
+				return { title : '验证通过' , auth : true }
 			},
 			toRunningWater(status) { //跳转流水页面
 				uni.navigateTo({

service-uniapp-technician/plugins/api.js

@@ -106,6 +106,8 @@ const config = {
 	updateTerProject : { url : '/ter/updateTerProject' , method : 'POST' , auth : true },
 	//查询技师上钟项目
 	queryTerProject : { url : '/ter/queryTerProject' , method : 'POST' , auth : true },
+	//技师端-提现
+	giveWithdrawal : { url : '/order/giveWithdrawal' , method : 'POST' , auth : true },
 }