From d1fdbd0bce21d68c6b1e77d876968229cc4c131b Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Tue, 11 Jul 2023 14:44:23 +0800
Subject: [PATCH] 优化冲突1

---
 packageA/pages/serviceCard_pd/cart/cart.wxml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/packageA/pages/serviceCard_pd/cart/cart.wxml b/packageA/pages/serviceCard_pd/cart/cart.wxml
index 875b0a9..9cdad53 100644
--- a/packageA/pages/serviceCard_pd/cart/cart.wxml
+++ b/packageA/pages/serviceCard_pd/cart/cart.wxml
@@ -21,6 +21,7 @@
                       </navigator>
 
                 </view>
+
 <!-- 保障服务 -->
 <view class="bz_view22 flex bdt16 ai_c" wx:if="{{bconfig.service_bz}}">
           <image class="bzfu_img22" src="{{imgUrl}}/miniapp/images/bzfu_w.png"></image>
@@ -33,20 +34,17 @@
           </view>
         </view>
                 
-                <view class="coupon-mes flex-vertical">
+     <view class="coupon-mes flex-vertical">
                     <view>留言</view>
                     <view class="leave-word">
                         <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
-                     
-
-
-                <view class="set-mes bdr_b-14">
-                    <view wx:if="{{order.store_prom}}">
-                        <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
-                    </view>
+                        </view>
                 </view>
+                      
 
-         </block>
+             
+
+        
 
          <view class="information bdr14">
             <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
@@ -60,7 +58,7 @@
             </view>
 
         </view>
-    </view>
+
 
      <view class="btn-wrap">
 			<view class="pay-amount">
@@ -68,6 +66,9 @@
 			</view>
 			<button class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
      </view>
+     
+      </block>
+ </view>
 </form>
 
 <warn id="warn"></warn>
--
libgit2 0.21.4