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

Application/Home/Controller/TestResourceController.class.php

@@ -39,7 +39,7 @@ class TestResourceController extends BaseController
 
       $map['user.promote_id']=session("promote_auth.pid");
       $data = M('test_resource','tab_')
-          ->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,check_status')
+          ->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,lock_status as check_status')
           ->join('left join tab_user as user on tab_test_resource.user_id = user.id')
           ->where($map)
           ->page($page,$row)
@@ -74,7 +74,7 @@ class TestResourceController extends BaseController
       }
 
       $data = [
-          'check_status' => 0
+          'lock_status' => 0
       ];
 
       $isFreeze = M('user','tab_')->where("id=".$supportId)->save($data);
@@ -93,7 +93,7 @@ class TestResourceController extends BaseController
         }
 
         $data = [
-            'check_status' => 1
+            'lock_status' => 1
         ];
 
         $isFreeze = M('user','tab_')->where("id=".$supportId)->save($data);

Application/Home/View/default/Article/article/detail.html

@@ -5,6 +5,8 @@
   .trunk-article .article-voice {right:0;}
   .trunk-article .article-content img {max-width:100%;}
   .header .nav { display: none }
+  .backDiv {position: relative;bottom: 55px;width: 100px;height: 35px;text-align: center;background: #fff;border-radius: 5px;}
+  .backA {line-height: 35px;font-size: 12px;color: #2bd8ed;width:100%;display: block}
 </style>
 </block>
 <block name="body">
@@ -12,11 +14,13 @@
     <div class="banner">
       <div class="inner"></div>
     </div>
-  <div style="position: relative;bottom: 100px;left:180px;width:100px;height:35px;text-align: center;background: #2bd8ed;border-radius: 5px">
-    <a style="line-height: 35px;font-size: 18px;font-weight: 600;color: #ffffff" href="{:U('Promote/msg_list')}">返回</a>
-  </div>
+
     <div class="page-detail article-detail-detail">
+
       <div class="inner clearfix">
+        <div class="backDiv">
+          <a class="backA" href="{:U('Promote/msg_list')}">返回</a>
+        </div>
         <div class="wrap">
           <div class="trunk-article clearfix">
             <div class="article-title" style="width:960px">{$info.title}</div>

Application/Mobile/Controller/SsgController.class.php

@@ -19,7 +19,7 @@ class SsgController extends BaseController {
     const CODE_ERROR = -97;         //验证码错误
     const RETURN_SUCCESS = 1;
     const RETURN_FALSE = 2;
-    const signprice = 0.01; //充值金额
+    const signprice = 10; //充值金额
 
 
     public function login()
@@ -61,8 +61,9 @@ class SsgController extends BaseController {
     public function do_login()
     {
         $account = I("Account");
-        $password = I("Password");
+        $password =  I("Password");
         $promoteId = I("promote_id", 0);
+        $password = base64_decode($password);
         /*if (!$promoteId) {
         	$this->ajaxReturn(array("ErrorCode" => -97, "ResultMsg" => "参数非法"));
         }*/

Application/Mobile/View/Ssg/login.html

@@ -97,7 +97,7 @@
                         </div>
                         <div class="formitem">
                             <img src="__IMG__/ssg/login/password.png">
-                            <input id="phonepassword" type="password" placeholder="请输入6-12位自字母组合密码" value="">
+                            <input id="phonepassword" type="password" placeholder="请输入6-12位字母组合密码" value="">
                         </div>
                         <div class="formitem" style="border: 0px;">
                             <div class="formitem" style="margin-right: .2rem;margin-top: 0px;width: 3.5rem;">
@@ -139,7 +139,7 @@
                         </div>
                         <div class="formitem">
                             <img src="__IMG__/ssg/login/password.png">
-                            <input id="regpassword" type="password" placeholder="请输入6-12位自字母组合密码" value="">
+                            <input id="regpassword" type="password" placeholder="请输入6-12位字母组合密码" value="">
                         </div>
                         <div class="formitem">
                             <img src="__IMG__/ssg/login/password.png">
@@ -212,6 +212,7 @@
 </body>
 <script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
 <script src="__JS__/swiper.min.js" type="text/javascript"></script>
+<script src="__JS__/ssg/base64.min.js" type="text/javascript"></script>
 <script>
 var PhoneObj = {
     i:60,
@@ -257,15 +258,30 @@ var PhoneObj = {
                         if (result.status != 1) {
                             alert(result.msg);
                         }
-                        //  else {
-                        //     fun()
-                        // }
                     }
                 })
             }
         }else{
             // alert("发送验证码频率过高，请等待"+PhoneObj.i+"秒后再试")
         }
+    },
+    checkPassword(password){
+        console.log(password);
+        if(password.length < 6 || password.length > 15){
+            alert('密码长度6-15个字符');
+            return false;
+        }
+        var pwdRegex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z])');
+        if (!pwdRegex.test(password)) {
+            alert("您的密码复杂度太低（密码中必须包含字母、数字）！");
+            return false;
+        }
+        var chinaRex = new RegExp("[\\u4E00-\\u9FFF]+","g");;
+        if (chinaRex.test(password)) {
+            alert("密码不允许含有中文字符！");
+            return false;
+        }
+        return true;
     }
 
 }
@@ -333,7 +349,7 @@ var PhoneObj = {
             url: 'mobile.php?s=/Ssg/do_login.html',
             data: {
                 'Account': loginName,
-                'Password': (loginPass),
+                'Password': window.btoa(loginPass),
                 'VerifyCode': userCode,
                 'promote_id': promoteId,
             },
@@ -362,17 +378,9 @@ var PhoneObj = {
         if(!PhoneObj.checkPhone(phone)){
             return false;
         }
-        if(phonepassword.length < 6 || phonepassword.length > 15){
-            alert('密码长度6-15个字符');
-            
+        if(!PhoneObj.checkPassword(phonepassword)){
             return false;
         }
-        var pwdRegex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z])');
-        if (!pwdRegex.test(phonepassword)) {
-            alert("您的密码复杂度太低（密码中必须包含字母、数字）！");
-            return false;
-        }
-
         if(phonecode == ''){
             alert('请输入验证码');
             return false;
@@ -435,13 +443,7 @@ var PhoneObj = {
             alert("账号必须是6-12位字母数字组合！");
             return false;
         }
-        if(regpassword.length < 6 || regpassword.length > 15){
-            alert('密码长度6-15个字符');
-            return false;
-        }
-       
-        if (!pwdRegex.test(regpassword)) {
-            alert("您的密码复杂度太低（密码中必须包含字母、数字）！");
+        if(!PhoneObj.checkPassword(regpassword)){
             return false;
         }
         if(regpassword != regpassword2){
@@ -480,14 +482,7 @@ var PhoneObj = {
         if(!PhoneObj.checkPhone(phone)){
             return false;
         }
-        if(phonepassword.length < 6 || phonepassword.length > 15){
-            alert('密码长度6-15个字符');
-            
-            return false;
-        }
-        var pwdRegex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z])');
-        if (!pwdRegex.test(phonepassword)) {
-            alert("您的密码复杂度太低（密码中必须包含字母、数字）！");
+        if(!PhoneObj.checkPassword(phonepassword)){
             return false;
         }
         if(phonecode == ''){

Public/Mobile/js/ssg/base64.min.js

@@ -0,0 +1 @@
+!function(){var e="object"==typeof exports&&null!==exports&&"number"!=typeof exports.nodeType?exports:"undefined"!=typeof self?self:$.global,c="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function f(e){this.message=e}(f.prototype=new Error).name="InvalidCharacterError",e.btoa||(e.btoa=function(e){for(var t,r,o=String(e),n=0,a=c,i="";o.charAt(0|n)||(a="=",n%1);i+=a.charAt(63&t>>8-n%1*8)){if(255<(r=o.charCodeAt(n+=.75)))throw new f("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range.");t=t<<8|r}return i}),e.atob||(e.atob=function(e){var t=String(e).replace(/[=]+$/,"");if(t.length%4==1)throw new f("'atob' failed: The string to be decoded is not correctly encoded.");for(var r,o,n=0,a=0,i="";o=t.charAt(a++);~o&&(r=n%4?64*r+o:o,n++%4)?i+=String.fromCharCode(255&r>>(-2*n&6)):0)o=c.indexOf(o);return i})}();