From 134d89e61d1797a3d8ced5325c6347f95ec6e1f0 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 30 Oct 2023 16:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=8A=A5=E5=90=8D=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/headline/web/controller/headline.ctrl.php          | 3 ++-
 .../plugin/headline/web/view/default/headline/infoList.html   | 3 +++
 .../plugin/rush/web/view/default/active/active_list.html      | 3 +++
 .../sys/view/default/member/campus_activities/index.html      | 4 +++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/weliam_smartcity/plugin/headline/web/controller/headline.ctrl.php b/addons/weliam_smartcity/plugin/headline/web/controller/headline.ctrl.php
index 5b1b6bd..9c6661f 100644
--- a/addons/weliam_smartcity/plugin/headline/web/controller/headline.ctrl.php
+++ b/addons/weliam_smartcity/plugin/headline/web/controller/headline.ctrl.php
@@ -143,7 +143,8 @@ class Headline_WeliamController {
             a.call_id,
             a.goods_name,
             b.name as one_name,
-            d.name as two_name
+            d.name as two_name,
+            a.diyformid
             FROM "
             . tablename(PDO_NAME . "headline_content")
             . " a LEFT JOIN "
diff --git a/addons/weliam_smartcity/plugin/headline/web/view/default/headline/infoList.html b/addons/weliam_smartcity/plugin/headline/web/view/default/headline/infoList.html
index 77bbb87..8ed0ef1 100644
--- a/addons/weliam_smartcity/plugin/headline/web/view/default/headline/infoList.html
+++ b/addons/weliam_smartcity/plugin/headline/web/view/default/headline/infoList.html
@@ -62,6 +62,9 @@
                             <td>{php echo date("Y-m-d H:i:s",$v['release_time'])}</td>
                             <td>{$v['browse']}</td>
                             <td>
+                                {if $v['diyformid']}
+                                <a class="btn btn-primary btn-sm" href="{php echo web_url('member/campusActivities/enrollList',array('activities_id' => $v['id'],'active' => 3,'template_type' => 1));}" target="_blank" title="">报名记录</a>
+                                {/if}
                                 <a class="btn btn-sm btn-success js-clip" href="javascript:;" data-url="{php echo h5_url('pages/mainPages/headline/headlineDetail',['id'=>$v['id']])}" >复制链接</a>
                                 <a class="btn btn-sm btn-info js-clip" href="javascript:;" data-url="pages/mainPages/headline/headlineDetail?id={$v['id']}" >复制路径</a>
                                 <a class="btn btn-sm btn-warning" href="{php echo web_url('headline/headline/getIntoEdit',array('id'=>$v['id']))}" >编辑</a>
diff --git a/addons/weliam_smartcity/plugin/rush/web/view/default/active/active_list.html b/addons/weliam_smartcity/plugin/rush/web/view/default/active/active_list.html
index 8cd89b6..624b12b 100644
--- a/addons/weliam_smartcity/plugin/rush/web/view/default/active/active_list.html
+++ b/addons/weliam_smartcity/plugin/rush/web/view/default/active/active_list.html
@@ -182,6 +182,9 @@
 						{if empty($item['pftid']) && Customized::init('pft147') > 0 }
 						<p style="color: #428bca;display: inline-block;"><a href="{php echo web_url('goodshouse/goodshouse/checklist', array('id' => $item['id'],'plugin'=>'rush'))}">核销码</a> </p>
 						{/if}
+						{if $item['diyformid_enroll']}
+						<p style="color: #428bca;display: inline-block;"><a href="{php echo web_url('member/campusActivities/enrollList',array('activities_id' => $item['id'],'active' => 3,'template_type' => 2));}" target="_blank">报名记录</a> </p>
+						{/if}
 					</td>
 				</tr>
 				{/loop}
diff --git a/addons/weliam_smartcity/sys/view/default/member/campus_activities/index.html b/addons/weliam_smartcity/sys/view/default/member/campus_activities/index.html
index 01eb312..c1177bc 100644
--- a/addons/weliam_smartcity/sys/view/default/member/campus_activities/index.html
+++ b/addons/weliam_smartcity/sys/view/default/member/campus_activities/index.html
@@ -131,7 +131,9 @@
                         <a href="#" class="btn btn-danger btn-sm" data-toggle="modal" data-target="#modal-reject{$row['id']}" data-placement="top" title="驳回">驳回</a>
                             {/if}
                         {/if}
-                        <a class="btn btn-success btn-sm" href="{php echo web_url('member/campusActivities/enrollList',array('activities_id' => $row['id'],'active' => 3));}" title="">报名记录</a>
+                        {if $row['diyformid']}
+                        <a class="btn btn-success btn-sm" href="{php echo web_url('member/campusActivities/enrollList',array('activities_id' => $row['id'],'active' => 3,'template_type' => 1));}" title="">报名记录</a>
+                        {/if}
                         <a class="btn btn-primary btn-sm" href="{php echo web_url('member/campusActivities/edit',array('id' => $row['id']));}" title="">编辑</a>
                         <a class="btn btn-danger btn-sm" href="#" onclick="deleteInfo(this,{php echo $row['id'];},{php echo $row['status'];})" title="">删除</a>
                     </td>