From a6b19376b34e027b43f7af8e783be35ee108c9b7 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Sun, 24 Dec 2023 21:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/index/topCenter.vue | 2 +- src/view/order.vue | 88 ++++++++++++++++++------------ src/view/storeLogin.vue | 56 +------------------ 3 files changed, 56 insertions(+), 90 deletions(-) diff --git a/src/components/index/topCenter.vue b/src/components/index/topCenter.vue index d6fc1cc..b8baf70 100644 --- a/src/components/index/topCenter.vue +++ b/src/components/index/topCenter.vue @@ -74,7 +74,7 @@
{{ data?.merchantCountInfo?.todayMerchantCount }} - 件
+ 个
diff --git a/src/view/order.vue b/src/view/order.vue index 39c8aac..f27348a 100644 --- a/src/view/order.vue +++ b/src/view/order.vue @@ -290,13 +290,17 @@ const addConfigData = (data) => { `
${item.merchant.is_trader ? '自营' : '非自营'}
`, `
- - ${item.orderProduct[0].cart_info.product.store_name} + +
+ + ${item.orderProduct[0].cart_info.product.store_name} +
+ ${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name}
`, `
${item.total_price}
`, `
${orderStatus(item.status)}
`, - `
${item.user_address}
`, + `
${item.user_address_code.substring(item.user_address_code.length - 1)}队
`, `
${payType(item.pay_type)}
`, ] ) @@ -362,20 +366,23 @@ const addConfigData = (data) => { `
${item.merchant.mer_name}
`, `
${item.merchant.is_trader ? '自营' : '非自营'}
`, `
- - ${item.orderProduct[0].cart_info.product.store_name} - - + + + + +
+ + ${item.orderProduct[0].cart_info.product.store_name} +
${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name} -
`, `
${item.cost}
`, `
${orderStatus(item.status)}
`, - `
${item.user_address}
`, + `
${item.user_address_code.substring(item.user_address_code.length - 1)}队
`, `
${payType(item.pay_type)}
`, ] @@ -453,13 +460,23 @@ const addConfigData2 = (data) => { `
${item.user.nickname}
`, `
${item.merchant.mer_name}
`, `
${item.merchant.is_trader ? '自营' : '非自营'}
`, - `
${item.mer_delivery_address || '--'}
`, + `
${item.order.user_address_code.substring(item.order.user_address_code.length - 1) || '--'} 队
`, `
${item.refund_price}
`, `
+ + + + + + +
- - ${item.refundProduct[0].product.cart_info.product.store_name} - + ${item.refundProduct[0].product.cart_info.product.store_name} +
+ + + + ${item.refundProduct[0].product.product_num} ${item.refundProduct[0].product.cart_info.product.unit_name} @@ -536,16 +553,19 @@ const addConfigData2 = (data) => { `
${item.user.nickname}
`, `
${item.merchant.mer_name}
`, `
${item.merchant.is_trader ? '自营' : '非自营'}
`, - `
${item.mer_delivery_address || '--'}
`, + `
${item.order.user_address_code.substring(item.order.user_address_code.length - 1) || '--'} 队
`, `
${item.refund_price}
`, `
+
- - ${item.refundProduct[0].product.cart_info.product.store_name} - + ${item.refundProduct[0].product.cart_info.product.store_name} +
+ + + + ${item.refundProduct[0].product.product_num} ${item.refundProduct[0].product.cart_info.product.unit_name} -
`, `
@@ -631,21 +651,20 @@ const addConfigData3 = (data) => {
`, `
核销订单
`, - `
${item.user_address}
`, + `
${item.user_address_code.substring(item.user_address_code.length - 1)}队
`, `
${item.real_name}
`, `
${item.merchant.mer_name}
`, `
${item.merchant.is_trader ? '自营' : '非自营'}
`, `
- - ${item.orderProduct[0].cart_info.product.store_name} + +
+ + + + ${item.orderProduct[0].cart_info.product.store_name} +
- - ${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name} - - - -
`, `
${item.pay_price} @@ -708,19 +727,20 @@ const addConfigData3 = (data) => {
`, `
核销订单
`, - `
${item.user_address}
`, + `
${item.user_address_code.substring(item.user_address_code.length - 1)}队
`, `
${item.real_name}
`, `
${item.merchant.mer_name}
`, `
${item.merchant.is_trader ? '自营' : '非自营'}
`, `
- - ${item.orderProduct[0].cart_info.product.store_name} - - - - ${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name} +
+ + ${item.orderProduct[0].cart_info.product.store_name} +
+ + ${item.orderProduct[0].product_num}${item.orderProduct[0].cart_info.product.unit_name} +
`, diff --git a/src/view/storeLogin.vue b/src/view/storeLogin.vue index e58a9db..73e69a6 100644 --- a/src/view/storeLogin.vue +++ b/src/view/storeLogin.vue @@ -308,7 +308,7 @@ const addData2 = (data) => { `
`, `
${item.store_name}
`, `
`, - `
${item.total} 单 + `
${item.total} 人
`, ] @@ -341,7 +341,6 @@ const addData3 = (data) => { merchant_count_mainApi( - { ...query } ).then((res) => { for (let key in res.data) { @@ -360,61 +359,8 @@ watch( } ) -onMounted(() => { - // for (let i = 0; i < 20; i++) { - // config3.data.push( - // [ - // `
${i + 1}
`, - // `
`, - // `
商asdasdasdssadasdasdasd品名称
`, - // `
`, - // `
5495 单 - // - //
`, - - // ], - - - // ) - // } - // for (let i = 0; i < 20; i++) { - // config1.data.push( - // [ - // `
${i + 1}
`, - // `
`, - // `
商品名称
`, - // `
`, - // `
5495 单 - // - //
`, - - // ], - - - // ) - // } for (let i = 0; i < 20; i++) { - // config2.data.push( - // [ - // `
${i + 1}
`, - // `
`, - // `
商品名称
`, - // `
`, - // `
5495 单 - // - //
`, - - // ], - - - // ) - // } - - - -}) -