解决冲突2

WXD-SEASON\season
1 parent ec45a1e4
Showing 2 changed files with 4 additions and 4 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
@@ -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">
@@ -2573,7 +2573,7 @@ line-height: 38rpx;
  }
  /* 门店分类列表 */
 .sort_store_list{
-<<<<<<< HEAD
+
   max-height: 790rpx;
   /* max-height: 700rpx; */
   min-height: 700rpx;