Merge branch 'sh' into dev

common/components/dict.php

@@ -9,7 +9,7 @@ class dict
 
     public static $data = [
 		//使用新的配送方式
-        'newShMethod'=>[0],
+        'newShMethod'=>[36843],
         // 配送方式默认配置
         'shMethod' => [
             0 => [

common/config/main-local.php

@@ -1,20 +1,7 @@
 <?php
 // 线上
 if (getenv('YII_ENV') == 'production') {
-    //$config = [];
-    $config = [
-        'bootstrap' => ['debug', 'gii'],
-        'modules' => [
-            'debug' => [
-                'class' => 'yii\debug\Module',
-                'allowedIPs' => [getenv('DEBUG_ALLOWED_IP','127.0.0.1')],
-            ],
-            'gii' => [
-                'class' => 'yii\gii\Module',
-                'allowedIPs' => [getenv('GII_ALLOWED_IP','127.0.0.1')],
-            ],
-        ],
-    ];
+    $config = [];
 } else { // 非线上
     $config = [
         'bootstrap' => ['debug', 'gii'],