Commit 77bd42636c61e1ee12b285b137ef8da1c061aa91

Authored by pengye
1 parent a81ac978

测试

... ... @@ -151,7 +151,7 @@
</view>
</view>
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1">
<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)))}}">
特别优惠
</view>
<!-- 当前日期要大于限制结束日期 -->
... ...
... ... @@ -159,7 +159,7 @@
</view>
</view>
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1">
<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)))}}">
特别优惠
</view>
<!-- 当前日期要大于限制结束日期 -->
... ...
... ... @@ -730,8 +730,9 @@
background: #fbf6f1;
}
.pearlWhite .chefText,
.pearlWhite .rubric {
color: #0143A3;
color: #06436F;
}
.pearlWhite .handlePhone,
... ...
... ... @@ -136,7 +136,7 @@
</view>
</view>
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1 texts">
<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)))}}">
特别优惠
</view>
<!-- 当前日期要大于限制结束日期 -->
... ...
... ... @@ -131,7 +131,7 @@
</view>
</view>
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1">
<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)))}}">
特别优惠
</view>
<!-- 当前日期要大于限制结束日期 -->
... ...
... ... @@ -215,7 +215,7 @@
</view>
</view>
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1">
<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)))}}">
特别优惠
</view>
<!-- 当前日期要大于限制结束日期 -->
... ...
... ... @@ -153,7 +153,7 @@
</view>
</view>
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1">
<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)))}}">
特别优惠
</view>
<!-- 当前日期要大于限制结束日期 -->
... ...
... ... @@ -139,7 +139,7 @@
</view>
</view>
<view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
<view class="rubric rubric1">
<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)))}}">
特别优惠
</view>
<!-- 当前日期要大于限制结束日期 -->
... ...