Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

pages/order/index.vue

@@ -65,19 +65,22 @@
 					<view class="id_left">
 						订单编号：{{item.orderId}}
 					</view>
-					<view class="id_right"  v-if="item.refundType ==0">
+					<view class="id_right" v-if="item.refundType ==0">
 						未退款
 					</view>
-					<view class="id_right"  v-if="item.refundType ==1">
-						已退款
+					<view class="id_right" v-if="item.refundType ==1">
+						退款成功
 					</view>
-					<view class="id_right"  v-if="item.refundType ==2">
+					<view class="id_right" v-if="item.refundType ==2">
 						退款中
 					</view>
-					<view class="id_right"  v-if="item.refundType ==3">
+					<view class="id_right" v-if="item.refundType ==3">
 						退款失败
 					</view>
-					<view class="id_right"  v-if="item.refundType ==99">
+					<view class="id_right" v-if="item.refundType ==4">
+						拒绝退款
+					</view>
+					<view class="id_right" v-if="item.refundType ==99">
 						挂起
 					</view>
 				</view>
@@ -125,7 +128,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="is_show" @click.stop="unfold(index)" v-if="item.orderLinkCategorySpecItems&&item.orderLinkCategorySpecItems.length > 2">
+					<view class="is_show" @click.stop="unfold(index)"
+						v-if="item.orderLinkCategorySpecItems&&item.orderLinkCategorySpecItems.length > 2">
 						{{item.isShow?'收起查看':'展开查看'}}
 						<image src="/static/order/hidden.png" mode="" v-if="item.isShow"></image>
 						<image src="/static/order/show.png" mode="" v-else></image>
@@ -437,7 +441,7 @@
 			//跳转实况记录
 			goLive(item) {
 				uni.navigateTo({
-					url: '/pages/order/serviceOrder/live?taskId=' + item.taskId+'&checkType='+item.checkType
+					url: '/pages/order/serviceOrder/live?taskId=' + item.taskId + '&checkType=' + item.checkType
 				})
 			},
 			selectTime() {
@@ -821,19 +825,19 @@
 				// this.paramState = '06'
 				// this.serveType = '02'
 				let params = {
-				  taskId: item.taskId,
-				  checkType: item.checkType,
-				  uptype: 4,         // 道路救援
-				  paramState: '06',
-				  serveType: '02',
-				  // isUpload: true
+					taskId: item.taskId,
+					checkType: item.checkType,
+					uptype: 4, // 道路救援
+					paramState: '06',
+					serveType: '02',
+					// isUpload: true
 				}
 				let queryString = Object.keys(params)
-				  .map(key => `${key}=${encodeURIComponent(params[key])}`)
-				  .join('&');
+					.map(key => `${key}=${encodeURIComponent(params[key])}`)
+					.join('&');
 				uni.navigateTo({
 					// url:'/pages/order/arriveUpload、${queryString}'  paramState
-					 url: `/pages/order/arriveUpload?taskId=${item.taskId}&checkType=${item.checkType}&uptype=4&paramState=06&serveType=02&jumptype=0`
+					url: `/pages/order/arriveUpload?taskId=${item.taskId}&checkType=${item.checkType}&uptype=4&paramState=06&serveType=02&jumptype=0`
 				})
 			},
 			//救援完成拍照

pages/order/record.vue

@@ -208,13 +208,20 @@
 					reOrderId:this.reOrderId
 				}
 				this.$http.post("/app/order/locaOrder/agreeRefund",data).then(res => {
-					if (res.statusCode == 200) {
+					console.log(res)
+					if (res.data.code == 200) {
 						uni.showToast({
 							icon: 'none',
 							title: '商家已同意退款'
 						})
 						this.getRecord()
 					}
+					else{
+						uni.showToast({
+							icon: 'none',
+							title: res.data.message
+						})
+					}
 				})
 				
 			}