From 21782ff951a7547d6280493de7dd52ba2a6b2c5e Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Sat, 9 Nov 2019 16:58:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=8F=AF=E4=B8=8B=E8=BD=BD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Download/listsIndex.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Application/Home/View/default/Download/listsIndex.html b/Application/Home/View/default/Download/listsIndex.html
index 3e31eb9fd..a3de12995 100644
--- a/Application/Home/View/default/Download/listsIndex.html
+++ b/Application/Home/View/default/Download/listsIndex.html
@@ -138,7 +138,7 @@
                       </td>
                   <td>
                       <if condition="$vo['status'] eq 0">
-                          <a href="{:U('download/export',array('conditions'=>$vo['conditions'],'id'=>$vo['id'],'dataname'=>$vo['dataname']))}" style="cursor: pointer"
+                          <a href="{:U('download/export',array('conditions'=>$vo['conditions'],'id'=>$vo['id'],'dataname'=>$vo['dataname']))}" onclick="reload()" style="cursor: pointer"
                        class="chakan"><span>可下载</span></a>
                        
                       <else /> <a href="javascript:;"  class="current"><span style="color:#9D9D9D">已下载</span></a>
@@ -235,4 +235,9 @@
   <script>
         setValue('pid', {$Think.request.pid |default = '""'});           
   </script>
+  <script>
+    function reload() {
+            setTimeout(function(){ window.location.reload(); }, 1000);
+        }  
+  </script>
 </block>

From 3a109a644421af596ac64a8600ddb9db4b76e3fa Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Mon, 11 Nov 2019 10:34:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/DownloadController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index f7028dcd7..82183649d 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -2513,7 +2513,7 @@ class DownloadController extends BaseController {
         foreach ($records as $key1 => $value1) {
            $xlsData[] = $value1;
         }
-        $this->exportExcel($xlsName, $xlsCell, $xlsData,$id);
+        $this->exportExcel($xlsName, $xlsCell, $xlsData,$tid);
      }
      
      public function rechargeExcelInfo($id,$map) {