Merge branch 'dev'

Application/Home/View/default/Public/bases.html

@@ -75,7 +75,7 @@
   <block name="body"></block>
 </div>
 
-<div class="footer">
+<!-- <div class="footer">
   <div class="inner" style="margin-top: 27px;">
     <p>
       <span>客服电话：{:C('CH_SET_SERVER_TEL')}</span><span>客服邮箱：{:C('CH_SET_SERVER_EMAIL')}</span><span>服务时间：09:00 - 18:00</span>
@@ -84,7 +84,7 @@
             class="footer_text2">网络文化经营许可证编号：{:C('CH_SET_LICENSE')}</span><span class="footer_text3">{:C('CH_SET_COPYRIGHT')}</span>
     </p>
   </div>
-</div>
+</div> -->
 
 <script type="text/javascript">
     (function () {

Application/Media/View/default/Index/hezuo.html

@@ -10,7 +10,7 @@
             <div>邮政编码：350004</div>
         </div>
     </div>
-    <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
     <script type="text/javascript">
         //创建和初始化地图函数：
         function initMap(){

Public/Admin/css/loginnews1711.css

@@ -35,7 +35,7 @@ input:-webkit-autofill{background-color:#ECF5FA;background-image: none;-webkit-b
 .logintop ul li a:hover{color:#fff;}
 
 .loginbody{background:url(../images/loginbg3.png) no-repeat center center; width:100%; height:585px; overflow:hidden; position:absolute; top:47px;}
-.systemlogo{background:url(../images/loginlogo.png) no-repeat center;width:100%; height:71px; margin-top:75px;}
+.systemlogo{/*background:url(../images/loginlogo.png) no-repeat center;*/width:100%; height:71px; margin-top:75px;}
 .loginbox{width:500px; height:336px;height:356px; position:absolute;left:0;right:0;background:#FFF;margin:50px auto 0;border-radius:5px;box-shadow:1px 1px 14px rgba(0,0,0,.4);}
 .loginbox .wrap {padding:0 50px;}
 .loginbox h3 {overflow:hidden;clear:both;height:80px;line-height:90px;}