Commit 52f2e3ca5beec51a61ad665be4874641ae55912d
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
2 additions
and
2 deletions
pages/user/coupons/coupons.wxml
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | </view> |
| 56 | 56 | <view class="moneys">{{filter.getNum(detail.Sum)}}元微券</view> |
| 57 | 57 | <view class="car-rim"> |
| 58 | - <view class="coupon_from">微券来源: {{detail.Operator==null?'微信商城':detail.Operator==''?"微信商城":detail.Operator}}</view> | |
| 58 | + <view class="coupon_from">微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view> | |
| 59 | 59 | <view wx:if="{{detail.ValidDate!=null&&detail.BeginDate!=null}}"> |
| 60 | 60 | <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 --> |
| 61 | 61 | <view class="text">有效期: {{(detail.BeginDate==null || detail.BeginDate=='')?"":time.replace_time2(detail.BeginDate)}}至{{time.replace_time2(detail.ValidDate)}}</view> | ... | ... |
pages/user/coupons/query/index.wxml
| ... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 | <view class="moneys">{{filter.getNum(detail.Sum)}}元微券</view> |
| 93 | 93 | <view class="car-rim"> |
| 94 | 94 | <view class="text"> |
| 95 | - 微券来源: {{detail.Operator==null?'微信商城':detail.Operator}}</view> | |
| 95 | + 微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view> | |
| 96 | 96 | <view wx:if="{{detail.ValidDate!=null}}"> |
| 97 | 97 | <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 --> |
| 98 | 98 | <view class="text">有效期: | ... | ... |