显示最近访问的店铺

app-hd/controllers/OrderController.php

@@ -37,13 +37,8 @@ class OrderController extends BaseController
         $post = Yii::$app->request->post();
         $needSend = isset($post['needSend']) && is_numeric($post['needSend']) ? $post['needSend'] : 1;
         $orderType = $post['orderType'] ?? 1;
-
-        $defaultShopId = MerchantService::getDefaultShopId($this->sj);
-        if (empty($defaultShopId)) {
-            util::fail('没有找到门店');
-        }
         $post['merchantId'] = $this->sjId;
-        $post['shopId'] = $defaultShopId;
+        $post['shopId'] = $this->shopId;
         $post['payWay'] = $this->isWx == true ? 0 : 1;
         $now = time();
         $expireTime = $now + 1800;//订单30分钟后过期
@@ -528,7 +523,8 @@ class OrderController extends BaseController
         $search = isset($get['search']) ? $get['search'] : '';
         $where = [];
         $where['shopId'] = $this->shopId;
-        if (!empty($get['status'])) {
+        $status = $get['status'] ?? 0;
+        if (!empty($status)) {
             $where['status'] = $get['status'];
         }
         if (!empty($search)) {

app-mall/controllers/BaseController.php

@@ -25,9 +25,7 @@ class BaseController extends PublicController
     {
         //定义平台类型 1花店 2供货商 3商城
         Yii::$app->params['ptStyle'] = 3;
-
         $userId = jwt::getLoginId();
-
         if (empty($userId)) {
             util::fail('您还没有登陆');
         }

common/components/dict.php

@@ -10,7 +10,7 @@ class dict
     public static $data = [
 
         //需要显示国兰的信息 0不需要 1需要（要审核小程序请显示国兰信息）
-        'showGlInfo' => 1,
+        'showGlInfo' => 0,
         //显示零售和供货商的演示入口
         'showDemo' => 1,
         //零售演示的管理员id