杨乐 / virtual · 提交

转到一个项目

作者 杨乐
提交 7d339405c975de0159fcbe72e3aaa236b64c17b7 1 个父辈 e0d49d62
1 个管道 的构建 通过 耗费 4 秒

提交

内嵌 并排对比
正在显示 10 个修改的文件 包含 94 行增加 和 115 行删除
... ... @@ -53,12 +53,14 @@
<!-- <a href="index.html"><img src="./img/portfolio/Y9.png"></a> -->
<a class="header-right-btn" onclick="setPersonal()">
<h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;border-radius: 50%;">&nbsp;</h1>
<!-- <h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;border-radius: 50%;">&nbsp;</h1>
<div class="header-xian">
<div class="header-xian1">&nbsp;</div>
<div class="header-xian2">&nbsp;</div>
</div>
</div> -->
<img src="./img/portfolio/circle.png" style="width: 50px;height: 50px;">
</a>
</div>
</div>
... ...
... ... @@ -37,50 +37,56 @@
<body>
<header>
<!-- /////////////////////////////////////////Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
<!-- <nav class="navbar navbar-default navbar-fixed-top">
<div class="header-text">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<img src="img/portfolio/B1.png" class="navbar-brand page-scroll" alt="">
<!-- <img src="img/portfolio/B1.png" class="img-responsive" alt=""> -->
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<!-- <span class="icon-bar"></span> -->
</button>
<!-- <a class="navbar-brand page-scroll" href="#page-top">CLEMENTINE</a> -->
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<!-- <li class="hidden">
<a href="#page-top"></a>
</li> -->
<li>
<a class="page-scroll" href="#about">退出登录</a>
</li>
<li>
<!-- <a class="navbar-brand page-scroll" href="#page-top">CLEMENTINE</a> -->
<a class="page-scroll" href="#projects">Projects</a>
<!-- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> -->
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
</div>
<!-- /.container-fluid -->
</nav> -->
<nav>
<div class="header-txt1" style="display: flex;justify-content: space-between;">
<div class="header-img1">
<img src="./img/portfolio/B1.png">
</div>
<div class="header-right1">
<div class="header-btnL">
<a href="login.html">
<div class="header-loginBtn" style="color: #323232;border-bottom: 1px solid #323232;margin-right: 30px;">退出登录</div>
</a>
</div>
<div>
<!-- <a href="index.html"><img src="./img/portfolio/Y9.png"></a> -->
<a class="header-right-btn" onclick="setPersonal()">
<!-- <h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;border-radius: 50%;">&nbsp;</h1>
<div class="header-xian">
<div class="header-xian1">&nbsp;</div>
<div class="header-xian2">&nbsp;</div>
</div> -->
<img src="./img/portfolio/circle.png" style="width: 50px;height: 50px;">
</a>
</div>
</div>
</div>
</nav>
<!-- Navigation -->
... ...
... ... @@ -47,17 +47,21 @@
<div class="header-loginBtn">退出登录</div>
</a>
<a class="header-right-btn" onclick="setPersonal()">
<h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;height: 40px; border-radius: 50%;">&nbsp;</h1>
<!-- <h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;height: 40px; border-radius: 50%;">&nbsp;</h1>
<div class="header-xian">
<div class="header-xian1">&nbsp;</div>
<div class="header-xian2">&nbsp;</div>
</div>
</div> -->
<img src="./img/portfolio/circle.png" style="width: 50px;height: 50px;">
</a>
</div>
</div>
</nav>
<div class="header-text hidden-xs" style="padding: 0 70px;">
<div class="col-md-12 text-center" style='display:flex;justify-content: space-between;'>
<div style="flex: 3;">
... ...
... ... @@ -375,7 +375,7 @@
<!-- <script src="js/owl.carousel.min.js"></script> -->
<script src="js/cbpAnimatedHeader.js"></script>
<script src="./index.js"></script>
<script src="./js/script.js"></script>
<!-- <script src="./js/script.js"></script> -->
<script src="config.js"></script>
<!-- carousel -->
<script src="./owl-carousel/owl.carousel.js"></script>
... ...
... ... @@ -263,6 +263,14 @@ $(document).ready(function() {
// })
});
var header1 = {
"Content-Type": "application/x-www-form-urlencoded",
"token": localStorage.getItem('token'),
}
var header2 = {
"Content-Type": "application/json",
"token": localStorage.getItem('token'),
}
//首页答案
function showAnswer(id) {
... ...
... ... @@ -37,50 +37,31 @@
<body>
<header>
<!-- /////////////////////////////////////////Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="header-text">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<img src="img/portfolio/B1.png" class="navbar-brand page-scroll" alt="">
<!-- <img src="img/portfolio/B1.png" class="img-responsive" alt=""> -->
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<!-- <span class="icon-bar"></span> -->
</button>
<!-- <a class="navbar-brand page-scroll" href="#page-top">CLEMENTINE</a> -->
<nav>
<div class="header-txt1" style="display: flex;justify-content: space-between;">
<div class="header-img1">
<img src="./img/portfolio/B1.png">
</div>
<div class="header-right1">
<div class="header-btnL">
<a href="login.html">
<div class="header-loginBtn" style="color: #323232;border-bottom: 1px solid #323232;margin-right: 30px;">退出登录</div>
</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<!-- <li class="hidden">
<a href="#page-top"></a>
</li> -->
<li>
<a class="page-scroll" href="#about">退出登录</a>
</li>
<li>
<!-- <a class="navbar-brand page-scroll" href="#page-top">CLEMENTINE</a> -->
<a class="page-scroll" href="#projects">Projects</a>
<!-- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> -->
</li>
</ul>
<div>
<!-- <a href="index.html"><img src="./img/portfolio/Y9.png"></a> -->
<a class="header-right-btn" onclick="setPersonal()">
<!-- <h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;border-radius: 50%;">&nbsp;</h1>
<div class="header-xian">
<div class="header-xian1">&nbsp;</div>
<div class="header-xian2">&nbsp;</div>
</div> -->
<img src="./img/portfolio/circle.png" style="width: 50px;height: 50px;">
</a>
</div>
<!-- /.navbar-collapse -->
</div>
</div>
<!-- /.container-fluid -->
</nav>
<!-- Navigation -->
... ...
... ... @@ -25,12 +25,7 @@
<link rel="stylesheet" href="font-awesome-4.4.0/css/font-awesome.min.css" type="text/css">
<link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="js/html5shiv.js"></script>
<script src="js/respond.min.js"></script>
<![endif]-->
</head>
... ...
... ... @@ -5,7 +5,7 @@ $(document).ready(function() {
//截取url ?id=1 第四位
var str1 = url.substr(4)
//公司介绍
var url = "/recommend/recommendList"; // 接口
var url8 = "/recommend/recommendList"; // 接口
var header = {
"Content-Type": "application/x-www-form-urlencoded",
}
... ... @@ -13,7 +13,7 @@ $(document).ready(function() {
id: str1
}
// 调用公共ajax
ajax(url, "GET", header, params, function(res) {
ajax(url8, "GET", header, params, function(res) {
console.log(res);
// console.log(res.data);
$('#titleExplain').html(res.data.titleExplain)
... ...
... ... @@ -43,16 +43,19 @@
<div>
<!-- <a href="index.html"><img src="./img/portfolio/Y9.png"></a> -->
<a class="header-right-btn" onclick="setPersonal()">
<h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;border-radius: 50%;">&nbsp;</h1>
<!-- <h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;border-radius: 50%;">&nbsp;</h1>
<div class="header-xian">
<div class="header-xian1">&nbsp;</div>
<div class="header-xian2">&nbsp;</div>
</div>
</div> -->
<img src="./img/portfolio/circle.png" style="width: 50px;height: 50px;">
</a>
</div>
</div>
</div>
</nav>
</header>
... ...
... ... @@ -37,51 +37,31 @@
<body>
<header>
<!-- /////////////////////////////////////////Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="header-text">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<img src="img/portfolio/B1.png" class="navbar-brand page-scroll" alt="">
<!-- <img src="img/portfolio/B1.png" class="img-responsive" alt=""> -->
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<!-- <span class="icon-bar"></span> -->
</button>
<!-- <a class="navbar-brand page-scroll" href="#page-top">CLEMENTINE</a> -->
<nav>
<div class="header-txt1" style="display: flex;justify-content: space-between;">
<div class="header-img1">
<img src="./img/portfolio/B1.png">
</div>
<div class="header-right1">
<div class="header-btnL">
<a href="login.html">
<div class="header-loginBtn" style="color: #323232;border-bottom: 1px solid #323232;margin-right: 30px;">退出登录</div>
</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<!-- <li class="hidden">
<a href="#page-top"></a>
</li> -->
<li>
<a class="page-scroll" href="#about">退出登录</a>
</li>
<li>
<!-- <a class="navbar-brand page-scroll" href="#page-top">CLEMENTINE</a> -->
<a class="page-scroll" href="#projects">Projects</a>
<!-- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> -->
</li>
</ul>
<div>
<!-- <a href="index.html"><img src="./img/portfolio/Y9.png"></a> -->
<a class="header-right-btn" onclick="setPersonal()">
<!-- <h1 class="header-h1-btn" style="background-color: #66CA94;position: absolute;width: 40px;border-radius: 50%;">&nbsp;</h1>
<div class="header-xian">
<div class="header-xian1">&nbsp;</div>
<div class="header-xian2">&nbsp;</div>
</div> -->
<img src="./img/portfolio/circle.png" style="width: 50px;height: 50px;">
</a>
</div>
<!-- /.navbar-collapse -->
</div>
</div>
<!-- /.container-fluid -->
</nav>
<!-- Navigation -->
</header>
... ...