From 699974b91821ea19aa4e7f40fb5d01c571d27b09 Mon Sep 17 00:00:00 2001
From: wpf <2187978347@qq.com>
Date: Sun, 17 Dec 2023 14:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/orderDetail/indexOther.vue   | 2 +-
 pages/admin/orderList/indexOther.vue     | 3 ++-
 pages/users/order_list/indexOther.vue    | 4 ++--
 pages/users/supply_procurement/index.vue | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/admin/orderDetail/indexOther.vue b/pages/admin/orderDetail/indexOther.vue
index bfe4fff..d461e8f 100644
--- a/pages/admin/orderDetail/indexOther.vue
+++ b/pages/admin/orderDetail/indexOther.vue
@@ -48,7 +48,7 @@
 						</view>
 					</view>
 					<view class="money">
-						<view class="x-money">￥{{ item.cart_info.productAttr.price }}</view>
+						<view class="x-money">￥{{ item.cart_info.productAttr.procure_price }}</view>
 						<view class="num">x{{ item.product_num }}
 							<text class="font-color refund_num" v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
 						</view>
diff --git a/pages/admin/orderList/indexOther.vue b/pages/admin/orderList/indexOther.vue
index 0acb94b..0a74d3a 100644
--- a/pages/admin/orderList/indexOther.vue
+++ b/pages/admin/orderList/indexOther.vue
@@ -125,7 +125,7 @@
 								</view>
 							</view>
 							<view class="money">
-								<view class="x-money">￥{{ val.cart_info.productAttr.price }}</view>
+								<view class="x-money">￥{{ val.cart_info.productAttr.procure_price }}</view>
 								<view class="num">x{{ val.product_num }}</view>
 								<!-- <view class="refund-num" v-if="val.product_num-val.refund_num>0">{{val.product_num-val.refund_num}}件{{val.is_refund==1?'退款中' : val.is_refund==2 ? '已退款' : val.is_refund==3?'全部退款':''}}</view> -->
 							</view>
@@ -264,6 +264,7 @@
 				current: "",
 				change: false,
 				refundMark: false,
+				showBar: false, //是否显示二维码
 				types: 1,
 				where: {
 					page: 1,
diff --git a/pages/users/order_list/indexOther.vue b/pages/users/order_list/indexOther.vue
index 021b4a8..9acb8d2 100644
--- a/pages/users/order_list/indexOther.vue
+++ b/pages/users/order_list/indexOther.vue
@@ -135,7 +135,7 @@
 															<view>x{{goods.product_num}}</view>
 														</view>
 														<view v-else class='money'>
-															<view>￥{{goods.cart_info.productAttr.price}}</view>
+															<view>￥{{goods.cart_info.productAttr.procure_price}}</view>
 															<view>x{{goods.product_num}}</view>
 														</view>
 													</view>
@@ -242,7 +242,7 @@
 													<view>x{{goods.product_num}}</view>
 												</view>
 												<view class='money' v-else>
-													<view>￥{{goods.cart_info.productAttr.price}}</view>
+													<view>￥{{goods.cart_info.productAttr.procure_price}}</view>
 													<view>x{{goods.product_num}}</view>
 												</view>
 												<view v-if="item.pay_type==8" style="text-align: right;width: 100%;font-size: 14px;">先货后款 实付:￥0.00</view>
diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
index 09101e9..edd0bf5 100644
--- a/pages/users/supply_procurement/index.vue
+++ b/pages/users/supply_procurement/index.vue
@@ -68,6 +68,7 @@
               item.content = '先发货 后付款';
             }
           })
+		  res.data = res.data.filter(item=>item.name!='线上铺货'&&item.name!='实体铺货')
           this.list = res.data;
         })
       },