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

Application/Sdk/Conf/config.php

@@ -114,7 +114,7 @@ $config = array(
     	'SQ_SHORTCUT' => 15,
     	'SQ_SMALL_PROGRAM' => 16, //双乾 小程序
     ),
-    'ADMIN_DOMAIN' => 'https://mg.wmtxkj.cn/', // 'http://10.0.1.75:8089/',//
+    'ADMIN_DOMAIN' => 'http://www.platform.com', // 'http://10.0.1.75:8089/',//
     'WX_PAY_LIMIT' => 3000,
     'PAY_DOMAIN' => 'https://api.wmtxkj.cn/',
     'H5_DOMAIN' => 'http://api.wmtxkj.cn/',

Application/Sdk/Controller/GameController.class.php

@@ -254,7 +254,8 @@ class GameController extends BaseController{
 
         $ball_status = M('config','sys_')->where(['name' => 'WAP_SUSPEND_SHWO_STATUS'])->getField('value');
         $sites_ball_logo = M('config','sys_')->where(['name' => 'WAP_SUSPEND_ICON'])->getField('value');
-        $sites_ball_logo = get_cover( $sites_ball_logo ,'path');
+        $ball = get_cover( $sites_ball_logo ,'path');
+        $sites_ball_logo = (substr($ball, 0, 7) == "http://" || substr($ball, 0, 8) == "https://" ) ? $ball : C('ADMIN_DOMAIN') . $ball;
         if(strpos($sites_ball_logo, 'http')!==false){
             $sites_ball_logo = $sites_ball_logo;
         }else{

Application/Sdk/Controller/GameGiftPageController.class.php

@@ -57,7 +57,8 @@ class GameGiftPageController extends Controller{
             $list[$key]['now_time'] = NOW_TIME;
    		}
    		$game = M('game','tab_')->where(['id' => $gameId])->field('icon,game_name,icon')->find();
-        $game['icon'] = (substr($game['icon'], 0, 7) == "http://" || substr($game['icon'], 0, 8) == "https://" ) ? $game['icon'] : C('ADMIN_DOMAIN') . get_cover($game['icon'],"path");
+        $icon = get_cover($game['icon'],"path");
+        $game['icon'] = (substr($icon, 0, 7) == "http://" || substr($icon, 0, 8) == "https://" ) ? $icon : C('ADMIN_DOMAIN') . $icon;
    		$game['gift_num'] = count($list);
 
     	$this->assign('user_token', I('user_token'));

Application/Sdk/Controller/UserHController.class.php

@@ -33,7 +33,8 @@ class UserHController extends Controller
                      ->field('user.game_name,user.bind_balance,game.icon')->select();
         foreach($user_play as $k => $v)
         {
-            $cover =  (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] : C('ADMIN_DOMAIN') . get_cover($v['icon'],"path");
+            $icon = get_cover($v['icon'],"path");
+            $cover =  (substr($icon, 0, 7) == "http://" || substr($icon, 0, 8) == "https://" ) ? $icon : C('ADMIN_DOMAIN') . $icon;
             $user_play[$k]['cover'] = $cover;
         }
         $deposit   = M('deposit','tab_')->where(['user_id' => $user_info['id'],'pay_status' => 1])