Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into hotfix/bug
Conflicts: template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
Showing
4 changed files
with
8 additions
and
16 deletions
@@ -69,8 +69,7 @@ function callpay(orderCode) { | @@ -69,8 +69,7 @@ function callpay(orderCode) { | ||
69 | document.attachEvent('onWeixinJSBridgeReady', jsApiCall); | 69 | document.attachEvent('onWeixinJSBridgeReady', jsApiCall); |
70 | } | 70 | } |
71 | } else { | 71 | } else { |
72 | - window.location.href = '/home/wechatpay?order_code=' + orderCode; | ||
73 | - /*$.ajax({ | 72 | + $.ajax({ |
74 | type: 'GET', | 73 | type: 'GET', |
75 | url: '/home/wechatpay?order_code=' + orderCode, | 74 | url: '/home/wechatpay?order_code=' + orderCode, |
76 | dataType: 'json', | 75 | dataType: 'json', |
@@ -85,7 +84,7 @@ function callpay(orderCode) { | @@ -85,7 +84,7 @@ function callpay(orderCode) { | ||
85 | error: function() { | 84 | error: function() { |
86 | tip.show('请刷新本页面,完成微信支付'); | 85 | tip.show('请刷新本页面,完成微信支付'); |
87 | } | 86 | } |
88 | - });*/ | 87 | + }); |
89 | } | 88 | } |
90 | } | 89 | } |
91 | 90 |
@@ -46,9 +46,9 @@ | @@ -46,9 +46,9 @@ | ||
46 | <a href="/cart/index/selectCoupon"> | 46 | <a href="/cart/index/selectCoupon"> |
47 | <span class="title">优惠券</span> | 47 | <span class="title">优惠券</span> |
48 | {{# coupon}} | 48 | {{# coupon}} |
49 | - {{!--<span class="coupon-count">}} | 49 | + <!--<span class="coupon-count"> |
50 | {{count}}张可用 | 50 | {{count}}张可用 |
51 | - </span>--}} | 51 | + </span>--> |
52 | 52 | ||
53 | {{#if couponName}} | 53 | {{#if couponName}} |
54 | <span class="used coupon-use" data-name="{{couponName}}"> | 54 | <span class="used coupon-use" data-name="{{couponName}}"> |
@@ -33,15 +33,8 @@ var _hmt = _hmt || []; | @@ -33,15 +33,8 @@ var _hmt = _hmt || []; | ||
33 | var s = document.getElementsByTagName("script")[0]; | 33 | var s = document.getElementsByTagName("script")[0]; |
34 | s.parentNode.insertBefore(hm, s); | 34 | s.parentNode.insertBefore(hm, s); |
35 | })(); | 35 | })(); |
36 | - | ||
37 | - (function() { | ||
38 | - var hm = document.createElement("script"); | ||
39 | - hm.src = "http://static.yohobuy.com/m/v1/js/om_code.js"; | ||
40 | - hm.async = 1; | ||
41 | - var s = document.getElementsByTagName("script")[0]; | ||
42 | - s.parentNode.insertBefore(hm, s); | ||
43 | - })(); | ||
44 | } | 36 | } |
45 | window.addEventListener('load', async_load, false); | 37 | window.addEventListener('load', async_load, false); |
46 | })(); | 38 | })(); |
47 | -</script> | ||
39 | +</script> | ||
40 | +<script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script> |
@@ -16,8 +16,8 @@ | @@ -16,8 +16,8 @@ | ||
16 | <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script> | 16 | <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script> |
17 | {{/if}} | 17 | {{/if}} |
18 | {{#if devEnv}} | 18 | {{#if devEnv}} |
19 | -<script src="http://172.16.6.241:8000/static/js/sea.js?nowrap"></script> | ||
20 | -<script>seajs.config({base: 'http://172.16.6.241:8000/'});</script> | 19 | +<script src="http://localhost:8000/static/js/sea.js?nowrap"></script> |
20 | +<script>seajs.config({base: 'http://localhost:8000/'});</script> | ||
21 | {{/if}} | 21 | {{/if}} |
22 | {{> layout/use}} | 22 | {{> layout/use}} |
23 | {{> layout/analysis}} | 23 | {{> layout/analysis}} |
-
Please register or login to post a comment