Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

css/components.css

@@ -120,7 +120,7 @@ body a {
   color: #777;
 }
 body a:hover {
-  color: #2382ff;
+  color: #03C762;
   text-decoration: none;
 }
 body::-webkit-scrollbar {
@@ -136,7 +136,7 @@ body::-webkit-scrollbar-thumb {
   background: #999;
 }
 body::-webkit-scrollbar-thumb:hover {
-  background: #2382ff;
+  background: #03C762;
 }
 body::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
@@ -170,7 +170,7 @@ body::-webkit-scrollbar-track {
 .header .ha-item .img span {
   font-size: 30px;
   font-weight: bold;
-  color: #2382ff;
+  color: #03C762;
   display: block;
   line-height: 70px;
 }
@@ -186,9 +186,9 @@ body::-webkit-scrollbar-track {
   }
 }
 .header .ha-item .button .button {
-  color: #2382ff;
+  color: #03C762;
   padding: 10px;
-  border: 2px solid #2382ff;
+  border: 2px solid #03C762;
   margin-top: 13px;
   text-align: center;
   font-size: 20px;
@@ -206,7 +206,7 @@ body::-webkit-scrollbar-track {
 }
 .header .ha-item .app a {
   text-decoration: none;
-  color: #2382ff;
+  color: #03C762;
 }
 .header .ha-item .app a img {
   width: 50px;
@@ -226,7 +226,7 @@ body::-webkit-scrollbar-track {
   }
 }
 .header .hb-item .nav > .nav-item > a.active {
-  color: #2382ff;
+  color: #03C762;
 }
 .header .hb-item .nav .nav-item {
   padding: 0 20px;
@@ -246,7 +246,7 @@ body::-webkit-scrollbar-track {
   color: #e6e6e6;
 }
 .header .hb-item .nav .nav-item a:hover {
-  color: #2382ff;
+  color: #03C762;
 }
 .header .hb-item .nav .nav-item .nav-ul {
   display: none;
@@ -263,7 +263,7 @@ body::-webkit-scrollbar-track {
   list-style: none;
 }
 .header .hb-item .nav .nav-item .nav-ul .nav-li:hover {
-  background-color: #2382ff;
+  background-color: #03C762;
 }
 .header .hb-item .nav .nav-item .nav-ul .nav-li:hover a {
   color: #fff;
@@ -298,7 +298,7 @@ body::-webkit-scrollbar-track {
   height: 0;
 }
 #nav-sm > ul > li > a.active {
-  color: #2382ff;
+  color: #03C762;
 }
 #nav-sm ul {
   padding-inline-start: 0;
@@ -315,7 +315,7 @@ body::-webkit-scrollbar-track {
   text-decoration: none;
 }
 #nav-sm ul li a:hover {
-  color: #2382ff;
+  color: #03C762;
 }
 #nav-sm ul li .nav-sm-ul {
   display: flex;
@@ -424,7 +424,7 @@ body::-webkit-scrollbar-track {
   padding-bottom: 10px;
 }
 .body .my-comment .comment .nocomment:hover {
-  color: #2382ff;
+  color: #03C762;
 }
 .body .my-comment .comment .user {
   width: 100%;
@@ -476,7 +476,7 @@ body::-webkit-scrollbar-track {
 }
 .body .my-nav ul .active {
   color: black;
-  border-bottom: 3px solid #2382ff;
+  border-bottom: 3px solid #03C762;
   font-weight: bold;
 }
 .body .my-list .list-item {
@@ -583,7 +583,7 @@ body::-webkit-scrollbar-track {
 #share > div:first-child {
   height: 132px;
   box-sizing: border-box;
-  background-color: #2382ff;
+  background-color: #03C762;
   color: #fff;
   font-size: 15px;
   width: 30px;
@@ -730,7 +730,7 @@ body::-webkit-scrollbar-track {
   background: #999;
 }
 #imglist::-webkit-scrollbar-thumb:hover {
-  background: #2382ff;
+  background: #03C762;
 }
 #imglist::-webkit-scrollbar-track {
   /*滚动条里面轨道*/

css/components.less

@@ -1,6 +1,6 @@
 @title-top: #3181ff;
 @title-bg: #e0ecff;
-@body-bg: #2382ff;
+@body-bg: #03C762;
 
 
 // 通用样式

css/exam_detail_img.css

@@ -131,7 +131,7 @@
   color: #999;
 }
 .body .edi-body .edi-user .right i {
-  background-color: #2382ff;
+  background-color: #03C762;
   font-size: 25px;
   width: 45px;
   height: 45px;
@@ -191,7 +191,7 @@
   border-radius: 30px;
   background-color: #eef5ff;
   padding: 6px 20px;
-  color: #2382ff;
+  color: #03C762;
 }
 .body .edi-body .edi-open span i {
   margin-left: 5px;
@@ -254,7 +254,7 @@
   }
 }
 .body .prog .title {
-  color: #2382ff;
+  color: #03C762;
   position: absolute;
   top: 10px;
 }
@@ -285,7 +285,7 @@
 .body .prog .flex .pro .pro-content {
   width: 0%;
   height: 100%;
-  background-color: #2382ff;
+  background-color: #03C762;
 }
 .body .prog .flex .pro .icon {
   position: absolute;
@@ -303,7 +303,7 @@
   width: 100px;
   position: absolute;
   top: 20px;
-  color: #2382ff;
+  color: #03C762;
 }
 .body .prog .flex .button {
   width: 80px;

css/exam_detail_img.less

@@ -1,6 +1,4 @@
-@title-top: #3181ff;
-@title-bg: #e0ecff;
-@body-bg: #2382ff;
+@body-bg: #03C762;
 .header{
   max-width: 768px;
   margin-left: calc(~"50vw - 389px");

css/index.css

@@ -45,7 +45,7 @@
   border-bottom: 3px solid #a94442;
 }
 .body .hotspot h4 a .a {
-  border-bottom: 3px solid #2382ff;
+  border-bottom: 3px solid #03C762;
 }
 .body .hotspot ul {
   padding-left: 20px;
@@ -76,8 +76,8 @@
 }
 .body .title-style .h4 {
   padding: 15px;
-  border-top: 2px solid #3181ff;
-  background-color: #e0ecff;
+  border-bottom: 2px solid #03C762;
+  background-color: #cdf5df;
   vertical-align: middle;
 }
 .body .scroll-style ul {

css/index.less

@@ -1,6 +1,6 @@
-@body-bg:#2382ff;
-@title-top:#3181ff;
-@title-bg: #e0ecff;
+@body-bg:#03C762;
+@title-top:#03C762;
+@title-bg: #cdf5df;
 .body {
   // 行头
   .row-style {
@@ -52,7 +52,7 @@
         }
 
         .a {
-          border-bottom: 3px solid #2382ff;
+          border-bottom: 3px solid @body-bg;
         }
       }
     }
@@ -89,7 +89,7 @@
     }
     .h4 {
       padding: 15px;
-      border-top: 2px solid @title-top;
+      border-bottom: 2px solid @title-top;
       background-color: @title-bg;
       vertical-align: middle;
     }

h_exam/exam_detail.html

@@ -169,7 +169,9 @@
             <div class="comment">
               <!-- 功能 用户图片 昵称 言论  回复功能 点赞功能 -->
               <!-- <div class="nocomment">说说你对套卷的看法吧！</div> -->
-              <div id="detail"></div>
+              <div id="detail">
+
+              </div>
               <div class="loading">正在加载中....</div>
               <div class="nodata">到底了</div>
             </div>
@@ -216,4 +218,4 @@
   </div>
 </body>
 
-</html>
+</html>

index.html

@@ -151,7 +151,7 @@
           <!-- 网页第三行 -->
           <div class="row row-style">
             <div class="title-style">
-              <h4 class="h4"><i class="glyphicon glyphicon-book"></i>最新考试</h4>
+              <h4 class="h4"><i class="glyphicon glyphicon-tasks"></i>最新考试</h4>
               <div class="content-style row">
                 <div class="col col-sm-4 col-sm-12">
                   <div class="hotspot flex-item-style">
@@ -200,7 +200,7 @@
           <!-- 网页第四行 -->
           <div class="row row-style">
             <div class="title-style zhuantizixun">
-              <h4 class="h4"><i class="glyphicon glyphicon-book"></i>资讯专题</h4>
+              <h4 class="h4"><i class="glyphicon glyphicon-tasks"></i>资讯专题</h4>
               <div class="content-style row zhuantizixun">
                 <div class="col col-sm-4 col-sm-12 zhuantizixun">
                   <div class="hotspot flex-item-style">

js/components.js

@@ -187,18 +187,6 @@ var shareModel = {
     var targetUrl = "https://connect.qq.com/widget/shareqq/iframe_index.html?" + s.join('&');
     window.open(targetUrl, 'qq');
   },
-
-  //  /**
-  //    * 微信分享
-  //    * @return {[type]} [description]
-  //    */
-  weixin: function () {
-    var url = window.location.href,
-      encodePath = encodeURIComponent(url),
-      targetUrl = 'https://api.gaokaozhitongche.com/v1/direct?text=' + encodePath;
-    window.open(targetUrl, 'weixin');
-  },
-
   //  /**
   //    * 分享新浪微博
   //    * @param  {[type]} title [分享标题]
@@ -246,7 +234,7 @@ $(function () {
         text: window.location.href,
         width: 100,
         height: 100,
-        colorDark: "#000000",
+        colorDark: "#03C762",
         colorLight: "#ffffff",
         correctLevel: QRCode.CorrectLevel.H
       });
@@ -476,7 +464,8 @@ $(function () {
 $(function () {
   // 获取图片
   let showimglist = Array.from($('.showimglist img')), imglist = [], imglistdom = $("#imglist")
-  i = 0, size = 1;
+  i = 0;
+  var w, h, width = document.documentElement.clientWidth, height = document.documentElement.clientHeight, size = 1;
   $('.showimglist img').click(function () {
     $("body").css({ "overflow-y": "hidden" })
     i = showimglist.indexOf(this);
@@ -491,9 +480,9 @@ $(function () {
     let newimg = new Image();
     newimg.src = src;
     newimg.onload = function (e) {
-      let w = this.width / 2,
-        h = this.height / 2;
-      $("#imglist>div>img").css({ "top": `calc(50vh - ${h}px)`, "left": `calc(50vw - ${w}px)` })
+      w = this.width;
+      h = this.height;
+      $("#imglist>div>img").css({ "width": w, "height": h, "top": `calc(50vh - ${h / 2}px)`, "left": `calc(50vw - ${w / 2}px)` })
     }
   }
   let btns = $("#imglist>div>.glyphicon");
@@ -505,19 +494,22 @@ $(function () {
   }
   $(btns[0]).click(function (e) {
     size = 1;
-    scale(0);
     imgshow(-1);
   });
   $(btns[1]).click(function (e) {
     size = 1;
-    scale(0);
     imgshow(1);
   })
   let btnss = $("#imglist>div>span>img");
   function scale (num) {
     size += num;
     if (size <= 0) size = 0.5;
-    $("#imglist>div>img").css({ "transform": `scale(${size})` })
+    let imgw, imgh;
+    imgw = w * size; imgh = h * size;
+    let top = imgh / 2, left = imgw / 2;
+    imgw > width ? left = `0px` : left = `50vw - ${left}px`;
+    imgh > height ? top = `0px` : top = `50vh - ${top}px`;
+    $("#imglist>div>img").css({ "width": imgw, "height": imgh, "top": `calc(${top})`, "left": `calc(${left})` })
   }
   $(btnss[0]).click(function (e) {
     scale(0.5);