From fce9fb8252b9489fead7c625b1444bdc083cb4b8 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 1 Nov 2023 09:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=89=A7=E8=A1=8C=E5=86=85=E5=AE=B9=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=BE=AE=E4=BF=A1=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E6=89=93=E5=BC=80=EF=BC=8C=E6=9C=AA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BB=A5=E8=BF=9B=E5=85=A5=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=9C=AA=E7=99=BB=E5=BD=95=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/survey/controllers/SurveyController.php   | 11 ++++++++---
 app/common/middleware/AuthenticateFrontend.php        |  7 ++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/backend/modules/survey/controllers/SurveyController.php b/app/backend/modules/survey/controllers/SurveyController.php
index 52a5b4f4..218f445e 100644
--- a/app/backend/modules/survey/controllers/SurveyController.php
+++ b/app/backend/modules/survey/controllers/SurveyController.php
@@ -883,6 +883,9 @@ class SurveyController extends BaseController{
             'ims_yz_invite_page',
             'ims_yz_point_mall_goods',
             'ims_yz_red_packet_goods',
+            'ims_yz_goods_area_dividend',
+            'ims_yz_goods_weight_value',
+
             // 附件相关
             'ims_yz_core_attachment',
             'ims_yz_core_attachment_tags',
@@ -891,6 +894,7 @@ class SurveyController extends BaseController{
             'ims_yz_decorate_advertising',
             'ims_yz_decorate_footer',
             'ims_yz_decorate_templet',
+            'ims_yz_diyform_type',
             // 其他 | 系统相关
             'ims_yz_order_invoice',
             'ims_yz_setting',
@@ -902,7 +906,8 @@ class SurveyController extends BaseController{
             'ims_yz_wechat_rule',
             'ims_yz_wechat_rule_keyword',
             'ims_yz_withdraw_rich_text',
-
+            'ims_yz_help_center_content',
+            'ims_yz_rich_text',
 
 
             // 经销商相关
@@ -934,7 +939,7 @@ class SurveyController extends BaseController{
         // 获取存在数据的表
         $hasTable = $this->getHasDataTable($tables,$notCleanUp);
 
-        debug($hasTable);
+
         // 执行清除操作
         // foreach($tables as $name){
         //     if(!in_array($name,$notCleanUp)){
@@ -947,7 +952,7 @@ class SurveyController extends BaseController{
         //             $primaryKey = $fields[0];
         //             $max = \DB::table($tableName)->where('uniacid',0)->max($primaryKey);
         //             \DB::table($tableName)->where('uniacid','>',0)->delete();
-        //             \DB::select('alter table '.$name.' AUTO_INCREMENT='.$max);
+        //             // \DB::select('alter table '.$name.' AUTO_INCREMENT='.$max);
         //         }else{
         //             \DB::select('TRUNCATE TABLE '.$name.';');
         //         }
diff --git a/app/common/middleware/AuthenticateFrontend.php b/app/common/middleware/AuthenticateFrontend.php
index 82bbb7ab..3bf32508 100644
--- a/app/common/middleware/AuthenticateFrontend.php
+++ b/app/common/middleware/AuthenticateFrontend.php
@@ -73,13 +73,14 @@ class AuthenticateFrontend
             return true;
         }
         if (in_array($type, [MemberFactory::LOGIN_MINI_APP, MemberFactory::LOGIN_DOUYIN, MemberFactory::LOGIN_MINI_APP_FACE])) {
-            return $this->errorJson('请登录', ['login_status' => 0, 'login_url' => Url::absoluteApi('member.login.index', $queryString)]);
+            return $this->errorJson('请登录', ['login_status' => 1, 'login_url' => '', 'type' => $type, 'i' => \YunShop::app()->uniacid, 'mid' => $mid, 'scope' => $scope]);
+            // return $this->errorJson('请登录', ['login_status' => 0, 'login_url' => Url::absoluteApi('member.login.index', $queryString)]);
         }
         if (in_array($type, [MemberFactory::LOGIN_MOBILE, MemberFactory::LOGIN_APP_YDB, MemberFactory::LOGIN_Native, MemberFactory::LOGIN_APP_ANCHOR, MemberFactory::LOGIN_APP_LSP_WALLET])) {
             return $this->errorJson('请登录', ['login_status' => 1, 'login_url' => '', 'type' => $type, 'i' => \YunShop::app()->uniacid, 'mid' => $mid, 'scope' => $scope]);
         }
 
-        return $this->errorJson('请登录', ['login_status' => 0, 'login_url' => Url::absoluteApi('member.login.index', $queryString)]);
-
+        // return $this->errorJson('请登录', ['login_status' => 0, 'login_url' => Url::absoluteApi('member.login.index', $queryString)]);
+        return $this->errorJson('请登录', ['login_status' => 1, 'login_url' => '', 'type' => $type, 'i' => \YunShop::app()->uniacid, 'mid' => $mid, 'scope' => $scope]);
     }
 }
\ No newline at end of file