杨乐 / virtual · 提交

转到一个项目

作者 杨乐
提交 c4faf5e6155792da4d4833670ac2147f689083e9 1 个父辈 6a59d84f
1 个管道 的构建 通过 耗费 3 秒

提交

内嵌 并排对比
正在显示 5 个修改的文件 包含 219 行增加 和 80 行删除
@@ -43,9 +43,72 @@ @@ -43,9 +43,72 @@
43 <link href="assets/css/responsive.css" rel="stylesheet"> 43 <link href="assets/css/responsive.css" rel="stylesheet">
44 44
45 <style> 45 <style>
  46 + #sixfields1{
  47 + padding-top: 40px;
  48 + }
  49 + #fivefields1{
  50 + font-size: 18px;
  51 + font-family: Gotham, Gotham-Medium;
  52 + font-weight: 500;
  53 + text-align: left;
  54 + color: #66ca94;
  55 + line-height: 23px;
  56 + }
  57 + #fivefields2{
  58 + margin-top: 20px;
  59 + font-size: 40px;
  60 + font-family: PingFangSC, PingFangSC-Regular;
  61 + font-weight: 400;
  62 + text-align: left;
  63 + color: #323232;
  64 + line-height: 60px;
  65 + }
  66 + .share_head{
  67 + text-align: left;margin: 80px 0 80px 200px;
  68 + }
  69 + .share_all{
  70 + display: flex;flex-direction: column; padding: 20px;
  71 + }
  72 + .share_top{
  73 + display: flex;place-items: center;
  74 + }
46 .login-footer-all { 75 .login-footer-all {
47 display: none; 76 display: none;
48 } 77 }
  78 + .share_img{
  79 + width: 130px;
  80 + height: 130px;
  81 + }
  82 + .share_name{
  83 + margin-left: 40px;
  84 + }
  85 + .share_name p{
  86 + font-size: 32px;
  87 + font-family: PingFangSC, PingFangSC-Semibold;
  88 + font-weight: 600;
  89 + text-align: justify;
  90 + color: #323232;
  91 + line-height: 32px;
  92 + }
  93 + .share_name div{
  94 + font-size: 20px;
  95 + font-family: PingFangSC, PingFangSC-Semibold;
  96 + font-weight: 600;
  97 + text-align: justify;
  98 + color: #323232;
  99 + line-height: 32px;
  100 + }
  101 + .share_title{
  102 + margin-top: 30px;
  103 + font-size: 18px;
  104 + font-family: Helvetica;
  105 + text-align: left;
  106 + color: #5a5a5a;
  107 + line-height: 32px;
  108 + }
  109 +
  110 +
  111 +
49 112
50 .index-header-showTitle { 113 .index-header-showTitle {
51 width: 70%; 114 width: 70%;
@@ -179,6 +242,75 @@ @@ -179,6 +242,75 @@
179 } 242 }
180 243
181 @media(max-width:768px) { 244 @media(max-width:768px) {
  245 + #fivefields1{
  246 + margin-top: 40px;
  247 + font-size: 9px;
  248 + font-family: Gotham, Gotham-Medium;
  249 + font-weight: 500;
  250 + text-align: center;
  251 + color: #66ca94;
  252 + }
  253 + #fivefields2{
  254 + margin-top: 10px;
  255 + font-size: 14px;
  256 + font-family: PingFangSC, PingFangSC-Semibold;
  257 + font-weight: 600;
  258 + text-align: center;
  259 + color: #323232;
  260 + line-height: 14px;
  261 + }
  262 + .share_head{
  263 + text-align: left;
  264 + margin: 0;
  265 + /* margin: 80px 0 80px 200px; */
  266 + }
  267 + .share_all{
  268 + display: flex;flex-direction: column; padding: 10px;
  269 + }
  270 + .share_top{
  271 + display: flex;place-items: center;
  272 + }
  273 + /* .login-footer-all {
  274 + display: none;
  275 + } */
  276 + .share_img{
  277 + width: 90px;
  278 + height: 50px;
  279 + }
  280 + .share_name{
  281 + margin-left: 6px;
  282 + }
  283 + .share_name p{
  284 + font-size: 10px;
  285 + font-family: PingFangSC, PingFangSC-Semibold;
  286 + font-weight: 600;
  287 + text-align: justify;
  288 + color: #323232;
  289 + line-height: 10px;
  290 + }
  291 + .share_name div{
  292 + padding-top: 2px;
  293 + font-size: 9px;
  294 + font-family: PingFangSC, PingFangSC-Semibold;
  295 + text-align: justify;
  296 + color: #323232;
  297 + line-height: 10px;
  298 + }
  299 + .share_title{
  300 + margin-top: 8px;
  301 + font-size: 9px;
  302 + font-family: Helvetica;
  303 + text-align: left;
  304 + color: #5a5a5a;
  305 + line-height: 14px;
  306 + display: -webkit-box;
  307 + -webkit-box-orient: vertical;
  308 + -webkit-line-clamp: 3;
  309 + overflow: hidden;
  310 + }
  311 +
  312 +
  313 +
182 header { 314 header {
183 height: 350px; 315 height: 350px;
184 } 316 }
@@ -677,32 +809,30 @@ @@ -677,32 +809,30 @@
677 </div> 809 </div>
678 </div> 810 </div>
679 </section> 811 </section>
680 - <!-- 测试 -->  
681 - <div class="banner-box">  
682 - <div class="banner-top"></div>  
683 - <div class="banner-top-one"></div> 812 + <!-- 学长学姐分享 -->
  813 + <div class="banner-box" style="background: #f0f0f0;">
  814 + <div class="share_head">
  815 + <div id="fivefields1"></div>
  816 + <h2 id="fivefields2"></h2>
  817 + </div>
684 <div class="swiper-container"> 818 <div class="swiper-container">
685 <div class="swiper-wrapper"> 819 <div class="swiper-wrapper">
686 - <div class="swiper-slide swiper-slide-center none-effect">  
687 - <a href="javascript:;">  
688 - <img src="swiperCss/images/t1.png" about="" title="">  
689 - </a>  
690 - </div>  
691 - <div class="swiper-slide">  
692 - <a href="javascript:;">  
693 - <img src="swiperCss/images/t2.png" about="" title="">  
694 - </a>  
695 - </div>  
696 - <div class="swiper-slide">  
697 - <a href="javascript:;">  
698 - <img src="swiperCss/images/t3.png" about="" title="">  
699 - </a>  
700 - </div>  
701 - <div class="swiper-slide">  
702 - <a href="javascript:;">  
703 - <img src="swiperCss/images/t4.png" about="" title="">  
704 - </a>  
705 - </div> 820 +
  821 + <!-- <div class="swiper-slide swiper-slide-center none-effect">
  822 + <div class="share_all">
  823 + <div class="share_top">
  824 + <div class="share_img">
  825 + <img src="img/portfolio/H1.png" style="width: 100%;">
  826 + </div>
  827 + <div class="share_name">
  828 + <p>张同学</p>
  829 + <div>加入START-LINE已有3个月</div>
  830 + </div>
  831 + </div>
  832 + <div class="share_title">Start-line提供了各种不同行业不同角色的真实职场工作体验机会，通过不同项目的完成，我可以快速深入了解各类型工作及企业的真实状态及企业文化情况，使自己可以清晰透彻地评估自身性格特点，优势劣势，与职位及企业的匹配程度，在信息充分 …</div>
  833 + </div>
  834 + </div> -->
  835 +
706 </div> 836 </div>
707 <div class="banner-arrow"> 837 <div class="banner-arrow">
708 <div class="swiper-button-prev"></div> 838 <div class="swiper-button-prev"></div>
@@ -145,52 +145,68 @@ $(document).ready(function() { @@ -145,52 +145,68 @@ $(document).ready(function() {
145 console.log(res); 145 console.log(res);
146 }) 146 })
147 //学长学姐分享 147 //学长学姐分享
148 - var url7 = "/warrantyThree/warrantyThreeList"  
149 header5 = { 148 header5 = {
150 "Content-Type": "application/x-www-form-urlencoded" 149 "Content-Type": "application/x-www-form-urlencoded"
151 } 150 }
152 - ajax(url7, "GET", header5, function(res) { 151 + ajax("/warrantyThree/warrantyThreeList", "GET", header5, function(res) {
153 152
154 }, function(res) { 153 }, function(res) {
155 console.log(res); 154 console.log(res);
156 for (let i in res.data) { 155 for (let i in res.data) {
157 console.log(res.data[i]); 156 console.log(res.data[i]);
158 - let img = `<img src='${res.data[i].img}' style="width: 100%; ">`  
159 - $("#head-img").append(img)  
160 -  
161 - $("#little-name").html(res.data[i].name)  
162 - $("#remark").html(res.data[i].remark)  
163 - $("#sketch").html(res.data[i].sketch)  
164 - $("#h-name").html(res.data[i].name)  
165 - $("#h-remark").html(res.data[i].remark)  
166 - $("#header-content").html(res.data[i].content)  
167 -  
168 - let title = `  
169 - <div class="training-block-one">  
170 - <div class="inner-box">  
171 - <div class="content-box">  
172 - <figure><img src="img/portfolio/white.png" alt=""></figure>  
173 - <div class="text" style="top: 0px;">  
174 - <div style="display: flex;place-items: center;padding-left: 5%; ">  
175 - <div id="head-img" style="width:30%"><img src='${res.data[i].img}' style="width: 100%; "></div>  
176 - <div style='display:flex;flex-direction: column;padding-left: 8%;text-align: left;'>  
177 - <h3 id="little-name" style="color: #323232;">${res.data[i].name}</h3>  
178 - <p id="remark" style="color: #5a5a5a;">${res.data[i].remark}</p> 157 + let tit = `
  158 + <div class="swiper-slide swiper-slide-center none-effect">
  159 + <div class="share_all">
  160 + <div class="share_top">
  161 + <div class="share_img">
  162 + <img src="${res.data[i].img}" style="width: 100%;">
  163 + </div>
  164 + <div class="share_name">
  165 + <p>${res.data[i].name}</p>
  166 + <div>${res.data[i].remark}</div>
179 </div> 167 </div>
180 </div> 168 </div>
181 - <h4 id="sketch" style="color: #5A5A5A;">${res.data[i].sketch}</h4>  
182 - </div>  
183 - </div>  
184 - <div class="overlay-box">  
185 - <div class="text" style="display: flex;">  
186 - <h4 id="h-name" style="padding-right: 10px;">${res.data[i].name}</h4>  
187 - <h4 id="h-remark">${res.data[i].remark}</h4> 169 + <div class="share_title">${res.data[i].sketch}</div>
188 </div> 170 </div>
189 - <p id="header-content">${res.data[i].content}</p>  
190 - </div>  
191 - </div>  
192 - </div>`  
193 - $(".owl-stage").append(title) 171 + </div>`
  172 + $(".swiper-wrapper").append(tit)
  173 +
  174 + // let img = `<img src='${res.data[i].img}' style="width: 100%; ">`
  175 + // $("#head-img").append(img)
  176 +
  177 + // $("#little-name").html(res.data[i].name)
  178 + // $("#remark").html(res.data[i].remark)
  179 + // $("#sketch").html(res.data[i].sketch)
  180 + // $("#h-name").html(res.data[i].name)
  181 + // $("#h-remark").html(res.data[i].remark)
  182 + // $("#header-content").html(res.data[i].content)
  183 +
  184 + // let title = `
  185 + // <div class="training-block-one">
  186 + // <div class="inner-box">
  187 + // <div class="content-box">
  188 + // <figure><img src="img/portfolio/white.png" alt=""></figure>
  189 + // <div class="text" style="top: 0px;">
  190 + // <div style="display: flex;place-items: center;padding-left: 5%; ">
  191 + // <div id="head-img" style="width:30%"><img src='${res.data[i].img}' style="width: 100%; "></div>
  192 + // <div style='display:flex;flex-direction: column;padding-left: 8%;text-align: left;'>
  193 + // <h3 id="little-name" style="color: #323232;">${res.data[i].name}</h3>
  194 + // <p id="remark" style="color: #5a5a5a;">${res.data[i].remark}</p>
  195 + // </div>
  196 + // </div>
  197 + // <h4 id="sketch" style="color: #5A5A5A;">${res.data[i].sketch}</h4>
  198 + // </div>
  199 + // </div>
  200 + // <div class="overlay-box">
  201 + // <div class="text" style="display: flex;">
  202 + // <h4 id="h-name" style="padding-right: 10px;">${res.data[i].name}</h4>
  203 + // <h4 id="h-remark">${res.data[i].remark}</h4>
  204 + // </div>
  205 + // <p id="header-content">${res.data[i].content}</p>
  206 + // </div>
  207 + // </div>
  208 + // </div>`
  209 + // $(".owl-stage").append(title)
194 210
195 211
196 212
@@ -21,20 +21,14 @@ $(document).ready(function() { @@ -21,20 +21,14 @@ $(document).ready(function() {
21 //传回code值 微信登录 21 //传回code值 微信登录
22 ajax('/login/loginCheck', "POST", header1, params, function(res) { 22 ajax('/login/loginCheck', "POST", header1, params, function(res) {
23 console.log(res); 23 console.log(res);
24 - //res.data  
25 - //id:"1351093655816945665"  
26 - //status:1  
27 - //status1:2  
28 - //token:'****'  
29 - //w_name:null  
30 var header2 = { 24 var header2 = {
31 "Content-Type": "application/x-www-form-urlencoded", 25 "Content-Type": "application/x-www-form-urlencoded",
32 "token": res.data.token 26 "token": res.data.token
33 } 27 }
34 -  
35 // alert("登录成功！") 28 // alert("登录成功！")
36 localStorage.setItem("token", res.data.token); 29 localStorage.setItem("token", res.data.token);
37 localStorage.setItem("userId", res.data.id); 30 localStorage.setItem("userId", res.data.id);
  31 + localStorage.setItem("w_name", res.data.w_name);
38 var params = { code: ncode } 32 var params = { code: ncode }
39 //绑定账号的用户授权 33 //绑定账号的用户授权
40 ajax('/login/loginCheck1', "PUT", header2, params, function(res) { 34 ajax('/login/loginCheck1', "PUT", header2, params, function(res) {
@@ -702,7 +702,7 @@ @@ -702,7 +702,7 @@
702 </div> --> 702 </div> -->
703 <div style="margin-bottom: 50px;"> 703 <div style="margin-bottom: 50px;">
704 <div style="background: url(./img/portfolio/Y10.png) no-repeat;background-size: 100% 100%;padding-left: 2%;"> 704 <div style="background: url(./img/portfolio/Y10.png) no-repeat;background-size: 100% 100%;padding-left: 2%;">
705 - <h3 id="vip-info">普通会员</h3> 705 + <h3 id="vip-info"></h3>
706 <div class="per2-date"> 706 <div class="per2-date">
707 <img src="./img/portfolio/Y11.png" style="width: 15px;height: 15px;"> 707 <img src="./img/portfolio/Y11.png" style="width: 15px;height: 15px;">
708 <div class="per2-date-a"> 708 <div class="per2-date-a">
@@ -794,7 +794,7 @@ @@ -794,7 +794,7 @@
794 794
795 <!-- Custom Theme JavaScript --> 795 <!-- Custom Theme JavaScript -->
796 <script src="js/agency.js"></script> 796 <script src="js/agency.js"></script>
797 - <script src='./personalCenter.js'></script> 797 + <script src='./personalCenter2.js'></script>
798 <!-- Plugin JavaScript --> 798 <!-- Plugin JavaScript -->
799 <script src="js/jquery.easing.min.js"></script> 799 <script src="js/jquery.easing.min.js"></script>
800 <script src="js/classie.js"></script> 800 <script src="js/classie.js"></script>
1 $(document).ready(function() { 1 $(document).ready(function() {
2 2
3 //获取个人信息（传一个token） 3 //获取个人信息（传一个token）
4 - var url = "/login/userInfo"; // 接口  
5 var header = { 4 var header = {
6 "Content-Type": "application/x-www-form-urlencoded", 5 "Content-Type": "application/x-www-form-urlencoded",
7 "token": localStorage.getItem('token'), 6 "token": localStorage.getItem('token'),
8 } 7 }
9 - // 调用公共ajax  
10 - ajax(url, "GET", header, function(res) { 8 + ajax("/login/userInfo", "GET", header, function(res) {
11 console.log(res); 9 console.log(res);
12 }, function(res) { 10 }, function(res) {
13 console.log(res); 11 console.log(res);
@@ -35,17 +33,18 @@ $(document).ready(function() { @@ -35,17 +33,18 @@ $(document).ready(function() {
35 $('#Pnumber').html(res.data.phoneNumber) 33 $('#Pnumber').html(res.data.phoneNumber)
36 $("#startTime").html(res.data.startTime) 34 $("#startTime").html(res.data.startTime)
37 $("#dateTime").html(res.data.dateTime) 35 $("#dateTime").html(res.data.dateTime)
  36 + $("#vip-info").html(res.data.memberName)
38 let title = ` <img src="${res.data.img}" style='width:100%'>` 37 let title = ` <img src="${res.data.img}" style='width:100%'>`
39 $("#head-img").html(title) 38 $("#head-img").html(title)
40 - if (res.data.memberName == '1') {  
41 - $("#vip-info").html("基础会员")  
42 - } else if (res.data.memberName == '2') {  
43 - $("#vip-info").html("标准会员")  
44 - } else if (res.data.memberName == '3') {  
45 - $("#vip-info").html("超级会员")  
46 - } else {  
47 - $("#vip-info").html("无会员信息")  
48 - } 39 + // if (res.data.memberName == '1') {
  40 + // $("#vip-info").html("基础会员")
  41 + // } else if (res.data.memberName == '2') {
  42 + // $("#vip-info").html("标准会员")
  43 + // } else if (res.data.memberName == '3') {
  44 + // $("#vip-info").html("超级会员")
  45 + // } else {
  46 + // $("#vip-info").html("无会员信息")
  47 + // }
49 }) 48 })
50 //修改个人信息 49 //修改个人信息
51 $(".btnSave button").click(function() { 50 $(".btnSave button").click(function() {