From 4e3e18cdb0d75c098b68353ef8c86cdd7c0f79b2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 21 八月 2025 15:27:34 +0800
Subject: [PATCH] 111

---
 small-program/pages/order-details/order-details.vue |  459 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 399 insertions(+), 60 deletions(-)

diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 9e62cc0..f3f372d 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -4,64 +4,79 @@
 			宸插彇娑�
 		</view> -->
 		<view class="order-head" :style="{ backgroundImage: 'url(' + bgImg + ')' }">
-			<view class="order-head-status">寰呮帴鍗�</view>
-			<view class="order-head-info">鎮ㄥ凡缁忔垚鍔熷彂璧风敤宸ュ崟锛岃鑰愬績绛夊緟鎺ュ崟</view>
+			<view class="order-head-status">{{info.statusName || ''}}</view>
+			<view class="order-head-info">{{getStatusInfo()}}</view> 
 		</view>
 		<view class="order-quxiao">
-			<view class="order-quxiao-btn">鍙栨秷璁㈠崟</view>
+			<view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view>
+			<view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
 		</view>
-		<view class="order-user">
+		<view class="order-user"  v-if="userInfo.id === info.releaseMemberId">
 			<view class="order-user-info">
 				<view class="user-info-l">
 					<view class="user-info-l-image">
-						<image src="/static/logo.png" mode="widthFix"></image>
+						<image v-if="info.acceptCoverImage" :src="info.acceptCoverImage" mode="widthFix"></image>
+						<image v-else src="/static/logo.png" mode="widthFix"></image>
 					</view>
 					<view class="user-info-l-i">
-						<view class="user-info-l-i-top">鑾茶姳鍔冲姟鍏徃</view>
+						<view class="user-info-l-i-top">{{info.acceptName || '鍖垮悕'}}</view>
 						<view class="user-info-l-i-bottom">
 							<view class="user-info-l-i-bottom-item">
 								<text>璇勫垎锛�</text>
-								<text>90</text>
+								<text>{{info.score || '-'}}</text>
 							</view>
 							<view class="user-info-l-i-bottom-item">
 								<text>鍗曟暟锛�</text>
-								<text>100</text>
+								<text>{{info.publishNum || 0}}</text>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="user-info-r">
+				<view class="user-info-r" @click="contactPhone(info.acceptPhone)">
 					<image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
 					<text>鑱旂郴甯堝倕</text>
 				</view>
 			</view>
 		</view>
-		<view class="order-info">
+		<view class="order-info" >
 			<view class="order-info-title">
 				<view class="x"></view>
-				<text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
+				<text v-if="info.type===0">鐢ㄥ伐鍗�-{{(info.workType===0?'閲囨憳宸�':(info.workType===1?'鍒嗘嫞宸�':'鍖呰宸�')) }}</text> 
+				<text v-if="info.type===1">杩愯揣鍗�-{{info.categoryName || ''}}-{{info.carUnit || ''}}</text>
+				<text v-if="info.type===2">璁㈤鍗�</text>
+				
 			</view>
-			<view class="order-info-wz">钁¤悇锝�2000鏂�</view>
+			<view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}鏂�</view>
+			<view v-if="info.type===1" class="order-info-wz">{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}闇�{{info.priceNum2 || '' }}杈�</view> 
 			<view class="order-info-address">
 				<image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
 				<view class="order-info-address-info">
-					<text>闀挎睙瑗胯矾澶ц渶灞辨.鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
-					<text>鍦扮偣鎻忚堪鏂囧瓧鍦扮偣鎻忚堪鍦扮偣鎻忚堪鏂囧瓧</text>
+					<text>{{info.location || '' }}</text>
+					<text>{{info.locationRemark || '' }}</text>
 				</view>
 			</view>
 			<view class="order-info-address">
 				<image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
 				<view class="order-info-address-info">
-					<text>闀挎睙瑗胯矾澶ц渶灞辨.鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
+					<text>{{info.startDate || ''}}-{{info.endDate || ''}}({{info.totalDays||0}}澶�)</text>
+				</view>
+			</view>
+			<view class="address" v-if="info.type===1 && wayList && wayList.length>0">
+				<view class="address-xian"></view>
+				<view class="address-row"  v-for="(item,index) in wayList" style="display: block;margin: 10px" :key="'bbb'+index">
+					<image v-if="index === 0" src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
+					<image v-if="index >0 && index < wayList.length-1" src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
+					<image v-if="index === wayList.length-1" src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
+					<text>{{item.location || ''}}</text>
 				</view>
 			</view>
 			<view class="order-info-x"></view>
 			<view class="order-info-supplement">
 				<view class="order-info-supplement-title">闇�姹傝ˉ鍏咃細</view>
-				<view class="order-info-supplement-val">鐢峰コ閮藉彲锛屽寘鍗堥キ锛屽共娲婚夯鍒╋紝鏃╀笂9鐐瑰埌涓嬪崍4鐐癸紝鍙厤璐瑰甫1鏂よ憽钀勫洖瀹�</view>
+				<view class="order-info-supplement-val">{{info.supplement || '' }}</view>
 				<view class="order-info-supplement-list">
-					<view class="order-info-supplement-list-item" v-for="(item,index) in 4" :key="index">
-						<image src="/static/logo.png" mode="widthFix"></image>
+					<view class="order-info-supplement-list-item" v-for="(item,index) in info.multifileList" v-if="info.multifileList && info.multifileList.length>0" :key="item.imgurl">
+						<image v-if="item.fileurlFull"  :src="item.fileurlFull" @click="previemImg(item.fileurlFull)" mode="widthFix"></image>
 					</view>
 					<view style="width: 156rpx; height: 0;"></view>
 					<view style="width: 156rpx; height: 0;"></view>
@@ -70,35 +85,43 @@
 			<view class="order-info-price">
 				<view class="price-row">
 					<view class="price-row-label">璐圭敤鏍囧噯</view>
-					<view class="price-row-val">0.5鍏�/鏂�</view>
+					<view class="price-row-val" v-if="info.type !==2">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</view>
+					<view class="price-row-val" v-if="info.type ===2">
+						<text  v-for="(item,index) in wayList">
+							 {{item.name || ''}}{{((item.price||0)/100).toFixed(2)}}鍏儃{item.num||0}}浠絳{index != wayList.length-1?'|':''}}
+						</text>
+					</view>
 				</view>
 				<view class="price-row">
-					<view class="price-row-label">棰勪及鎬昏垂鐢�</view>
-					<view class="price-row-val" style="color: #FF0000;">楼1000.00</view>
+					<view class="price-row-label">棰勪及鎬昏垂鐢�(鍏�)</view>
+					<view class="price-row-val" style="color: #FF0000;">
+						楼{{((info.estimatedAccount||0)/100).toFixed(2) }}
+					</view>
 				</view>
 			</view>
 		</view>
-		<view class="order-info">
+		<view class="order-info" v-if="info.commentStatus ===1">
 			<view class="order-info-title">
 				<text>璇勪环</text>
 			</view>
-			<u-rate :count="count" activeColor="#FFC331" size="26" v-model="value"></u-rate>
+			<u-rate :count="count" activeColor="#FFC331" size="26" v-model="info.commentLevel"></u-rate>
 			<view class="order-info-remark">
-				骞叉椿鍒╄惤鏁堢巼楂樺共娲诲埄钀芥晥鐜囬珮骞叉椿鍒╄惤鏁堢巼楂樺共娲诲埄钀芥晥鐜囬珮骞叉椿鍒╄惤鏁堢巼楂�
+				{{ info.commentInfo || '-'}}
 			</view>
 		</view>
-		<view class="order-ren">
+		<view class="order-ren" v-if="userInfo.id === info.acceptMemberId">
 			<view class="order-ren-left">
 				<view class="order-ren-left-img">
-					<image src="/static/logo.png" mode="widthFix"></image>
+					<image v-if="info.releaseCoverImage" :src="info.releaseCoverImage" mode="widthFix"></image>
+					<image v-else src="/static/logo.png" mode="widthFix"></image>
 				</view>
-				<text>鍙插ぉ鏁�</text>
-				<view class="order-ren-left-tip">涓氫富</view>
+				<text>{{info.releaseName || '鍖垮悕'}}</text>
+				<view class="order-ren-left-tip">鍙戝崟鏂�</view>
 			</view>
 			<view class="order-ren-x"></view>
-			<view class="order-ren-lx">
+			<view class="order-ren-lx"  @click="contactPhone(info.releasePhone)">
 				<image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
-				<text>鑱旂郴涓氫富</text>
+				<text>鍙戝崟鏂�</text>
 			</view>
 		</view>
 		<view class="order-info">
@@ -108,43 +131,49 @@
 			<view class="order-info-list">
 				<view class="order-info-list-item">
 					<text>璁㈠崟缂栧彿锛�</text>
-					<text>202107131742520001</text>
+					<text>{{info.code || ''}}</text>
 				</view>
 				<view class="order-info-list-item">
 					<text>涓嬪崟鏃堕棿锛�</text>
-					<text>2025-07-26 09:32:11</text>
+					<text>{{info.createTime||'-'}}</text>
 				</view>
 				<view class="order-info-list-item">
 					<text>鎺ュ崟鏃堕棿锛�</text>
-					<text>2025-07-26 09:32:11</text>
+					<text>{{info.acceptTime||'-'}}</text>
 				</view>
 				<view class="order-info-list-item">
 					<text>寮�濮嬫椂闂达細</text>
-					<text>2025-07-26 09:32:11</text>
+					<text>{{info.workStartTime||'-'}}</text>
 				</view>
 				<view class="order-info-list-item">
 					<text>瀹屾垚鏃堕棿锛�</text>
-					<text>2025-07-26 09:32:11</text>
+					<text>{{info.finishTime||'-'}}</text>
 				</view>
 				<view class="order-info-list-item">
 					<text>鏀粯鏃堕棿锛�</text>
-					<text>2025-07-26 09:32:11</text>
+					<text>{{info.payTime||'-'}}</text>
 				</view>
 				<view class="order-info-list-item">
 					<text>鏀粯鏂瑰紡锛�</text>
-					<text>2025-07-26 09:32:11</text>
+					<text>{{info.payMethod==0?'寰俊鏀粯':'-'}}</text>
 				</view>
 				<view class="order-info-list-item">
 					<text>浜ゆ槗鍗曞彿锛�</text>
-					<text>2025-07-26 09:32:11</text>
+					<text>{{info.wxExternalNo || '-'}}</text>
 				</view>
 			</view>
 		</view>
-		<view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));"></view>
-		<view class="order-footer">
-			<view class="order-footer-btn">
-				<view class="order-footer-btn-a" @click="show = true">鍙栨秷璁㈠崟</view>
-				<view class="order-footer-btn-b">淇敼璁㈠崟</view>
+		<view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view>
+		<view class="order-footer" v-if="![99].includes(info.status)">
+			<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" @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))" @click="show1 = true">鍘绘敮浠�</view>
+				<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 ||  info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
+				<view class="order-footer-btn-b" @click="show5 =true" v-if="userInfo.id === info.acceptMemberId && (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"  @click="show6 =true" v-if="userInfo.id !== info.releaseMemberId && (info.status ===1)">鎶㈠崟</view>
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
 		</view>
@@ -160,10 +189,54 @@
 			</view>
 			<view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
 				<view class="btn1" @click="show = false">鎴戝啀鎯虫兂</view>
-				<view class="btn2" @click="show = false">纭鍙栨秷</view>
+				<view class="btn2" @click="cancelDo">纭鍙栨秷</view>
 			</view>
 		</u-modal>
-		
+		<u-modal
+			title="娓╅Θ鎻愮ず"
+			:show="show4"
+			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="show = false">鎴戝啀鎯虫兂</view>
+				<view class="btn2" @click="cancelDo">纭鍙栨秷</view>
+			</view>
+		</u-modal>
+		<u-modal
+			title="娓╅Θ鎻愮ず"
+			:show="show6"
+			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="show6 = false">鎴戝啀鎯虫兂</view>
+				<view class="btn2" @click="acceptDo">纭鎺ュ崟</view>
+			</view>
+		</u-modal>
+		<u-modal
+			title="娓╅Θ鎻愮ず"
+			:show="show5"
+			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="show5=false">鎴戝啀鎯虫兂</view>
+				<view style="width: 20rpx; height: 100%;"></view>
+				<view class="btn2" style="background-color: #f56c6c; color: #ffffff;" @click="confirmUpdDo(1)">涓嶅悓鎰�</view>
+				<view style="width: 20rpx; height: 100%;"></view>
+				<view class="btn2" @click="confirmUpdDo(0)">鍚屾剰</view>
+			</view>
+		</u-modal>
 		<!-- 鏀粯寮圭獥 -->
 		<u-popup :show="show1" round="15" mode="bottom">
 			<view class="zhifu">
@@ -173,16 +246,16 @@
 					<image @click="show1 = false" src="/static/icon/ic_close@2x.png" mode="widthFix"></image>
 				</view>
 				<view class="zhifu-c">
-					<view class="zhifu-c-info">
-						璇风‘璁ら噾棰濆苟鏀粯璐圭敤缁� <text>鑾茶姳鍔冲姟鍏徃</text>
+					<view class="zhifu-c-info" v-if="info.type !== 2">
+						璇风‘璁ら噾棰濆苟鏀粯璐圭敤缁� <text>{{info.acceptName}}</text>
 					</view>
 					<view class="zhifu-c-info1">鏀粯閲戦锛�</view>
 					<view class="zhifu-c-input">
 						<image src="/static/icon/楼@2x.png" mode="widthFix"></image>
-						<input type="number" placeholder="璇疯緭鍏�" />
+						<input type="number" v-model="amount" :disabled="info.type === 2" placeholder="璇疯緭鍏�" />
 					</view>
 				</view>
-				<view class="zhifu-botton">纭鏀粯</view>
+				<view class="zhifu-botton" @click="payment">纭鏀粯</view>
 			</view>
 		</u-popup>
 		
@@ -197,31 +270,254 @@
 				<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">
 					<image src="/static/icon/ic_pingjia@2x.png" mode="widthFix"></image>
-					<u--textarea placeholder="璇疯璇存偍瀵规湰娆′氦鏄撶殑鎰熷彈" border="none" count></u--textarea>
+					<u--textarea placeholder="璇疯璇存偍瀵规湰娆′氦鏄撶殑鎰熷彈" border="none" v-model="commentInfo" count></u--textarea>
 				</view>
-				<view class="zhifu-botton" style="margin-top: 60rpx;">绔嬪嵆璇勪环</view>
+				<view class="zhifu-botton" style="margin-top: 60rpx;" @click="commentDo">绔嬪嵆璇勪环</view>
 			</view>
 		</u-popup>
-		
 	</view>
 </template>
 
 <script>
+	import { mapState } from 'vuex'
 	export default {
+		computed: {
+			...mapState( ['userInfo'])
+		},
 		data() {
 			return {
 				show: false,
 				show1: false,
 				show2: false,
-				count: 4,
-				value: 2,
-				bgImg: require('@/static/image/bg_green@2x.png')
+				count: 5, 
+				show3:false,
+				show4:false,
+				show5:false,
+				show6:false,
+				value:0,
+				wayList:[],
+				bgImg: require('@/static/image/bg_green@2x.png'),
+				id: null,
+				loading:false,
+				commentInfo:'',
+				info: {},
+				amount: ''
 			};
+		},
+		onLoad(options) {
+			console.log(options)
+			var id = options.id
+			this.id = id
+			this.getOrderData()
+		},
+		methods:{
+			// 淇敼
+			jumpEdit() {
+				if (this.info.type === 0 && this.info.workType === 0) {
+					uni.navigateTo({
+						url: `/pages/using-workers/using-workers?id=${this.info.id}`
+					})
+				} else if (this.info.type === 0 && this.info.workType === 1) {
+					uni.navigateTo({
+						url: `/pages/sorting/sorting?id=${this.info.id}`
+					})
+				} else if (this.info.type === 0 && this.info.workType === 2) {
+					uni.navigateTo({
+						url: `/pages/packaging-worker/packaging-worker?id=${this.info.id}`
+					})
+				} else if (this.info.type === 1) {
+					uni.navigateTo({
+						url: `/pages/freight/freight?id=${this.info.id}`
+					})
+				}
+			},
+			payment() {
+				var that = this
+				// 璁㈤
+				if (this.info.type === 2) {
+					this.$u.api.reusePay({
+						orderId: this.info.id
+					}).then(res => {
+						if (res.code === 200) {
+							wx.requestPayment({
+								timeStamp: res.data.object.timeStamp,
+								nonceStr: res.data.object.nonceStr,
+								package: res.data.object.packageVal,
+								signType: res.data.object.signType,
+								paySign: res.data.object.paySign,
+								success (res1) {
+									if (res1.errMsg = 'requestPayment:ok') {
+										that.show1 = false
+										uni.showToast({ title: '鏀粯鎴愬姛', icon: 'success', duration: 2000 });
+										that.getOrderData()
+									}
+								},
+								fail(err) {
+									console.log(err)
+								}
+							})
+						}
+					})
+				} else {
+					this.$u.api.doneOrder({
+						orderId: this.info.id,
+						amount: Number(this.amount) * 100
+					}).then(res => {
+						if (res.code === 200) {
+							wx.requestPayment({
+								timeStamp: res.data.object.timeStamp,
+								nonceStr: res.data.object.nonceStr,
+								package: res.data.object.packageVal,
+								signType: res.data.object.signType,
+								paySign: res.data.object.paySign,
+								success (res1) {
+									if (res1.errMsg = 'requestPayment:ok') {
+										that.show1 = false
+										uni.showToast({ title: '鏀粯鎴愬姛', icon: 'success', duration: 2000 });
+										that.getOrderData()
+									}
+								},
+								fail(err) {
+									console.log(err)
+								}
+							})
+						}
+					})
+				}
+			},
+			commentDo(){
+				var that = this
+				var param = { info: that.commentInfo,level:that.value||0,orderId: this.id}
+				this.$u.api.comment(param).then(res =>{
+					if(res.code ===200){
+						that.show2=false
+						uni.showToast({ title: '璇勪环鎴愬姛', icon: 'error', duration: 2000 });
+						that.getOrderData()
+					}
+				}) 
+			},
+			beginDo(){
+				var that = this
+				var param = {orderId: this.id}
+				this.$u.api.begin(param).then(res =>{
+					if(res.code ===200){
+						that.show3=false
+						uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'error', duration: 2000 });
+						that.getOrderData()
+					}
+				}) 
+			},
+			confirmUpdDo(status){
+				var that = this
+				var param = {orderId: this.id,status:status}
+				this.$u.api.confirmUpd(param).then(res =>{
+					if(res.code ===200){
+						that.show5=false
+						uni.showToast({ title: '纭鎴愬姛', icon: 'error', duration: 2000 });
+						if(status==1){
+							uni.navigateBack({ delta: 1 })
+						}else{
+							that.getOrderData()
+						} 
+					}
+				}) 
+			},
+			acceptDo(){
+				var that = this
+				var param = {orderId: this.id}
+				this.$u.api.accept(param).then(res =>{
+					if(res.code ===200){
+						that.show6=false
+						uni.showToast({ title: '鎶㈠崟鎴愬姛', icon: 'error', duration: 2000 });
+						that.getOrderData()
+					}
+				}) 
+			},
+			cancelDo(){
+				var that = this
+				var param ={ orderId:that.id}
+				this.$u.api.cancelOrder(param).then(res =>{
+					if(res.code ===200){
+						that.show=false
+						uni.showToast({ title: '璁㈠崟鍙栨秷鎴愬姛', icon: 'error', duration: 2000 });
+						that.getOrderData()
+						if(that.userInfo.id !== that.info.releaseMemberId){
+							uni.navigateBack({ delta: 1 })
+						}else{
+							that.getOrderData()
+						} 
+					}
+				 }) 
+			},
+			previemImg(src){
+				uni.previewImage({
+					current: src, // 褰撳墠鏄剧ず鍥剧墖鐨刪ttp閾炬帴
+					urls: [src] // 闇�瑕侀瑙堢殑鍥剧墖http閾炬帴鍒楄〃
+				  });
+			},
+			contactPhone(phone){
+				if(phone !=null && phone!=''){
+					uni.makePhoneCall({
+					   phoneNumber: phone  
+					})
+				}
+			},
+			//璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑�
+			getStatusInfo(){
+				if(this.userInfo.id === this.info.acceptMemberId){
+					//濡傛灉鏄帴鍗曟柟
+					if(this.info.status === 0){
+						return ''
+					}else if(this.info.status === 1){
+						return ''
+					}else if(this.info.status === 2){
+						return '鎮ㄥ凡鎺ュ崟锛岃鎸夋椂瀹屾垚璁㈠崟浠诲姟'
+					}else if(this.info.status === 3){
+						return '璁㈠崟杩涜涓紝璇锋寜鏃跺畬鎴愯鍗曚换鍔�'
+					}else if(this.info.status === 4){
+						return '鎮ㄧ殑璁㈠崟宸插畬鎴�'
+					}else if(this.info.status === 99){
+						return '璁㈠崟宸插彇娑�'
+					}
+				}else{
+					//濡傛灉鏄彂甯冩柟
+					if(this.info.status === 0){
+						return '璇峰敖蹇畬鎴愭敮浠橈紝鍙戝竷璁㈠崟'
+					}else if(this.info.status === 1){
+						return '鎮ㄨ鍗曞凡缁忔垚鍔熷彂璧凤紝璇疯�愬績绛夊緟鎺ュ崟'
+					}else if(this.info.status === 2){
+						return '璁㈠崟寮�濮嬩綔涓氬悗锛岃鎷栧姩涓嬫柟鈥滃紑濮嬩綔涓氣�濇寜'
+					}else if(this.info.status === 3){
+						return this.info.type!=2?'璁㈠崟瀹屾垚鍚庤鐐瑰嚮涓嬫柟鈥滃畬鎴愬苟鏀粯鈥濇寜閽�':'璁㈠崟姝e湪杩涜涓�'
+					}else if(this.info.status === 4){
+						return this.info.commentStatus==1?'鎮ㄧ殑璁㈠崟宸插畬鎴愶紝娆㈣繋鍐嶆浣跨敤': '鎮ㄧ殑璁㈠崟宸插畬鎴愶紝璇峰強鏃惰瘎浠�'
+					}else if(this.info.status === 99){
+						return '璁㈠崟宸插彇娑�'
+					}
+				}
+			},
+			getOrderData(){
+				var that = this
+				var param ={ orderId:that.id}
+				this.$u.api.getDetail(param).then(res =>{
+					if(res.code ===200){
+						if(that.userInfo.id === res.data.releaseMemberId || that.userInfo.id === res.data.acceptMemberId ){
+							that.info = res.data
+							that.amount = ((that.info.estimatedAccount || 0) / 100).toFixed(2)
+							if(that.info.wayInfo){
+								that.wayList = JSON.parse(that.info.wayInfo)
+							}
+						}else{
+							uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
+						}
+					}
+				 }) 
+			}
 		}
 	}
 </script>
@@ -403,9 +699,9 @@
 				box-sizing: border-box;
 				display: flex;
 				align-items: center;
-				justify-content: space-between;
+				justify-content: space-between; 
 				.order-footer-btn-a {
-					width: 334rpx;
+					flex: 1;
 					height: 88rpx;
 					line-height: 88rpx;
 					text-align: center;
@@ -416,7 +712,7 @@
 					border: 1rpx solid #B2B2B2;
 				}
 				.order-footer-btn-b {
-					width: 334rpx;
+					flex: 1;
 					height: 88rpx;
 					line-height: 88rpx;
 					text-align: center;
@@ -568,7 +864,9 @@
 					&:last-child {
 						margin: 0 !important;
 					}
-					.price-row-label {
+					.price-row-label { 
+						flex-shrink: 0;
+						margin-right: 30rpx;
 						font-weight: 400;
 						font-size: 30rpx;
 						color: #777777;
@@ -788,4 +1086,45 @@
 			}
 		}
 	}
+	.address {
+		width: 100%;
+		background: #F7F7F7;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		margin-bottom: 24rpx;
+		position: relative;
+		.address-xian {
+			position: absolute;
+			top: 17px;
+			left: 24px;
+			width: 1rpx;
+			height: calc(100% - 60rpx);
+			border-right: 2rpx dashed #B2B2B2;
+		}
+		.address-row {
+			position: relative;
+			z-index: 2;
+			width: 100%;
+			display: flex !important; 
+			align-items: center;
+			margin-bottom: 30rpx ;
+			margin-left: 0rpx !important;
+			margin-top: 0rpx !important;
+			&:last-child { 
+				margin-bottom: 0 !important;
+			}
+			image {
+				width: 36rpx;
+				height: 36rpx;
+				flex-shrink: 0;
+				margin-right: 24rpx;
+			}
+			text {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
 </style>

--
Gitblit v1.9.3