Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Sdk/View/default/Ipa365/pay.html

@@ -69,7 +69,7 @@
             <span>{$price}元</span>
         </div>
         <a class="order-payinfo-item"
-           href="#;" onclick="jump('{$url}')"
+           href="#;" onclick="jump('{$url}', '{$order_id}')"
            title="支付宝">
             <div class="order-payinfo-icon">
                 <img src="__IMG__/ssg/alipay/zfb-pic.jpg" alt="支付宝">
@@ -86,9 +86,9 @@
 </div>
 </body>
 <script>
-    function jump(pay_url) {
+    function jump(pay_url, order_id) {
         if(isWeiXin()){
-            window.location.href = "/sdk.php/Ipa365/paytip/order_id/"+pay_url;
+            window.location.href = "/sdk.php/Ipa365/paytip/order_id/"+order_id;
         }else{
             window.location.href=pay_url;
         }