Merge branch 'master' into 'houdong'

# Conflicts:
#   app/Tpl/Vip/Index/withdraw.html

app/Lib/Action/Vip/IndexAction.class.php

@@ -57,28 +57,28 @@ class IndexAction extends IdentityAction {
 
 
         //取最后获奖的18个用户
-        $suffix = D('Userinfo')->getTable($this->GID);
-        $table =$suffix?'mncg_archive.userinfo'.$suffix:'mncg.userinfo';
-
-        $where=array('sex'=>$this->GID,'new_phb'=>['gt',0],'zt'=>1,'monthzzl'=>['gt',150]);
-        //测试时不用缓存->cache(true,cacheTime())
-        $finalWinList = M($table, " ", C('DB_CONFIG_MNCG3'))->where($where)->order('zongup   desc')->limit(18)->cache(true,cacheTime())->select();
-        $userids = array();
-        foreach ($finalWinList as $key => &$w) {
-            $userIDs = explode("X", $w['uid']);
-            $w['user_id'] = $userIDs[1];
-            $w['userUrl'] = tradeDetailLink($this->GID,3,$userIDs[1]);
-            $userids[] = $userIDs[1];
-        }
+//        $suffix = D('Userinfo')->getTable($this->GID);
+//        $table =$suffix?'mncg_archive.userinfo'.$suffix:'mncg.userinfo';
+//
+//        $where=array('sex'=>$this->GID,'new_phb'=>['gt',0],'zt'=>1,'monthzzl'=>['gt',150]);
+//        //测试时不用缓存->cache(true,cacheTime())
+//        $finalWinList = M($table, " ", C('DB_CONFIG_MNCG3'))->where($where)->order('zongup   desc')->limit(18)->cache(true,cacheTime())->select();
+//        $userids = array();
+//        foreach ($finalWinList as $key => &$w) {
+//            $userIDs = explode("X", $w['uid']);
+//            $w['user_id'] = $userIDs[1];
+//            $w['userUrl'] = tradeDetailLink($this->GID,3,$userIDs[1]);
+//            $userids[] = $userIDs[1];
+//        }
 
         //取昵称
-        $nick_name_arry =getUser($userids,'nick');////
-        foreach ($finalWinList as $key => &$value) {
-            $nick_name = $nick_name_arry[$value['user_id']];
-//            $value['username'] = $nick_name?$nick_name:$value['username'];
-            $value['username'] = $nick_name;
-        }
-        $this->assign('finalWinList',$finalWinList);
+//        $nick_name_arry =getUser($userids,'nick');////
+//        foreach ($finalWinList as $key => &$value) {
+//            $nick_name = $nick_name_arry[$value['user_id']];
+////            $value['username'] = $nick_name?$nick_name:$value['username'];
+//            $value['username'] = $nick_name;
+//        }
+//        $this->assign('finalWinList',$finalWinList);
 
         $this->assign($firstPageData);
         $this->setValue($userId);

app/Tpl/Vip/Index/saicheng.html

@@ -228,7 +228,6 @@
     }
     $(function(){
         //支付成功的弹窗
-
         if('{$_GET.is_payok}'==1){
             $(".mask").show();
             $("#popPaySucc").show();

app/Tpl/Vip/Index/withdraw.html

@@ -73,7 +73,7 @@
               <tr>
                 <td>提现</td>
                 <td class="withdraw-num green"><span class="num">¥{$vo.item_money}元</span></td>
-                <td>{$vo.item_time}</td><td>已完成</td>
+                <td>{$vo.item_time}</td><td><eq name="vo.status" value="1">已完成<else/>待审核</eq> </td>
               </tr>
             </foreach>
             <tr>