Commit e16d356f4c9c0fdf6265f172513df975765ed160

Authored by 后端研发-苏明海
2 parents 0611624b 93e7940a

Merge branch 'test' into 'qa'

Test

See merge request !810
packageC/pages/presell/cart/cart.wxml
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 </view> 220 </view>
221 221
222 222
223 - <view class="set-mes bdr_b-14" wx:if="{{presell.deposit_pay_time>0 && presell.tail_pay_state==0 && !no_start && !wait_dj && order.order_status<2}}"> 223 + <view class="set-mes bdr_b-14" wx:if="{{presell.presell_type==0 && presell.deposit_pay_time>0 && presell.tail_pay_state==0 && !no_start && !wait_dj && order.order_status<2}}">
224 <view wx:if="{{order.store_prom}}"> 224 <view wx:if="{{order.store_prom}}">
225 <icon color="#f23030" size="16" type="info"></icon> 225 <icon color="#f23030" size="16" type="info"></icon>
226 {{order.store_prom}} 226 {{order.store_prom}}