From adf4e106d82aeab065564dc60c8c1a45ffa02e83 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 19 Oct 2022 14:42:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-buy/goods.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index 6a80af3..c17b6d0 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -38,7 +38,7 @@
 						<view v-else>
 							
 							<!-- 批发价格 -->
-							<div class='price-row flex' v-if="wholesaleList.length">
+							<div class='price-row flex' v-if="goodsDetail.salesModel === 'WHOLESALE'">
 								<div class='goods-price' v-for="(item,index) in wholesaleList" :key="index">
 									<span>
 										￥

From 9b5e2ec7f0ac9872830698264bd20761a2e2e4c8 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 20 Oct 2022 10:03:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/fillorder.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index da23637..2ef494b 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -147,9 +147,9 @@
             <p class="goods-prices">
               <span>￥</span>
               <span class="goods-price">{{
-                $options.filters.goodsFormatPrice(val.goodsSku.price)[0]
+                $options.filters.goodsFormatPrice(val.purchasePrice)[0]
               }}</span>
-              <span>.{{ $options.filters.goodsFormatPrice(val.goodsSku.price)[1] }}</span>
+              <span>.{{ $options.filters.goodsFormatPrice(val.purchasePrice)[1] }}</span>
             </p>
           </div>
         </div>

From 9b3704a141776557007cba4376ad1cf5f57c3cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Wed, 26 Oct 2022 16:28:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A5=BC=E5=B1=82=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabbar/home/template/tpl_flex_one.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/tabbar/home/template/tpl_flex_one.vue b/pages/tabbar/home/template/tpl_flex_one.vue
index 7945a4e..67c08cf 100644
--- a/pages/tabbar/home/template/tpl_flex_one.vue
+++ b/pages/tabbar/home/template/tpl_flex_one.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="layout">
     <div class="flex-one">
-      <!-- <u-image width="100%" mode="aspectFit" height="280rpx" :src="res.list[0].img" alt=""></u-image> -->
-      <hotzone :res="res"></hotzone>
+      <u-image v-if="res.list[0].zoneInfo == ''" @click="modelNavigateTo(res.list[0])" width="100%" mode="aspectFit" height="280rpx" :src="res.list[0].img" alt=""></u-image>
+      <hotzone v-else :res="res"></hotzone>
     </div>
   </div>
 </template>
@@ -17,7 +17,7 @@ export default {
   },
   data() {
     return {
-      modelNavigateTo,
+      modelNavigateTo
     };
   },
   props: ["res"],