修改

app-hd/controllers/AdminController.php

@@ -62,15 +62,6 @@ class AdminController extends BaseController
         $apiHost = Yii::$app->params['hdHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
 
-        $lookAllShop = 0;
-        if (getenv('YII_ENV') == 'production') {
-            if ($adminId == 919) {
-                $lookAllShop = 1;
-            }
-        } else {
-            $lookAllShop = 1;
-        }
-
         //涉及几个登录的地方，需要同步修改，请搜索关键词uni_login_info
         util::success([
             'token' => '',
@@ -83,7 +74,6 @@ class AdminController extends BaseController
             'imgUploadApi' => $imgUploadApi,
             //有小程序新版本提示更新
             'update' => $remind,
-            'lookAllShop' => $lookAllShop,
         ]);
     }
 

app-hd/controllers/AuthController.php

@@ -105,15 +105,6 @@ class AuthController extends PublicController
         $apiHost = Yii::$app->params['hdHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
 
-        $lookAllShop = 0;
-        if (getenv('YII_ENV') == 'production') {
-            if ($adminId == 919) {
-                $lookAllShop = 1;
-            }
-        } else {
-            $lookAllShop = 1;
-        }
-
         //涉及几个登录的地方，需要同步修改，请搜索关键词uni_login_info
         util::success([
             'token' => $token,
@@ -126,7 +117,6 @@ class AuthController extends PublicController
             'imgUploadApi' => $imgUploadApi,
             //有小程序新版本提示更新
             'update' => $remind,
-            'lookAllShop' => $lookAllShop,
         ]);
     }
 
@@ -194,15 +184,6 @@ class AuthController extends PublicController
         $apiHost = Yii::$app->params['hdHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
 
-        $lookAllShop = 0;
-        if (getenv('YII_ENV') == 'production') {
-            if ($adminId == 919) {
-                $lookAllShop = 1;
-            }
-        } else {
-            $lookAllShop = 1;
-        }
-
         //涉及几个登录的地方，需要同步修改，请搜索关键词uni_login_info
         util::success([
             'token' => $token,
@@ -215,7 +196,6 @@ class AuthController extends PublicController
             'showDemo' => $showDemo,
             //有小程序新版本提示更新
             'update' => $remind,
-            'lookAllShop' => $lookAllShop,
         ]);
     }
 
@@ -298,15 +278,6 @@ class AuthController extends PublicController
         $apiHost = Yii::$app->params['hdHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
 
-        $lookAllShop = 0;
-        if (getenv('YII_ENV') == 'production') {
-            if ($adminId == 919) {
-                $lookAllShop = 1;
-            }
-        } else {
-            $lookAllShop = 1;
-        }
-
         //涉及几个登录的地方，需要同步修改，请搜索关键词uni_login_info
         util::success([
             'token' => $token,
@@ -319,7 +290,6 @@ class AuthController extends PublicController
             'imgUploadApi' => $imgUploadApi,
             //有小程序新版本提示更新
             'update' => $remind,
-            'lookAllShop' => $lookAllShop,
         ]);
     }
 
@@ -543,15 +513,6 @@ class AuthController extends PublicController
         $apiHost = Yii::$app->params['hdHost'];
         $imgUploadApi = $apiHost . '/upload/save-file';
 
-        $lookAllShop = 0;
-        if (getenv('YII_ENV') == 'production') {
-            if ($adminId == 919) {
-                $lookAllShop = 1;
-            }
-        } else {
-            $lookAllShop = 1;
-        }
-
         //涉及几个登录的地方，需要同步修改，请搜索关键词uni_login_info
         util::success([
             'token' => $token,
@@ -564,7 +525,6 @@ class AuthController extends PublicController
             'imgUploadApi' => $imgUploadApi,
             //有小程序新版本提示更新
             'update' => $remind,
-            'lookAllShop' => $lookAllShop,
         ]);
     }
 

biz-hd/purchase/classes/PurchaseClass.php

@@ -770,6 +770,8 @@ class PurchaseClass extends BaseClass
                                     }
                                     $xjData[] = $xjBase;
                                 }
+                            } else {
+                                $itemData[] = $tmp;
                             }
                         } else {
                             $itemData[] = $tmp;