diff --git a/my/order/revenueDetails - 副本.vue b/my/order/revenueDetails - 副本.vue
deleted file mode 100644
index aad6829..0000000
--- a/my/order/revenueDetails - 副本.vue	
+++ /dev/null
@@ -1,1885 +0,0 @@
-<template>
-	<view class="content">
-		
-		<view class="header"></view>
-		<view class="mian">
-			<view class="mian-top">
-				<view class="countDown" style="text-align: center;" v-if="order.status == 6">
-					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-						font-size="74" separator-size="74" @change="onCountdownChange"></u-count-down>
-				</view>
-				<view class="mian-top-head">
-					<image v-if="order && order.ordersMassageList"
-						:src="(order.ordersMassageList[0].massageType || {}).massageImg"
-						 class="mian-top-head-img"></image>
-					<view class="mian-top-head-right">
-						<view class="mian-title" v-if="order && order.ordersMassageList">
-							
-							<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
-							<view class="nav-btn" v-if="order.status ==1">待付款</view>
-							<view class="nav-btn" v-if="order.status ==2">待服务</view>
-							<view class="nav-btn" v-if="order.status ==5">待评价</view>
-							<view class="nav-btn" v-if="order.status ==3">已完成</view>
-							<view class="nav-btn" v-if="order.status ==6">服务中</view>
-							<view class="nav-btn" v-if="order.status ==7">已出发</view>
-							<view class="nav-btn" v-if="order.status ==8">已到达</view>
-							<view class="nav-btn" v-if="order.status ==4">已取消</view>
-						</view>
-						<view class="mian-time" v-if="order && order.ordersMassageList">
-							服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
-							x{{order.ordersMassageList[0].num}}
-						</view>
-						
-						<view class="mian-money">
-							<view class="mian-money-title">项目价格：</view>
-							<view class="mian-money-num">
-								<span class="fuhao">￥</span>
-								<span class="number">{{order.payMoney}}</span>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
-					<view class="mian-top-foot-view">
-						<view class="mian-top-foot-view-title">客户信息: </view>
-						<view class="mian-top-foot-view-img">
-							<span  @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
-								{{order.userName}}
-								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
-								<u-icon name="file-text"></u-icon>
-							</span>
-							<span v-else>
-								{{order.userName}}
-								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
-							</span>
-							<image src="../../static/index/dianhua.png" mode=""></image>
-						</view>
-					</view>
-					<view class="mian-top-foot-view" style="margin-top: 5px;">
-						<view class="mian-top-foot-view-title">服务地址: </view>
-						<view class="mian-top-foot-view-text" style="width: 70%;">
-							{{order.address}}
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="diandan-num"@tap="copy(order.ordersNo)">
-				订单编号:  {{order.ordersNo}}<u-icon name="file-text"></u-icon>
-			</view>
-			
-			<view class="mina-title">
-				<span class="mina-title-text">项目明细</span>
-				<span class="mina-title-bor"></span>
-			</view>
-			<view class="mian-view">
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">服务项目</span>
-					<span class="mian-view-list-text" v-if="order && order.ordersMassageList">
-						{{(order.ordersMassageList[0].massageType || {}).title}}
-					</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">下单时间</span>
-					<span class="mian-view-list-text">{{order.createTime}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">预约时间</span>
-					<span class="mian-view-list-text">{{order.serveTime}}</span>
-				</view>
-			</view>
-			<view class="mian-view">
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">优惠券金额</span>
-					<span class="mian-view-list-text">-￥{{order.couponMoney}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">项目金额</span>
-					<span class="mian-view-list-text"> ￥{{order.massageMoney}}</span>
-				</view>
-				<!-- <view class="mian-view-list">
-					<span class="mian-view-list-title">提成比例</span>
-					<span class="mian-view-list-text">70.00%</span>
-				</view> -->
-			</view>
-			<view class="mian-view">
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">是否加钟</span>
-					<span class="mian-view-list-text">{{order.addNum!=''?'是':'否'}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">加钟项目</span>
-					<span class="mian-view-list-text">{{order.jzName!=''?order.jzName:'无'}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">加钟数量</span>
-					<span class="mian-view-list-text">{{order.addNum}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">加钟金额</span>
-					<span class="mian-view-list-text">￥{{order.addMoney}}</span>
-				</view>
-			</view>
-			<view class="mian-view">
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">是否改价</span>
-					<span class="mian-view-list-text">{{order.isSupplement!=''?'是':'否'}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">改价项目</span>
-					<span class="mian-view-list-text">{{order.gjName!=''?order.gjName:'无'}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">改价金额</span>
-					<span class="mian-view-list-text">￥{{order.gjPrice}}</span>
-				</view>
-				<view class="mian-view-list">
-					<span class="mian-view-list-title">支付差价</span>
-					<span class="mian-view-list-text">￥{{order.gjcePrice}}</span>
-				</view>
-			</view>
-			<view class="mian-content" style="margin-bottom: 10px;">
-				<view class="mian-content-list">
-					<span class="mian-content-list-title">是否提前结束</span>
-					<span class="mian-content-list-text">{{order.earlyFinishReason!=''?'是':'否'}}</span>
-				</view>
-				<view class="mian-content-textarea">
-					<span class="mian-content-list-title"  style="margin: 10px 0px;">提前结束原因</span>
-					<textarea class="textarea-mian" v-model="order.earlyFinishReason" placeholder="请输入备注...." maxlength="100" name="" id=""></textarea>
-				</view>
-				<!-- <view class="yingde">
-					<view class="yingde-title">应得收益</view>
-					<view class="yingde-money">
-						<span class="fuhao-hei">￥</span>
-						<span class="num-hei">489</span>
-					</view>
-				</view> -->
-			</view>
-			<view class="mina-title">
-				<span class="mina-title-text">扣费明细</span>
-				<span class="mina-title-bor"></span>
-			</view>
-			<view class="mian-content" style="margin-bottom: 10px;">
-				<view class="mian-content-list">
-					<span class="mian-content-list-title">渠道扣费</span>
-					<span class="mian-content-list-text">-￥{{order.channelDeduction}}</span>
-				</view>
-				<view class="mian-content-list">
-					<span class="mian-content-list-title">储值扣费</span>
-					<span class="mian-content-list-text">-￥{{order.valueStorageDeduction}}</span>
-				</view>
-				<view class="mian-content-list">
-					<span class="mian-content-list-title">管理费扣费</span>
-					<span class="mian-content-list-text">-￥{{order.pingMoney}}</span>
-				</view>
-				<!-- <view class="mian-content-list">
-					<span class="mian-content-list-title">服务费扣费</span>
-					<span class="mian-content-list-text">￥4.54</span>
-				</view> -->
-				<view class="yingde" style="background: #FFF1DE;">
-					<view class="yingde-title">合计扣费</view>
-					<view class="yingde-money">
-						<span class="fuhao-hei">￥</span>
-						<span class="num-hei">-{{order.channelDeduction+order.valueStorageDeduction+order.pingMoney}}</span>
-					</view>
-				</view>
-			</view>
-			<view class="mina-title">
-				<span class="mina-title-text">车费明细</span>
-				<span class="mina-title-bor"></span>
-			</view>
-			<view class="mian-content" style="margin-bottom: 10px;">
-				<view class="mian-content-list" v-if="order.tripWay">
-					<view class="mian-content-list-title">出行方式</view>
-					<view v-if="order.tripWay == 1" class="mian-content-list-text">公交</view>
-					<view v-if="order.tripWay == 2" class="mian-content-list-text">出租</view>
-					<view v-if="order.tripWay == 3" class="mian-content-list-text">免费</view>
-				</view>
-				<view class="mian-content-list">
-					<span class="mian-content-list-title">全程距离</span>
-					<span class="mian-content-list-text">{{order.km}}km</span>
-				</view>
-				<view class="mian-content-list">
-					<span class="mian-content-list-title">车费收益</span>
-					<span class="mian-content-list-text">￥ {{order.taxiMoney}}</span>
-				</view>
-				<!-- <view class="mian-content-list">
-					<span class="mian-content-list-title">提现手续费</span>
-					<span class="mian-content-list-text">-￥{{order.pingTaxiMoney}}</span>
-				</view> -->
-				<view class="yingde" style="background: #EBEBEB;">
-					<view class="yingde-title">车费收益</view>
-					<view class="yingde-money">
-						<span class="fuhao-hei">￥</span>
-						<span class="num-hei">{{order.taxiMoney}}</span>
-					</view>
-				</view>
-			</view>
-			<view class="yiji">
-				<view class="yuji-title">预计收益</view>
-				<view class="yingde-money">
-					<span class="fuhao-heis">￥</span>
-					<span class="num-heis">{{order.sumArtificerMoney}}</span>
-				</view>
-			</view>
-			<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
-				<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
-				</view>
-				<view class="flex flex-wrap justify-between">
-					<view class="flex margin-bottom-sm"
-						style="width: 48%;height: 200rpx;margin-right: 5rpx;position: relative;"
-						v-for="(image,index) in order.startImg" :key="index"
-						@click="saveImg( order.startImg,index)">
-						<image :src="image" style="width: 100%;height: 100%;border-radius: 10upx;"
-							mode="aspectFill">
-						</image>
-					</view>
-				</view>
-			</view>
-			<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
-				<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片1
-				</view>
-				<view class="flex flex-wrap">
-					<view v-if="startImgs.length">
-						<view class="flex margin-right-sm flex-wrap">
-							<view class="flex"
-								style="width: 200rpx;height: 200rpx;margin-right: 5rpx;position: relative;"
-								v-for="(image,index) in startImgs" :key="index">
-								<image :src="pictureEcho[0]" style="width: 100%;height: 100%;"></image>
-								<view style="z-index: 0;position: absolute;top: -15rpx;right: -15rpx;"
-									@click="removeImg(index,1)">
-									<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="flex align-center justify-center padding-tb "
-						style="background: #f5f5f5;width: 200rpx;height: 200rpx;">
-						<view class="text-center" @click="addImage(1)">
-							<image src="../static/photo.png" style="width:60upx;height: 50upx;"></image>
-							<view class="text-sm">上传照片</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			
-			<view class="footers">
-				<view @click="cxOrder(order)" class="footers-btn footers-true" v-if="order.status == 2">
-					现在出发
-				</view>
-				<view @click="cxOrder(order)" class="footers-btn footers-bor" v-if="order.status == 7">
-					我已到达
-				</view>
-				<view @click="fuwuOrder(order)" class="footers-btn footers-true"v-if="order.status == 8">
-					开始服务
-				</view>
-				<view  @click="toggle('bottom',order)" class="footers-btn footers-bor" v-if="order.status == 6">
-					服务完成
-				</view>
-				<view class="footers-btn footers-true" v-if="order.status == 9">
-					确认接单
-				</view>
-				<view class="footers-btn footers-bor" v-if="order.status == 9">
-					拒单申请
-				</view>
-				<view class="footers-btn footers-bor" @click="goChat">联系客服</view>
-				<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
-			</view>
-		</view>
-		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
-		<!-- #ifndef H5 -->
-		<image src="../../static/images/index/jinji.png" class="bj_view" @tap="goBaoJing"></image>
-		<!-- #endif -->
-		<!-- 支付方式 -->
-		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
-			<view class="popup_pay">
-				<view style="background-color: #fff;">
-					<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;">
-						<view
-							style="display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
-							v-for="(item,index) in openLists" :key='index'>
-							<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
-							</image>
-							<view style="font-size: 30upx;margin-left: 20upx;width: 70%;">
-								{{item.text}}
-							</view>
-							<radio-group name="openWay" style="margin-left: 45upx;" @tap='selectWay(item)'>
-								<label class="tui-radio">
-									<radio color="#1777FF" :checked="openWay === item.id ? true : false" />
-								</label>
-							</radio-group>
-						</view>
-					</view>
-				</view>
-				<view class="pay_btn" @click="pay()">确认支付</view>
-			</view>
-		</u-popup>
-		<view>
-			<!-- 普通弹窗 -->
-			<uni-popup ref="popup" type="bottom" background-color="#fff">
-				<view class="popup-content">
-					<view class="popup-head">
-						<span></span>
-						<span @click="closePopup(type)">x</span>
-					</view>
-					<view class="popup-mian">
-						<view class="popup-view">
-							<view class="fuwu">
-								<view class="popup-title">服务承诺</view>
-								<view class="fuwu-check">
-									<uni-data-checkbox @change="change" selectedColor="#049F89" class="fuwu-checkbox" multiple v-model="checkbox1" :localdata="hobby"></uni-data-checkbox>
-								</view>
-							</view>
-							<view class="guke">
-								<view class="popup-title">顾客评价</view>
-								<view class="guke-list">
-									<view class="guke-btn huiBtn" 
-									:class="{ lanBtn: selected.includes(item) }" 
-									@click="gukeBtn(item)" 
-									v-for="(item,index) in fuwuBtn" 
-									:key="index">
-										{{item.title}}
-									</view>
-								</view>
-							</view>
-							<view class="beizhu">
-								<view class="popup-title">特殊情况备注</view>
-								<textarea @input="textareaData" class="beizhu-textarea" placeholder="本次服务中出现的特殊情况，请在此输入" name="" id="" cols="30" rows="10"></textarea>
-							</view>
-						</view>
-						<view class="popup-mian-btn">
-							<span @click="closePopup(type)">
-								取消
-							</span>
-							<span @click="cancel(order)">
-								确定
-							</span>
-						</view>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as websocketUtils from 'utils/websocketUtils.js';
-	import {getXZX,post,} from "@/common/httpRequest.js";
-	export default {
-		// components: {
-		// 	CountDown,
-		// },
-		data(){
-			return{
-				//老 订单详情
-				goods: {},
-				startImgs: [],
-				startImg: '',
-				endImgs: [],
-				endImg: '',
-				latitude: '',
-				longitude: '',
-				loading: true,
-				customStyle: {
-					// backgroundColor: '#e5e5e5',
-					// color: '#FFFFFF',
-				
-					// #ifdef MP-WEIXIN
-					width: "330upx",
-					// #endif
-					// #ifndef MP-WEIXIN
-					width: '111px',
-				
-					// #endif	
-					margin: '0 20upx',
-				},
-				customStyle2: {
-					backgroundColor: '#096f4b',
-					color: '#FFFFFF',
-					// #ifdef MP-WEIXIN
-					width: "330upx",
-					// #endif
-					// #ifndef MP-WEIXIN
-					width: '111px',
-				
-					// #endif	
-					margin: '0 20upx',
-				},
-				id: '',
-				order: {
-					user: {},
-					game: {}
-				},
-				isTrue: 0,
-				sumMoney: 0,
-				phone: '',
-				isVip: false,
-				birthDate: '',
-				age: '',
-				showpay: false,
-				openLists: [],
-				openWay: 1,
-				closeable: true,
-				startImgSel: '否',
-				pictureEcho: [],
-				formatEndTime: "",
-				endOfServiceTimer: null,
-				formatTimeStamp: null,
-				innerAudioContext: null,
-				orderIdSend: null,
-				homeMaterialPackageList: [],
-				currentPage: null,
-				pageSize: null,
-				//新订单详情
-				selected:[],
-				selectedString:'',
-				gukeData:[
-					{text:'颈椎问题'},
-					{text:'肩周炎'},
-					{text:'肩周炎'},
-					{text:'肩周炎'},
-					{text:'颈椎问题'},
-					{text:'肩周炎'},
-					{text:'肩周炎'},
-					{text:'肩周炎'},
-				],
-				headImg: [],
-				type:'bottom',
-				checkbox1: [0],
-				hobby: [{
-					text: '服务承诺1',
-					value: '0'
-				}, {
-					text: '服务承诺2',
-					value: '1'
-				}, {
-					text: '服务承诺3',
-					value: '2'
-				}],
-				fuwuBtn:[],
-				textareaTxt:''
-			}
-		},
-		watch: {
-			formatTimeStamp(newValue, oldValue) {
-				console.log(newValue);
-			},
-		},
-		onLoad(e) {
-			setInterval(() => {
-				this.getOrder();
-			}, 120000)
-			this.startImgSel = this.$queue.getData('startImgSel');
-			uni.showLoading({
-				title: '加载中......'
-		
-			})
-			let that = this;
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					console.log('当前位置的经度：' + res.longitude);
-					console.log('当前位置的纬度：' + res.latitude);
-					that.$queue.setData('longitude', res.longitude);
-					that.$queue.setData('latitude', res.latitude);
-					that.latitude = res.latitude
-					that.longitude = res.longitude
-				}
-			});
-			// setTimeout(() => {
-			// 	// this.loading = false;
-			// }, 2000)
-			this.isTrue = e.isTrue
-			if (this.isTrue) {
-				uni.setNavigationBarTitle({
-					title: '订单详情'
-				})
-			}
-			this.ordersId = e.ordersId
-			this.orderIdSend = e.ordersId;
-			// this.getOrder()
-		},
-		onShow() {
-			let that = this;
-			this.getOrder()
-			this.token = uni.getStorageSync('token')
-			if (uni.getStorageSync('token')) {
-				this.getIsVip()
-			}
-		
-			// #ifdef APP
-			this.openLists = [{
-					image: '../../static/images/icon_weixin.png',
-					text: '微信',
-					id: 2
-				}, {
-					image: '../../static/images/lingqian.png',
-					text: '零钱支付',
-					id: 1
-				}, {
-					image: '../../static/images/zhifubao.png',
-					text: '支付宝支付',
-					id: 3
-				}],
-				this.openWay = 1;
-			// #endif
-		
-			// #ifdef MP-WEIXIN
-			this.openLists = [{
-					image: '../../static/images/icon_weixin.png',
-					text: '微信',
-					id: 2
-				}, {
-					image: '../../static/images/lingqian.png',
-					text: '零钱支付',
-					id: 1
-				}],
-				this.openWay = 1;
-			// #endif
-		
-			// #ifdef H5
-			this.openLists = [{
-					image: '../../static/images/lingqian.png',
-					text: '零钱支付',
-					id: 1
-				}, {
-					image: '../../static/images/zhifubao.png',
-					text: '支付宝支付',
-					id: 3
-				}],
-				this.openWay = 1;
-			// #endif
-		},
-		onPullDownRefresh() {
-			this.getOrder();
-		},
-		destroyed() {
-			if (this.innerAudioContext) {
-				try {
-					this.innerAudioContext.pause();
-					this.innerAudioContext.destroy();
-					this.innerAudioContext = null;
-				} catch (e) {
-		
-				}
-			}
-		},
-		methods:{
-			gukeBtn(item){
-				var index = this.selected.indexOf(item);
-				  if (index === -1) {
-					this.selected.push(item);
-				  } else {
-					this.selected.splice(index, 1);
-				  }
-				  var data=[];
-				  for(var i=0;i<this.selected.length;i++){
-					  data.push(this.selected[i].title)
-				  }
-				  this.selectedString=data.join(",")
-			},
-			textareaData(e){
-				this.textareaTxt=e.detail.value
-			},
-			change(e) {
-					for(var i=0;i<this.checkbox1.length;i++){
-						this.checkbox1[i]=this.hobby[i].text
-					}
-			},
-			toggle(type,order) {// 弹出框
-				this.type = type
-				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-				this.$refs.popup.open(type);
-				this.$Request.getT('/app/artificer/getPingjiaTagList').then(res => {
-					if (res.code == 0) {
-						this.fuwuBtn=res.data;
-					} else {
-						this.$queue.showToast(res.msg);
-					}
-				});
-			},
-			fuwuOrder(e) {//开始服务
-				let startImg = '';
-				if (this.startImgSel === '是') {
-					if (this.startImgs.length == 0) {
-						this.$queue.showToast('请上传开始服务图片!');
-						return;
-					} else {
-						startImg = this.startImgs.toString();
-					}
-				}
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '确认开始服务吗？',
-					success: function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId,
-								startLongitude: that.longitude,
-								startLatitude: that.latitude,
-								startImg: startImg,
-							}
-							that.$queue.showLoading('提交中...')
-							that.$Request.post('/app/artificer/startOrders', data).then(res => {
-								uni.hideLoading();
-								if (res.code == 0) {
-									that.getOrder()
-									websocketUtils.uploadAudioStart(); //开启音频录制
-								} else {
-									that.$queue.showToast(res.msg);
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			// 完成订单
-			cancel(e) {
-				let that = this
-				let artificerId = uni.getStorageSync("artificerId");
-				let jumpRootStatus = false;
-				uni.showModal({
-					title: '提示',
-					content: '如果服务未完成点击完成订单会遭到平台违规处理，请确认服务是否完毕?',
-					success: async function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId,
-								accomplishLongitude: that.longitude,
-								accomplishLatitude: that.latitude,
-								jsFwcn:that.checkbox1,
-								jsPjtag:that.selectedString,
-								jsTsbz:that.textareaTxt
-							}
-							that.$queue.showLoading('提交中...')
-							let resA = await post('/app/artificer/accomplishOrders', data);
-							uni.hideLoading();
-							try {
-								if (resA.code == 0) {
-									websocketUtils.uploadAudioEnd(); //关闭音频上传
-								} else {
-									that.$queue.showToast(resA.msg);
-								}
-							} catch (e) {
-								//TODO handle the exception
-							}
-							// let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" +
-							// 	artificerId + "&page=" +
-							// 	(this
-							// 		.currentPage ? this
-							// 		.currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : ''));
-							// console.log(resB);
-							// if (resB && resB.data && resB.code == 0) {
-							// 	that.homeMaterialPackageList = resB?.data;
-							// }
-							// let materialPackageCountFlag = that.homeMaterialPackageList.some((item) => item
-							// 	.residue <= item
-							// 	.materialMinimum);
-							// if (materialPackageCountFlag) {
-							// 	jumpRootStatus = false;
-							// 	let resC = await post('/app/artificer/offline', );
-							// 	if (resC && resC.code == 0) {
-							// 		that.$queue.showToast("当前剩余物料包数量不足，已强制离线");
-							// 	} else {
-							// 		that.$queue.showToast(resC.msg);
-							// 	}
-							// }
-							// setTimeout(() => {
-							// 	uni.navigateBack();
-							// }, 1600)
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			//老订单 方法
-			onCountdownChange(e) {
-				console.log(e, "23123ool");
-				if (e == 183) {
-					if (this.innerAudioContext) {
-						try {
-							this.innerAudioContext.pause();
-							this.innerAudioContext.destroy();
-							this.innerAudioContext = null;
-						} catch (e) {
-			
-						}
-					}
-					this.innerAudioContext = uni.createInnerAudioContext();
-					this.innerAudioContext.autoplay = true;
-					this.innerAudioContext.src = "../../static/endServerTimer.mp3";
-					this.innerAudioContext.onPlay(() => {
-						console.log('开始播放');
-					});
-					this.innerAudioContext.onError((res) => {
-						console.log(res.errMsg);
-						console.log(res.errCode);
-					});
-				}
-			},
-			// 触发uni倒计时组件服务时间3分钟时播放提示音
-			timeFormat(param) {
-				return param < 10 ? '0' + param : param;
-			},
-			goBaoJing() {
-				uni.navigateTo({
-					url: '/pages/index/jinji'
-				});
-			},
-			goChat() {
-				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
-				let kefuPhone = this.$queue.getData('kefuPhone');
-				if (uni.getStorageSync('token')) {
-					if (kefu == 1) {
-						uni.makePhoneCall({
-							phoneNumber: kefuPhone //仅为示例
-						});
-					} else {
-						// #ifdef MP-WEIXIN
-						let that = this
-						try {
-							wx.openCustomerServiceChat({
-								extInfo: {
-									url: that.$queue.getData('kefuUrl')
-								},
-								corpId: that.$queue.getData('kefuAppId'),
-								success(res) {},
-								fail(res) {
-									console.error(res)
-								}
-							})
-						} catch (error) {
-							console.error("catchcatch" + error)
-							uni.showToast({
-								title: '请更新至微信最新版本'
-							});
-						}
-						// #endif
-						// #ifndef MP-WEIXIN
-						let url = this.$queue.getData('kefuUrl');
-						if (url.indexOf('/pages/') !== -1 || url.indexOf('/my/') !== -1) {
-							uni.navigateTo({
-								url
-							});
-						} else {
-							//#ifndef H5
-							uni.navigateTo({
-								url: '/pages/index/webView?url=' + url
-							});
-							//#endif
-							//#ifdef H5
-							window.location.href = url;
-							//#endif
-						}
-						// #endif
-					}
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '您还未登录,请先登录',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								uni.navigateTo({
-									url: '/pages/public/login'
-								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					})
-				}
-			},
-			copy(num) {
-				uni.setClipboardData({
-					data: num,
-					success: r => {
-						this.$queue.showToast('复制成功');
-					}
-				});
-			},
-			//支付选择
-			selectWay: function(item) {
-				this.openWay = item.id;
-			},
-			//换算年龄
-			getAge(e) {
-				console.log('出生日期：' + e)
-				this.birthDate = e
-				//创建系统日期
-				var today = new Date();
-				//把出生日期转换成日期
-				this.birthDate = new Date(this.birthDate);
-				//分别获取到年份后相减
-				this.age = today.getFullYear() - this.birthDate.getFullYear();
-				// console.log(this.age+'当前年龄')
-			},
-			// 修改订单地址
-			undateAdd(order) {
-				if (order.state == 0) {
-					uni.navigateTo({
-						url: '../address/address?order=' + order.ordersId + '&id=' + 3
-					})
-				}
-			},
-			copyAddress() {
-				uni.setClipboardData({
-					data: this.order.userName + '\n' + this.order.phone + '\n' + this.order.address,
-					success: r => {
-						this.$queue.showToast('复制成功');
-					}
-				});
-			},
-			// 一键导航
-			bindGps(latitude, longitude, name, detailsadd) {
-				console.log(latitude, longitude, name, detailsadd)
-				uni.openLocation({
-					latitude: latitude - 0, //要去的纬度-地址       
-					longitude: longitude - 0, //要去的经度-地址
-					name: name, //地址名称
-					address: detailsadd, //详细地址名称
-					success: function() {
-						console.log('导航成功');
-					},
-					fail: function(error) {
-						console.log(error)
-					}
-				});
-			},
-			// 拨打电话
-			bindphone(phone) {
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '是否拨打电话',
-					success: function(res) {
-						if (res.confirm) {
-							console.log('用户点击确定', phone);
-							uni.makePhoneCall({
-								phoneNumber: phone //仅为示例
-							});
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			goNav(e) {
-				uni.navigateTo({
-					url: e
-				})
-			},
-			ysPhone(phoneA, phoneB) {
-				this.$Request.getT('/app/user/insertVirtualPhone?phoneA=' + phoneA + '&phoneB=' + phoneB).then(res => {
-					if (res.code == 0) {
-						this.order.phone = res.data;
-					}
-				});
-			},
-			getOrder() {
-				let data = {
-					ordersId: this.ordersId
-				}
-				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
-					if (res.code == 0) {
-						this.goods = [];
-						this.loading = false
-						uni.hideLoading()
-						this.order = res.data
-						this.formatEndTime = res.data.endTime;
-						if (this.order.artificerTaxiMoney && this.order.sumArtificerMoney) {
-							this.sumMoney = parseFloat(parseFloat(this.order.sumArtificerMoney) - parseFloat(this
-								.order.artificerTaxiMoney)).toFixed(2);
-						} else {
-							this.sumMoney = this.order.sumArtificerMoney;
-						}
-						if (this.order.startImg) {
-							this.order.startImg = this.order.startImg.split(',')
-						}
-						if (this.order.endServiceImg) {
-							this.order.endServiceImg = this.order.endServiceImg.split(',')
-						}
-						let aliphone = this.$queue.getData('aliphone');
-						if (aliphone === '是' && this.order.artificer) {
-							this.ysPhone(this.order.phone, this.order.artificer.phone);
-						}
-						if (res.data.status == 6 && res.data.endTime) {
-							let afterTimeStamp = new Date(res.data.endTime).getTime() / 1000;
-							let currentTimeStamp = new Date().getTime() / 1000;
-							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
-							console.log("eeee",currentTimeStamp);
-							this.endOfServiceTimer = formatTimeStamp;
-						}
-						this.goods = res.data;
-						// if (this.$refs.countDownEl) this.$refs.countDownEl.update();
-						uni.stopPullDownRefresh();
-					}
-				})
-			},
-			delOrder(e) {
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '确定删除订单吗?',
-					success: function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId,
-							}
-							that.$queue.showLoading('删除中...')
-							that.$Request.post('/app/artificer/removeOrders', data).then(res => {
-								uni.hideLoading();
-								if (res.code == 0) {
-									uni.showToast({
-										name: "删除成功"
-									})
-									uni.navigateBack()
-								} else {
-									that.$queue.showToast(res.msg);
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			getIsVip() {
-				this.$Request.get("/app/UserVip/isUserVip").then(res => {
-					if (res.code == 0) {
-						this.isVip = res.data
-						uni.setStorageSync('isVIP', res.data)
-					}
-				});
-			},
-			openpay() {
-				this.showpay = true
-			},
-			// 支付订单
-			pay() {
-				let that = this
-				if (that.openWay == 1) { //零钱支付
-					uni.showModal({
-						title: '付款提示',
-						content: '确认支付' + that.order.payMoney + '元吗?',
-						success: function(re) {
-							if (re.confirm) {
-								console.log('用户点击确定');
-								that.$queue.showLoading('支付中...')
-								that.$Request.post("/app/artificer/payOrders", {
-									ordersId: that.order.ordersId,
-								}).then(res => {
-									uni.hideLoading();
-									if (res.code == 0) {
-										uni.showToast({
-											title: '支付成功'
-										})
-										that.getOrder()
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: 'none'
-										})
-									}
-								});
-							} else if (re.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-			
-					})
-				} else if (that.openWay == 2) { //微信支付
-					// #ifdef MP-WEIXIN
-					let data = {
-						orderId: that.order.ordersId,
-						// type: 3
-					}
-					that.$Request.post('/app/wxPay/wxPayMpOrder', data).then(ret => {
-						console.log(ret)
-						if (ret.code == 0) {
-							this.showpay = false
-							uni.requestPayment({
-								provider: 'wxpay',
-								timeStamp: ret.data.timestamp,
-								nonceStr: ret.data.noncestr,
-								package: ret.data.package,
-								signType: ret.data.signType,
-								paySign: ret.data.sign,
-								success: function(ret) {
-									console.log(ret)
-									uni.showToast({
-										title: '支付成功',
-										icon: 'none'
-									})
-									that.getOrder()
-									// this.$queue.showToast('支付成功');
-			
-									// uni.switchTab({
-									// 	url: '/pages/my/index'
-									// })
-								},
-								fail: function(err) {
-									// this.$queue.showToast('支付失败');
-									uni.showToast({
-										title: '支付失败',
-										icon: 'nones'
-									});
-									that.getOrder()
-								}
-							});
-						}
-					});
-					// #endif
-			
-					// #ifdef H5
-					let data = {
-						orderId: that.order.ordersId,
-						// type: 2
-					}
-					that.$Request.post('/app/wxPay/wxPayJsApiOrder', data).then(rea => {
-						that.showpay = false
-						that.callPay(rea);
-					});
-					// #endif
-			
-					// #ifdef APP
-					let data = {
-						orderId: that.order.ordersId,
-						// type: 1
-					}
-					that.$Request.post('/app/wxPay/payAppOrder', data).then(rea => {
-						console.log(rea)
-						that.showpay = false
-						if (rea.code == 0) {
-							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
-						}
-					});
-					// #endif
-				} else if (that.openWay == 3) { //支付宝支付
-					// #ifdef H5
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 2
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							that.showpay = false
-							const div = document.createElement('div')
-							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
-							document.body.appendChild(div)
-							document.forms[0].submit()
-						});
-					// #endif
-			
-					// #ifdef APP-PLUS
-					let data = {
-						ordersId: that.order.ordersId,
-						type: 1
-					}
-					that.$Request.post('/app/aliPay/payOrder', data).then(
-						rea => {
-							that.showpay = false
-							that.setPayment('alipay', rea.data);
-						});
-					// #endif
-				}
-			},
-			callPay: function(response) {
-				if (typeof WeixinJSBridge === "undefined") {
-					if (document.addEventListener) {
-						document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady(response), false);
-					} else if (document.attachEvent) {
-						document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady(response));
-						document.attachEvent('onWeixinJSBridgeReady', this.onBridgeReady(response));
-					}
-				} else {
-					this.onBridgeReady(response);
-				}
-			},
-			onBridgeReady: function(response) {
-				let that = this;
-				if (!response.package) {
-					return;
-				}
-				WeixinJSBridge.invoke(
-					'getBrandWCPayRequest', {
-						"appId": response.appid, //公众号名称，由商户传入
-						"timeStamp": response.timestamp, //时间戳，自1970年以来的秒数
-						"nonceStr": response.noncestr, //随机串
-						"package": response.package,
-						"signType": response.signType, //微信签名方式：
-						"paySign": response.sign //微信签名
-					},
-					function(res) {
-						if (res.err_msg === "get_brand_wcpay_request:ok") {
-							// 使用以上方式判断前端返回,微信团队郑重提示：
-							//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
-							uni.hideLoading();
-			
-							uni.showToast({
-								title: '支付成功',
-								icon: 'none'
-							})
-							that.getOrder()
-						} else {
-							uni.hideLoading();
-						}
-						WeixinJSBridge.log(response.err_msg);
-					}
-				);
-			},
-			isCheckPay(code, name, order) {
-				if (code == 0) {
-					this.setPayment(name, order);
-				} else {
-					uni.hideLoading();
-					uni.showToast({
-						title: '支付信息有误'
-					});
-				}
-			},
-			setPayment(name, order) {
-				let that = this
-				uni.requestPayment({
-					provider: name,
-					orderInfo: order, //微信、支付宝订单数据
-					success: function(res) {
-						uni.hideLoading();
-						uni.showToast({
-							title: '支付成功',
-							icon: 'none'
-						})
-						that.getOrder()
-					},
-					fail: function(err) {
-						uni.hideLoading();
-					},
-					complete() {
-						uni.hideLoading();
-					}
-				});
-			},
-			cxOrder(e) {
-				let contentName = '确认已经出发了吗？';
-				if (e.status == 7) {
-					contentName = '确认到达服务地点准备开始服务了吗？';
-				}
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: contentName,
-					success: function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId
-							}
-							that.$queue.showLoading('提交中...')
-							that.$Request.post('/app/artificer/artificerStartOrEndTime', data).then(res => {
-								uni.hideLoading();
-								if (res.code == 0) {
-									that.getOrder()
-								} else {
-									that.$queue.showToast(res.msg);
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			
-			// 取消订单
-			cancelOrder(e) {
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '确认取消订单吗？取消订单将会被扣除信用分！',
-					success: function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId
-							}
-							that.$queue.showLoading('提交中...')
-							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
-								uni.hideLoading();
-								if (res.code == 0) {
-									that.getOrder()
-								} else {
-									that.$queue.showToast(res.msg);
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			// 查看图片
-			saveImg(imgs, index) {
-				if (this.LBSelect) {
-					if (index == this.LBIndex - 1) {
-						return;
-					}
-				}
-				// console.log(imgs)
-				let that = this;
-				let imgArr = imgs
-				// imgArr.push(imgs);
-				// //预览图片
-				uni.previewImage({
-					urls: imgArr,
-					current: imgArr[index],
-				});
-			},
-			removeImg(index, state) {
-				if (state == 1) {
-					this.startImgs.splice(index, 1)
-				} else if (state == 2) {
-					this.endImgs.splice(index, 1)
-				}
-			},
-			// 图片上传
-			addImage(e) {
-				console.log(11)
-				let that = this;
-				uni.chooseImage({
-					count: 6,
-					sourceType: ['camera'],
-					success: res => {
-						// 用于拍照后回显
-						let urlName = "";
-						if (e == 1) {
-							urlName = websocketUtils.getBaseUrl() + '/alioss/uploadWatermark';
-						}
-						console.log(urlName);
-						if (res && res.tempFilePaths.length > 0) that.pictureEcho.push(res.tempFilePaths[0]);
-						for (let i = 0; i < res.tempFilePaths.length; i++) {
-							that.$queue.showLoading("上传中...");
-							uni.uploadFile({ // 上传接口
-								// url: websocketUtils.uploadFileUrl(), //真实的接口地址
-								url: urlName, //真实的接口地址
-								filePath: res.tempFilePaths[i],
-								name: 'file',
-								success: (uploadFileRes) => {
-									if (e == 1) {
-										console.log(JSON.parse(uploadFileRes.data).data)
-										that.startImgs.push(JSON.parse(uploadFileRes.data).data)
-									} else if (e == 2) {
-										that.endImgs.push(JSON.parse(uploadFileRes.data).data)
-									}
-									uni.hideLoading();
-								},
-								fail(err) {
-									console.log(err);
-								}
-							});
-						}
-					}
-				})
-			},
-			// 获取APP端当前物料包剩余数量及最小消耗数量判断，如果剩余数量少于最小消耗数量时
-			getHomeMaterialPackageList() {
-				let artificerId = uni.getStorageSync("artificerId");
-				let that = this;
-				getXZX("/app/material/selectMaterialArtificer?artificerId=" + artificerId + "&page=" +
-					(this
-						.currentPage ? this
-						.currentPage : '') + "&limit=" + (this.pageSize ? this.pageSize : '')).then(async (res) => {
-					if (res && res.data && res.code === 0) {
-						that.homeMaterialPackageList = res?.data;
-					}
-				})
-			},
-			
-			goMsg() {
-				let data = {
-					userId: uni.getStorageSync('userId'),
-					focusedUserId: this.order.user.userId
-				}
-				this.$Request.postJson('/app/chat/insertChatConversation ', data).then(res => {
-					if (res.code == 0) {
-						let id = this.order.user.userId == res.data.userId ? res.data.focusedUserId : this.order
-							.user.userId
-						uni.navigateTo({
-							url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
-								'&byUserId=' + id
-						})
-					}
-				})
-			},
-			//新订单 方法
-			
-			
-			closePopup(type){//    关闭弹出框
-				this.type = type
-				this.$refs.popup.close(type);
-			},
-			
-		}
-	}
-</script>
-
-<style scoped>
-	.bj_view {
-		width: 100rpx;
-		height: 100rpx;
-		border-radius: 100rpx;
-		position: fixed;
-		right: 30rpx;
-		bottom: 180rpx;
-	}
-	.beizhu-textarea{
-		width: 100%;
-		height: 199rpx;
-		background-color: rgba(226, 226, 226, 0.3);
-		border-radius: 14rpx;
-		padding: 10px;
-	}
-	.guke-list{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		flex-wrap: wrap;
-		box-sizing: border-box;
-		justify-content: space-between;
-	}
-	.huiBtn{
-		background: #E2E2E2;
-		color: #333333;
-	}
-	.lanBtn{
-		background-color: #049F89;
-		color: #fff;
-	}
-	.guke-btn{
-		width: 23%;
-		height: 55rpx;
-		margin-left: 5px;
-		text-align: center;
-		line-height: 55rpx;
-		font-weight: bold;
-		font-size: 25rpx;
-		border-radius: 14rpx;
-		margin-bottom: 10px;
-	}
-	/deep/.uni-data-checklist .checklist-group .checklist-box .checkbox__inner .checkbox__inner-icon{
-		top: 0px;
-		left: 5px;
-		height: 13px;
-		width: 8px;
-	}
-	/deep/.uni-data-checklist 
-	.checklist-group 
-	.checklist-box 
-	.checklist-content 
-	.checklist-text{
-		font-size: 28rpx;
-	}
-	/deep/.uni-data-checklist .checklist-group .checklist-box .checkbox__inner{
-		width: 44.44rpx;
-		height: 44.44rpx;
-		border-radius: 50%;
-	}
-	/deep/.uni-data-checklist{
-		display: flex;
-		flex-direction: column;
-	}
-	/deep/.uni-data-checklist /deep/.checklist-group{
-		flex-direction: column;
-	}
-	.popup-title{
-		font-weight: bold;
-		font-size: 29rpx;
-		color: #333333;
-		margin-bottom: 10px;
-	}
-	.fuwu,.guke,.beizhu{
-		width: 100%;
-		display: flex;
-		margin-top: 20px;
-		flex-direction: column;
-	}
-	.popup-view{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-	}
-	.popup-mian-btn span:nth-child(1){
-		background: linear-gradient(90deg, #FE912E, #FF9970);
-	}
-	.popup-mian-btn span:nth-child(2){
-		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-	}
-	.popup-mian-btn span{
-		width: 247rpx;
-		height: 77rpx;
-		line-height: 77rpx;
-		text-align: center;
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #FFFEFE;
-		border-radius: 39rpx;
-	}
-	.popup-mian-btn{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 10px;
-	}
-	
-	.popup-mian{
-		width: 88%;
-		display: flex;
-		flex-direction: column;
-		margin: 5px auto 0px auto;
-	}
-	.popup-head span:nth-child(2){
-		width: 50rpx;
-		height: 50rpx;
-		line-height: 19px;
-		text-align: center;
-		font-size: 24px;
-		color: #15AB8D;
-		border-radius: 50%;
-		border: 3px solid #15AB8D;
-	}
-	.popup-head span:nth-child(1){
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #333333;
-	}
-	.popup-head{
-		width: 100%;
-		height: 99.38rpx;
-		background-color: rgba(21, 171, 141, 0.09);
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 15px;
-	}
-	.popup-content{
-		width: 100%;
-		height: 510px;
-		background: #FFFFFF;
-		border-top-left-radius: 56rpx;
-		border-top-right-radius: 56rpx;
-		display: flex;
-		flex-direction: column;
-	}
-	.item-view-bottom-btn{
-		text-align: center;
-		width: 131rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
-		border-radius: 10rpx;
-		font-weight: bold;
-		font-size: 24rpx;
-		color: #FFFFFF;
-	}
-	.dian{
-		width: 33px;
-		height: 33px;
-		line-height: 16px;
-		border-radius: 50%;
-		border: 3px solid #029D88;
-		display: flex;
-		justify-content: center;
-		font-size: 24px;
-		font-weight: bold;
-		color: #029D88;
-	}
-	.footers-bor{
-		border: 3px solid #029D88;
-		background-color: #fff;
-		color: #029D88;
-	}
-	.footers-true{
-		background: #029D88;
-		color: #fff;
-	}
-	.footers-btn{
-		width: 204rpx;
-		height: 69rpx;
-		text-align: center;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 35rpx;
-		font-weight: 400;
-		font-size: 29rpx;
-	}
-	.footers{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		margin-top: 30px;
-	}
-	.margin-top-view{
-		width: 189rpx;
-		height: 189rpx;
-		background: #EBEBEB;
-		border-radius: 21rpx;
-	}
-	.item_view {
-		margin-top: 30rpx;
-	}
-	.item_view input {
-		margin-top: 20rpx;
-		height: 40rpx;
-		font-size: 24rpx;
-		font-family: PingFang SC Regular, PingFang SC Regular-Regular;
-		font-weight: 400;
-		color: #333333;
-	}
-	.xian {
-		width: 100%;
-		border-bottom: 1rpx solid #f7f7f7;
-		margin-top: 10rpx;
-	}
-	.item_title {
-		font-weight: 400;
-		font-size: 22rpx;
-		color: #666666;
-		font-family: PingFang SC Heavy, PingFang SC Heavy-Heavy;
-	}
-	.fuhao-heis{
-		color: #fff;
-		font-size:25rpx;
-	}
-	.num-heis{
-		color: #fff;
-		font-size:34.72rpx;
-		font-weight: bold;
-	}
-	.yingde-money{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.yuji-title{
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #FFFFFF;
-	}
-	.yiji{
-		width: 100%;
-		height: 72rpx;
-		background: linear-gradient(-90deg, #2EC5AC, #08A28A);
-		border-radius: 21rpx;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 5px;
-		height: 72rpx;
-		margin-top: 10px;
-	}
-	.fuhao-hei{
-		font-size: 25rpx;
-		color: #333333;
-	}
-	.num-hei{
-		font-size:31.25rpx;
-		color: #333333;
-	}
-	.yingde-money{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.yingde-title{
-		font-size: 25rpx;
-		color: #333333;
-	}
-	.yingde{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 5px;
-		height: 73rpx;
-		background: #DCF4EF;
-		border-bottom-left-radius: 24rpx;
-		border-bottom-right-radius: 24rpx;
-	}
-	.mian-content-textarea{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		height: 105px;
-		border-bottom: 1px solid #e5e5e5;
-		padding: 0px 5px;
-		margin-bottom: 10px;
-	}
-	.mian-content-list-title{
-		font-size: 22rpx;
-		color: #333333;
-	}
-	.mian-content-list-title{
-		font-size: 22rpx;
-		color: #555555;
-	}
-	.mian-content{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		background: #fff;
-		border-radius: 24rpx;
-		padding: 10px;
-		margin-top: 20px;
-	}
-	.mian-content-list{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		height: 40px;
-		border-bottom: 1px solid #e5e5e5;
-		padding: 0px 5px;
-	}
-	.textarea-mian{
-		width: 100%;
-		height: 126rpx;
-		background: #F3F3F3;
-		border-radius: 14rpx;
-		padding: 5px;
-	}
-	.mian-view-list-text{
-		font-size: 22rpx;
-		color: #333333;
-	}
-	.mian-content-list-title{
-		font-size: 22rpx;
-		color: #555555;
-	}
-	.mian-view-list-title{
-		font-size: 22rpx;
-		color: #555555;
-	}
-	.mian-view-list:last-child{
-		border: 0px !important;
-	}
-	
-	.mian-view-list{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		height: 40px;
-		border-bottom: 1px solid #e5e5e5;
-		padding: 0px 5px;
-	}
-	
-	.mian-view{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		background: #fff;
-		border-radius: 24rpx;
-		padding: 10px;
-		margin-top: 20px;
-	}
-	.mina-title-bor{
-		width: 111rpx;
-		height: 16rpx;
-		background: linear-gradient(90deg, rgba(255, 255, 255, 0.4), rgba(32, 169, 143, 0.4));
-		border-radius: 8rpx;
-		position: absolute;
-		bottom: 0px;
-		margin-bottom: -2px;
-	}
-	.mina-title-text{
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #333333;
-	}
-	.mina-title{
-		width: 100%;
-		text-align: center;
-		display: flex;
-		flex-direction: column;
-		position: relative;
-		align-items: center;
-		justify-content: center;
-	}
-	.mian-view{
-		width: 100%;
-		padding: 10px;
-		display: flex;
-		flex-direction: column;
-	}
-	.diandan-num{
-		width: 100%;
-		height: 74rpx;
-		line-height: 74rpx;
-		font-size: 25rpx;
-		color: #666666;
-		padding-left: 10px;
-		background: #FFFFFF;
-		border-radius: 24rpx;
-		margin: 15px 0px 20px 0px;
-	}
-	.mian-top-foot-view-img span,.mian-top-foot-view-text{
-		font-size: 25rpx;
-		color: #666666;
-	}
-	.mian-top-foot-view-img image{
-		width: 26.39rpx;
-		height: 25.69rpx;
-		margin-left: 5px;
-	}
-	.mian-top-foot-view-img{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.mian-top-foot-view-title{
-		font-size: 25rpx;
-		color: #666666;
-	}
-	.mian-top-foot-view{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.mian-top-foot{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-	}
-	.number{
-		color: #FF6000;
-		font-size:35.42rpx;
-		font-weight: bold;
-	}
-	.fuhao{
-		color: #FF6000;
-		font-size:28.47rpx;
-		font-weight: bold;
-	}
-	.mian-money-num{
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.mian-money-title{
-		font-size: 25rpx;
-		color: #666666;
-	}
-	.mian-money{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-	.mian-time{
-		font-size: 25rpx;
-		color: #666666;
-	}
-	.mian-title-view{
-		font-weight: bold;
-		font-size: 31rpx;
-		color: #333333;
-	}
-	.mian-title{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.mian-top-head-right{
-		width: 75%;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-	.mian-top-head-img{
-		width: 145rpx;
-		height: 146rpx;
-		border-radius: 14rpx;
-	}
-	.mian-top-head{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		border-bottom: 1px solid #E5E5E5;
-		padding-bottom: 15px;
-		margin-bottom: 7px;
-	}
-	.mian-top{
-		width: 100%;
-		/* height: 331rpx; */
-		padding: 10px;
-		background: #FFFFFF;
-		border-radius: 24rpx;
-	}
-	.mian{
-		width: 95%;
-		display: flex;
-		flex-direction: column;
-		position: absolute;
-		top: 0;
-		margin-top: 20px;
-		overflow: scroll;
-		background: #f7f7f7;
-		padding-bottom:30px;
-		border-radius: 24rpx;
-	}
-	.header{
-		width: 100%;
-		height: 228rpx;
-		background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
-	}
-	.nav-btn{
-		font-size: 25rpx;
-		color: #019C88;
-		line-height: 63rpx;
-	}
-	.nav-title{
-		font-weight: bold;
-		font-size: 38rpx;
-		color: #17181C;
-	}
-	.nav-tab image{
-		width: 15.42rpx;
-		height: 27.64rpx;
-	}
-	.nav-tab{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		padding:10px;
-	}
-	
-	.content{
-		width: 100%;
-		height: 100vh;
-		background-color: #f7f7f7;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding-bottom: 30px;
-		overflow: scroll;
-	}
-</style>
\ No newline at end of file
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index dfcc74c..15ec2c8 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -2102,7 +2102,7 @@
 				} else {
 					this.onBridgeReady(response);
 				}
-			},
+			},  
 			onBridgeReady: function(response) {
 				let that = this;
 				if (!response.package) {
diff --git a/pages/order/index - 副本.vue b/pages/order/index - 副本.vue
deleted file mode 100644
index 369380b..0000000
--- a/pages/order/index - 副本.vue	
+++ /dev/null
@@ -1,737 +0,0 @@
-<!-- 菜单悬浮的原理: 通过给菜单添加position:sticky实现, 用法超简单, 仅APP端的低端机不兼容 https://caniuse.com/#feat=css-sticky -->
-<template>
-	<view class="content">
-		<!-- 对于mescroll-body: 需设置:sticky="true", 此应避免在mescroll-body标签前面加其他非定位的元素, 否则下拉区域会被挤出, 无法会隐藏.-->
-		<!-- 对于mescroll-uni: 则无需设置:sticky="true", 无其他限制和要求 -->
-
-		<!-- sticky吸顶悬浮的菜单, 父元素必须是 mescroll -->
-		<view class="sticky-tabs">
-			<view class=" u-flex padding ding-view">
-				<view class="u-m-r-10">
-					<image :src="avatar" style="width: 100rpx;height: 100rpx;border-radius: 100rpx;"
-						@click="goNav('/pages/my/userinfo')"></image>
-				</view>
-				<view class="u-flex-1 u-m-l-10 " v-if="isLogin && userName">
-					<view class="u-font-18 text-bold">
-						<view class="flex align-center" style="justify-content: space-between;">
-							<view class="margin-left-sm " style="color: #ffffff;">{{ userName }}</view>
-							<view class="labe zhuangtai" @tap="stateSave">
-								<view v-if="isTrue">已上线</view>
-								<view v-if="!isTrue">已离线</view>
-							</view>
-						</view>
-						<view class="flex margin-left-sm margin-top-xs"
-							style="font-size: 22rpx;font-weight: 500;color: #ffffff;">
-							<view v-if="renzheng == 0" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
-								暂未实名认证
-							</view>
-							<view v-if="renzheng == 1" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
-								实名审核中
-							</view>
-							<view v-if="renzheng == 2">
-								已实名认证
-							</view>
-							<view v-if="renzheng == 3" @click.stop="goNav('/my/renzheng/index?classify=' + 1)">
-								实名已拒绝
-							</view>
-						</view>
-
-					</view>
-				</view>
-				<view v-else class="text-xl u-p-l-20 text-bold" @click="goLogin('/pages/public/login')"
-					style="color: #ffffff;">
-					登录
-				</view>
-			</view>
-			<!-- <view class="flex align-center padding-left bg">
-				<image src="../../static/images/data.png" style="width: 26upx;height: 26upx;"></image>
-				<view class="margin-left-xs flex align-center" style="color: #999999;">
-					<view @click="bindData(1)">{{startTime?startTime:'开始时间'}}</view>
-					至
-					<view @click="bindData(2)">{{endTime?endTime:'结束时间'}}</view>
-				</view>
-			</view> -->
-			<!-- <me-tabs v-model="tabIndex" nameKey='title' :tabs="tabs" @change="tabChange"></me-tabs> -->
-			<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
-				inactive-color="#999999" :customStyle="{ 'background-color': '#050505' }" isShowImg textClass="">
-			</u-tabs>
-		</view>
-
-		<mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			style="padding: 0 16px;width: 100%;min-height: 100vh;">
-			<!-- 数据列表 -->
-			<!-- <view v-if="goods.length > 0" class="margin-sm padding-sm bg radius" v-for="(item,index) in goods"
-				:key='index' @click="clickItem(item)"> -->
-			<view class="bgwhite radius margin-bottom-sm padding-bottom-sm " v-for="(item, index) in goods" :key='index'
-				@click="goNav('/my/order/pay?ordersId=' + item.ordersId)">
-				<view class="flex justify-between padding-sm">
-
-					<view class="text-green" v-if="item.status == 1">待付款...</view>
-					<view class="text-green" v-if="item.status == 2">待服务</view>
-					<view class="text-green" v-if="item.status == 5">已完成</view>
-					<view class="text-green" v-if="item.status == 6">服务中</view>
-					<view class="text-green" v-if="item.status == 7">已出发</view>
-					<view class="text-green" v-if="item.status == 8">已到达</view>
-					<view class="text-green" v-if="item.status == 3">待评价</view>
-					<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view>
-					<view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</view>
-					<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
-			
-					<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
-
-					<view class="text-green">预约时间：{{ item.serveTime }}</view>
-				</view>
-				<view class="xian"></view>
-				<view class=" u-flex u-p-t-30 padding-sm">
-					<view class="u-m-r-10">
-						<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
-							size="100">
-						</u-avatar>
-					</view>
-					<view class="u-flex-1  margin-left-xs">
-						<view class="u-font-18  text-bold u-line-1" style="width: 560rpx;">
-							<view class="margin-right-xs text-df margin-left-xs"
-								style="margin-top: 0rpx;display: inline-block;width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
-								{{ item.title }}
-							</view>
-						</view>
-						<view class="margin-left-xs text-cut" style="width:550upx">{{ item.address }}</view>
-
-					</view>
-				</view>
-				<view class="flex u-p-t-20 justify-between align-center padding-sm">
-					<view class=" flex-sub ">
-						实收：<text class="text-df">￥</text><text class="text-xl text-bold">{{ item.sumArtificerMoney
-							}}</text>
-					</view>
-					<view class="flex text-right">
-						<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
-							@click="cancelOrder(item)">取消订单</u-button> -->
-						<!-- <u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="bindphone(item.phone)">联系TA</u-button> -->
-
-						<u-button v-if="item.state == 1" :custom-style="customStyle1" shape="circle" :plain="true"
-							@click="goNav('/my/order/pay?id=' + item.ordersId + '&isTrue=1')">查看详情</u-button>
-						<u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
-							@click="cancel(item)">服务完成</u-button>
-					</view>
-				</view>
-				<view class="xian" v-if="item.status == 6"></view>
-				<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
-					<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #096f4b;">服务倒计时
-					</view>
-					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
-						font-size="30" separator-size="30"></u-count-down>
-					<!-- 				<uni-countdown ref="countDownEl" :title="'剩余'" :showDay="false" :fontSize="'14'"
-						:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
-						color="#20C675" /> -->
-					<!-- <uni-countdown :day="item.endTime.day" :hour="item.endTime.hour" :minute="item.endTime.minute"
-						:second="item.endTime.second">
-					</uni-countdown> -->
-				</view>
-			</view>
-			<empty v-if="goods.length == 0"></empty>
-			<!-- 开始时间 -->
-			<u-picker v-model="startshow" mode="time" :params="paramsStart" @confirm="startData"></u-picker>
-			<!-- 结束时间 -->
-			<u-picker v-model="endshow" mode="time" :params="paramsEnd" @confirm="endData"></u-picker>
-		</mescroll-body>
-	</view>
-</template>
-
-<script>
-	import MescrollMixin from "@/components/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-	import mescrollBody from "@/components/mescroll-uni/components/mescroll-body/mescroll-body.vue";
-	import meTabs from "@/components/mescroll-uni/me-tabs/me-tabs.vue";
-	import empty from '@/components/empty.vue'
-	import * as websocketUtils from 'utils/websocketUtils.js';
-
-	export default {
-		mixins: [MescrollMixin], // 使用mixin
-		components: {
-			mescrollBody,
-			meTabs,
-			empty
-		},
-		data() {
-			return {
-				endOfServiceTimer: null,
-				goods: [], // 数据列表
-				num: 1,
-				game: [],
-				tabs: [{
-					//这四个都支持支持class,style,src,onClick,等html内容
-					//选中图片
-					activityImageProps: {
-						src: '../../static/images/order_01.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					//未选中时的样式
-					noactivityImageProps: {
-						src: '../../static/images/order_011.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					//选中时的文字
-					activityTitleTextProps: {
-						class: 'activityTitleTextProps',
-					},
-					//未选中时的文字
-					noactivityTitleTextProps: {
-						class: 'noactivityTitleTextProps',
-					},
-					name: '今日订单',
-					status: '1'
-				}, {
-					activityImageProps: {
-						src: '../../static/images/order_02.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					noactivityImageProps: {
-						src: '../../static/images/order_022.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					activityTitleTextProps: {
-						class: 'activityTitleTextProps',
-					},
-					noactivityTitleTextProps: {
-						class: 'noactivityTitleTextProps',
-					},
-					name: '待服务',
-					status: '2'
-				}, {
-					activityImageProps: {
-						src: '../../static/images/order_03.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					noactivityImageProps: {
-						src: '../../static/images/order_033.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					activityTitleTextProps: {
-						class: 'activityTitleTextProps',
-					},
-					noactivityTitleTextProps: {
-						class: 'noactivityTitleTextProps',
-					},
-					name: '已完成',
-					status: '3'
-				}, {
-					activityImageProps: {
-						src: '../../static/images/order_04.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					noactivityImageProps: {
-						src: '../../static/images/order_044.png',
-						style: 'width: 26px;height: 26px;',
-					},
-					activityTitleTextProps: {
-						class: 'activityTitleTextProps',
-					},
-					noactivityTitleTextProps: {
-						class: 'noactivityTitleTextProps',
-					},
-					name: '历史订单',
-					status: '4'
-				}],
-				tabIndex: 0, // tab下标
-				isTrue: true,
-				page: 1,
-				limit: 10,
-				userId: 0,
-				status: 1,
-				nickName: '',
-				customStyle: {
-					color: '#999999',
-					border: '2rpx solid #999999',
-					// backgroundColor: '#1E1F31',
-					border: "8rpx",
-					width: '180rpx',
-					height: '54rpx',
-					margin: "0 0 0 20rpx"
-				},
-				customStyle1: {
-					color: '#096f4b',
-					border: '2rpx solid #096f4b',
-					border: "8rpx",
-					width: '180rpx',
-					height: '54rpx',
-					margin: "0 0 0 20rpx"
-				},
-				latitude: '',
-				longitude: '',
-				avatar: '../../static/logo.png',
-				isLogin: true,
-				userName: '',
-				renzheng: 0,
-				startshow: false,
-				endshow: false,
-				paramsStart: {
-					year: true,
-					month: true,
-					day: true,
-					hour: false,
-					minute: false,
-					second: false
-				},
-				paramsEnd: {
-					year: true,
-					month: true,
-					day: true,
-					hour: false,
-					minute: false,
-					second: false
-				},
-				startTime: '',
-				endTime: '',
-			}
-		},
-		onLoad() {
-			this.$queue.showLoading("加载中...");
-			this.userId = uni.getStorageSync('userId')
-			this.nickName = uni.getStorageSync('nickName')
-			let that = this;
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					console.log('当前位置的经度：' + res.longitude);
-					console.log('当前位置的纬度：' + res.latitude);
-					that.$queue.setData('longitude', res.longitude);
-					that.$queue.setData('latitude', res.latitude);
-					that.latitude = res.latitude
-					that.longitude = res.longitude
-				}
-			});
-		},
-		onShow() {
-			let that = this;
-			this.userId = uni.getStorageSync('userId')
-			if (this.userId) {
-				this.getArtificer()
-				this.isLogin = true
-				this.getUserInfo()
-
-			} else {
-				this.isLogin = false
-				this.userName = ''
-				this.browse = 0
-				this.fans = 0
-				this.follow = 0
-				this.visitor = 0
-				this.avatar = '../../static/logo.png'
-			}
-			setTimeout(d => {
-				this.mescroll.resetUpScroll()
-			}, 1000)
-			this.upCallback({
-				num: this.num
-			});
-		},
-		watch: {
-			isTrue(newValue) {
-				if (newValue) {
-					this.$queue.showToast('您已上线');
-				} else {
-					this.$queue.showToast('您已离线');
-				}
-			},
-			isLogin(newValue) {
-				if (!newValue) {
-					this.goods = [];
-				}
-			}
-		},
-		methods: {
-			//获取理疗师的信息
-			getArtificer() {
-				this.$Request.getT("/app/artificer/selectArtificer").then(res => {
-					if (res.code == 0) {
-						if (res.data) {
-							if (res.data.status == 1) {
-								this.isTrue = true
-							} else if (res.data.status == 2) {
-								this.isTrue = false
-							}
-						} else {
-							this.isTrue = false
-						}
-						websocketUtils.changeGoLiveFn(this.isTrue);
-						uni.setStorageSync('artificerId', res.data?.artificerId)
-					}
-				});
-			},
-			stateSave() {
-				this.$Request.postT('/app/artificer/updateArtificer').then(res => {
-					if (res.code == 0) {
-						this.getArtificer();
-					} else {
-						this.$queue.showToast(res.msg);
-					}
-				});
-			},
-			// 拨打电话
-			bindphone(phone) {
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '是否拨打电话',
-					success: function(res) {
-						if (res.confirm) {
-							console.log('用户点击确定', phone);
-							uni.makePhoneCall({
-								phoneNumber: phone //仅为示例
-							});
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			/*下拉刷新的回调 */
-			downCallback() {
-				// 这里加载你想下拉刷新的数据, 比如刷新轮播数据
-				// loadSwiper();
-				// 下拉刷新的回调,默认重置上拉加载列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
-				this.mescroll.resetUpScroll()
-			},
-			timeFormat(param) {
-				return param < 10 ? '0' + param : param;
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				// debugger;
-				if (!this.isLogin) {
-					uni.hideLoading();
-					if (this.mescroll) this.mescroll.endSuccess(); // 隐藏加载状态栏
-					return;
-				}
-				// debugger;
-
-				let curTab = this.tabs[this.tabIndex].status
-				this.num = page.num;
-				let data = {
-					type: curTab,
-					page: page.num,
-					limit: page.size,
-					startTime: this.startTime,
-					endTime: this.endTime
-				}
-				this.$Request.get('/app/artificer/selectTodayOrder', data).then(res => {
-					uni.hideLoading();
-					this.mescroll.endBySize(res.data.list.length, res.data.totalCount)
-					if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
-					this.goods = [...this.goods, ...res.data.list]; //追加新数据
-
-					this.goods.forEach(ret => {
-						switch (ret.state) {
-							case '1':
-								ret.statusName = '今日订单'
-								break;
-							case '2':
-								ret.statusName = '待完成'
-								break;
-							case '3':
-								ret.statusName = '已完成'
-								break;
-							case '4':
-								ret.statusName = '历史订单'
-								break;
-						}
-						if (ret.status == 6 && ret.endTime) {
-							let afterTimeStamp = new Date(ret.endTime).getTime() / 1000;
-							let currentTimeStamp = new Date().getTime() / 1000;
-							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
-							this.endOfServiceTimer = formatTimeStamp;
-						}
-						if (this.$refs.countDownEl) this.$refs.countDownEl.update();
-					})
-					this.mescroll.endSuccess(res.data.list.length); // 隐藏加载状态栏
-
-				}).catch(() => {
-					//联网失败, 结束加载
-					this.mescroll.endErr();
-				});
-			},
-			// 切换菜单
-			tabChange(index) {
-				this.tabIndex = index
-				this.goods = []; // 置空列表,显示加载进度条
-				this.mescroll.resetUpScroll()
-			},
-			// 取消订单
-			cancelOrder(e) {
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '确认取消订单吗？取消订单将会被扣除信用分！',
-					success: function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId,
-							}
-							that.$queue.showLoading('提交中...')
-							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
-								uni.hideLoading();
-								if (res.code == 0) {
-									that.mescroll.resetUpScroll()
-								} else {
-									that.$queue.showToast(res.msg);
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			// 完成订单
-			cancel(e) {
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '如果服务未完成点击完成订单会遭到平台违规处理，请确认服务是否完毕?',
-					success: function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId,
-								accomplishLongitude: that.longitude,
-								accomplishLatitude: that.latitude
-							}
-							that.$queue.showLoading('提交中...')
-							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
-								uni.hideLoading();
-								if (res.code == 0) {
-									that.mescroll.resetUpScroll()
-									websocketUtils.uploadAudioEnd(); //关闭音频上传
-								} else {
-									that.$queue.showToast(res.msg);
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			//时间弹框开关
-			bindData(index) {
-				console.log(index, 1111)
-				if (index == 1) {
-					this.startshow = true
-				} else if (index == 2) {
-					this.endshow = true
-
-				}
-			},
-			//开始时间
-			startData(e) {
-				// console.log(e)
-				this.startTime = e.year + ' ' + e.month + '-' + e.day
-			},
-			// 结束时间
-			endData(e) {
-				this.endTime = e.year + ' ' + e.month + '-' + e.day
-				// console.log(this.endTime)
-				this.mescroll.resetUpScroll()
-			},
-			goNav(e, name) {
-				console.log(e)
-				if (this.userId) {
-					uni.navigateTo({
-						url: e
-					})
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '您还未登录,请先登录',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								uni.navigateTo({
-									url: '/pages/public/login'
-								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					})
-				}
-			},
-			getUserInfo() {
-				this.$Request.get("/app/user/selectUserById").then(res => {
-					if (res.code == 0) {
-						this.userName = res.data.userName
-						this.invitationCode = res.data.invitationCode
-						this.avatar = res.data.avatar ? res.data.avatar : '../../static/logo.png'
-						this.isAuthentication = res.data.isAuthentication
-
-						// uni.setStorageSync('isAuthentication', res.data.isAuthentication)
-
-						uni.setStorageSync('avatar', res.data.avatar)
-						uni.setStorageSync('invitationCode', res.data.invitationCode)
-						uni.setStorageSync('zhiFuBao', res.data.zhiFuBao)
-						uni.setStorageSync('zhiFuBaoName', res.data.zhiFuBaoName)
-
-						if (res.data.isAuthentication == 0 || res.data.isAuthentication == null) {
-							this.renzheng = 0
-							uni.setStorageSync("renzheng", this.renzheng)
-						} else if (res.data.isAuthentication == 1) {
-							this.renzheng = 1
-							uni.setStorageSync("renzheng", this.renzheng)
-						} else if (res.data.isAuthentication == 2) {
-							this.renzheng = 2
-							uni.setStorageSync("renzheng", this.renzheng)
-						} else if (res.data.isAuthentication == 3) {
-							this.renzheng = 3
-							uni.setStorageSync("renzheng", this.renzheng)
-						} else if (res.data.isAuthentication == 4) {
-							this.renzheng = 4
-							uni.setStorageSync("renzheng", this.renzheng)
-						} else if (res.data.isAuthentication == 5) {
-							this.renzheng = 5
-							uni.setStorageSync("renzheng", this.renzheng)
-						} else if (res.data.isAuthentication == 6) {
-							this.renzheng = 6
-							uni.setStorageSync("renzheng", this.renzheng)
-						}
-
-					}
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	/*
-	sticky生效条件：
-	1、父元素不能overflow:hidden或者overflow:auto属性。(mescroll-body设置:sticky="true"即可, mescroll-uni本身没有设置overflow)
-	2、必须指定top、bottom、left、right4个值之一，否则只会处于相对定位
-	3、父元素的高度不能低于sticky元素的高度
-	4、sticky元素仅在其父元素内生效,所以父元素必须是 mescroll
-	*/
-
-   .ding-view{
-	   width: 95%;
-	   height: 290rpx;
-	   background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
-	   border-radius: 24rpx;
-	   margin: 10px auto 0px auto;
-	   align-items: end;
-   }
-	.content{
-		width: 100%;
-		height: 100vh;
-		background-image: url('../../static/index/swim.jpg');
-		background-repeat: no-repeat;
-		background-size: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding-bottom: 30px;
-	}
-
-	.u-tabs {
-		padding: 16px;
-		width: 90%;
-		height: 199rpx;
-		background: #F7F7F7 !important;
-		border-radius: 21rpx;
-		margin: -70px auto 0px auto;
-	}
-
-	/deep/.u-scroll-view {
-		padding: 10px 16px !important;
-	}
-
-	/deep/.u-tab-item {
-		height: auto !important;
-		line-height: normal !important;
-		width: 25% !important;
-		padding: 0 !important;
-	}
-
-	/deep/.u-tab-bar {
-		display: none !important;
-	}
-
-	.sticky-tabs {
-		width: 100%;
-		z-index: 990;
-		position: fixed;
-		top: 0px;
-		// background-color: #fff;
-	}
-
-	/deep/.activityTitleTextProps {
-		color: #096f4b;
-		font-size: 14px;
-	}
-
-	/deep/.noactivityTitleTextProps {
-		color: #666666;
-		font-size: 14px;
-	}
-
-	// 使用mescroll-uni,则top为0
-	.mescroll-uni,
-	/deep/.mescroll-uni {
-		.sticky-tabs {
-			top: 300upx;
-		}
-	}
-
-	.demo-tip {
-		padding: 18upx;
-		font-size: 24upx;
-		text-align: center;
-	}
-
-	/deep/.page-box {
-		background: top !important;
-	}
-
-	.bg {
-		background-image: linear-gradient(to right, #223845, #00a85b);
-		padding: 16px 16px 36px 16px;
-	}
-
-	.bgwhite {
-		background-color: #FFFFFF;
-	}
-
-	.xian {
-		width: 100%;
-		height: 1rpx;
-		border: 1rpx solid #f8f8f8;
-		margin-top: 20rpx;
-	}
-
-	.pintuan_syrs {
-		color: #999999;
-		font-size: 20upx;
-		margin: 20rpx 20rpx 0rpx;
-		display: flex;
-		padding-right: 18upx;
-	}
-
-	.labe {
-		width: 42px;
-		background: #FFE45A;
-		border-radius: 15rpx 0rpx 15rpx 0rpx;
-		display: inline-flex;
-		align-items: center;
-		color: #7A3A00;
-		font-size: 22rpx;
-		font-weight: 400;
-		height: 36rpx;
-		margin-left: 20rpx;
-		justify-content: center;
-		text {
-			width: 12rpx;
-			height: 12rpx;
-			background: #20C675;
-			border-radius: 50%;
-			margin-right: 8rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/static/index/fun_banner4 - 副本.png b/static/index/fun_banner4 - 副本.png
deleted file mode 100644
index 4ae4314..0000000
Binary files a/static/index/fun_banner4 - 副本.png and /dev/null differ
diff --git a/unpackage/release/apk/__UNI__B37C795__20240626092226.apk b/unpackage/release/apk/__UNI__B37C795__20240626092226.apk
deleted file mode 100644
index efb6eb4..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240626092226.apk and /dev/null differ
diff --git a/unpackage/release/apk/__UNI__B37C795__20240626150355.apk b/unpackage/release/apk/__UNI__B37C795__20240626150355.apk
deleted file mode 100644
index 9af39cf..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240626150355.apk and /dev/null differ