Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

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) {

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>