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

Application/Mobile/View/Ssg/order.html

@@ -26,7 +26,7 @@
         <if condition="$data_list">
             <ul>
                 <volist name="data_list" id="data">
-                    <li onclick="handleOrderDetail('{$data[\'order_id\']}','{$data[\'pay_status\']}','{$data[\'game_id\']}')">
+                    <li onclick="handleOrderDetail('{$data[\'order_id\']}','{$data[\'pay_status\']}','{$data[\'game_id\']}','{$data[\'user_id\']}')">
                         <p>订单编号：{$data.order_id}</p>
                         <dl>
                             <dt><img src="{$data['icon']|get_cover='path'}"></dt>
@@ -54,10 +54,10 @@
         </if>
     </div>
     <script>
-        function handleOrderDetail(orderID, state, game_id) {
+        function handleOrderDetail(orderID, state, game_id, user_id) {
             if (state == 1) {
                 //前往详情
-                window.location.href = "/sdk.php/Ipa365/install_show/order_id/"+orderID+"/game_id/"+game_id;
+                window.location.href = "/sdk.php/Ipa365/install_show/order_id/"+orderID+"/game_id/"+game_id+"/user_id/"+user_id;
             }
         }
     </script>

Application/Sdk/Controller/Ipa365Controller.class.php

@@ -150,8 +150,8 @@ class Ipa365Controller extends BaseController{
     	$param['payway']  = 1;
     	$param['title'] = $price;
     	$param['body'] = $price;
-    	$param['callback'] = "https://api.wmtxkj.com/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
+    	$param['callback'] = "https://m.wmtxkj.com/sdk.php/Ipa365/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
-    	$param['notifyurl'] = "https://api.wmtxkj.com/callback.php/Notify/notify/apitype/alipay";
+    	$param['notifyurl'] = "https://m.wmtxkj.com/callback.php/Notify/notify/apitype/alipay";
     	
     	$ret = $this->alipay($param);
 
@@ -214,8 +214,13 @@ class Ipa365Controller extends BaseController{
     public function install_show() {
     	$orderId = I('order_id', 0);
     	$gameId = I('game_id', 0);
+    	$userId = I('user_id', 0);
     	
-    	$userId = $_SESSION['user_id'];
+    	$user = M('user', 'tab_')->where(array(
+    		'id' => $userId
+    	))->find();
+    	
+//     	$userId = $_SESSION['user_id'];
     	if (!$userId ) {
     		$this->error("请登入", "/mobile.php/ssg/login");
     	}

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

@@ -69,7 +69,7 @@
             <span>{$price}元</span>
         </div>
         <a class="order-payinfo-item"
-           href="#;" onclick="jump('{$order_id}')"
+           href="#;" onclick="jump('{$url}')"
            title="支付宝">
             <div class="order-payinfo-icon">
                 <img src="__IMG__/ssg/alipay/zfb-pic.jpg" alt="支付宝">