合并分支 'dev-fix/#11' 到 'dev'

修改底部备案号位置，首页底部轮播图图片格式

查看合并请求 QJMIS-CPD/CPD_company_site/web_company_site!15

.gitlab-ci.yml

@@ -58,9 +58,9 @@ build_push_image_pred:
 remote_run_image_dev:
     stage: deploy
     script:
-      - bash ~/.local/bin/f200.sh   $CONTAINER_NAME    7084 80   $DEV_REPO:$CONTAINER_NAME  guojia   192.168.10.200
+      - bash ~/.local/bin/f200.sh $CONTAINER_NAME  8066 80  $DEV_REPO:$CONTAINER_NAME guojia 192.168.10.200
     tags:
-      - shell-200
+        - shell-200
     only:
       - dev 
     when: on_success
@@ -69,7 +69,7 @@ remote_run_image_pred:
     stage: deploy
   
     script:
-      - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  7084 80  $PRED_REPO:$CONTAINER_NAME zp  39.106.144.161
+      - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  8066  80  $PROD_REPO:$CONTAINER_NAME   zp 39.106.144.161
     tags:
         - shell-prod 
     only:

about.html

@@ -403,10 +403,11 @@
             <img src="./images/white_logo.png" alt="">
         </div>
         <p class="support">千家网络科技提供技术支持</p>
-        <span>唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.冀ICP备14024444号-1</span>
+        <p class="bottom_title">唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.</p>
         <a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window"
-            class="clear filing_information">
-            <img class="left" src="./images/filing_information.png" alt="">
+            class=" filing_information">
+            <img src="./images/filing_information.png" alt="">
+            <span>冀ICP备14024444号-1</span>
         </a>
     </footer>
 </body>

contactus.html

@@ -340,9 +340,11 @@
             <img src="./images/white_logo.png" alt="">
         </div>
         <p class="support">千家网络科技提供技术支持</p>
-        <span>唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.冀ICP备14024444号-1</span>
-        <a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window" class="clear filing_information">
-            <img class="left" src="./images/filing_information.png" alt="">
+        <p class="bottom_title">唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.</p>
+        <a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window"
+            class=" filing_information">
+            <img src="./images/filing_information.png" alt="">
+            <span>冀ICP备14024444号-1</span>
         </a>
     </footer>
 </body>

css/about.css

@@ -392,7 +392,8 @@ header {
     border-radius: 50%;
     background: url(../images/switch.jpg);
     z-index: 100;
-    }
+    overflow: hidden;
+}
 #video_banner .box_show li video{
     object-fit: fill;
     width:100%;

css/index.css

@@ -1646,7 +1646,7 @@
     background: #192d3b;
 }
 
-#footer img {
+#footer .service_img img {
     padding-top: 25px;
     display: block;
     margin: auto;
@@ -1662,7 +1662,7 @@
     margin-top: 12px;
 }
 
-#footer span {
+#footer .bottom_title {
     font-size: 12px;
     line-height: 12px;
     color: rgba(255, 255, 255, .6);
@@ -1672,17 +1672,21 @@
 }
 
 #footer .filing_information {
-    width: 20px;
-    display: block;
-    margin-left: 50%;
-    transform: translate(-10px);
-    margin-top: 10px;
+    text-decoration:none;
+    position: relative;
+    left:50%;
+    top:10px;
+    margin-left:-71px;
 }
-
 #footer .filing_information img {
     width: 20px;
     height: 20px;
-    padding-top: 0;
+}
+
+#footer .filing_information span{
+    color: rgba(255, 255, 255, .6);
+    font-size: 12px;
+    line-height: 20px;
 }
 
 /* 自定义动画 */

index.html

@@ -29,9 +29,7 @@
         <!-- 固定顶部导航 -->
         <div id="top_nav" class="header_scroll">
             <div class="main_body clear">
-                <a class="logo left" href="./index.html#header">
-                    
-                </a>
+                <a class="logo left" href="./index.html#header"></a>
                 <div class="nav right">
                     <a class="nav_first" href="./index.html#header">首页</a>
                     <a href="#introduces">公司介绍</a>
@@ -840,67 +838,67 @@
                 <div class="swiper-wrapper" style="transition-duration: 0ms; transform: translate3d(-4860px, 0px, 0px);">
                     <div class="swiper-slide swiper-slide-duplicate" data-swiper-slide-index="0" style="transform: translateX(9620px); z-index: 899; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/1.jpg">
+                        <img src="images/banner1.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate" data-swiper-slide-index="1" style="transform: translateX(7956px); z-index: 909; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/2.jpg">
+                        <img src="images/banner2.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate" data-swiper-slide-index="2" style="transform: translateX(6448px); z-index: 919; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/3.jpg">
+                        <img src="images/banner3.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate" data-swiper-slide-index="3" style="transform: translateX(5096px); z-index: 929; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/4.jpg">
+                        <img src="images/banner4.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate swiper-slide-duplicate-prev"
                         data-swiper-slide-index="4" style="transform: translateX(3900px); z-index: 939; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/5.jpg">
+                        <img src="images/banner5.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate-active" data-swiper-slide-index="0" style="transform: translateX(2860px);-index: 949; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/1.jpg">
+                        <img src="images/banner1.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate-next" data-swiper-slide-index="1" style="transform: translateX(1976px); z-index: 959; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/2.jpg">
+                        <img src="images/banner2.png">
                     </div>
                     <div class="swiper-slide" data-swiper-slide-index="2" style="transform: translateX(1248px); z-index: 969; opacity: 1; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/3.jpg">
+                        <img src="images/banner3.png">
                     </div>
                     <div class="swiper-slide" data-swiper-slide-index="3" style="transform: translateX(676px); z-index: 979; opacity: 1; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/4.jpg">
+                        <img src="images/banner4.png">
                     </div>
                     <div class="swiper-slide swiper-slide-prev" data-swiper-slide-index="4" style="transform: translateX(320px); z-index: 989; opacity: 1; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/5.jpg">
+                        <img src="images/banner5.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate swiper-slide-active" data-swiper-slide-index="0"
                         style="transform: translateX(0px);-index: 999; opacity: 1; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/1.jpg">
+                        <img src="images/banner1.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate swiper-slide-next" data-swiper-slide-index="1"
                         style="transform: translateX(-320px); z-index: 989; opacity: 1; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/2.jpg">
+                        <img src="images/banner2.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate" data-swiper-slide-index="2" style="transform: translateX(-676px); z-index: 979; opacity: 1; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/3.jpg">
+                        <img src="images/banner3.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate" data-swiper-slide-index="3" style="transform: translateX(-1248px); z-index: 969; opacity: 1; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/4.jpg">
+                        <img src="images/banner4.png">
                     </div>
                     <div class="swiper-slide swiper-slide-duplicate swiper-slide-duplicate-prev"
                         data-swiper-slide-index="4" style="transform: translateX(-1976px); z-index: 959; opacity: 0; transition-duration: 0ms;">
                         <div class="imgmask"></div>
-                        <img src="images/5.jpg">
+                        <img src="images/banner5.png">
                     </div>
                 </div>
             </div>
@@ -914,10 +912,11 @@
             <img src="./images/white_logo.png" alt="">
         </div>
         <p class="support">千家网络科技提供技术支持</p>
-        <span>唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.冀ICP备14024444号-1</span>
+        <p class="bottom_title">唐山千家房地产经纪有限公司版权所有copyright 2005-2014© www.allhome.com.cn Network.All Rights Reserved.</p>
         <a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window"
-            class="clear filing_information">
-            <img class="left" src="./images/filing_information.png" alt="">
+            class=" filing_information">
+            <img src="./images/filing_information.png" alt="">
+            <span>冀ICP备14024444号-1</span>
         </a>
     </footer>
 </body>