diff --git a/src/main/webapp/templets/1/shuiwu/about.htm b/src/main/webapp/templets/1/default/about.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/about.htm
rename to src/main/webapp/templets/1/default/about.htm
diff --git a/src/main/webapp/templets/1/shuiwu/advice.htm b/src/main/webapp/templets/1/default/advice.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/advice.htm
rename to src/main/webapp/templets/1/default/advice.htm
diff --git a/src/main/webapp/templets/1/shuiwu/case-list.htm b/src/main/webapp/templets/1/default/case-list.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/case-list.htm
rename to src/main/webapp/templets/1/default/case-list.htm
diff --git a/src/main/webapp/templets/1/shuiwu/contact.htm b/src/main/webapp/templets/1/default/contact.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/contact.htm
rename to src/main/webapp/templets/1/default/contact.htm
diff --git a/src/main/webapp/templets/1/shuiwu/css/animate.css b/src/main/webapp/templets/1/default/css/animate.css
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/css/animate.css
rename to src/main/webapp/templets/1/default/css/animate.css
diff --git a/src/main/webapp/templets/1/shuiwu/css/jquery.sinaemotion.css b/src/main/webapp/templets/1/default/css/jquery.sinaemotion.css
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/css/jquery.sinaemotion.css
rename to src/main/webapp/templets/1/default/css/jquery.sinaemotion.css
diff --git a/src/main/webapp/templets/1/shuiwu/footer.htm b/src/main/webapp/templets/1/default/footer.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/footer.htm
rename to src/main/webapp/templets/1/default/footer.htm
diff --git a/src/main/webapp/templets/1/shuiwu/head-file.htm b/src/main/webapp/templets/1/default/head-file.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/head-file.htm
rename to src/main/webapp/templets/1/default/head-file.htm
diff --git a/src/main/webapp/templets/1/shuiwu/head.htm b/src/main/webapp/templets/1/default/head.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/head.htm
rename to src/main/webapp/templets/1/default/head.htm
diff --git a/src/main/webapp/templets/1/shuiwu/images/00.png b/src/main/webapp/templets/1/default/images/00.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/00.png
rename to src/main/webapp/templets/1/default/images/00.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/01.jpg b/src/main/webapp/templets/1/default/images/01.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/01.jpg
rename to src/main/webapp/templets/1/default/images/01.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/02.jpg b/src/main/webapp/templets/1/default/images/02.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/02.jpg
rename to src/main/webapp/templets/1/default/images/02.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/03.jpg b/src/main/webapp/templets/1/default/images/03.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/03.jpg
rename to src/main/webapp/templets/1/default/images/03.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/1471918025445.png b/src/main/webapp/templets/1/default/images/1471918025445.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/1471918025445.png
rename to src/main/webapp/templets/1/default/images/1471918025445.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/about_us.jpg b/src/main/webapp/templets/1/default/images/about_us.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/about_us.jpg
rename to src/main/webapp/templets/1/default/images/about_us.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/ad_ctr.png b/src/main/webapp/templets/1/default/images/ad_ctr.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/ad_ctr.png
rename to src/main/webapp/templets/1/default/images/ad_ctr.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/alpha.png b/src/main/webapp/templets/1/default/images/alpha.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/alpha.png
rename to src/main/webapp/templets/1/default/images/alpha.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/baidu.png b/src/main/webapp/templets/1/default/images/baidu.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/baidu.png
rename to src/main/webapp/templets/1/default/images/baidu.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/banner.jpg b/src/main/webapp/templets/1/default/images/banner.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/banner.jpg
rename to src/main/webapp/templets/1/default/images/banner.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/case.png b/src/main/webapp/templets/1/default/images/case.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/case.png
rename to src/main/webapp/templets/1/default/images/case.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/code.jpg b/src/main/webapp/templets/1/default/images/code.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/code.jpg
rename to src/main/webapp/templets/1/default/images/code.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/company.png b/src/main/webapp/templets/1/default/images/company.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/company.png
rename to src/main/webapp/templets/1/default/images/company.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/contact_us.jpeg b/src/main/webapp/templets/1/default/images/contact_us.jpeg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/contact_us.jpeg
rename to src/main/webapp/templets/1/default/images/contact_us.jpeg
diff --git a/src/main/webapp/templets/1/shuiwu/images/error.png b/src/main/webapp/templets/1/default/images/error.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/error.png
rename to src/main/webapp/templets/1/default/images/error.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/hu1.png b/src/main/webapp/templets/1/default/images/hu1.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/hu1.png
rename to src/main/webapp/templets/1/default/images/hu1.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/img-2.png b/src/main/webapp/templets/1/default/images/img-2.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/img-2.png
rename to src/main/webapp/templets/1/default/images/img-2.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/level-0.png b/src/main/webapp/templets/1/default/images/level-0.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/level-0.png
rename to src/main/webapp/templets/1/default/images/level-0.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/level-1.png b/src/main/webapp/templets/1/default/images/level-1.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/level-1.png
rename to src/main/webapp/templets/1/default/images/level-1.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/level-2.png b/src/main/webapp/templets/1/default/images/level-2.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/level-2.png
rename to src/main/webapp/templets/1/default/images/level-2.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/level-3.png b/src/main/webapp/templets/1/default/images/level-3.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/level-3.png
rename to src/main/webapp/templets/1/default/images/level-3.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/level-4.png b/src/main/webapp/templets/1/default/images/level-4.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/level-4.png
rename to src/main/webapp/templets/1/default/images/level-4.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/level-5.png b/src/main/webapp/templets/1/default/images/level-5.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/level-5.png
rename to src/main/webapp/templets/1/default/images/level-5.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/loading.gif b/src/main/webapp/templets/1/default/images/loading.gif
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/loading.gif
rename to src/main/webapp/templets/1/default/images/loading.gif
diff --git a/src/main/webapp/templets/1/shuiwu/images/logo.png b/src/main/webapp/templets/1/default/images/logo.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/logo.png
rename to src/main/webapp/templets/1/default/images/logo.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/micro-blog.png b/src/main/webapp/templets/1/default/images/micro-blog.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/micro-blog.png
rename to src/main/webapp/templets/1/default/images/micro-blog.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/mobile.png b/src/main/webapp/templets/1/default/images/mobile.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/mobile.png
rename to src/main/webapp/templets/1/default/images/mobile.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/more.png b/src/main/webapp/templets/1/default/images/more.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/more.png
rename to src/main/webapp/templets/1/default/images/more.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/ms.ico b/src/main/webapp/templets/1/default/images/ms.ico
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/ms.ico
rename to src/main/webapp/templets/1/default/images/ms.ico
diff --git a/src/main/webapp/templets/1/shuiwu/images/new-loading.gif b/src/main/webapp/templets/1/default/images/new-loading.gif
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/new-loading.gif
rename to src/main/webapp/templets/1/default/images/new-loading.gif
diff --git a/src/main/webapp/templets/1/shuiwu/images/news.png b/src/main/webapp/templets/1/default/images/news.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/news.png
rename to src/main/webapp/templets/1/default/images/news.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/news2.png b/src/main/webapp/templets/1/default/images/news2.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/news2.png
rename to src/main/webapp/templets/1/default/images/news2.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/no-comment.png b/src/main/webapp/templets/1/default/images/no-comment.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/no-comment.png
rename to src/main/webapp/templets/1/default/images/no-comment.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/no-data.png b/src/main/webapp/templets/1/default/images/no-data.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/no-data.png
rename to src/main/webapp/templets/1/default/images/no-data.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/our_company.jpeg b/src/main/webapp/templets/1/default/images/our_company.jpeg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/our_company.jpeg
rename to src/main/webapp/templets/1/default/images/our_company.jpeg
diff --git a/src/main/webapp/templets/1/shuiwu/images/pexels-photo-583845.jpeg b/src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/pexels-photo-583845.jpeg
rename to src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
diff --git a/src/main/webapp/templets/1/shuiwu/images/pic.png b/src/main/webapp/templets/1/default/images/pic.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/pic.png
rename to src/main/webapp/templets/1/default/images/pic.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/pics.png b/src/main/webapp/templets/1/default/images/pics.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/pics.png
rename to src/main/webapp/templets/1/default/images/pics.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/search.jpg b/src/main/webapp/templets/1/default/images/search.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/search.jpg
rename to src/main/webapp/templets/1/default/images/search.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/search.png b/src/main/webapp/templets/1/default/images/search.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/search.png
rename to src/main/webapp/templets/1/default/images/search.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/talk_online.jpeg b/src/main/webapp/templets/1/default/images/talk_online.jpeg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/talk_online.jpeg
rename to src/main/webapp/templets/1/default/images/talk_online.jpeg
diff --git a/src/main/webapp/templets/1/shuiwu/images/timg.jpg b/src/main/webapp/templets/1/default/images/timg.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/timg.jpg
rename to src/main/webapp/templets/1/default/images/timg.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/images/we-chat.png b/src/main/webapp/templets/1/default/images/we-chat.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/we-chat.png
rename to src/main/webapp/templets/1/default/images/we-chat.png
diff --git a/src/main/webapp/templets/1/shuiwu/images/weixin.jpg b/src/main/webapp/templets/1/default/images/weixin.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/images/weixin.jpg
rename to src/main/webapp/templets/1/default/images/weixin.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/js/demo.js b/src/main/webapp/templets/1/default/js/demo.js
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/js/demo.js
rename to src/main/webapp/templets/1/default/js/demo.js
diff --git a/src/main/webapp/templets/1/shuiwu/js/jquery.sinaEmotion.js b/src/main/webapp/templets/1/default/js/jquery.sinaEmotion.js
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/js/jquery.sinaEmotion.js
rename to src/main/webapp/templets/1/default/js/jquery.sinaEmotion.js
diff --git a/src/main/webapp/templets/1/shuiwu/js/slider.js b/src/main/webapp/templets/1/default/js/slider.js
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/js/slider.js
rename to src/main/webapp/templets/1/default/js/slider.js
diff --git a/src/main/webapp/templets/1/shuiwu/less/about.less b/src/main/webapp/templets/1/default/less/about.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/about.less
rename to src/main/webapp/templets/1/default/less/about.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/advice.less b/src/main/webapp/templets/1/default/less/advice.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/advice.less
rename to src/main/webapp/templets/1/default/less/advice.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/base.less b/src/main/webapp/templets/1/default/less/base.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/base.less
rename to src/main/webapp/templets/1/default/less/base.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/case-list.less b/src/main/webapp/templets/1/default/less/case-list.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/case-list.less
rename to src/main/webapp/templets/1/default/less/case-list.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/center.less b/src/main/webapp/templets/1/default/less/center.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/center.less
rename to src/main/webapp/templets/1/default/less/center.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/index.less b/src/main/webapp/templets/1/default/less/index.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/index.less
rename to src/main/webapp/templets/1/default/less/index.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/login.less b/src/main/webapp/templets/1/default/less/login.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/login.less
rename to src/main/webapp/templets/1/default/less/login.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/news-list.less b/src/main/webapp/templets/1/default/less/news-list.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/news-list.less
rename to src/main/webapp/templets/1/default/less/news-list.less
diff --git a/src/main/webapp/templets/1/shuiwu/less/news-show.less b/src/main/webapp/templets/1/default/less/news-show.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/less/news-show.less
rename to src/main/webapp/templets/1/default/less/news-show.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/about.htm b/src/main/webapp/templets/1/default/m/about.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/about.htm
rename to src/main/webapp/templets/1/default/m/about.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/advice.htm b/src/main/webapp/templets/1/default/m/advice.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/advice.htm
rename to src/main/webapp/templets/1/default/m/advice.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/case-list.htm b/src/main/webapp/templets/1/default/m/case-list.htm
similarity index 82%
rename from src/main/webapp/templets/1/shuiwu/m/case-list.htm
rename to src/main/webapp/templets/1/default/m/case-list.htm
index 3eaad36d..a019b883 100644
--- a/src/main/webapp/templets/1/shuiwu/m/case-list.htm
+++ b/src/main/webapp/templets/1/default/m/case-list.htm
@@ -13,38 +13,29 @@
                     <div class="am-gallery-item ms-case-div">
                         <a href='[field.source/]'><img class="ms-case-list-img" src="{ms:global.host/}[field.litpic/]" alt="[field.title/]"/></a>
                 	</div>
-                	<span class="am-hide ms-cur-{ms:page.cur/}-[field.index/]">{ms:page.next/}</span>
                 </li>
                 {/ms:arclist}
             </ul>
-           <!--  <div id="ul{ms:page.cur/}"></div> -->
         </div>
         <#include "m/footer.htm"/>
     </body>
 </html>
 <script>
-/*var time = 1;
+var time = 1;
 $(window).scroll(function() {　　
 	var scrollTop = $(this).scrollTop();　　
 	var scrollHeight = $(document).height();　
 	var windowHeight = $(this).height();　　
 	if(scrollTop + windowHeight == scrollHeight) {
 		var time2 = $(".ms-cur-" + time + "-1").text()
-		if(time == "{ms:page.total/}") {
-			return;
-		}
 		$("#ul" + time).load(time2 + " #ms-ui");
 		$("#am-active-1").append("<div id=\"ul" + (time + 1) + "\"></div>")
 		time++;
 	}else if(scrollTop + 56 + windowHeight == scrollHeight){
 		var time2 = $(".ms-cur-" + time + "-1").text()
-		if(time == "{ms:page.total/}") {
-			return;
-		}
 		$("#ul" + time).load(time2 + " #ms-ui");
 		$("#am-active-1").append("<div id=\"ul" + (time + 1) + "\"></div>")
 		time++;
 	}
 });
-*/
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/templets/1/shuiwu/m/contact.htm b/src/main/webapp/templets/1/default/m/contact.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/contact.htm
rename to src/main/webapp/templets/1/default/m/contact.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/css/jquery.sinaemotion.css b/src/main/webapp/templets/1/default/m/css/jquery.sinaemotion.css
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/css/jquery.sinaemotion.css
rename to src/main/webapp/templets/1/default/m/css/jquery.sinaemotion.css
diff --git a/src/main/webapp/templets/1/shuiwu/m/css/style.css b/src/main/webapp/templets/1/default/m/css/style.css
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/css/style.css
rename to src/main/webapp/templets/1/default/m/css/style.css
diff --git a/src/main/webapp/templets/1/shuiwu/m/footer.htm b/src/main/webapp/templets/1/default/m/footer.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/footer.htm
rename to src/main/webapp/templets/1/default/m/footer.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/head-file.htm b/src/main/webapp/templets/1/default/m/head-file.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/head-file.htm
rename to src/main/webapp/templets/1/default/m/head-file.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/head.htm b/src/main/webapp/templets/1/default/m/head.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/head.htm
rename to src/main/webapp/templets/1/default/m/head.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/01.png b/src/main/webapp/templets/1/default/m/images/01.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/01.png
rename to src/main/webapp/templets/1/default/m/images/01.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/02.png b/src/main/webapp/templets/1/default/m/images/02.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/02.png
rename to src/main/webapp/templets/1/default/m/images/02.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/03.png b/src/main/webapp/templets/1/default/m/images/03.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/03.png
rename to src/main/webapp/templets/1/default/m/images/03.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/04.png b/src/main/webapp/templets/1/default/m/images/04.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/04.png
rename to src/main/webapp/templets/1/default/m/images/04.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/05.png b/src/main/webapp/templets/1/default/m/images/05.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/05.png
rename to src/main/webapp/templets/1/default/m/images/05.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/about.png b/src/main/webapp/templets/1/default/m/images/about.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/about.png
rename to src/main/webapp/templets/1/default/m/images/about.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/case.png b/src/main/webapp/templets/1/default/m/images/case.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/case.png
rename to src/main/webapp/templets/1/default/m/images/case.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/hu1.png b/src/main/webapp/templets/1/default/m/images/hu1.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/hu1.png
rename to src/main/webapp/templets/1/default/m/images/hu1.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/level-0.png b/src/main/webapp/templets/1/default/m/images/level-0.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/level-0.png
rename to src/main/webapp/templets/1/default/m/images/level-0.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/level-1.png b/src/main/webapp/templets/1/default/m/images/level-1.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/level-1.png
rename to src/main/webapp/templets/1/default/m/images/level-1.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/level-2.png b/src/main/webapp/templets/1/default/m/images/level-2.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/level-2.png
rename to src/main/webapp/templets/1/default/m/images/level-2.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/level-3.png b/src/main/webapp/templets/1/default/m/images/level-3.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/level-3.png
rename to src/main/webapp/templets/1/default/m/images/level-3.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/level-4.png b/src/main/webapp/templets/1/default/m/images/level-4.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/level-4.png
rename to src/main/webapp/templets/1/default/m/images/level-4.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/level-5.png b/src/main/webapp/templets/1/default/m/images/level-5.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/level-5.png
rename to src/main/webapp/templets/1/default/m/images/level-5.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/loading.gif b/src/main/webapp/templets/1/default/m/images/loading.gif
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/loading.gif
rename to src/main/webapp/templets/1/default/m/images/loading.gif
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/message.png b/src/main/webapp/templets/1/default/m/images/message.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/message.png
rename to src/main/webapp/templets/1/default/m/images/message.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/mo.png b/src/main/webapp/templets/1/default/m/images/mo.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/mo.png
rename to src/main/webapp/templets/1/default/m/images/mo.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/mobile.png b/src/main/webapp/templets/1/default/m/images/mobile.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/mobile.png
rename to src/main/webapp/templets/1/default/m/images/mobile.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/ms.ico b/src/main/webapp/templets/1/default/m/images/ms.ico
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/ms.ico
rename to src/main/webapp/templets/1/default/m/images/ms.ico
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/no-data.png b/src/main/webapp/templets/1/default/m/images/no-data.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/no-data.png
rename to src/main/webapp/templets/1/default/m/images/no-data.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/pics.png b/src/main/webapp/templets/1/default/m/images/pics.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/pics.png
rename to src/main/webapp/templets/1/default/m/images/pics.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/timg.jpg b/src/main/webapp/templets/1/default/m/images/timg.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/timg.jpg
rename to src/main/webapp/templets/1/default/m/images/timg.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/m/images/搜索.png b/src/main/webapp/templets/1/default/m/images/搜索.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/images/搜索.png
rename to src/main/webapp/templets/1/default/m/images/搜索.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/index.htm b/src/main/webapp/templets/1/default/m/index.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/index.htm
rename to src/main/webapp/templets/1/default/m/index.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/indexa.htm b/src/main/webapp/templets/1/default/m/indexa.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/indexa.htm
rename to src/main/webapp/templets/1/default/m/indexa.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/js/jiaoben.js b/src/main/webapp/templets/1/default/m/js/jiaoben.js
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/js/jiaoben.js
rename to src/main/webapp/templets/1/default/m/js/jiaoben.js
diff --git a/src/main/webapp/templets/1/shuiwu/m/js/jquery.sinaEmotion.js b/src/main/webapp/templets/1/default/m/js/jquery.sinaEmotion.js
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/js/jquery.sinaEmotion.js
rename to src/main/webapp/templets/1/default/m/js/jquery.sinaEmotion.js
diff --git a/src/main/webapp/templets/1/shuiwu/m/less/about.less b/src/main/webapp/templets/1/default/m/less/about.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/less/about.less
rename to src/main/webapp/templets/1/default/m/less/about.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/less/advice.less b/src/main/webapp/templets/1/default/m/less/advice.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/less/advice.less
rename to src/main/webapp/templets/1/default/m/less/advice.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/less/base.less b/src/main/webapp/templets/1/default/m/less/base.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/less/base.less
rename to src/main/webapp/templets/1/default/m/less/base.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/less/case-list.less b/src/main/webapp/templets/1/default/m/less/case-list.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/less/case-list.less
rename to src/main/webapp/templets/1/default/m/less/case-list.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/less/index.less b/src/main/webapp/templets/1/default/m/less/index.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/less/index.less
rename to src/main/webapp/templets/1/default/m/less/index.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/less/news-list.less b/src/main/webapp/templets/1/default/m/less/news-list.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/less/news-list.less
rename to src/main/webapp/templets/1/default/m/less/news-list.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/less/news-show.less b/src/main/webapp/templets/1/default/m/less/news-show.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/less/news-show.less
rename to src/main/webapp/templets/1/default/m/less/news-show.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/news-list.htm b/src/main/webapp/templets/1/default/m/news-list.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/news-list.htm
rename to src/main/webapp/templets/1/default/m/news-list.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/news-show.htm b/src/main/webapp/templets/1/default/m/news-show.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/news-show.htm
rename to src/main/webapp/templets/1/default/m/news-show.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/center.htm b/src/main/webapp/templets/1/default/m/people/center.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/center.htm
rename to src/main/webapp/templets/1/default/m/people/center.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/css/ms.mall.m.people.css b/src/main/webapp/templets/1/default/m/people/css/ms.mall.m.people.css
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/css/ms.mall.m.people.css
rename to src/main/webapp/templets/1/default/m/people/css/ms.mall.m.people.css
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/head-file.htm b/src/main/webapp/templets/1/default/m/people/head-file.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/head-file.htm
rename to src/main/webapp/templets/1/default/m/people/head-file.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/head.htm b/src/main/webapp/templets/1/default/m/people/head.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/head.htm
rename to src/main/webapp/templets/1/default/m/people/head.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/background.png b/src/main/webapp/templets/1/default/m/people/images/background.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/background.png
rename to src/main/webapp/templets/1/default/m/people/images/background.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/bg-upload.png b/src/main/webapp/templets/1/default/m/people/images/bg-upload.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/bg-upload.png
rename to src/main/webapp/templets/1/default/m/people/images/bg-upload.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/btn.png b/src/main/webapp/templets/1/default/m/people/images/btn.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/btn.png
rename to src/main/webapp/templets/1/default/m/people/images/btn.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/cart-active.png b/src/main/webapp/templets/1/default/m/people/images/cart-active.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/cart-active.png
rename to src/main/webapp/templets/1/default/m/people/images/cart-active.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/cart-goods-top.png b/src/main/webapp/templets/1/default/m/people/images/cart-goods-top.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/cart-goods-top.png
rename to src/main/webapp/templets/1/default/m/people/images/cart-goods-top.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/cart-input.png b/src/main/webapp/templets/1/default/m/people/images/cart-input.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/cart-input.png
rename to src/main/webapp/templets/1/default/m/people/images/cart-input.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/cart.png b/src/main/webapp/templets/1/default/m/people/images/cart.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/cart.png
rename to src/main/webapp/templets/1/default/m/people/images/cart.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/center-bg.png b/src/main/webapp/templets/1/default/m/people/images/center-bg.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/center-bg.png
rename to src/main/webapp/templets/1/default/m/people/images/center-bg.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/center-head.png b/src/main/webapp/templets/1/default/m/people/images/center-head.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/center-head.png
rename to src/main/webapp/templets/1/default/m/people/images/center-head.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_feedback.png b/src/main/webapp/templets/1/default/m/people/images/center-icon_feedback.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_feedback.png
rename to src/main/webapp/templets/1/default/m/people/images/center-icon_feedback.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_help.png b/src/main/webapp/templets/1/default/m/people/images/center-icon_help.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_help.png
rename to src/main/webapp/templets/1/default/m/people/images/center-icon_help.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_member.png b/src/main/webapp/templets/1/default/m/people/images/center-icon_member.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_member.png
rename to src/main/webapp/templets/1/default/m/people/images/center-icon_member.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_personal.png b/src/main/webapp/templets/1/default/m/people/images/center-icon_personal.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/center-icon_personal.png
rename to src/main/webapp/templets/1/default/m/people/images/center-icon_personal.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/center-insider.png b/src/main/webapp/templets/1/default/m/people/images/center-insider.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/center-insider.png
rename to src/main/webapp/templets/1/default/m/people/images/center-insider.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/cloth.jpg b/src/main/webapp/templets/1/default/m/people/images/cloth.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/cloth.jpg
rename to src/main/webapp/templets/1/default/m/people/images/cloth.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/finish.png b/src/main/webapp/templets/1/default/m/people/images/finish.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/finish.png
rename to src/main/webapp/templets/1/default/m/people/images/finish.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/header-bg.png b/src/main/webapp/templets/1/default/m/people/images/header-bg.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/header-bg.png
rename to src/main/webapp/templets/1/default/m/people/images/header-bg.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/img.jpg b/src/main/webapp/templets/1/default/m/people/images/img.jpg
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/img.jpg
rename to src/main/webapp/templets/1/default/m/people/images/img.jpg
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/location-border.png b/src/main/webapp/templets/1/default/m/people/images/location-border.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/location-border.png
rename to src/main/webapp/templets/1/default/m/people/images/location-border.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/pay_wx.png b/src/main/webapp/templets/1/default/m/people/images/pay_wx.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/pay_wx.png
rename to src/main/webapp/templets/1/default/m/people/images/pay_wx.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/images/pay_zfb.png b/src/main/webapp/templets/1/default/m/people/images/pay_zfb.png
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/images/pay_zfb.png
rename to src/main/webapp/templets/1/default/m/people/images/pay_zfb.png
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/center.less b/src/main/webapp/templets/1/default/m/people/less/center.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/center.less
rename to src/main/webapp/templets/1/default/m/people/less/center.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/head.less b/src/main/webapp/templets/1/default/m/people/less/head.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/head.less
rename to src/main/webapp/templets/1/default/m/people/less/head.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/login.less b/src/main/webapp/templets/1/default/m/people/less/login.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/login.less
rename to src/main/webapp/templets/1/default/m/people/less/login.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/password-change.less b/src/main/webapp/templets/1/default/m/people/less/password-change.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/password-change.less
rename to src/main/webapp/templets/1/default/m/people/less/password-change.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/password-forget-1.less b/src/main/webapp/templets/1/default/m/people/less/password-forget-1.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/password-forget-1.less
rename to src/main/webapp/templets/1/default/m/people/less/password-forget-1.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/password-forget-2.less b/src/main/webapp/templets/1/default/m/people/less/password-forget-2.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/password-forget-2.less
rename to src/main/webapp/templets/1/default/m/people/less/password-forget-2.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/password-forget-3.less b/src/main/webapp/templets/1/default/m/people/less/password-forget-3.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/password-forget-3.less
rename to src/main/webapp/templets/1/default/m/people/less/password-forget-3.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/less/register.less b/src/main/webapp/templets/1/default/m/people/less/register.less
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/less/register.less
rename to src/main/webapp/templets/1/default/m/people/less/register.less
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/login.htm b/src/main/webapp/templets/1/default/m/people/login.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/login.htm
rename to src/main/webapp/templets/1/default/m/people/login.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/password-change.htm b/src/main/webapp/templets/1/default/m/people/password-change.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/password-change.htm
rename to src/main/webapp/templets/1/default/m/people/password-change.htm
diff --git a/src/main/webapp/templets/1/shuiwu/m/people/register.htm b/src/main/webapp/templets/1/default/m/people/register.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/m/people/register.htm
rename to src/main/webapp/templets/1/default/m/people/register.htm
diff --git a/src/main/webapp/templets/1/shuiwu/menu-left.htm b/src/main/webapp/templets/1/default/menu-left.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/menu-left.htm
rename to src/main/webapp/templets/1/default/menu-left.htm
diff --git a/src/main/webapp/templets/1/shuiwu/news-list.htm b/src/main/webapp/templets/1/default/news-list.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/news-list.htm
rename to src/main/webapp/templets/1/default/news-list.htm
diff --git a/src/main/webapp/templets/1/shuiwu/news-show.htm b/src/main/webapp/templets/1/default/news-show.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/news-show.htm
rename to src/main/webapp/templets/1/default/news-show.htm
diff --git a/src/main/webapp/templets/1/shuiwu/people/center.htm b/src/main/webapp/templets/1/default/people/center.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/people/center.htm
rename to src/main/webapp/templets/1/default/people/center.htm
diff --git a/src/main/webapp/templets/1/shuiwu/people/login.htm b/src/main/webapp/templets/1/default/people/login.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/people/login.htm
rename to src/main/webapp/templets/1/default/people/login.htm
diff --git a/src/main/webapp/templets/1/shuiwu/people/password-change.htm b/src/main/webapp/templets/1/default/people/password-change.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/people/password-change.htm
rename to src/main/webapp/templets/1/default/people/password-change.htm
diff --git a/src/main/webapp/templets/1/shuiwu/people/register.htm b/src/main/webapp/templets/1/default/people/register.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/people/register.htm
rename to src/main/webapp/templets/1/default/people/register.htm
diff --git a/src/main/webapp/templets/1/shuiwu/search.htm b/src/main/webapp/templets/1/default/search.htm
similarity index 100%
rename from src/main/webapp/templets/1/shuiwu/search.htm
rename to src/main/webapp/templets/1/default/search.htm