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

Application/Sdk/Conf/config.php

@@ -114,14 +114,10 @@ $config = array(
     	'SQ_SHORTCUT' => 15,
     	'SQ_SMALL_PROGRAM' => 16, //双乾 小程序
     ),
-    'ADMIN_DOMAIN' => 'http://www.platform.com', // 'http://10.0.1.75:8089/',//
+    'ADMIN_DOMAIN' => 'https://mg.wmtxkj.cn/', // 'http://10.0.1.75:8089/',//
     'WX_PAY_LIMIT' => 3000,
     'PAY_DOMAIN' => 'https://api.wmtxkj.cn/',
-    'H5_DOMAIN' => 'http://api.wmtxkj.cn/',
+    'H5_DOMAIN' => 'http://api.wmtxkj.cn/'
-    'DL_DOMAIN' => 'https://dl.wmtxkj.cn/',
-    
-    //'PAY_DOMAIN' => 'http://10.0.1.75:8088/',
-    //'H5_DOMAIN' => 'http://10.0.1.75:8088/',
 );
 return $config;
 /* $pay = include(APP_PATH . "/Sdk/Conf/pay.php");

Application/Sdk/Controller/GameController.class.php

@@ -256,11 +256,7 @@ class GameController extends BaseController{
         $sites_ball_logo = M('config','sys_')->where(['name' => 'WAP_SUSPEND_ICON'])->getField('value');
         $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{
-            $sites_ball_logo = C('ADMIN_DOMAIN').$sites_ball_logo;
-        }
 
         $ret = [
             'sites_ball_logo' => $sites_ball_logo,