新版首页修改

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

@@ -1,92 +1,91 @@
-@charset "utf-8";
-li{list-style:none}
-.toLogin{display:none;}
-/**
- * PC端
- */
-@media screen and (min-width:768px){
-    body{width: 100%;height: 100%;background-color: #ffffff;background: url("/img/document/document_bg.png")no-repeat;background-size: cover;}
-    #loginPage{width: 100%;height: 100%;}
-    #globalHead{width: 100%;position: fixed;top: 0;left: 0;z-index: 10000;}
-    .header{width: 100%;height: 80px;background: linear-gradient(90deg, #FF8B45, #FF5B00);box-sizing: border-box;padding: 18px 0;}
-    .wrap{width: 1200px;height: 100%;line-height: 44px;font-size: 20px;color: #ffffff;}
-    .wrap .logo{width: 52px;height: 44px;margin-right: 10px;}
-    .login-contailer{width: 100%;min-height: 100%;box-sizing: border-box;padding-top: 216px;position: relative;}
-    .loginWrap{width:900px;height:420px;overflow:hidden;background-color: #ffffff;margin:0 auto;box-sizing:border-box;box-shadow: 0px 0px 20px 0px rgba(227, 88, 24, 0.1);border-radius: 10px;    position: fixed;top: 0;left: 0;right: 0;bottom: 0;margin: auto;}
-    .login-image{width: 383px;height: 420px;float: left;}
-    .loginForm{float:right;width:517px;height:420px;padding:74px 80px;font-size:14px;position:relative;box-sizing: border-box;}
-    .loginForm h1{color:#FF5B00;font-size:24px;font-weight:bold;line-height:30px;text-align: center;}
-    .loginForm form{margin-top:40px}
-    .loginForm .formLine{height:70px;padding:0;margin-top: 10px;}
-    .loginForm input{height:48px;line-height:48px;}
-    .loginForm .checked{top:14px;}
-    .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: 360px;height: 48px;background: linear-gradient(90deg, #FF8B45, #FF5B00);border-radius: 4px;cursor: pointer;font-size: 18px;color: #ffffff;    line-height: 48px;text-align: center;}
-    .loginForm .submit .btn:hover{opacity:.8}
-    .formLine.code input{width: 230px;float: left;}
-    .formLine.code .code-btn{width: 120px;height: 48px;background: linear-gradient(135deg, #F28F31 0%, #FF5B00 100%);border-radius: 4px;float: right;display: block;line-height: 48px;text-align: center;color: #FFFFFF;}
-    .formLine.code .code-btn.disabled{background: #EBEBEB;color: #999999;}
-    .formLine.code .checked{left:200px;}
-    #codeMsg{display: inline-block;float: left;}
-    .loginForm .codeBtn{position:absolute;right:0;top:0;width:100px;height:100px;}
-    .loginForm .codeBtn:before{width:100px;height:100px;background-position:-138px -146px}
-    .baseHeadCenter.account .accountLogin{display:none}
-    .login-success{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background-color: #FFFFFF;z-index: 9999;opacity: 0;}
-    .login-success.active{opacity: 1;}
-    .login-success .inner{width: 500px;margin: 0 auto;display: flex;flex-direction: column;align-items: center;padding-top: 130px;}
-    .login-success .pc-icon{width: 300px;height:228px;display: block;}
-    .login-success h1{width: 300px;height: 60px;font-size: 30px;line-height: 60px;text-align: center;margin-top: 20px;}
-    .login-success h1.text-success{color: #25C474;}
-    .login-success h1.text-error{color: #F94B4B;}
-    .login-success p{width: 300px;height: 24px;font-size: 18px;color: #666666;line-height: 24px;text-align: center;}
-    .login-success p span{color: #FF5B00;}
-    .login-success .btn{display: block;width: 120px;height: 40px;background: linear-gradient(90deg, #FF8B45, #FF5B00);border-radius: 20px;font-size: 18px;color: #FFFFFF;line-height: 40px;text-align: center;margin:20px auto;}
-
-
-}
-
-/**
-* 移动端
-*/
-@media screen and (max-width:768px){
-    body{background-color: #ffffff;}
-    #loginPage{width: 100%;height: 100%;}
-    #globalHead{width: 100%;position: fixed;top: 0;left: 0;z-index: 10000;}
-    .header{width: 100%;height: 17.8vw;background: linear-gradient(90deg, #FF8B45, #FF5B00);box-sizing: border-box;padding: 3.4vw 6vw;}
-    .wrap{width: 100%;height: 100%;line-height: 10vw;font-size: 4vw;color: #ffffff;}
-    .wrap .logo{width: 10vw;height: 8.8vw;margin-right: 1vw;}
-    .loginForm .showPwd{display:none;}
-    .login-contailer{width: 100%;min-height:100%;box-sizing: border-box;padding: 0 10vw;position: relative;padding-top: 17.8vw;}
-    .login-image{width: 56.1vw;height: 50.1vw;margin: 0 auto;margin-top: 15vw;margin-bottom: 10vw;}
-    .loginForm .title{display: none;}
-    .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:100%;margin:0 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;border-radius:1vw; }
-    .loginForm .checked{top:3.6vw;right:3.6vw;}
-    .formLine.code .code-btn{width: 21vw;height: 11vw;display: block;float: right;text-align: center;line-height: 11vw;border-radius: 1vw;box-sizing: border-box;background: linear-gradient(135deg, #F28F31 0%, #FF5B00 100%);color: #FFFFFF;font-size: 3vw;}
-    .formLine.code .code-btn.disabled{background: #EBEBEB;color: #999999;}
-    .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-radius:1vw;margin-bottom:4.8vw}
-    .loginForm .submit .btn{background: linear-gradient(135deg, #F28F31 0%, #FF5B00 100%);color: #FFFFFF;}
-    .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}
-    .login-success{width: 100%;height: 100%;position: absolute;top: 0;left: 0;background-color: #FFFFFF;z-index: 9999;opacity: 0;}
-    .login-success.active{opacity: 1;}
-    .login-success .inner{width: 100%;display: flex;flex-direction: column;align-items: center;padding-top: 30vw;}
-    .login-success .success-main{display: flex;flex-direction: column;align-items: center;}
-    .login-success .h5-icon{width: 47vw;height:35vw;display: block;}
-    .login-success h1{width:  47vw;height: 10vw;font-size: 5vw;line-height: 10vw;text-align: center;margin-top: 4vw;}
-    .login-success h1.text-success{color: #25C474;}
-    .login-success h1.text-error{color: #F94B4B;}
-    .login-success p{width: 47vw;height: 4vw;font-size: 3vw;color: #666666;line-height:  4vw;text-align: center;}
-    .login-success p span{color: #FF5B00;}
-    .login-success .btn{display: block;width: 30vw;height: 9vw;background: linear-gradient(90deg, #FF8B45, #FF5B00);border-radius: 4.5vw;font-size:3vw;color: #FFFFFF;line-height: 9vw;text-align: center;margin:4vw auto;}
-
-
-
-}
+@charset "utf-8";
+li{list-style:none}
+.toLogin{display:none;}
+/**
+ * PC端
+ */
+@media screen and (min-width:768px){
+    body{width: 100%;height: 100%;background-color: #ffffff;background: url("/img/document/document_bg.png")no-repeat;background-size: cover;}
+    #loginPage{width: 100%;height: 100%;}
+    #globalHead{width: 100%;position: fixed;top: 0;left: 0;z-index: 10000;}
+    .header{width: 100%;height: 80px;background: linear-gradient(90deg, #FF8B45, #FF5B00);box-sizing: border-box;padding: 18px 0;}
+    .wrap{width: 1200px;height: 100%;line-height: 44px;font-size: 20px;color: #ffffff;}
+    .wrap .logo{width: 52px;height: 44px;margin-right: 10px;}
+    .login-contailer{width: 100%;min-height: 100%;box-sizing: border-box;padding-top: 216px;position: relative;}
+    .loginWrap{width:520px;height:420px;overflow:hidden;background-color: #ffffff;box-sizing:border-box;box-shadow: 0px 0px 20px 0px rgba(227, 88, 24, 0.1);border-radius: 10px;    position: fixed;top: 0;left: 0;right: 0;bottom: 0;margin: auto;}
+    .loginForm{float:right;width:517px;height:420px;padding:74px 80px;font-size:14px;position:relative;box-sizing: border-box;}
+    .loginForm h1{color:#FF5B00;font-size:24px;font-weight:bold;line-height:30px;text-align: center;}
+    .loginForm form{margin-top:40px}
+    .loginForm .formLine{height:70px;padding:0;margin-top: 10px;}
+    .loginForm input{height:48px;line-height:48px;}
+    .loginForm .checked{top:14px;}
+    .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: 360px;height: 48px;background: linear-gradient(90deg, #FF8B45, #FF5B00);border-radius: 4px;cursor: pointer;font-size: 18px;color: #ffffff;    line-height: 48px;text-align: center;}
+    .loginForm .submit .btn:hover{opacity:.8}
+    .formLine.code input{width: 230px;float: left;}
+    .formLine.code .code-btn{width: 120px;height: 48px;background: linear-gradient(135deg, #F28F31 0%, #FF5B00 100%);border-radius: 8px;float: right;display: block;line-height: 48px;text-align: center;color: #FFFFFF;}
+    .formLine.code .code-btn.disabled{background: #EBEBEB;color: #999999;}
+    .formLine.code .checked{left:200px;}
+    #codeMsg{display: inline-block;float: left;}
+    .loginForm .codeBtn{position:absolute;right:0;top:0;width:100px;height:100px;}
+    .loginForm .codeBtn:before{width:100px;height:100px;background-position:-138px -146px}
+    .baseHeadCenter.account .accountLogin{display:none}
+    .login-success{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background-color: #FFFFFF;z-index: 9999;opacity: 0;}
+    .login-success.active{opacity: 1;}
+    .login-success .inner{width: 500px;margin: 0 auto;display: flex;flex-direction: column;align-items: center;padding-top: 130px;}
+    .login-success .pc-icon{width: 300px;height:228px;display: block;}
+    .login-success h1{width: 300px;height: 60px;font-size: 30px;line-height: 60px;text-align: center;margin-top: 20px;}
+    .login-success h1.text-success{color: #25C474;}
+    .login-success h1.text-error{color: #F94B4B;}
+    .login-success p{width: 300px;height: 24px;font-size: 18px;color: #666666;line-height: 24px;text-align: center;}
+    .login-success p span{color: #FF5B00;}
+    .login-success .btn{display: block;width: 120px;height: 40px;background: linear-gradient(90deg, #FF8B45, #FF5B00);border-radius: 20px;font-size: 18px;color: #FFFFFF;line-height: 40px;text-align: center;margin:20px auto;}
+
+
+}
+
+/**
+* 移动端
+*/
+@media screen and (max-width:768px){
+    body{background-color: #ffffff;}
+    #loginPage{width: 100%;height: 100%;}
+    #globalHead{width: 100%;position: fixed;top: 0;left: 0;z-index: 10000;}
+    .header{width: 100%;height: 17.8vw;background: linear-gradient(90deg, #FF8B45, #FF5B00);box-sizing: border-box;padding: 3.4vw 6vw;}
+    .wrap{width: 100%;height: 100%;line-height: 10vw;font-size: 4vw;color: #ffffff;}
+    .wrap .logo{width: 10vw;height: 8.8vw;margin-right: 1vw;}
+    .loginForm .showPwd{display:none;}
+    .login-contailer{width: 100%;min-height:100%;box-sizing: border-box;padding: 0 10vw;position: relative;padding-top: 17.8vw;}
+    .login-image{width: 56.1vw;height: 50.1vw;margin: 0 auto;margin-top: 15vw;margin-bottom: 10vw;}
+    .loginForm .title{display: none;}
+    .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:100%;margin:0 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;border-radius:1vw; }
+    .loginForm .checked{top:3.6vw;right:3.6vw;}
+    .formLine.code .code-btn{width: 21vw;height: 11vw;display: block;float: right;text-align: center;line-height: 11vw;border-radius: 1vw;box-sizing: border-box;background: linear-gradient(135deg, #F28F31 0%, #FF5B00 100%);color: #FFFFFF;font-size: 3vw;}
+    .formLine.code .code-btn.disabled{background: #EBEBEB;color: #999999;}
+    .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-radius:1vw;margin-bottom:4.8vw}
+    .loginForm .submit .btn{background: linear-gradient(135deg, #F28F31 0%, #FF5B00 100%);color: #FFFFFF;}
+    .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}
+    .login-success{width: 100%;height: 100%;position: absolute;top: 0;left: 0;background-color: #FFFFFF;z-index: 9999;opacity: 0;}
+    .login-success.active{opacity: 1;}
+    .login-success .inner{width: 100%;display: flex;flex-direction: column;align-items: center;padding-top: 30vw;}
+    .login-success .success-main{display: flex;flex-direction: column;align-items: center;}
+    .login-success .h5-icon{width: 47vw;height:35vw;display: block;}
+    .login-success h1{width:  47vw;height: 10vw;font-size: 5vw;line-height: 10vw;text-align: center;margin-top: 4vw;}
+    .login-success h1.text-success{color: #25C474;}
+    .login-success h1.text-error{color: #F94B4B;}
+    .login-success p{width: 47vw;height: 4vw;font-size: 3vw;color: #666666;line-height:  4vw;text-align: center;}
+    .login-success p span{color: #FF5B00;}
+    .login-success .btn{display: block;width: 30vw;height: 9vw;background: linear-gradient(90deg, #FF8B45, #FF5B00);border-radius: 4.5vw;font-size:3vw;color: #FFFFFF;line-height: 9vw;text-align: center;margin:4vw auto;}
+
+
+
+}

src/main/resources/static/css/index/index-pc.css

@@ -498,15 +498,15 @@ li{list-style:none;}
 .section-content-usertop .user-column-d .column-d-image{
     width: 42px;
     height: 42px;
-    border-radius: 2px;
+    border-radius: 4px;
     overflow: hidden;
-    background-color: #dbdbdb;
+    border: 1px solid #e1e1e1;
 }
 .section-content-usertop .user-column-d .column-d-image img{
-    width: 42px;
-    height: 42px;
+    width: 41px;
+    height: 41px;
     display: block;
-    border-radius: 2px;
+    border-radius: 4px;
 }
 .section-content-usertop .user-column-d .column-d-text{
     width: 140px;
@@ -537,7 +537,7 @@ li{list-style:none;}
     font-size: 12px;
     line-height: 22px;
     text-align: left;
-    color: #333333;
+    color: #999999;
 }
 .section-content-userbox .section-content-userbottom{
     width: 100%;

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

@@ -1,167 +1,167 @@
-var loginPage = new Vue({
-    el: "#loginPage",
-    data: {
-        maxtime:60,
-        loginLoading: false,
-        qrCodeLogin: false,
-        loginAccount: '',
-        activateCode: '',
-        showClass:'',
-        mobilCount:0,
-        mobileCodeText:'获取验证码',
-        mobilTime:null,
-        isMobileDisabled:false,
-        emailCount:0,
-        emailCodeText:'获取验证码',
-        emailTime:null,
-        isEmailDisabled:false,
-        isCodeModel:false,
-        codeImagePath:'',
-        codeImageToken:'',
-        imageCode:'',
-        isSuccess:false,
-        isError:false,
-        isLoginSuccess:false,
-        rule:{
-            phone: '^1[3|4|5|7|8|9][0-9]{9}$',
-            code: '^\\d{6}$'
-        },
-        isWeChat: false,
-        maxtime:3
-    },
-    computed: {
-
-    },
-    methods: {
-        getMobileImage:function() {//获取图形验证码
-            var _self = this;
-            var pass = verifyCheack('.massageBtn');
-            if (_self.isMobileDisabled) { return false; }
-            this.$nextTick(function() {
-                if (!pass) {
-                    return false;
-                }
-                DocumentApi.GetImgVerifyCode({},function(response){
-                    if(response.code == 0){
-                        _self.imageCode = '';
-                        _self.codeImagePath = response.data.baseImage;
-                        _self.codeImageToken = response.data.token;
-                        _self.isCodeModel = true;
-                    }else{
-                        CAIMEI.Alert(response.msg,'确定',false);
-                    }
-                })
-            });
-        },
-        getMobileCodeFn:function(){//获取登录短信验证码
-            var _self = this;
-            if(_self.imageCode == ''){
-                CAIMEI.dialog('请输入图形验证码',false,function () {});
-                return;
-            }
-            var params = {
-                    mobile:_self.loginAccount,
-                    imgCode:_self.imageCode,
-                    token:_self.codeImageToken
-            };
-            _self.isMobileDisabled = true;
-            DocumentApi.DocumentNote(params,function (response) {
-                if(response.code == 0){
-                    _self.isCodeModel = false;
-                    CAIMEI.dialog('验证短信已发送',false,function () {});
-                    var TIME_COUNT = 60;
-                    if (!_self.mobilTime) {
-                        _self.mobilCount = TIME_COUNT;
-                        _self.isMobileDisabled = true;
-                        _self.mobilTime = setInterval(function(){
-                            if (_self.mobilCount > 1 && _self.mobilCount <= TIME_COUNT) {
-                                _self.mobilCount--;
-                                _self.mobileCodeText = _self.mobilCount +'s重新发送';
-                            } else {
-                                _self.isMobileDisabled = false;
-                                clearInterval(_self.mobilTime);
-                                _self.mobilTime = null;
-                                _self.mobileCodeText = '获取验证码';
-                            }
-                        },1000)
-                    }
-                }else{
-                    CAIMEI.Alert(response.msg,'确定',false);
-                    _self.isMobileDisabled = false;
-                    _self.isCodeModel = false;
-                }
-            })
-        },
-        blurHandle: function(event) {  // 失去焦点校验
-            var el = event.currentTarget;
-            verifyHandle(el);
-        },
-        refreshCodeImage:function(){
-            this.getMobileImage()
-        },
-        closeCodeModel:function(){
-            this.isCodeModel = false;
-        },
-        loginSubmit: function () {  // 账号登录
-            var _self = this;
-            var pass = verifyForm();
-            if (this.loginLoading) { return false; }
-            this.$nextTick(function(){
-                if (!pass) { return false; }
-                _self.loginLoading = true;
-                var params =  {mobile: _self.loginAccount,code: _self.activateCode};
-                DocumentApi.MobileCodeLogin(params,function(response){
-                    _self.loginLoading = false;
-                    if(response.code === 0){
-                        // 登录成功页面跳转
-                        _self.isLoginSuccess = true;
-                        _self.isSuccess = true;
-                        var timeClock = setInterval(function(){
-                            _self.maxtime--;
-                            if (_self.maxtime == 0) {
-                                location.href = '/document/list.html';
-                                clearInterval(timeClock);
-                                _self.maxtime = 3;
-                                _self.isRefresh = true;
-                            }
-                        },1000);
-                    } else if(response.code == -2) {// 登录失败
-                        _self.isLoginSuccess = true;
-                        _self.isError = true;
-                    }else{
-                        CAIMEI.Alert(response.msg,'确定',false);
-                    }
-                });
-            });
-        },
-        navLinkFn:function(){//跳转
-            location.href = '/document/list.html';
-        },
-        goBackLogin:function(){
-            this.isLoginSuccess = false;
-            this.isError = false
-        },
-        setStorages:function(data){//存储本地数据
-            localStorage.setItem('userInfo',JSON.stringify(data));
-        }
-    },
-    created: function () {
-        var userAgent = navigator.userAgent.toLowerCase();
-        this.isWeChat = userAgent.match(/MicroMessenger/i);
-        // this.weChatAutoLogin();
-    },
-    mounted: function () {
-        var _self = this;
-        $('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();
-            }
-        });
-    }
-});
+var loginPage = new Vue({
+    el: "#loginPage",
+    data: {
+        maxtime:60,
+        loginLoading: false,
+        qrCodeLogin: false,
+        loginAccount: '',
+        activateCode: '',
+        showClass:'',
+        mobilCount:0,
+        mobileCodeText:'获取验证码',
+        mobilTime:null,
+        isMobileDisabled:false,
+        emailCount:0,
+        emailCodeText:'获取验证码',
+        emailTime:null,
+        isEmailDisabled:false,
+        isCodeModel:false,
+        codeImagePath:'',
+        codeImageToken:'',
+        imageCode:'',
+        isSuccess:false,
+        isError:false,
+        isLoginSuccess:false,
+        rule:{
+            phone: '^1[3|4|5|7|8|9][0-9]{9}$',
+            code: '^\\d{6}$'
+        },
+        isWeChat: false,
+        maxtime:3
+    },
+    computed: {
+
+    },
+    methods: {
+        getMobileImage:function() {//获取图形验证码
+            var _self = this;
+            var pass = verifyCheack('.massageBtn');
+            if (_self.isMobileDisabled) { return false; }
+            this.$nextTick(function() {
+                if (!pass) {
+                    return false;
+                }
+                DocumentApi.GetImgVerifyCode({},function(response){
+                    if(response.code === 0){
+                        _self.imageCode = '';
+                        _self.codeImagePath = response.data.baseImage;
+                        _self.codeImageToken = response.data.token;
+                        _self.isCodeModel = true;
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定',false);
+                    }
+                })
+            });
+        },
+        getMobileCodeFn:function(){//获取登录短信验证码
+            var _self = this;
+            if(_self.imageCode == ''){
+                CAIMEI.dialog('请输入图形验证码',false,function () {});
+                return;
+            }
+            var params = {
+                    mobile:_self.loginAccount,
+                    imgCode:_self.imageCode,
+                    token:_self.codeImageToken
+            };
+            _self.isMobileDisabled = true;
+            DocumentApi.DocumentNote(params,function (response) {
+                if(response.code == 0){
+                    _self.isCodeModel = false;
+                    CAIMEI.dialog('验证短信已发送',false,function () {});
+                    var TIME_COUNT = 60;
+                    if (!_self.mobilTime) {
+                        _self.mobilCount = TIME_COUNT;
+                        _self.isMobileDisabled = true;
+                        _self.mobilTime = setInterval(function(){
+                            if (_self.mobilCount > 1 && _self.mobilCount <= TIME_COUNT) {
+                                _self.mobilCount--;
+                                _self.mobileCodeText = _self.mobilCount +'s重新发送';
+                            } else {
+                                _self.isMobileDisabled = false;
+                                clearInterval(_self.mobilTime);
+                                _self.mobilTime = null;
+                                _self.mobileCodeText = '获取验证码';
+                            }
+                        },1000)
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isMobileDisabled = false;
+                    _self.isCodeModel = false;
+                }
+            })
+        },
+        blurHandle: function(event) {  // 失去焦点校验
+            var el = event.currentTarget;
+            verifyHandle(el);
+        },
+        refreshCodeImage:function(){
+            this.getMobileImage()
+        },
+        closeCodeModel:function(){
+            this.isCodeModel = false;
+        },
+        loginSubmit: function () {  // 账号登录
+            var _self = this;
+            var pass = verifyForm();
+            if (this.loginLoading) { return false; }
+            this.$nextTick(function(){
+                if (!pass) { return false; }
+                _self.loginLoading = true;
+                var params =  {mobile: _self.loginAccount,code: _self.activateCode};
+                DocumentApi.MobileCodeLogin(params,function(response){
+                    _self.loginLoading = false;
+                    if(response.code === 0){
+                        // 登录成功页面跳转
+                        _self.isLoginSuccess = true;
+                        _self.isSuccess = true;
+                        var timeClock = setInterval(function(){
+                            _self.maxtime--;
+                            if (_self.maxtime === 0) {
+                                location.href = '/document/list.html';
+                                clearInterval(timeClock);
+                                _self.maxtime = 3;
+                                _self.isRefresh = true;
+                            }
+                        },1000);
+                    } else if(response.code === -2) {// 登录失败
+                        _self.isLoginSuccess = true;
+                        _self.isError = true;
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定',false);
+                    }
+                });
+            });
+        },
+        navLinkFn:function(){//跳转
+            location.href = '/document/list.html';
+        },
+        goBackLogin:function(){
+            this.isLoginSuccess = false;
+            this.isError = false
+        },
+        setStorages:function(data){//存储本地数据
+            localStorage.setItem('userInfo',JSON.stringify(data));
+        }
+    },
+    created: function () {
+        var userAgent = navigator.userAgent.toLowerCase();
+        this.isWeChat = userAgent.match(/MicroMessenger/i);
+        // this.weChatAutoLogin();
+    },
+    mounted: function () {
+        var _self = this;
+        $('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();
+            }
+        });
+    }
+});

src/main/resources/static/js/index.js

@@ -94,7 +94,7 @@ var homeData = new Vue({
                     if(data.list && data.list.length>0) {
                         _self.orders = data.list[0].orderProductList[0];
                     }else{
-                        _self.orders = [];
+                        _self.orders = null;
                     }
                 }
             })
@@ -154,7 +154,6 @@ var homeData = new Vue({
         },
         // 是否显示vip标签价格
         showVipPriceTag(pros){
-            console.log('showVipPriceTag',pros.priceFlag)
             if(pros){
                 //非会员
                 // if(!GLOBAL_VIP_FLAG === 1) return false;

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

@@ -1,100 +1,96 @@
-<!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="https://www.thymeleaf.org ">
-<head>
-    <title>采美资料库</title>
-    <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/document/login.css(v=${version})}" rel="stylesheet" type="text/css">
-    <template th:replace="components/analysis"></template>
-</head>
-<body>
-<!-- 二级页面 -->
-<div id="loginPage">
-    <header id="globalHead" xmlns:th="http://www.w3.org/1999/xhtml">
-        <div class="header document">
-            <div class="wrap clear">
-                <img class="logo" src="/img/document/document_logo.png" alt="采美 生美/医美采购服务平台"/>
-                <span>采美资料库</span>
-            </div>
-        </div>
-        <input type="hidden" th:value="${coreServer}" id="coreServer">
-        <input type="hidden" th:value="${agent}" id="userAgent">
-    </header>
-    <div class="login-contailer">
-        <div class="loginWrap clear">
-            <div class="login-image">
-                <img v-if="isPC" src="/img/document/document_img.png" alt="">
-                <img v-else src="/img/document/document-h5img.png" alt="">
-            </div>
-            <div class="loginForm">
-                <div class="title">
-                    <h1>欢迎登录</h1>
-                </div>
-                <form>
-                    <div class="formLine">
-                        <input class="massageBtn" type="text" v-model="loginAccount" placeholder="请输入手机号" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
-                        <i class="checked icon mIcon"></i>
-                        <span class="errTips icon mIcon" tips="请输入正确的手机号"></span>
-                    </div>
-                    <div class="formLine code">
-                        <input type="text" v-model="activateCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
-                        <a class="code-btn" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
-                        <i class="checked icon mIcon"></i>
-                        <span class="errTips icon mIcon" tips="请输入有效短信验证码" id="codeMsg"></span>
-                    </div>
-                    <div class="submit clear">
-                        <div class="btn" @click="loginSubmit()">登录</div>
-                    </div>
-                </form>
-            </div>
-        </div>
-        <div class="login-success" v-if="isLoginSuccess" :class="isLoginSuccess ? 'active' : ''">
-            <div class="header document">
-                <div class="wrap clear">
-                    <img class="logo" src="/img/document/document_logo.png" alt="采美 生美/医美采购服务平台"/>
-                    <span>采美资料库</span>
-                </div>
-            </div>
-            <div class="inner">
-                <div class="success-main" v-if="isSuccess">
-                    <img class="pc-icon" v-if="isPC" src="/img/document/icon-success.png" alt="">
-                    <img class="h5-icon" v-else src="/img/document/icon-h5success.png" alt="">
-                    <h1 class="text-success">登录成功</h1>
-                    <p><span>{{ maxtime }}</span>秒后自动 <span @click="navLinkFn">跳转</span></p>
-                </div>
-                <div class="success-main" v-if="isError">
-                    <img class="pc-icon" v-if="isPC" src="/img/document/icon-error.png" alt="">
-                    <img class="h5-icon" v-else src="/img/document/icon-h5error.png" alt="">
-                    <h1 class="text-error">登录失败!</h1>
-                    <p>您可能没有查看资料的权限</p>
-                   <a href="javascript:void(0);"class="btn" @click="goBackLogin">返回登录</a>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="content-model"  :class="isCodeModel ? 'active' : ''">
-        <div class="model-main">
-            <div class="model-title"><p>获取短信验证码</p><i class="icon mIcon icon-close"  @click="closeCodeModel"></i></div>
-            <div class="model-content">
-                <div class="model-form">
-                    <input class="input" type="text" placeholder="请输入图形验证码" v-model="imageCode" maxlength="4">
-                    <div class="image"><img :src="codeImagePath" alt=""></div>
-                    <div class="refresh" @click="refreshCodeImage">
-                        <i class="icon mIcon"></i>
-                        <span>刷新</span>
-                    </div>
-                </div>
-                <div class="model-button">
-                    <div class="button"  @click="getMobileCodeFn">获取短信验证码</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- 引入底部 -->
-<template th:replace="document/components/document-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/document.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/document/login.js(v=${version})}"></script>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <title>采美资料库</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/document/login.css(v=${version})}" rel="stylesheet" type="text/css">
+    <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 二级页面 -->
+<div id="loginPage">
+    <header id="globalHead" xmlns:th="http://www.w3.org/1999/xhtml">
+        <div class="header document">
+            <div class="wrap clear">
+                <img class="logo" src="/img/document/document_logo.png" alt="采美 生美/医美采购服务平台"/>
+                <span>采美资料库</span>
+            </div>
+        </div>
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${agent}" id="userAgent">
+    </header>
+    <div class="login-contailer">
+        <div class="loginWrap clear">
+            <div class="loginForm">
+                <div class="title">
+                    <h1>欢迎登录</h1>
+                </div>
+                <form>
+                    <div class="formLine">
+                        <input class="massageBtn" type="text" v-model="loginAccount" placeholder="请输入手机号" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入正确的手机号"></span>
+                    </div>
+                    <div class="formLine code">
+                        <input type="text" v-model="activateCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                        <a class="code-btn" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
+                        <i class="checked icon mIcon"></i>
+                        <span class="errTips icon mIcon" tips="请输入有效短信验证码" id="codeMsg"></span>
+                    </div>
+                    <div class="submit clear">
+                        <div class="btn" @click="loginSubmit()">登录</div>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <div class="login-success" v-if="isLoginSuccess" :class="isLoginSuccess ? 'active' : ''">
+            <div class="header document">
+                <div class="wrap clear">
+                    <img class="logo" src="/img/document/document_logo.png" alt="采美 生美/医美采购服务平台"/>
+                    <span>采美资料库</span>
+                </div>
+            </div>
+            <div class="inner">
+                <div class="success-main" v-if="isSuccess">
+                    <img class="pc-icon" v-if="isPC" src="/img/document/icon-success.png" alt="">
+                    <img class="h5-icon" v-else src="/img/document/icon-h5success.png" alt="">
+                    <h1 class="text-success">登录成功</h1>
+                    <p><span>{{ maxtime }}</span>秒后自动 <span @click="navLinkFn">跳转</span></p>
+                </div>
+                <div class="success-main" v-if="isError">
+                    <img class="pc-icon" v-if="isPC" src="/img/document/icon-error.png" alt="">
+                    <img class="h5-icon" v-else src="/img/document/icon-h5error.png" alt="">
+                    <h1 class="text-error">登录失败!</h1>
+                    <p>您可能没有查看资料的权限</p>
+                   <a href="javascript:void(0);"class="btn" @click="goBackLogin">返回登录</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="content-model"  :class="isCodeModel ? 'active' : ''">
+        <div class="model-main">
+            <div class="model-title"><p>获取短信验证码</p><i class="icon mIcon icon-close"  @click="closeCodeModel"></i></div>
+            <div class="model-content">
+                <div class="model-form">
+                    <input class="input" type="text" placeholder="请输入图形验证码" v-model="imageCode" maxlength="4">
+                    <div class="image"><img :src="codeImagePath" alt=""></div>
+                    <div class="refresh" @click="refreshCodeImage">
+                        <i class="icon mIcon"></i>
+                        <span>刷新</span>
+                    </div>
+                </div>
+                <div class="model-button">
+                    <div class="button"  @click="getMobileCodeFn">获取短信验证码</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 引入底部 -->
+<template th:replace="document/components/document-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/document.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/document/login.js(v=${version})}"></script>
+</body>
+</html>

src/main/resources/templates/index.html

@@ -216,7 +216,9 @@
                                                     </template>
                                                     <template v-else>
                                                         <a href="javascript:void(0);">
-                                                            <div class="column-d-image"></div>
+                                                            <div class="column-d-image">
+                                                                <img src="/img/base/placeholder.png" alt="">
+                                                            </div>
                                                             <div class="column-d-text">
                                                                 <p>暂无订单信息</p>
                                                                 <p>下单后查看更多订单信息</p>
@@ -801,7 +803,7 @@
                                     <div class="supplier-list-mid">
                                         <div class="list-mid-item" v-for="(pros, prIndex) in sup.products"
                                              :key="prIndex">
-                                            <a :href="'/product-'+pros.productId+'.html'">
+                                            <a :href="'/product-'+pros.productId+'.html'" target="_blank">
                                                 <img :src="pros.mainImage" :alt="pros.name">
                                             </a>
                                         </div>