Skip to content

杨建斌 / page

Go to a project
Toggle navigation
Toggle navigation pinning
18e5d9c5 by Zelig
Options

Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

2 parents 67148877 d58bd67f
Inline Side-by-side
Showing 3 changed files with 11 additions and 5 deletions
application/controllers/Welcome.php
......@@ -18,9 +18,15 @@ class Welcome extends CI_Controller {
* map to /index.php/welcome/<method_name>
* @see https://codeigniter.com/user_guide/general/urls.html
*/
public function desk()
{
echo '';
}
public function index()
{
$this->load->view('welcome/index');
$this->load->view('welcome/work');
}
public function work()
......
application/views/welcome/index.php
......@@ -101,7 +101,7 @@
<div class="Hui-tabNav-wp">
<ul id="min_title_list" class="acrossTab cl">
<li class="active">
<span title="我的桌面" data-href="welcome.html">我的桌面</span>
<span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
<em></em></li>
</ul>
</div>
......@@ -110,7 +110,7 @@
<div id="iframe_box" class="Hui-article">
<div class="show_iframe">
<div style="display:none" class="loading"></div>
<iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe>
<iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
</div>
</div>
</section>
......
application/views/welcome/work.php
......@@ -19,7 +19,7 @@ $this->load->view('common/work_menu');
<div class="Hui-tabNav-wp">
<ul id="min_title_list" class="acrossTab cl">
<li class="active">
<span title="我的桌面" data-href="welcome.html">我的桌面</span>
<span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
<em></em></li>
</ul>
</div>
......@@ -28,7 +28,7 @@ $this->load->view('common/work_menu');
<div id="iframe_box" class="Hui-article">
<div class="show_iframe">
<div style="display:none" class="loading"></div>
<iframe scrolling="yes" frameborder="0" src="welcome.html"></iframe>
<iframe scrolling="yes" frameborder="0" src="<?=site_url('welcome/desk')?>"></iframe>
</div>
</div>
</section>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!