Merge remote-tracking branch 'origin/master'

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

@@ -16,6 +16,7 @@ class PkTopAction extends IdentityAction{
 
         //首页
     	public function index()        {
+    	    //首页的排行榜等切换
     	    if(!I('viewPage')){
                 header('location:'.M_URL.'/Match/jiang');
                 exit;
@@ -618,6 +619,13 @@ class PkTopAction extends IdentityAction{
             M('userinfo', " ", C('DB_CONFIG_MNCG3'))->add($initData);
         }
         D('Sms')->send(['mobile'=>$mobile,'content' =>$bmContent,'type'=>46],true,true);
+        //钱包
+
+        $wallet=M('Wallet')->where(['user_id'=>$userId])->find();
+        if(empty($wallet)){
+            M('Wallet')->add(['user_id'=>$userId,'user_name'=>$userName,'add_time'=>time()]);
+        }
+
 
         return array('status'=>1,'info'=>'参赛成功','debug'=>$userId);
 

app/Tpl/Vip/PkTop/index.html

@@ -769,6 +769,10 @@
             return false;
         });
 
+        //自动点击报名按钮
+        if('{$_GET.clickFlag}'==1){
+            $(".baoming").click();
+        }
 
     });