From 7cccb8e90bd44d8da48debe7b8c155ccea41b5e6 Mon Sep 17 00:00:00 2001
From: avene <gskanym@126.com>
Date: Sat, 12 May 2018 12:21:20 +0800
Subject: [PATCH] #46

---
 .../views/scripts/data/fund-list-bak.phtml    | 41 +++++++++++
 .../views/scripts/data/fund-list.phtml        | 72 ++++++++++++-------
 2 files changed, 89 insertions(+), 24 deletions(-)
 create mode 100644 application/default/views/scripts/data/fund-list-bak.phtml

diff --git a/application/default/views/scripts/data/fund-list-bak.phtml b/application/default/views/scripts/data/fund-list-bak.phtml
new file mode 100644
index 00000000..86c7cf78
--- /dev/null
+++ b/application/default/views/scripts/data/fund-list-bak.phtml
@@ -0,0 +1,41 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle('支持项目');
+$this->headTitle()->setSeparator(' - ');
+$this->nav[] = array('link'=>"/data/fund",'title'=>'支持项目浏览');
+$this->headLink()->appendStylesheet('/static-sanji/css/data-list.css');
+?>
+<hr class="c-f">
+<div class="container">
+    <div class="row">
+        <div class="col-lg-12">
+            <?= $this->render('breadcrumbs.phtml'); ?>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <?= $this->partial('data/tools.phtml'); ?>
+        </div>
+    </div>
+</div>
+<hr class="c-f">
+
+<div class="container">
+    <div class="row">
+        <div class="col-lg-12">
+            <?php if (!empty($this->paginator)) : ?>
+                <?php foreach($this->paginator as $md) : ?>
+                    <div class="well">
+                        <h4><a href="/data/fund/id/<?php echo $md['id'];?>"><?php echo $this->escape($md['title']);?></a></h4>
+                        编号：<?php echo $md['fund_id']; ?>  |  类型：<?php echo $md['fund_type']; ?> | 提供数据集：<?php echo $md['datacount']; ?>条，<?php echo $md['filesize']>5000?(round($md['filesize']/1024,2)).'GB':$md['filesize'].'MB'; ?></div>
+                <?php endforeach; ?>
+                <div class="pagenavi"><?= $this->paginator; ?></div>
+            <?php else : ?>
+                暂无对应信息。
+            <?php endif; ?>
+
+        </div>
+    </div>
+</div>
+
diff --git a/application/default/views/scripts/data/fund-list.phtml b/application/default/views/scripts/data/fund-list.phtml
index 2f7b6664..da29e171 100644
--- a/application/default/views/scripts/data/fund-list.phtml
+++ b/application/default/views/scripts/data/fund-list.phtml
@@ -3,39 +3,63 @@ $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->data);
 $this->headTitle('支持项目');
 $this->headTitle()->setSeparator(' - ');
-$this->nav[] = array('link'=>"/data/fund",'title'=>'支持项目浏览');
-$this->headLink()->appendStylesheet('/static-sanji/css/data-list.css');
+$this->nav[] = array('link' => "/data/fund", 'title' => '项目浏览');
+$this->headLink()->appendStylesheet('/static-sanji-v2/css/dataProduct.css');
+$this->headLink()->appendStylesheet('/static-sanji-v2/css/header-position.css');
 ?>
-<hr class="c-f">
-<div class="container">
-    <div class="row">
-        <div class="col-lg-12">
-            <?= $this->render('breadcrumbs.phtml'); ?>
+<?= $this->render('breadcrumbs.phtml') ?>
+
+<!--搜索框-->
+<div class="searchBox searchBox2">
+    <div class="container">
+        <div class="col-sm-12">
+            <div class="form-group">
+                <input type="text" class="form-control" placeholder="搜素关键词">
+            </div>
+            <i></i>
         </div>
     </div>
-    <div class="row">
+</div>
+<!--固定搜索框-->
+<div class="searchBox searchBox1">
+    <div class="container">
+        <div class="col-sm-12">
+            <div class="form-group">
+                <input type="text" class="form-control" placeholder="搜素关键词">
+            </div>
+            <i></i>
+        </div>
+    </div>
+</div>
+<div class="searchOne">
+    <div class="container">
         <div class="col-lg-12">
             <?= $this->partial('data/tools.phtml'); ?>
         </div>
     </div>
 </div>
-<hr class="c-f">
+<div class="intro1">
+    <div class="container">
 
-<div class="container">
-    <div class="row">
-        <div class="col-lg-12">
-            <?php if (!empty($this->paginator)) : ?>
-                <?php foreach($this->paginator as $md) : ?>
-                    <div class="well">
-                        <h4><a href="/data/fund/id/<?php echo $md['id'];?>"><?php echo $this->escape($md['title']);?></a></h4>
-                        编号：<?php echo $md['fund_id']; ?>  |  类型：<?php echo $md['fund_type']; ?> | 提供数据集：<?php echo $md['datacount']; ?>条，<?php echo $md['filesize']>5000?(round($md['filesize']/1024,2)).'GB':$md['filesize'].'MB'; ?></div>
-                <?php endforeach; ?>
-                <div class="pagenavi"><?= $this->paginator; ?></div>
-            <?php else : ?>
-                暂无对应信息。
-            <?php endif; ?>
-
-        </div>
+    </div>
+</div>
+
+<div class="container">
+    <div class="col-lg-12">
+        <?php if (!empty($this->paginator)) : ?>
+            <?php foreach ($this->paginator as $md) : ?>
+                <div class="well">
+                    <h4><a href="/data/fund/id/<?php echo $md['id']; ?>"><?php echo $this->escape($md['title']); ?></a>
+                    </h4>
+                    编号：<?php echo $md['fund_id']; ?> | 类型：<?php echo $md['fund_type']; ?> |
+                    提供数据集：<?php echo $md['datacount']; ?>
+                    条，<?php echo $md['filesize'] > 5000 ? (round($md['filesize'] / 1024, 2)) . 'GB' : $md['filesize'] . 'MB'; ?>
+                </div>
+            <?php endforeach; ?>
+            <div class="pagenavi"><?= $this->paginator; ?></div>
+        <?php else : ?>
+            暂无对应信息。
+        <?php endif; ?>
     </div>
 </div>