1

mer_uniapp/pages/goods/goods_details/index.vue

@@ -463,12 +463,18 @@
 									立即购买
 								</button>
 							</form>
-							<form @submit="goSecondHand" report-submit="true" v-if="dataItem && dataItem.authorId !== uid && dataItem.saleStatus == 0">
+							<form @submit="goSecondHand" report-submit="true" v-if="dataItem.saleStatus == 0">
 								<button style="border-radius: 0;" :class="productInfo.systemFormId == 0 ? 'bnts' : 'longBnts'" class="buy"	
 								 form-type="submit">
 									立即购买
 								</button>
 							</form>
+						<!-- 	<form @submit="goSecondHand" report-submit="true" v-if="dataItem && dataItem.authorId !== uid && dataItem.saleStatus == 0">
+								<button style="border-radius: 0;" :class="productInfo.systemFormId == 0 ? 'bnts' : 'longBnts'" class="buy"	
+								 form-type="submit">
+									立即购买
+								</button>
+							</form> -->
 						</block>
 						<!-- 积分商品 -->
 						<block v-else-if="productType === ProductTypeEnum.Integral">

mer_uniapp/pages/goods/returns_and_refunds/index.vue

@@ -9,7 +9,7 @@
 						</view>
 						<view class='text'>
 							<view class='name line1 line-heightOne mb20'>{{orderInfo.productName}}</view>
-							<view class='sku text-999 f-s-20 line-heightOne mb20'>{{orderInfo.sku}}</view>
+							<view class='sku text-999 f-s-20 line-heightOne mb20'>{{orderInfo.sku | refundStatusFilter}}</view>
 							<view class='acea-row f-s-26 text-right row-middle'>
 								<view class="mr10 text-2828">￥{{orderInfo.price || orderInfo.refundPrice}} </view>
 								<view class='num text-999'> x {{orderInfo.applyRefundNum}}</view>
@@ -125,7 +125,7 @@
 				url: 1
 			});
 			this.refundOrderNo = options.refundOrderNo;
-			this.orderType = options.refundOrderNo || '';
+			this.orderType = options.orderType || '';
 			this.returnGoodsType = options.returnGoodsType ? Number(options.returnGoodsType) : 1;
 			if (this.returnGoodsType === 1) {
 				if (!this.$Cache.get('expressListAll')) {

mer_uniapp/pages/goods/second_refunds_details/index.vue

@@ -191,7 +191,7 @@
 						<view class="btn on" v-if="refundInfo.returnGoodsType==1&&refundInfo.refundStatus==0"  @click="modify(refundInfo,'2',0,1)">
 							退款审核
 						</view>
-						<view class="btn on" v-if="refundInfo.refundStatus==4" @click="modify(refundInfo, 2, 1,2)">确认收货</view>
+						<view class="btn on" v-if="refundInfo.refundStatus==5" @click="modify(refundInfo, 2, 1,2)">确认收货</view>
 					 </view>
 					 <PriceChange :change="change" :orderInfo="orderInfo" :isRefund="isRefund"
 					 	v-on:statusChange="statusChange($event)" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"
@@ -610,6 +610,9 @@
 					});
 				});
 			},
+			init(){
+				uni.navigateBack()
+			},
 			/**
 			 *
 			 * 剪切订单号

mer_uniapp/pages/trade_fair/trade_return_list/index.vue

@@ -11,7 +11,7 @@
 				<view>申请记录</view>
 			</view>
 			<view class='item' :class='refundTypeStatus==10 ? "on": ""' @click="statusClick(10)">
-				<view>待我处理</view>
+				<view>卖家处理</view>
 			</view>
 		</view>
 		<view class="borderPad mt20">
@@ -69,10 +69,10 @@
 					</view>
 					<view class="btn-box acea-row" style="justify-content: flex-end;">
 						<view></view>
-						<view v-if="refundTypeStatus == 10 && items.refundStatus === 0" class="btn btn-999 acea-row row-center line-heightOne mr-20" @click="handleRevokeAudit(items.refundOrderNo, false)">审核不通过</view>
-						<view v-if="items.refundStatus === 0 || items.refundStatus === 4 || items.refundStatus === 5" class="btn acea-row row-center line-heightOne"
-						 :class="refundTypeStatus == 10 ? 'bg-tk-color' : 'btn-999'" @click="refundTypeStatus == 10 ? handleRevokeAudit(items.refundOrderNo, true) : handleRevokeRefund(items.refundOrderNo)">{{refundTypeStatus == 10 ? '审核通过' : '撤销售后'}}</view>
-						<view v-if="items.refundStatus === 4 && items.afterSalesType === 2" style="color: #fff;" class="btn bg-color acea-row row-center line-heightOne ml20"
+						<!--view v-if="refundTypeStatus == 10 && items.refundStatus === 0" class="btn btn-999 acea-row row-center line-heightOne mr-20" @click="handleRevokeAudit(items.refundOrderNo, false)">审核不通过</view-->
+						<view v-if="refundTypeStatus !== 10 &&( items.refundStatus === 0 || items.refundStatus === 4 || items.refundStatus === 5)" class="btn btn-999 acea-row row-center line-heightOne"
+						  @click="handleRevokeRefund(items.refundOrderNo)">撤销售后</view>
+						<view v-if="items.refundStatus === 4 && items.afterSalesType === 2 && refundTypeStatus != 10 " style="color: #fff;" class="btn bg-color acea-row row-center line-heightOne ml20"
 						 @click="handleReturningRefund(items)">退回商品</view>
 					</view>
 				</view>
@@ -155,7 +155,7 @@
 				rejectOrder: ''
 			};
 		},
-		computed: mapGetters(['isLogin']),
+		computed: mapGetters(['isLogin',"uid"]),
 		watch: {
 			isLogin: {
 				handler: function(newV, oldV) {
@@ -308,7 +308,12 @@
 				let url;
 				if (this.refundTypeStatus == -1) {
 					goProductDetail(item.productId, 0, '', JSON.stringify({id: item.productId}), 1);
-				} else {
+				} 
+				else if( item.merId == this.uid) {
+					console.log(item.merId )
+					url = `/pages/goods/second_refunds_details/index?orderType=secondHand&orderTypeId=${this.refundTypeStatus}&refundOrderNo=` + item.refundOrderNo
+				}
+				else{
 					url = `/pages/goods/refund_details/index?orderType=secondHand&orderTypeId=${this.refundTypeStatus}&refundOrderNo=` + item.refundOrderNo
 				}
 				// #ifdef MP