Skip to content

T
test
提交 88a572a5 作者: 崔宇锋
操作

合并分支 'dev' 到 'release' 

修改底部备案号位置，修改图片格式和大小

查看合并请求 QJMIS-CPD/CPD_company_site/web_company_site!19
上级 d2f82684 11c91d92
正在显示 包含 61 行增加 和 38 行删除
.gitlab-ci.yml
...@@ -58,9 +58,9 @@ build_push_image_pred: ...@@ -58,9 +58,9 @@ build_push_image_pred:
remote_run_image_dev: remote_run_image_dev:
stage: deploy stage: deploy
script: 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: tags:
- shell-200 - shell-200
only: only:
- dev - dev
when: on_success when: on_success
...@@ -69,7 +69,7 @@ remote_run_image_pred: ...@@ -69,7 +69,7 @@ remote_run_image_pred:
stage: deploy stage: deploy
script: 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: tags:
- shell-prod - shell-prod
only: only:
......
about.html
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
<!-- 固定导航 --> <!-- 固定导航 -->
<div id="top_nav" class="header_scroll"> <div id="top_nav" class="header_scroll">
<div class="main_body clear"> <div class="main_body clear">
<a class="logo left" href="./index.html#header"> <a class="logo left" href="./index.html#header"></a>
<img src="./images/logo-02.svg" alt="" class="left">
</a>
<div class="nav right"> <div class="nav right">
<a class="nav_first" href="./index.html#header">首页</a> <a class="nav_first" href="./index.html#header">首页</a>
<a href="./index.html#introduce">公司介绍</a> <a href="./index.html#introduce">公司介绍</a>
...@@ -403,10 +401,11 @@ ...@@ -403,10 +401,11 @@
<img src="./images/white_logo.png" alt=""> <img src="./images/white_logo.png" alt="">
</div> </div>
<p class="support">千家网络科技提供技术支持</p> <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" <a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window"
class="clear filing_information"> class=" filing_information">
<img class="left" src="./images/filing_information.png" alt=""> <img src="./images/filing_information.png" alt="">
<span>冀ICP备14024444号-1</span>
</a> </a>
</footer> </footer>
</body> </body>
......
contactus.html
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
<!-- 固定导航 --> <!-- 固定导航 -->
<div id="top_nav" class="header_scroll"> <div id="top_nav" class="header_scroll">
<div class="main_body clear"> <div class="main_body clear">
<a class="logo left" href="./index.html#header"> <a class="logo left" href="./index.html#header"></a>
<img src="./images/logo-02.svg" alt="" class="left">
</a>
<div class="nav right"> <div class="nav right">
<a class="nav_first" href="./index.html#header">首页</a> <a class="nav_first" href="./index.html#header">首页</a>
<a href="./index.html#introduce">公司介绍</a> <a href="./index.html#introduce">公司介绍</a>
...@@ -122,12 +120,17 @@ ...@@ -122,12 +120,17 @@
<div class="market"> <div class="market">
<div class="circleProgress_wrapper"> <div class="circleProgress_wrapper">
<div class="rightcircle_on"></div> <div class="rightcircle_on"></div>
<!-- 右半边圆 -->
<div class="wrapper right"> <div class="wrapper right">
<div class="circleProgress rightcircle"><div class="rightcircle_right"></div></div> <div class="circleProgress rightcircle">
<div class="rightcircle_right"></div>
</div>
</div> </div>
<!-- 左半边圆 -->
<div class="wrapper left"> <div class="wrapper left">
<div class="circleProgress leftcircle"><div class="leftcircle_left"></div></div> <div class="circleProgress leftcircle">
<div class="leftcircle_left"></div>
</div>
</div> </div>
</div> </div>
<div class="text"> <div class="text">
...@@ -340,9 +343,11 @@ ...@@ -340,9 +343,11 @@
<img src="./images/white_logo.png" alt=""> <img src="./images/white_logo.png" alt="">
</div> </div>
<p class="support">千家网络科技提供技术支持</p> <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"> <a href="http://www.tsgswj.gov.cn//ei/Ei!certificate.action?id=4028858a5e8395ee015e94710f27001f" target="view_window"
<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> </a>
</footer> </footer>
</body> </body>
......
css/about.css
...@@ -392,7 +392,8 @@ header { ...@@ -392,7 +392,8 @@ header {
border-radius: 50%; border-radius: 50%;
background: url(../images/switch.jpg); background: url(../images/switch.jpg);
z-index: 100; z-index: 100;
} overflow: hidden;
}
#video_banner .box_show li video{ #video_banner .box_show li video{
object-fit: fill; object-fit: fill;
width:100%; width:100%;
......
css/contactus.css
...@@ -232,18 +232,21 @@ ...@@ -232,18 +232,21 @@
position: absolute; position: absolute;
top:0; top:0;
-webkit-transform: rotate(-135deg); -webkit-transform: rotate(-135deg);
-ms-transform: rotate(-135deg);
} }
.circleProgress_wrapper .wrapper .rightcircle{ .circleProgress_wrapper .wrapper .rightcircle{
border-top:20px solid #12ab8d; border-top:20px solid #12ab8d;
border-right:20px solid #12ab8d; border-right:20px solid #12ab8d;
right:0; right:0;
-webkit-animation: circleProgressLoad_right 2s linear forwards; -webkit-animation: circleProgressLoad_right 2s linear forwards;
-ms-animation: circleProgressLoad_right 2s linear forwards;
} }
.circleProgress_wrapper .wrapper .leftcircle{ .circleProgress_wrapper .wrapper .leftcircle{
border-bottom:20px solid #12ab8d; border-bottom:20px solid #12ab8d;
border-left:20px solid #12ab8d; border-left:20px solid #12ab8d;
left:0; left:0;
-webkit-animation: circleProgressLoad_left 2s linear forwards; -webkit-animation: circleProgressLoad_left 2s linear forwards;
-ms-animation: circleProgressLoad_left 2s linear forwards;
} }
@-webkit-keyframes circleProgressLoad_right{ @-webkit-keyframes circleProgressLoad_right{
0%{ 0%{
...@@ -253,12 +256,30 @@ ...@@ -253,12 +256,30 @@
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
} }
} }
@-ms-keyframes circleProgressLoad_right{
0%{
-ms-transform: rotate(-135deg);
}
50%,100%{
-ms-transform: rotate(45deg);
}
}
@-webkit-keyframes circleProgressLoad_left{ @-webkit-keyframes circleProgressLoad_left{
0%,50%{ 0%,50%{
-webkit-transform: rotate(-135deg); -webkit-transform: rotate(-135deg);
-ms-transform: rotate(-135deg);
} }
100%{ 100%{
-webkit-transform: rotate(-15deg); -webkit-transform: rotate(-15deg);
-ms-transform: rotate(-15deg);
}
}
@-ms-keyframes circleProgressLoad_left{
0%,50%{
-ms-transform: rotate(-135deg);
}
100%{
-ms-transform: rotate(-15deg);
} }
} }
.circleProgress_wrapper .right{ .circleProgress_wrapper .right{
......
css/index.css
...@@ -1326,7 +1326,7 @@ ...@@ -1326,7 +1326,7 @@
/* 发展历程 */ /* 发展历程 */
#cours { #cours {
height: 800px; height: 800px;
background: url('../images/cours_img.jpg') no-repeat center; background: url('../images/cours_img.png') no-repeat center;
} }
#cours .cours_content { #cours .cours_content {
...@@ -1528,7 +1528,7 @@ ...@@ -1528,7 +1528,7 @@
/* 荣誉资质 */ /* 荣誉资质 */
#honor { #honor {
margin-bottom: 80px; /* margin-bottom: 80px; */
} }
#honor .honor_content { #honor .honor_content {
text-align: center; text-align: center;
...@@ -1633,20 +1633,13 @@ ...@@ -1633,20 +1633,13 @@
} }
/* 千家大地图 */ /* 千家大地图 */
#qj_map .map_content {
width: 100%;
height: 900px;
margin-top: 60px;
background: url('../images/map.jpg') no-repeat center;
}
/* 底部 */ /* 底部 */
#footer { #footer {
height: 220px; height: 220px;
background: #192d3b; background: #192d3b;
} }
#footer img { #footer .service_img img {
padding-top: 25px; padding-top: 25px;
display: block; display: block;
margin: auto; margin: auto;
...@@ -1662,7 +1655,7 @@ ...@@ -1662,7 +1655,7 @@
margin-top: 12px; margin-top: 12px;
} }
#footer span { #footer .bottom_title {
font-size: 12px; font-size: 12px;
line-height: 12px; line-height: 12px;
color: rgba(255, 255, 255, .6); color: rgba(255, 255, 255, .6);
...@@ -1672,17 +1665,21 @@ ...@@ -1672,17 +1665,21 @@
} }
#footer .filing_information { #footer .filing_information {
width: 20px; text-decoration:none;
display: block; position: relative;
margin-left: 50%; left:50%;
transform: translate(-10px); top:10px;
margin-top: 10px; margin-left:-71px;
} }
#footer .filing_information img { #footer .filing_information img {
width: 20px; width: 20px;
height: 20px; height: 20px;
padding-top: 0; }
#footer .filing_information span{
color: rgba(255, 255, 255, .6);
font-size: 12px;
line-height: 20px;
} }
/* 自定义动画 */ /* 自定义动画 */
......
js/commons.js
...@@ -15,7 +15,7 @@ window.onscroll=function(){ ...@@ -15,7 +15,7 @@ window.onscroll=function(){
var arr=document.getElementsByClassName("numbers")[0]; var arr=document.getElementsByClassName("numbers")[0];
arr.innerHTML = num; arr.innerHTML = num;
if(num==85){ if(num==85){
clearInterval(t); clearInterval(t);
} }
if(num>40){ if(num>40){
$(".leftcircle_left").show() $(".leftcircle_left").show()
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论