From 22d80482d32dc896b475c55a2ae929745062b738 Mon Sep 17 00:00:00 2001
From: Cyy <547766613@qq.com>
Date: Wed, 21 Jun 2023 09:21:06 +0800
Subject: [PATCH] OA120115 搭配促销移至领券上方

---
 pages/goods/goodsInfo/goodsInfo.wxml | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 3fa9e37..6d653f9 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -638,6 +638,31 @@
           </block>
         </block>
 
+        <!-- - 搭配促销 -- -->
+        <view class="dp_cx_view" wx:if="{{collocationGoods}}">
+          <view class="bb_view">
+            <view>优惠热配</view>
+            <view class="red_bb" bindtap="go_prom_list">
+              查看全部
+              <text class="bg_jj"></text>
+            </view>
+          </view>
+          <!-- 搭配的显示 -->
+          <view class="flex" bindtap="go_prom_list">
+            <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image>
+            <view class="act_content">
+              <view class="fs32">{{collocationGoods.title}}</view>
+              <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">
+                搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}}
+              </view>
+              <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view>
+              <view class="fs30 color-gray">
+                活动至{{filters.format_time(collocationGoods.end_time,1)}}
+              </view>
+            </view>
+          </view>
+        </view>
+
 
         <!-- 许程 7.24暂时注释 -->
         <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}">
@@ -706,30 +731,7 @@
           </view>
         </view>
 
-        <!-- - 搭配促销 -- -->
-        <view class="dp_cx_view" wx:if="{{collocationGoods}}">
-          <view class="bb_view">
-            <view>优惠热配</view>
-            <view class="red_bb" bindtap="go_prom_list">
-              查看全部
-              <text class="bg_jj"></text>
-            </view>
-          </view>
-          <!-- 搭配的显示 -->
-          <view class="flex" bindtap="go_prom_list">
-            <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image>
-            <view class="act_content">
-              <view class="fs32">{{collocationGoods.title}}</view>
-              <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">
-                搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}}
-              </view>
-              <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view>
-              <view class="fs30 color-gray">
-                活动至{{filters.format_time(collocationGoods.end_time,1)}}
-              </view>
-            </view>
-          </view>
-        </view>
+        
         <!-- - 宝贝评价 -- -->
         <view class="bdt16">
           <view class="bb_view">
--
libgit2 0.21.4