Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into hotfix/bug

Conflicts:
	template/m.yohobuy.com/actions/cart/index/order-ensure.phtml

@@ -69,8 +69,7 @@ function callpay(orderCode) {
             document.attachEvent('onWeixinJSBridgeReady', jsApiCall);
             document.attachEvent('onWeixinJSBridgeReady', jsApiCall);
         }
         }
     } else {
     } else {
-        window.location.href = '/home/wechatpay?order_code=' + orderCode;
-        /*$.ajax({
+        $.ajax({
                 type: 'GET',
                 type: 'GET',
                 url: '/home/wechatpay?order_code=' + orderCode,
                 url: '/home/wechatpay?order_code=' + orderCode,
                 dataType: 'json',
                 dataType: 'json',
@@ -85,7 +84,7 @@ function callpay(orderCode) {
                 error: function() {
                 error: function() {
                     tip.show('请刷新本页面，完成微信支付');
                     tip.show('请刷新本页面，完成微信支付');
                 }
                 }
-            });*/
+            });
     }
     }
 }
 }
 
 

@@ -46,9 +46,9 @@
                 <a href="/cart/index/selectCoupon">
                 <a href="/cart/index/selectCoupon">
                     <span class="title">优惠券</span>
                     <span class="title">优惠券</span>
                     {{# coupon}}
                     {{# coupon}}
-                    {{!--<span class="coupon-count">}}
+                    <!--<span class="coupon-count">
                         {{count}}张可用
                         {{count}}张可用
-                    </span>--}}
+                    </span>-->
 
 
                     {{#if couponName}}
                     {{#if couponName}}
                     <span class="used coupon-use" data-name="{{couponName}}">
                     <span class="used coupon-use" data-name="{{couponName}}">

@@ -33,15 +33,8 @@ var _hmt = _hmt || [];
             var s = document.getElementsByTagName("script")[0];
             var s = document.getElementsByTagName("script")[0];
             s.parentNode.insertBefore(hm, s);
             s.parentNode.insertBefore(hm, s);
         })();
         })();
-
-        (function() {
-            var hm = document.createElement("script");
-            hm.src = "http://static.yohobuy.com/m/v1/js/om_code.js";
-            hm.async = 1;
-            var s = document.getElementsByTagName("script")[0];
-            s.parentNode.insertBefore(hm, s);
-        })();
     }
     }
     window.addEventListener('load', async_load, false);
     window.addEventListener('load', async_load, false);
 })();
 })();
 </script>
 </script>
+<script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>

@@ -16,8 +16,8 @@
 <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script>
 <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script>
 {{/if}}
 {{/if}}
 {{#if devEnv}}
 {{#if devEnv}}
-<script src="http://172.16.6.241:8000/static/js/sea.js?nowrap"></script>
-<script>seajs.config({base: 'http://172.16.6.241:8000/'});</script>
+<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
+<script>seajs.config({base: 'http://localhost:8000/'});</script>
 {{/if}}
 {{/if}}
         {{> layout/use}}
         {{> layout/use}}
 {{> layout/analysis}} 
 {{> layout/analysis}}