Commit 2991e889d53c3999d2510e6955b80f8bc582d55e
1 parent
4d996ef3
测试的bug修复
Showing
3 changed files
with
11 additions
and
7 deletions
packageA/pages/quan_list/quan_list.wxml
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | <view class="right fs24 co_g pding" style="background-image:url({{iurl}}/miniapp/images/coupon_img/white.png); position: relative"> | 18 | <view class="right fs24 co_g pding" style="background-image:url({{iurl}}/miniapp/images/coupon_img/white.png); position: relative"> |
| 19 | <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view> | 19 | <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view> |
| 20 | 20 | ||
| 21 | - <view style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view> | 21 | + <view class="ellipsis-1" style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view> |
| 22 | <view style="margin-top: 5rpx" wx:else>所有门店通用</view> | 22 | <view style="margin-top: 5rpx" wx:else>所有门店通用</view> |
| 23 | <view wx:if="{{item.endtype==0}}">有效期 | 23 | <view wx:if="{{item.endtype==0}}">有效期 |
| 24 | <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text> | 24 | <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text> |
packageA/pages/quan_pro/quan_pro.wxml
| @@ -8,16 +8,20 @@ | @@ -8,16 +8,20 @@ | ||
| 8 | <image style="width: 100%; height: 450rpx" src="{{iurl}}/miniapp/images/coupon_img/q_detail_bg.png"></image> | 8 | <image style="width: 100%; height: 450rpx" src="{{iurl}}/miniapp/images/coupon_img/q_detail_bg.png"></image> |
| 9 | <view class="q_content"> | 9 | <view class="q_content"> |
| 10 | <view class="upper flex jc_sb co-w"> | 10 | <view class="upper flex jc_sb co-w"> |
| 11 | - <view class="left fs30"> | 11 | + <view class="left fs30" style="width: 440rpx;"> |
| 12 | <view> | 12 | <view> |
| 13 | <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image> | 13 | <image style="width: 70rpx; height: 70rpx; vertical-align: middle; margin-right: 20rpx" src="{{iurl}}/miniapp/images/coupon_img/coupon_logo.png"></image> |
| 14 | {{q_data.name}} | 14 | {{q_data.name}} |
| 15 | </view> | 15 | </view> |
| 16 | - <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"><view class="t_circle"></view> | ||
| 17 | - <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text> | ||
| 18 | - <text wx:else>仅限{{q_data.useobjectname}}使用</text> | ||
| 19 | - <text>{{q_data.coupon_remark}}</text> | 16 | + <view class="flex ai-center" style="margin-top: 24rpx; margin-right: 20rpx; width: 440rpx"> |
| 17 | + <view class="t_circle"></view> | ||
| 18 | + <view> | ||
| 19 | + <text wx:if="{{q_data.useobjecttype==0}}">全场通用</text> | ||
| 20 | + <text wx:else>仅限{{q_data.useobjectname}}使用</text> | ||
| 21 | + </view> | ||
| 22 | + | ||
| 20 | </view> | 23 | </view> |
| 24 | + <view class="ellipsis-3" style="margin-top: 20rpx;">{{q_data.coupon_remark}}</view> | ||
| 21 | </view> | 25 | </view> |
| 22 | <view class="right" style="margin-right: 80rpx;"> | 26 | <view class="right" style="margin-right: 80rpx;"> |
| 23 | <view class="f40 t-c" style="margin-top: 100rpx"><text class="fs26">￥</text>{{filters.toFix(q_data.money,2)}}</view> | 27 | <view class="f40 t-c" style="margin-top: 100rpx"><text class="fs26">￥</text>{{filters.toFix(q_data.money,2)}}</view> |
pages/user/order_list/order_list.wxml
| @@ -222,7 +222,7 @@ | @@ -222,7 +222,7 @@ | ||
| 222 | </view> | 222 | </view> |
| 223 | <view class="subitem"> | 223 | <view class="subitem"> |
| 224 | <view class="key">单价</view> | 224 | <view class="key">单价</view> |
| 225 | - <view class="val">￥{{i.Price}}({{i.PosPrice}})</view> | 225 | + <view class="val">￥{{i.Price}}(<text style="text-decoration: line-through;">{{i.PosPrice}}</text>)</view> |
| 226 | </view> | 226 | </view> |
| 227 | <view class="subitem"> | 227 | <view class="subitem"> |
| 228 | <view class="key">金额</view> | 228 | <view class="key">金额</view> |