Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4
Showing
3 changed files
with
5 additions
and
4 deletions
| @@ -255,6 +255,7 @@ class CartData | @@ -255,6 +255,7 @@ class CartData | ||
| 255 | { | 255 | { |
| 256 | $param = Yohobuy::param(); | 256 | $param = Yohobuy::param(); |
| 257 | $param['method'] = 'app.Shopping.payment'; | 257 | $param['method'] = 'app.Shopping.payment'; |
| 258 | + $param['enable_red_envelopes'] = 0; //h5不使用红包 | ||
| 258 | $param['cart_type'] = $cartType; | 259 | $param['cart_type'] = $cartType; |
| 259 | $param['yoho_coin_mode'] = $isUseYohoCoin; | 260 | $param['yoho_coin_mode'] = $isUseYohoCoin; |
| 260 | $param['uid'] = $uid; | 261 | $param['uid'] = $uid; |
| @@ -76,10 +76,10 @@ | @@ -76,10 +76,10 @@ | ||
| 76 | </div> | 76 | </div> |
| 77 | </section> | 77 | </section> |
| 78 | 78 | ||
| 79 | + {{#if isJit}} | ||
| 80 | + {{> me/order/jit-more}} | ||
| 81 | + {{/if}} | ||
| 79 | <section class="block goods-bottom"> | 82 | <section class="block goods-bottom"> |
| 80 | - {{#if isJit}} | ||
| 81 | - {{> me/order/jit-more}} | ||
| 82 | - {{/if}} | ||
| 83 | {{#each goods}} | 83 | {{#each goods}} |
| 84 | {{> me/order/good}} | 84 | {{> me/order/good}} |
| 85 | {{/each}} | 85 | {{/each}} |
-
Please register or login to post a comment