From cb79d34e62195171630e64390984ec2f8f5a0fdc Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Thu, 6 Jul 2023 17:54:20 +0800
Subject: [PATCH] 解决冲突2

---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml | 6 +++---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 1d56e95..7836bb4 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -93,7 +93,7 @@
 				      {{djs.min}}
 				    </view>
 				    <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view>
-				    <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">
+				    <view class='time-val white t-c' style="background:{{prom_st==1?'#d40022':'#0097e0'}}">
 				      {{djs.sec}}
 				    </view>
 				    <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
@@ -163,7 +163,7 @@
                 {{djs.min}}
               </view>
               <view class="xc-time" style="color: {{'#d40022'}}">分</view>
-              <view class='xc-time-val white t-c' style=";background:{{'#d40022'}}">
+              <view class='xc-time-val white t-c' style="background:{{'#d40022'}}">
                 {{djs.sec}}
               </view>
               <view class="xc-time" style="color: {{'#d40022'}}">秒</view>
@@ -569,7 +569,7 @@
           </view>
           <scroll-view scroll-x="true" class="pj_scroll">
             <view class="flex">
-              <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="fir_comments">
+              <view class="xc_comment-detail"  wx:for="{{fir_comments}}" wx:key="fir_comments">
                 <view class="xc_comment-left">
                   <view class="xc_comment-user">
                     <view class="xc_user-img">
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
index 909a9f1..a117d2a 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
@@ -2573,7 +2573,7 @@ line-height: 38rpx;
  }
  /* 门店分类列表 */
 .sort_store_list{
-<<<<<<< HEAD
+
   max-height: 790rpx;
   /* max-height: 700rpx; */
   min-height: 700rpx;
--
libgit2 0.21.4