2

mer_uniapp/api/order.js

@@ -148,7 +148,7 @@ export function getExpressOrderDetail(uni) {
 }
 
 /**
- * 订单详情-快递
+ * 订单详情-二手交易
  * @param string uni
  */
 export function getSecondHandOrderDetail(uni) {

mer_uniapp/components/WaterfallsFlowItem/WaterfallsFlowItem.vue

@@ -2,7 +2,7 @@
 	<view class='list acea-row row-between-wrapper' :data-theme="theme">
 		<view class='item' hover-class='none' @click="goDetail(item)">
 			<view :class="isDynamics ? 'pictruesss' : 'pictrue'">
-				<view v-show="item.stock===0" class="sellOut">已售罄</view>
+				<view v-show="item.stock===0 || (items.saleStatus === 1 && isManage == 1)" class="sellOut">已售罄</view>
 				<easy-loadimage :image-src="!userFair ? item.image : item.cover" mode="widthFix"></easy-loadimage>
 				<view v-if="item.activityStyle" :style="{ backgroundImage: `url(${item.activityStyle})` }" class="border-picture"></view>
 			</view>

mer_uniapp/pages/goods/order_pay_status/index.vue

@@ -218,11 +218,15 @@
 			 */
 			goOrderDetails: function(e) {
 				if (this.apiType == 'fast') {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/substitute_fast_mail/my_fast_mail/index'
 					});
+				} else if (this.apiType == 'secondHand') {
+					uni.redirectTo({
+						url: `/pages/trade_fair/trade_fair_user/index`
+					});
 				} else {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: this.fromType =='svip'?'/pages/activity/vip_paid/index':this.type==2?`/pages/activity/status/index?orderNo=${this.orderNo}`:'/pages/goods/order_list/index'
 					});
 				}