Merge branch 'master' of http://120.78.169.79:3000/zhengxiaoyu/datiGame

public/plugins/layui/css/main.css

@@ -33,7 +33,11 @@ button,input{outline: none; -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
     justify-content: center;
     margin: 2rem auto 0;
 }
-
+.g-doc{
+        width: 7.5rem;
+        margin: 0 auto;
+        position: relative;
+}
 .loader .face {
     position: absolute;
     border-radius: 50%;
@@ -98,7 +102,7 @@ body{
     background: url(../img/bg2.jpg) center top;
 }
 .cov{ position: absolute; }
-.g-inner{margin: 0 auto;width: 7.5rem;}
+.g-inner{margin: 0 auto;width: 7.5rem;overflow: hidden;}
 .cov1{left: 50%;top: 3.3rem;width: 2.4rem;margin-left: -1.2rem;/* border: solid #71a3fd 2px; */border-radius: 50%;}
 .cov2{left: 50%;top: 10.5rem;margin-left: -1.5rem;width: 3rem;font-size: .3rem;text-align: center;}
 .cov1 .userface{width: 2.2rem;height: 2.2rem;margin: 0 auto;}

resources/views/home/login.blade.php

@@ -23,7 +23,7 @@
   <div class="layui-form-item" >
     <!-- <label class="layui-form-label">输入名字</label> -->
     <div class="layui-input-block">
-      <input type="text" name="username"   required  lay-verify="required" placeholder="输入名字" autocomplete="off" class="layui-input">
+      <input type="text" name="username"   required  lay-verify="required" placeholder="输入名字" autocomplete="off" class="layui-input" id="loginName">
     </div>
   </div>
   <div class="layui-form-item">
@@ -58,6 +58,11 @@ $.ajaxSetup({
     },'json');
     return false;
   });
+  try{
+    $("#loginName").val(Authentication.CTCGetConfig("UserID"));
+  }catch(e){
+    
+  }
 });
 </script>
 </body>

resources/views/home/user.blade.php

@@ -90,8 +90,8 @@
       <div class="result">
         <span class="icon top-icon success" id="Jresult"></span>
         <span class="live" id="Jlastmsg">初级玩家</span>
-        <a href="http://183.234.61.252:8090/Home/User/Index"><span class="btn-3 btn btn1" data-href="http://183.234.61.252:8090/Home/User/Index">再来一局</span></a>
-        <span class="btn-3 btn btn2" data-href="http://183.234.61.252:8090/Home/User/Index">查看等级</span>
+        <a href="./Index"><span class="btn-3 btn btn1" data-href="./Index">再来一局</span></a>
+        <span class="btn-3 btn btn2" data-href="./Index">查看等级</span>
       </div>
 
     </div>
@@ -235,22 +235,26 @@ function daoshu(argument) {
               if(data.user_id == $("#user_id").val()){
                 var score = parseInt($("#py1_score").html());
                 if(data.is_true == 1){
-                  $("#py1_score").html(score+300*(sum/10));
+                  var s=score+300*(sum/10);
+                  if(s<0)s=0;
+                  $("#py1_score").html(s);
                   $(".cur_answer").addClass("cur_true");
                 }else{
                   $(".cur_answer").addClass("cur_error");
                 }
               }else{
+                 var score = parseInt($("#py2_score").html());
                 if(data.is_true == 1){
-                  var score = parseInt($("#py2_score").html());
-                  $("#py2_score").html(score+300*(sum/10));
+                  var s=score+300*(sum/10);
+                  if(s<0)s=0;
+                  $("#py2_score").html(s);
                 }
               }
               var py1_score = parseInt($("#py1_score").html());
                 var py2_score = parseInt($("#py2_score").html());
                 if(data.is_end == 1){
                   //结算
-                  main.reSetClass("btn-3",0);
+                  if(window.main) main.reSetClass("btn-3",0);
                   clearInterval(ts)
                   setTimeout(function (argument) {
                     
@@ -306,7 +310,7 @@ function daoshu(argument) {
           case "question":
           setTimeout(function(argument) {
            loadQuestion(data);
-           main.reSetClass("btn-2",0);
+           if(window.main)main.reSetClass("btn-2",0);
           },1000);
             
           default :
@@ -402,15 +406,21 @@ function daoshu(argument) {
         return false;
       }
       $(this).addClass("cur_answer");
- 
+      $(".item").removeClass("on");
      answer(answerId);
   });
 var rules={
   "btn-1":{0:[0,0,0,0]},
   "btn-2":{
     line:1 
+  },
+  "btn-3":{
+    line:1 
   }
 };
+try{
+Authentication.CTCGetConfig("UserID");
+
  var btnConfig={
           className: "btn-1",
           currentClass:"on",
@@ -446,6 +456,11 @@ var rules={
                   // body...
                 }}
     window.main = new tvSysBtnBind(btnConfig);
+}catch(e){
+  console.log("机顶盒！")
+}
+ 
+ 
 });