productDev/jinkuai.git

			@@ -168,10 +168,11 @@
			<view class="order-footer-btn">
			<view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">取消订单</view>
			<view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 \|\| info.status ===1\|\| info.status ===2)">取消订单</view>
			<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && (info.status ===4 && info.commentStatus!=1)">去评价</view>
			<view class="order-footer-btn-b" @click="show2=true" v-if="userInfo.id === info.releaseMemberId && (info.status ===4 && info.commentStatus!=1)">去评价</view>
			<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId &&((info.status ===3 && info.type !==2)\|\| (info.status ===0 && info.type===2))">去支付</view>
			<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 \|\| info.status ===1\|\| info.status ===2)">修改订单</view>
			<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && (info.isUpdate==1 && info.status ===2)">修改确认</view>
			<view class="order-footer-btn-b" @click="show3 =true" v-if="userInfo.id === info.releaseMemberId && (info.status ===2)">开始作业</view>
			<view class="order-footer-btn-b" v-if="userInfo.id !== info.releaseMemberId && (info.status ===1)">抢单</view>
			</view>
			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
			@@ -191,7 +192,20 @@
			<view class="btn2" @click="cancelDo">确认取消</view>
			</view>
			</u-modal>

			<u-modal
			title="温馨提示"
			:show="show3"
			closeOnClickOverlay
			showCancelButton
			>
			<view class="slot-content">
			确认开始作业吗？
			</view>
			<view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
			<view class="btn1" @click="show3 = false">我再想想</view>
			<view class="btn2" @click="beginDo">确认开始</view>
			</view>
			</u-modal>
			<!-- 支付弹窗 -->
			<u-popup :show="show1" round="15" mode="bottom">
			<view class="zhifu">
			@@ -225,7 +239,7 @@
			<view class="zhifu-pj">
			<view class="zhifu-pj-label">服务评价</view>
			<view class="zhifu-pj-val">
			<u-rate :count="count" activeColor="#FFC331" size="26" v-model="value"></u-rate>
			<u-rate :count="count" activeColor="#FFC331" size="26" v-model="value" @click=""></u-rate>
			</view>
			</view>
			<view class="zhifu-textarea">
			@@ -250,6 +264,8 @@
			show1: false,
			show2: false,
			count: 5,
			show3:false,
			value:0,
			wayList:[],
			bgImg: require('@/static/image/bg_green@2x.png'),
			id: null,
			@@ -267,10 +283,10 @@
			methods:{
			commentDo(){
			var that = this
			var param = { info: that.commentInfo,level:that.value,orderId: this.id}
			var param = { info: that.commentInfo,level:that.value\|\|0,orderId: this.id}
			this.$u.api.comment(param).then(res =>{
			if(res.code ===200){
			that.show=false
			that.show2=false
			uni.showToast({ title: '评价成功', icon: 'error', duration: 2000 });
			that.getOrderData()
			}
			@@ -278,10 +294,10 @@
			},
			beginDo(){
			var that = this
			var param = { info: that.commentInfo,level:that.value,orderId: this.id}
			var param = {orderId: this.id}
			this.$u.api.begin(param).then(res =>{
			if(res.code ===200){
			that.show=false
			that.show3=false
			uni.showToast({ title: '操作成功', icon: 'error', duration: 2000 });
			that.getOrderData()
			}
			@@ -289,7 +305,7 @@
			},
			confirmUpdDo(){
			var that = this
			var param = { info: that.commentInfo,level:that.value,orderId: this.id}
			var param = {orderId: this.id}
			this.$u.api.confirmUpdDo(param).then(res =>{
			if(res.code ===200){
			that.show=false
			@@ -300,7 +316,7 @@
			},
			acceptDo(){
			var that = this
			var param = { info: that.commentInfo,level:that.value,orderId: this.id}
			var param = {orderId: this.id}
			this.$u.api.accept(param).then(res =>{
			if(res.code ===200){
			that.show=false