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

5 years ago · 4bb28e7d73
parent 9783acc3c1 13a4a48c1d
commit 4bb28e7d73
3 changed files with 29 additions and 21 deletions
--- a/Application/Mobile/Controller/SsgController.class.php
+++ b/Application/Mobile/Controller/SsgController.class.php
@ -108,7 +108,7 @@ class SsgController extends BaseController {
    	}
-        $order_list = M("game_supersign a","tab_")->field("a.order_id, b.game_name, b.icon, b.id as game_id, a.pay_status, a.user_id")->join("tab_game b on a.game_id=b.id")->where(array(
+        $order_list = M("game_supersign a","tab_")->field("a.order_id, b.game_name, b.icon, b.id as game_id, a.pay_status, a.user_id")->join("left join tab_game b on a.game_id=b.id")->where(array(
        	'a.user_id' => $user['user_id'],
        ))->order("a.id")->select();
 //         pp($order_list);
--- a/Application/Mobile/View/Ssg/order.html
+++ b/Application/Mobile/View/Ssg/order.html
@ -11,6 +11,10 @@
        .order-search li dl .order-status{
            background-image: url("__IMG__/ssg/order-status.png");
        }
        .order-search  .no-order{
            background-image: url("__IMG__/ssg/no-order.png");
        }
    </style>
 </head>
 <body>
@ -19,6 +23,7 @@
        <a href="javascript:history.go(-1);"></a>订单查询
    </div>
    <div class="order-search">
        <if condition="$data_list">
            <ul>
                <volist name="data_list" id="data">
                    <li onclick="handleOrderDetail('{$data[\'order_id\']}','{$data[\'pay_status\']}','{$data[\'game_id\']}')">
@ -39,6 +44,9 @@
                    </li>
                </volist>
            </ul>
            <else />
            <div class="no-order"></div>
        </if>
    </div>
    <script>
        function handleOrderDetail(orderID, state, game_id) {
--- a/Public/Mobile/images/ssg/no-order.png
+++ b/Public/Mobile/images/ssg/no-order.png