xt / xcx-book · Commits

Go to a project

Commit 77bd42636c61e1ee12b285b137ef8da1c061aa91

Authored by pengye
1 parent a81ac978
build: skipped

测试

Inline Side-by-side
Showing 8 changed files with 9 additions and 8 deletions
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 </view> 151 </view>
152 </view> 152 </view>
153 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 153 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
154 - <view class="rubric rubric1"> 154 + <view class="rubric rubric1" wx:if="{{marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1)))}}">
155 特别优惠 155 特别优惠
156 </view> 156 </view>
157 <!-- 当前日期要大于限制结束日期 --> 157 <!-- 当前日期要大于限制结束日期 -->
@@ -159,7 +159,7 @@ @@ -159,7 +159,7 @@
159 </view> 159 </view>
160 </view> 160 </view>
161 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 161 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
162 - <view class="rubric rubric1"> 162 + <view class="rubric rubric1" wx:if="{{marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1)))}}">
163 特别优惠 163 特别优惠
164 </view> 164 </view>
165 <!-- 当前日期要大于限制结束日期 --> 165 <!-- 当前日期要大于限制结束日期 -->
@@ -730,8 +730,9 @@ @@ -730,8 +730,9 @@
730 background: #fbf6f1; 730 background: #fbf6f1;
731 } 731 }
732 732
  733 +.pearlWhite .chefText,
733 .pearlWhite .rubric { 734 .pearlWhite .rubric {
734 - color: #0143A3; 735 + color: #06436F;
735 } 736 }
736 737
737 .pearlWhite .handlePhone, 738 .pearlWhite .handlePhone,
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 </view> 136 </view>
137 </view> 137 </view>
138 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 138 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
139 - <view class="rubric rubric1 texts"> 139 + <view class="rubric rubric1 texts" wx:if="{{marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1)))}}">
140 特别优惠 140 特别优惠
141 </view> 141 </view>
142 <!-- 当前日期要大于限制结束日期 --> 142 <!-- 当前日期要大于限制结束日期 -->
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 </view> 131 </view>
132 </view> 132 </view>
133 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 133 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
134 - <view class="rubric rubric1"> 134 + <view class="rubric rubric1" wx:if="{{marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1)))}}">
135 特别优惠 135 特别优惠
136 </view> 136 </view>
137 <!-- 当前日期要大于限制结束日期 --> 137 <!-- 当前日期要大于限制结束日期 -->
@@ -215,7 +215,7 @@ @@ -215,7 +215,7 @@
215 </view> 215 </view>
216 </view> 216 </view>
217 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 217 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
218 - <view class="rubric rubric1"> 218 + <view class="rubric rubric1" wx:if="{{marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1)))}}">
219 特别优惠 219 特别优惠
220 </view> 220 </view>
221 <!-- 当前日期要大于限制结束日期 --> 221 <!-- 当前日期要大于限制结束日期 -->
@@ -153,7 +153,7 @@ @@ -153,7 +153,7 @@
153 </view> 153 </view>
154 </view> 154 </view>
155 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 155 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
156 - <view class="rubric rubric1"> 156 + <view class="rubric rubric1" wx:if="{{marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1)))}}">
157 特别优惠 157 特别优惠
158 </view> 158 </view>
159 <!-- 当前日期要大于限制结束日期 --> 159 <!-- 当前日期要大于限制结束日期 -->
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
139 </view> 139 </view>
140 </view> 140 </view>
141 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 141 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
142 - <view class="rubric rubric1"> 142 + <view class="rubric rubric1" wx:if="{{marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1)))}}">
143 特别优惠 143 特别优惠
144 </view> 144 </view>
145 <!-- 当前日期要大于限制结束日期 --> 145 <!-- 当前日期要大于限制结束日期 -->