瀏覽代碼

二手交易-我的订单

ZZ 2 周之前
父節點
當前提交
ed648c920c
共有 2 個文件被更改,包括 27 次插入2 次删除
  1. 20 1
      mer_uniapp/filters/commFilter.js
  2. 7 1
      mer_uniapp/pages/goods/order_list/index.vue

+ 20 - 1
mer_uniapp/filters/commFilter.js

@@ -199,6 +199,20 @@ export function orderStatusFilterv2(status) {
 	}
 	}
 	return statusMap[status]
 	return statusMap[status]
 }
 }
+// 二手交易过滤器
+export function orderStatusFilterv3(status) {
+	const statusMap = {
+		0: '待付款',
+		1: '待发货',
+		2: '部分发货',
+		3: '待核销',
+		4: '待收货',
+		5: '已送达',
+		6: '已完成',
+		9: '已取消'
+	}
+	return statusMap[status]
+}
 /**
 /**
  * 支付方式
  * 支付方式
  */
  */
@@ -299,4 +313,9 @@ export function moneyFormat(value) {
 //时间戳
 //时间戳
 export function dataTime(data){
 export function dataTime(data){
 	return new Date(data.replace(/-/g, "/")).getTime() / 1000
 	return new Date(data.replace(/-/g, "/")).getTime() / 1000
-}
+}
+// 导出过滤器
+module.exports = {
+  orderStatusFilterv2: orderStatusFilterv2,
+  orderStatusFilterv3: orderStatusFilterv3,
+};

+ 7 - 1
mer_uniapp/pages/goods/order_list/index.vue

@@ -61,7 +61,7 @@
 						<view v-if="item.refundStatus == 3" class='font_color'>已退款</view>
 						<view v-if="item.refundStatus == 3" class='font_color'>已退款</view>
 						<template v-else>
 						<template v-else>
 							<view v-if="item.groupBuyRecordStatus==99||item.status==9||item.groupBuyRecordStatus==10 || orderType =='secondHand'" 
 							<view v-if="item.groupBuyRecordStatus==99||item.status==9||item.groupBuyRecordStatus==10 || orderType =='secondHand'" 
-								class='font_color'>{{item.status | orderStatusFilterv2}}</view>
+								class='font_color'>{{getStatusText(item.status)}}</view>
 							<view v-else class='font_color'>{{item.groupBuyRecordStatus===0?'拼团中':'拼团失败'}}</view>
 							<view v-else class='font_color'>{{item.groupBuyRecordStatus===0?'拼团中':'拼团失败'}}</view>
 						</template>
 						</template>
 					</view>
 					</view>
@@ -242,6 +242,7 @@
 	import animationType from '@/utils/animationType.js';
 	import animationType from '@/utils/animationType.js';
 	import easyLoadimage from '@/components/base/easy-loadimage.vue';
 	import easyLoadimage from '@/components/base/easy-loadimage.vue';
 	import orderPay from "@/mixins/OrderPay.js";
 	import orderPay from "@/mixins/OrderPay.js";
+	import {orderStatusFilterv2, orderStatusFilterv3} from "@/filters/commFilter.js";
 	const app = getApp();
 	const app = getApp();
 	export default {
 	export default {
 		mixins: [orderPay],
 		mixins: [orderPay],
@@ -311,6 +312,11 @@
 			if (options.orderType) this.orderType = options.orderType
 			if (options.orderType) this.orderType = options.orderType
 		},
 		},
 		methods: {
 		methods: {
+			getStatusText(status) {
+				return this.orderType === 'secondHand'
+					? orderStatusFilterv3(status)
+					: orderStatusFilterv2(status);
+			},
 			/**
 			/**
 			 * 分享打开
 			 * 分享打开
 			 *
 			 *