liugc 1 год назад
Родитель
Сommit
fa38e4a695

+ 2 - 2
app/adminapi/lists/property/PropertyActivityLists.php

@@ -38,7 +38,7 @@ class PropertyActivityLists extends BaseAdminDataLists implements ListsSearchInt
     public function setSearch(): array
     {
         return [
-            '=' => ['property_head_id', 'activity_name', 'activity_start_time', 'activity_end_time'],
+            '=' => ['property_head_id', 'activity_name', 'activity_start_time', 'activity_end_time','page_type'],
 
         ];
     }
@@ -57,7 +57,7 @@ class PropertyActivityLists extends BaseAdminDataLists implements ListsSearchInt
     {
         return PropertyActivity::with(['propertyHeadInfo'])
         ->where($this->searchWhere)
-            ->field(['id', 'property_head_id', 'activity_name', 'activity_start_time', 'activity_end_time','block_data','url_page'])
+            ->field(['id', 'property_head_id', 'activity_name', 'activity_start_time', 'activity_end_time','block_data','url_page','page_type'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

+ 3 - 1
app/adminapi/logic/property/PropertyActivityLogic.php

@@ -48,6 +48,7 @@ class PropertyActivityLogic extends BaseLogic
                 'activity_start_time' => $params['activity_start_time'],
                 'activity_end_time' => $params['activity_end_time'],
                 'url_page' => $params['url_page']??'',
+                'page_type' => $params['page_type']??0,
             ]);
 
             Db::commit();
@@ -78,6 +79,7 @@ class PropertyActivityLogic extends BaseLogic
                 'activity_end_time' => $params['activity_end_time']?strtotime($params['activity_end_time']):0,
                 'block_data' => json_encode($params['block_data']??[]),
                 'url_page' => $params['url_page']??'',
+                'page_type' => $params['page_type']??0,
             ]);
 
             Db::commit();
@@ -120,7 +122,7 @@ class PropertyActivityLogic extends BaseLogic
         try {
             $response = (new WeChatMnpService())->getUnlimitedQRCode(
                 'property_activity_id='.$params['id'],
-                env('miniprogram.property_activity_qrcode', ''),
+                (isset($params['mnp_page']) && $params['mnp_page'])?$params['mnp_page']:env('miniprogram.property_activity_qrcode', ''),
                 env('miniprogram.mini_env_version', 'release'),
                 false
             );