Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/components/order/index.vue

@@ -186,8 +186,9 @@
 			tagText() {
 				return this.timeout ? '超' : '剩'
 			},
-			timeText() {
-				return this.orderType == 4 ? this.orderData.submissionTime : this.orderData.auditDatetime
+			timeText() {
+				let time = this.orderType == 4 ? this.orderData.orderFinishDatetime : this.orderData.auditDatetime
+				return this.$u.timeFormat(time, 'yyyy.mm.dd hh:MM:ss')
 			},
 			timeTitle() {
 				return this.orderType == 4 ? '提交时间：' : '审核时间：'

src/pages/order/detail.vue

@@ -507,6 +507,7 @@
 					// 已派单的时显示拒单按钮
 					this.allowRejection = true
 					this.submitType = "orderAccept"
+					this.readMore = false
 				} else if (orderStatus < 31 && orderBusinessType === '订单池') {
 					// 抢单
 					this.centerButton = "appoint1"
@@ -514,6 +515,7 @@
 					this.showCenterBtn = true
 					this.submitType = "orderGan"
 					this.showTimeOut=false
+					this.readMore = false
 				} else if (orderStatus === 31 && !this.order.appointmentDatetime) {
 					// 预约
 					this.centerButton = "appoint2"
@@ -522,6 +524,7 @@
 					this.showCenterBtn = true
 					this.showTimeSelect = true
 					this.isAllowDianhuaAndDaohang = true
+					this.readMore = true
 					this.submitType = "workerAppointment"
 					this.loadCalendar()
 				} else if (orderStatus === 31 && this.order.appointmentDatetime) {
@@ -542,6 +545,7 @@
 					this.allowFeedback = true
 					this.showCenterBtn = true
 					this.scenePhoto = true
+					this.readMore = true
 					this.isAllowDianhuaAndDaohang = true
 				} else {}
 			},
@@ -635,7 +639,7 @@
 			clickFeedback(){
 				// 过程反馈
 				uni.navigateTo({
-					url: 'pages/order/feedback?orderId='+this.order.orderId+'&categoryId='+this.order.categoryId
+					url: 'pages/order/feedback?orderId='+this.order.orderId+'&categoryId='+this.order.categoryId+'&showGY=' + (this.centerButtonText != '预约' ? '1' : '0')
 				})
 			},
 			filish(){

src/pages/order/feedback.vue

@@ -75,6 +75,7 @@ export default {
 		return {
 			orderId: null,
 			categoryId: null,
+			showGY: true, // 非预约进来才显示改约
 			background: {
 				backgroundColor: 'none'
 			},
@@ -156,6 +157,7 @@ export default {
 		if (e) {
 			this.orderId = e.orderId || null;
 			this.categoryId = e.categoryId || null;
+			this.showGY = e.showGY == '1'
 		}
 		uni.showLoading({
 			title: '数据加载中',
@@ -171,7 +173,18 @@ export default {
 			let params = { categoryId: self.categoryId };
 			let res = await self.$u.api.feedbackConfig(params);
 			if (res && res.code == 200) {
-				self.feedback = res.data;
+					
+				if (!self.showGY) {
+					delete res.code['改约']
+				}
+				var data = {}
+				for (var item in res.data) {
+					if (item != '改约' || self.showGY) {
+						data[item] = res.data[item]
+					}
+				}
+				
+				self.feedback = data;
 				self.buildConfig();
 			}
 			uni.hideLoading();