修改Jquery版本库、登录页增加极验

src/main/resources/static/css/account/login.css

@@ -5,38 +5,43 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-footer .footTop{display:none;}
-.loginWrap{width:950px;height:366px;overflow:hidden;background:#FFF url(/img/account/login.png) no-repeat 30px center;margin:95px auto;box-sizing:border-box;box-shadow:0 10px 20px 0 rgba(255,180,150,0.17);border-radius:2px}
-.loginForm{float:right;width:400px;padding:20px 24px;font-size:14px;position:relative}
-.loginForm h1{color:#22272e;font-size:24px;font-weight:bold;line-height:30px}
-.loginForm h2{color:#22272e;font-size:16px;font-weight:normal;line-height:24px}
-.loginForm form{margin-top:60px}
-.loginForm .formLine{height:70px;padding:0;}
-.loginForm input{height:48px;line-height:48px;}
-.loginForm .checked{top:14px;}
-.loginForm .forget{text-align:right;color:#4a4f58;font-size:14px;line-height:14px;margin-top:0px}
-.loginForm .submit{height:44px;line-height:0;font-size:0;text-align:justify;margin-top:20px}
-.loginForm .submit:after{content:'';display:inline-block;width:100%}
-.loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:192px;height:44px;line-height:44px;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;text-align:center;color:#e15616;font-size:14px;cursor:pointer}
-.loginForm .submit button.btn{background-color:#e15616;color:#FFF}
-.loginForm .submit .btn:hover{opacity:.8}
-.loginForm .codeBtn{position:absolute;right:0;top:0;width:100px;height:100px}
-.loginForm .codeBtn:before{width:100px;height:100px;background-position:-138px -146px}
-.loginForm .qrCodeBox{text-align:center}
-.loginForm .qrCode{width:168px;height:168px;border-radius:2px;border:solid 1px #ffb496;margin:27px auto 0 auto}
-.loginForm .qrInfo{text-align:center;height:44px;line-height:44px;font-size:16px;color:#93979f}
-.loginForm .changeBtn{display:inline-block;height:24px;line-height:24px;color:#e15616;font-size:16px;position:absolute;right:24px;top:20px}
-.loginForm .changeBtn:before{width:24px;height:24px;background-position:-175px -251px;vertical-align:top;margin-right:6px}
-.loginForm .showPwd{position:absolute;right:22px;top:16px;width:22px;height:16px;cursor:pointer}
-.loginForm .showPwd:before{width:22px;height:20px;background-position:-240px -299px}
-.loginForm .showPwd.on:before{width:22px;height:20px;background-position:-205px -299px}
-#qrCodeWrap{position:relative}
-#qrCodeWrap .model{position:absolute;width:200px;height:200px;top:15px;left:98px;display:flex;justify-content:center;align-items:center;background:rgba(255,255,255,1);color:#000;z-index:99999;cursor:pointer;border:1px solid #EBEBEB}
-#qrCodeWrap .model .refresh{width:21px;height:21px;display:block;margin:0 auto 3px}
-#qrCodeWrap .model .refresh-div{width:100px;height:64px;display:block}
-#qrCodeWrap .model .refresh-div p{text-align:center;font-size:14px;line-height:20px}
-.baseHeadCenter.account .accountLogin{display:none}
-.bg{width: 100%;height: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 99999999;font-family: inherit;overflow: hidden;background-color: #4444444f;opacity: 0}
+ footer .footTop{display:none;}
+ .loginWrap{width:950px;height:400px;overflow:hidden;background:#FFF url(/img/account/login.png) no-repeat 30px center;margin:95px auto;box-sizing:border-box;box-shadow:0 10px 20px 0 rgba(255,180,150,0.17);border-radius:2px}
+ .loginForm{float:right;width:400px;padding:20px 24px;font-size:14px;position:relative;height: 100%;box-sizing: border-box;}
+ .loginForm h1{color:#22272e;font-size:24px;font-weight:bold;line-height:30px}
+ .loginForm h2{color:#22272e;font-size:16px;font-weight:normal;line-height:24px}
+ .loginForm form{margin-top:10px;}
+ .loginForm .formLine{height:70px;padding:0;}
+ .loginForm input{height:48px;line-height:48px;}
+ .loginForm .checked{top:14px;}
+ .loginForm .forget{text-align:right;color:#4a4f58;font-size:14px;line-height:30px;margin-top:0px;}
+ .loginForm .forget .btn{float: left;color: #E15621;}
+ .loginForm .submit{height:44px;line-height:0;font-size:0;text-align:justify;margin-top:20px}
+ .loginForm .submit:after{content:'';display:inline-block;width:100%}
+ .loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:44px;line-height:44px;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;text-align:center;color:#e15616;font-size:14px;cursor:pointer}
+ .loginForm .submit button.btn{background-color:#e15616;color:#FFF}
+ .loginForm .submit button.disabled{background-color:#E1E1E1;color:#F7F7F7;border-color:#E1E1E1;}
+ /*.loginForm .submit .btn:hover{opacity:.8}*/
+ .loginForm .codeBtn{position:absolute;right:0;top:0;width:100px;height:100px}
+ .loginForm .codeBtn:before{width:100px;height:100px;background-position:-138px -146px}
+ .loginForm .qrCodeBox{text-align:center}
+ .loginForm .qrCode{width:168px;height:168px;border-radius:2px;border:solid 1px #ffb496;margin:27px auto 0 auto}
+ .loginForm .qrInfo{text-align:center;height:44px;line-height:44px;font-size:16px;color:#93979f}
+ .loginForm .changeBtn{display:inline-block;height:24px;line-height:24px;color:#e15616;font-size:16px;position:absolute;right:24px;top:20px}
+ .loginForm .changeBtn:before{width:24px;height:24px;background-position:-175px -251px;vertical-align:top;margin-right:6px}
+ .loginForm .showPwd{position:absolute;right:22px;top:16px;width:22px;height:16px;cursor:pointer}
+ .loginForm .showPwd:before{width:22px;height:20px;background-position:-240px -299px}
+ .loginForm .showPwd.on:before{width:22px;height:20px;background-position:-205px -299px}
+ .verify-wrap{margin-top: 0;}
+ .fix-tips {background: -webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d));-webkit-background-clip: text;-webkit-text-fill-color: transparent;-webkit-animation: slidetounlock 3s infinite;color: #787878 !important;}
+ @keyframes slidetounlock { 0% {background-position: -100px 0;} 100% {background-position: 100px 0;} }
+ #qrCodeWrap{position:relative}
+ #qrCodeWrap .model{position:absolute;width:200px;height:200px;top:15px;left:98px;display:flex;justify-content:center;align-items:center;background:rgba(255,255,255,1);color:#000;z-index:99999;cursor:pointer;border:1px solid #EBEBEB}
+ #qrCodeWrap .model .refresh{width:21px;height:21px;display:block;margin:0 auto 3px}
+ #qrCodeWrap .model .refresh-div{width:100px;height:64px;display:block}
+ #qrCodeWrap .model .refresh-div p{text-align:center;font-size:14px;line-height:20px}
+ .baseHeadCenter.account .accountLogin{display:none}
+ .bg{width: 100%;height: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 99999999;font-family: inherit;overflow: hidden;background-color: #4444444f;opacity: 0}
  .bg .bg-content{width: 338px;height: 234px;position: absolute;top: 0;bottom: 0;right: 0;left: 0;margin: auto;z-index: 9999;background: #fff;}
  .bg .bg-content .bg-tittle{height: 42px;line-height: 42px;font-size: 16px;background:#f8f8f8;color: #333333;padding: 0 16px;position: relative}
  .bg-tittle .icon{width: 25px;height: 25px;position: absolute;right: 10px;top: 10px;cursor: pointer;}
@@ -51,31 +56,35 @@ footer .footTop{display:none;}
 * 移动端
 */
 @media screen and (max-width:768px){
-body{background:#FFF}
-footer{display:none}
-.loginForm .showPwd{display:none;}
-.loginForm{padding-top:4vw;text-align:center;background:#FFF url(/img/account/login_m.png) no-repeat center 25vw;background-size:57vw 43.2vw}
-.loginForm h1{color:#22272e;font-size:6.4vw;font-weight:bold;line-height:10vw}
-.loginForm h2{font-size:3.1vw;font-weight:normal;line-height:5.4vw;color:#627386}
-.loginForm form{width:93.4vw;margin:54vw auto 0}
-.loginForm .formLine{height:16.4vw;padding:0;}
-.loginForm input{height:11.2vw;line-height:6vw;padding: 2.6vw 0;box-sizing: border-box;}
-.loginForm .checked{top:3.6vw;right:3.6vw;}
-.loginForm .forget{text-align:right;color:#4a4f58;font-size:3.4vw;line-height:3.4vw;margin-bottom:4.8vw}
-.loginForm .submit{line-height:11.2vw;font-size:3.4vw;text-align:center;color:#22272e;}
-.loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:11.2vw;border:solid 1px #b8bfca;border-radius:2px;margin-bottom:4.8vw}
-.loginForm .submit button.btn{border-color:#e15616;background:#e15616;color:#FFF;}
-.loginForm .submit .weChat{display:block;margin:6vw auto;width:50vw;color:#627386;line-height:8vw}
-.loginForm .submit .weChat span{display:inline-block;width:100%}
-.loginForm .submit .weChat .mIcon:before{width:12vw;height:12vw;background-position:0 -77.8vw}
-.bg{width: 100%;height: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 99999999;font-family: inherit;overflow: hidden;background-color: #4444444f;opacity: 0}
-.bg .bg-content{width: 74.7vw;height: fit-content;position: absolute;top: 0;bottom: 0;right: 0;left: 0;margin: auto;z-index: 9999;background: #fff;border-radius: 4vw;}
-.bg .bg-content .bg-tittle{height:10.7vw;line-height: 10.7vw;font-size: 3.4vw;color: #333333;padding: 0 4vw;position: relative}
-.bg-tittle .icon{width: 6.4vw;height:6.4vw;position: absolute;right: 2.7vw;top: 2.7vw;cursor: pointer;}
-.bg-tittle .mIcon:before{ width:6.4vw ;height: 6.4vw;background-position: -33.5vw 0px;}
-.bg .bg-content .text-conten{padding: 4vw;border-top: .27vw solid #e2e7ef}
-.bg .bg-content .text-conten .status{color: #333333;font-size: 3.4vw;line-height: 5.4vw;margin-bottom: 5vw;text-align: center}
-.bg .bg-content .text-conten .tip-p{text-align: center;color:#e15616;font-size: 3vw;line-height: 7vw }
-.bg .bg-content .text-conten div{cursor: pointer;text-align: center;background: #e15616;width: 66.6vw;height: 9.9vw;line-height: 9.9vw;color: #fff;margin: auto;border-radius: .54vw;margin-top: 5vw}
-
+ body{background:#FFF}
+ footer{display:none}
+ .loginForm .showPwd{display:none;}
+ .loginForm{padding-top:4vw;text-align:center;background:#FFF url(/img/account/login_m.png) no-repeat center 25vw;background-size:57vw 43.2vw}
+ .loginForm h1{color:#22272e;font-size:6.4vw;font-weight:bold;line-height:10vw}
+ .loginForm h2{font-size:3.1vw;font-weight:normal;line-height:5.4vw;color:#627386}
+ .loginForm form{width:93.4vw;margin:54vw auto 0}
+ .loginForm .formLine{height:16.4vw;padding:0;}
+ .loginForm input{height:11.2vw;line-height:6vw;padding: 2.6vw 0;box-sizing: border-box;}
+ .loginForm .checked{top:3.6vw;right:3.6vw;}
+ .loginForm .forget{text-align:right;color:#4a4f58;font-size:3.4vw;line-height:3.4vw;margin-bottom:4.8vw}
+ .loginForm .forget .btn{float: left;color: #E15621;}
+ .loginForm .submit{line-height:11.2vw;font-size:3.4vw;text-align:center;color:#22272e;margin-top: 3vw;}
+ .loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:11.2vw;border:solid 1px #b8bfca;border-radius:2px;margin-bottom:4.8vw}
+ .loginForm .submit button.btn{border-color:#e15616;background:#e15616;color:#FFF;}
+ .loginForm .submit button.disabled{background-color:#E1E1E1;color:#F7F7F7;border-color:#E1E1E1;}
+ .loginForm .submit .weChat{display:block;margin:6vw auto;width:50vw;color:#627386;line-height:8vw}
+ .loginForm .submit .weChat span{display:inline-block;width:100%}
+ .loginForm .submit .weChat .mIcon:before{width:12vw;height:12vw;background-position:0 -77.8vw}
+ .bg{width: 100%;height: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 99999999;font-family: inherit;overflow: hidden;background-color: #4444444f;opacity: 0}
+ .bg .bg-content{width: 74.7vw;height: fit-content;position: absolute;top: 0;bottom: 0;right: 0;left: 0;margin: auto;z-index: 9999;background: #fff;border-radius: 4vw;}
+ .bg .bg-content .bg-tittle{height:10.7vw;line-height: 10.7vw;font-size: 3.4vw;color: #333333;padding: 0 4vw;position: relative}
+ .bg-tittle .icon{width: 6.4vw;height:6.4vw;position: absolute;right: 2.7vw;top: 2.7vw;cursor: pointer;}
+ .bg-tittle .mIcon:before{ width:6.4vw ;height: 6.4vw;background-position: -33.5vw 0px;}
+ .bg .bg-content .text-conten{padding: 4vw;border-top: .27vw solid #e2e7ef}
+ .bg .bg-content .text-conten .status{color: #333333;font-size: 3.4vw;line-height: 5.4vw;margin-bottom: 5vw;text-align: center}
+ .bg .bg-content .text-conten .tip-p{text-align: center;color:#e15616;font-size: 3vw;line-height: 7vw }
+ .bg .bg-content .text-conten div{cursor: pointer;text-align: center;background: #e15616;width: 66.6vw;height: 9.9vw;line-height: 9.9vw;color: #fff;margin: auto;border-radius: .54vw;margin-top: 5vw}
+ .verify-wrap{margin-top: 0;width: 93.4vw !important;}
+ .fix-tips {background: -webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d));-webkit-background-clip: text;-webkit-text-fill-color: transparent;-webkit-animation: slidetounlock 3s infinite;color: #787878 !important;}
+ @keyframes slidetounlock { 0% {background-position: -100px 0;} 100% {background-position: 100px 0;} }
 }

src/main/resources/static/js/account/login.js

@@ -33,6 +33,7 @@ var loginPage = new Vue({
         text:'',
         stautsfalse:false,
         infofalse:false,
+        isSlideFinishState:true
     },
     computed: {
 
@@ -258,16 +259,33 @@ var loginPage = new Vue({
     },
     mounted: function () {
         var _self = this;
+        var SlideVerifyPlug = window.slideVerifyPlug;
+        var slideVerify = new SlideVerifyPlug('#verify-wrap',{
+            wrapWidth:'350',//设置 容器的宽度 ,不设置的话，会设置成100%，需要自己在外层包层div,设置宽度，这是为了适应方便点；
+            initText:'请向右滑动滑块',  //设置  初始的 显示文字
+            sucessText:'验证通过',//设置 验证通过 显示的文字
+            getSuccessState:function(res){
+                //当验证完成的时候 会 返回 res 值 true，只留了这个应该够用了
+                console.log(res);
+                if(slideVerify.slideFinishState){
+                    $('.value').html(slideVerify.slideFinishState)
+                    $('#resetBtn').removeClass('prohibit')
+                    _self.isSlideFinishState = false;
+                }
+            }
+        });
         $('body').on("focus",'[needverify]:visible',function(){
             $(this).siblings('.errTips').removeClass("show").siblings('.checked').removeClass("show");
         });
         //enter键登录
-        $(document).keyup(function (e) {
-            var e = e || event;
-            e.stopPropagation();
-            if (e.keyCode === 13) {
-                _self.loginSubmit();
-            }
-        });
+        if(!_self.isSlideFinishState){
+            $(document).keyup(function (e) {
+                var e = e || event;
+                e.stopPropagation();
+                if (e.keyCode === 13) {
+                    _self.loginSubmit();
+                }
+            });
+        }
     }
 });

src/main/resources/static/js/common/ajax.service.js

@@ -43,11 +43,9 @@ var Http = {
                 }
             }).then(function(res) {
                 if(res.code== -99){
-                    CAIMEI.Alert('登录已失效,请重新登录','去登录',true,function () {
-                        CAIMEI.Storage.clear();
-                        setBeforeUrl();
-                        location.href = "/login.html";
-                    });
+                    CAIMEI.Storage.clear();
+                    setBeforeUrl();
+                    location.href = "/login.html";
                 }else{
                     def.resolve(res);
                 }

src/main/resources/static/lib/js/pdfh5.js

@@ -5,7 +5,7 @@
     console.log("pdfh5.js v" + version + " & https://www.gjtool.cn")
     if (typeof require !== 'undefined') {
         if (g.$ === undefined) {
-            g.$ = require('/lib/jquery-3.5.1.min.js');
+            g.$ = require('/lib/jquery-3.6.0.min.js');
         }
         g.pdfjsWorker = require('/lib/js/pdf.worker');
         g.pdfjsLib = require('/lib/js/pdf.js');

src/main/resources/templates/account/login.html

@@ -21,6 +21,10 @@
                 <h2>生美 / 医美采购服务平台</h2>
             </div>
             <form v-show="!qrCodeLogin">
+                <div class="forget">
+                    <a class="btn" href="/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','登录页面','注册','点击','','Um_Event_Regirster'])">免费注册</a>
+                    <a href="/forget.html">忘记密码？</a>
+                </div>
                 <div class="formLine">
                     <input type="text" v-model.trim="loginAccount" placeholder="请输入邮箱或手机号" :rule="rule.account" maxlength="30" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
@@ -32,13 +36,11 @@
                     <span class="errTips icon mIcon" tips="请输入正确的密码"></span>
                     <i class="icon showPwd" @click="showPassword($event)"></i>
                 </div>
-                <div class="forget">
-                    <a href="/forget.html">忘记密码？</a>
-                </div>
+                <!-- 滑动验证 -->
+                <div class="verify-wrap" id="verify-wrap"></div>
                 <div class="submit clear">
-                    <a v-if="isPC" class="btn" href="/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','登录页面','注册','点击','','Um_Event_Regirster'])">免费注册</a>
-                    <button class="btn" type="button" @click="loginSubmit()">登录</button>
-                    <a v-if="!isPC" class="btn" href="/register.html" rel="nofollow">免费注册</a>
+                    <button class="btn" type="button" @click="loginSubmit()" :disabled="isSlideFinishState" :class="[isSlideFinishState ?'disabled':'']">登录</button>
+<!--                    <a v-if="!isPC" class="btn" href="/register.html" rel="nofollow">免费注册</a>-->
                     <a v-if="!isPC && isWeChat" class="weChat" @click="weChatLogin()" href="javascript:void(0);">
                         <span>微信授权登录</span><i class="mIcon"></i>
                     </a>
@@ -71,6 +73,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/lib/slideVerify.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/account/login.js(v=${version})}"></script>
 </body>

src/main/resources/templates/activity/beautyTopic.html

@@ -807,7 +807,7 @@
     </div>
 </div>
 <!-- 引入js文件 -->
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript"

src/main/resources/templates/components/foot-link.html

@@ -1,4 +1,4 @@
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.slide-2.1.3.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>

src/main/resources/templates/document/beauty-archive-detail.html

@@ -144,7 +144,7 @@
     </template>
 </div>
 <script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>

src/main/resources/templates/document/beauty-archive.html

@@ -97,7 +97,7 @@
 <template th:replace="document/components/beautyIndustry-footer"></template>
 
 <script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript"

src/main/resources/templates/document/components/document-link.html

@@ -1,4 +1,4 @@
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.slide-2.1.3.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>