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

@@ -18,9 +18,15 @@ class Welcome extends CI_Controller {
 	 * map to /index.php/welcome/<method_name>
 	 * map to /index.php/welcome/<method_name>
 	 * @see https://codeigniter.com/user_guide/general/urls.html
 	 * @see https://codeigniter.com/user_guide/general/urls.html
 	 */
 	 */
+
+    public function desk()
+    {
+        echo '';
+    }
+
 	public function index()
 	public function index()
 	{
 	{
-		$this->load->view('welcome/index');
+		$this->load->view('welcome/work');
 	}
 	}
 
 
     public function work()
     public function work()

@@ -101,7 +101,7 @@
         <div class="Hui-tabNav-wp">
         <div class="Hui-tabNav-wp">
             <ul id="min_title_list" class="acrossTab cl">
             <ul id="min_title_list" class="acrossTab cl">
                 <li class="active">
                 <li class="active">
-                    <span title="我的桌面" data-href="welcome.html">我的桌面</span>
+                    <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
                     <em></em></li>
                     <em></em></li>
             </ul>
             </ul>
         </div>
         </div>
@@ -110,7 +110,7 @@
     <div id="iframe_box" class="Hui-article">
     <div id="iframe_box" class="Hui-article">
         <div class="show_iframe">
         <div class="show_iframe">
             <div style="display:none" class="loading"></div>
             <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>
     </div>
     </div>
 </section>
 </section>

@@ -19,7 +19,7 @@ $this->load->view('common/work_menu');
         <div class="Hui-tabNav-wp">
         <div class="Hui-tabNav-wp">
             <ul id="min_title_list" class="acrossTab cl">
             <ul id="min_title_list" class="acrossTab cl">
                 <li class="active">
                 <li class="active">
-                    <span title="我的桌面" data-href="welcome.html">我的桌面</span>
+                    <span title="我的桌面" data-href="<?=site_url('welcome/desk')?>">我的桌面</span>
                     <em></em></li>
                     <em></em></li>
             </ul>
             </ul>
         </div>
         </div>
@@ -28,7 +28,7 @@ $this->load->view('common/work_menu');
     <div id="iframe_box" class="Hui-article">
     <div id="iframe_box" class="Hui-article">
         <div class="show_iframe">
         <div class="show_iframe">
             <div style="display:none" class="loading"></div>
             <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>
     </div>
     </div>
 </section>
 </section>