1

mer_uniapp/pages/goods/order_details/index.vue

@@ -152,8 +152,8 @@
 							<view class='cor-86 f-s-28 userRemark'>{{orderInfo.orderInvoiceList[0].expressName}}</view>
 						</view>
 						<view class='flex justify-between userRemarkBox' v-if="orderInfo.orderInvoiceList && orderType == 'secondHand'">
-							<view class="f-s-28 color28">快递地址：</view>
-							<view class='cor-86 f-s-28 userRemark'>{{orderInfo.orderInvoiceList[0].expressRecordType}}</view>
+							<view class="f-s-28 color28">快递单号：</view>
+							<view class='cor-86 f-s-28 userRemark'>{{orderInfo.orderInvoiceList[0].trackingNumber}}</view>
 						</view>
 					</view>
 					<!-- <view v-if="orderInfo.status > 1" class="p-24 wrapper borRadius14">
@@ -281,10 +281,10 @@
 					<view class='bnt cancel' v-show="Number(orderInfo.status) >1 &&Number(orderInfo.status) < 9 && orderInfo.status!=3&&shippingType===1"
 					 @tap='godeliverRecord'>发货记录
 					</view>
-					<view class='bnt bg_color' v-show="orderType !== 'secondHand' && orderInfo.status==4 && orderInfo.refundStatus!==3" @tap='confirmOrder'>确认收货</view>
-					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 2 && orderInfo.status == 1 && orderInfo.uid == uid" @tap='confirmOrder'>确认收货</view>
-					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 1 && orderInfo.status == 4 && orderInfo.uid == uid" @tap='confirmOrder'>确认收货</view>
-					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 1 && orderInfo.status == 1 && orderInfo.sellerId == uid"
+					<view class='bnt bg_color' v-show="orderInfo.status==4 && orderInfo.refundStatus!==3" @tap='confirmOrder'>确认收货</view>
+					<!-- <view class='bnt bg_color' v-show="orderType == 'secondHand' && orderInfo.status == 4 && orderInfo.uid == uid" @tap='confirmOrder'>确认收货</view> -->
+<!-- 					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 1 && orderInfo.status == 4 && orderInfo.uid == uid" @tap='confirmOrder'>确认收货</view>
+ -->					<view class='bnt bg_color' v-show="orderType == 'secondHand' && shippingType == 1 && orderInfo.status == 1 && orderInfo.sellerId == uid"
 					 @tap='confirmFHOrder'>确认发货</view>
 					 <!-- <view class='bnt bg_color' v-show="orderType == 'secondHand' && orderInfo.refundStatus === 1 && orderInfo.sellerId == uid"
 					  @tap='refundFHOrder'>同意退款</view> -->

mer_uniapp/pages/goods/returns_and_refunds/index.vue

@@ -1,5 +1,5 @@
-<template>
-	<view>
+<template> 
+	<view :data-theme="theme">
 		<form @submit="submitForm" report-submit='true'>
 			<view class='apply-return'>
 				<view class='goodsStyle borRadius14'>

mer_uniapp/pages/goods/second_refunds_details/index.vue

@@ -336,7 +336,7 @@
 			},
 			async savePrice(opt) {
 				let that = this,
-					data = {};
+				data = {};
 				data.refundOrderNo = that.orderInfo.refundOrderNo;
 				if (that.apiModalType == 0) {
 					if(opt.type==2&&!opt.refuse_reason){
@@ -354,8 +354,8 @@
 							this.$util.Tips({
 								title: '审核成功'
 							})
-							this.init();
 							this.change = false
+							this.orderRefundInfo();
 						}else{
 							this.$util.Tips({
 								title:res.message
@@ -386,8 +386,8 @@
 								this.$util.Tips({
 									title: '操作成功'
 								})
-								this.init();
-								this.change = false
+								that.orderRefundInfo();
+								that.change = false
 							}else{
 								this.$util.Tips({
 									title:res.message
@@ -404,13 +404,13 @@
 						}
 						refundOrderAudit(requestObj).then(res=>{
 							if(res.code==200){
-								this.$util.Tips({
+								that.$util.Tips({
 									title: '操作成功'
 								})
-								this.init();
-								this.change = false
+								that.orderRefundInfo();
+								that.change = false
 							}else{
-								this.$util.Tips({
+								that.$util.Tips({
 									title:res.message
 								})
 							}
@@ -430,7 +430,7 @@
 								this.$util.Tips({
 									title: '操作成功'
 								})
-								this.init();
+								this.orderRefundInfo();
 								this.change = false
 							}else{
 								this.$util.Tips({
@@ -450,7 +450,7 @@
 								this.$util.Tips({
 									title: '操作成功'
 								})
-								this.init();
+								this.orderRefundInfo();
 								this.change = false
 							}else{
 								this.$util.Tips({