菜单链接修改

Application/Sdk/Controller/GameController.class.php

@@ -164,7 +164,8 @@ class GameController extends BaseController{
                 unset($menus[$k]);
                 continue;
             }
-            $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon'];
+            $menus[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] : 
+                                C('ADMIN_DOMAIN') . $v['icon'];
 //             die;
             if($v['type'] != 3){
                 if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") {
@@ -193,7 +194,8 @@ class GameController extends BaseController{
                 unset($personalMenu[$k]);
                 continue;
             }
-        	 $personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon'];
+        	 $personalMenu[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] : 
+                                C('ADMIN_DOMAIN') . $v['icon'];
 //             die;
             if($v['type'] != 3){
                 if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") {

Application/Sdk/Controller/UserController.class.php

@@ -833,11 +833,11 @@ class UserController extends BaseController
         #实例化用户接口
         $userApi = new MemberApi();
         if(!preg_match('/^[0-9a-zA-Z]{6,15}$/', $user['account'])){
-        	$this -> set_message(1027, "fail", "账号必须6-15位数字或字母组合");
+        	$this -> set_message(1027, "fail", "6-12位字母或数字");
         } 
         
         if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['password'])){
-        	$this -> set_message(1027, "fail", "密码必须6-15位数字与字母组合");
+        	$this -> set_message(1027, "fail", "6-12位字母或数字");
         }
         // user表加game_id
         if ($type == 2) {//手机2
@@ -848,7 +848,7 @@ class UserController extends BaseController
 
         } else {//用户1
         	if(!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,15}$/', $user['account'])){
-        		$this -> set_message(1027, "fail", "账号必须6-15位数字与字母组合");
+        		$this -> set_message(1027, "fail", "6-12位字母或数字");
         	}
             $result = $userApi -> sdk_register_($user['account'], $user['password'], 1, 1, $user['promote_id'], get_promote_name($user['promote_id']), $phone = "", $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version'] ,$user['device_type'],$user['unique_code']);
         }