bug3687,3679

src/css/login.less

@@ -126,7 +126,7 @@ body {
     height: 40px;
     position: relative;
     padding-left: 15px;
-    font-size: 16px;
+    font-size: 14px;
     img {
       position: absolute;
       right: 10px;

src/css/reset.less

@@ -191,17 +191,17 @@ textarea {
     left: 50%;
     top: 30%;
     margin-left: -200px;
-    // margin-top: -100px;
     padding-bottom: 20px;
+    border-radius: 4px;
+    overflow: hidden;
   }
   .title {
     border-bottom: 1px solid #eee;
-    background-color: #F8F8F8;
     line-height: 40px;
     height: 40px;
     position: relative;
     padding-left: 15px;
-    font-size: 16px;
+    font-size: 14px;
     img {
       position: absolute;
       right: 0px;
@@ -215,7 +215,7 @@ textarea {
     text-align: center;
   }
   .btns {
-    height: 45px;
+    height: 36px;
     text-align: center;
     span {
       border-radius: 5px;
@@ -223,11 +223,10 @@ textarea {
       // float: right;
       cursor: pointer;
       border: 1px solid #dedede;
-      height: 40px;
-      line-height: 40px;
-      width: 120px;
+      width: 80px;
+      height: 36px;
+      line-height: 36px;
       margin: 5px 5px 0;
-      padding: 0 15px;
       color: #333;
       border-radius: 3px;
       font-weight: 400;

src/js/index.js

@@ -59,7 +59,7 @@ function sureChangeWord(){
       $(".modalAction .waring").css('display','block').find("i").html('请输入新密码')
       return
     }else if(!sureword){
-      $(".modalAction .waring").css('display','block').find("i").html('请再次输入新密码')
+      $(".modalAction .waring").css('display','block').find("i").html('请确认新密码')
       return
     }
     if(newword != sureword){

src/js/modal.js

@@ -1,7 +1,7 @@
 const jQuery = require('jquery');
 
 (function ($) {
-    let close = require("../images/wordClose.png")
+    let close = require("../images/icon_close_default.png")
     let loadingImg = require("../images/loading.gif")
     $.alerModal = function (options) {
         var dft = {

src/js/utils.js

@@ -65,6 +65,9 @@ const getUrlArgObject = function getQueryString(name) {
 
 const post = function (url, data) {
   const token = getCookie('accessToken')
+  if(!token&&window.location.href.indexOf('login')==-1){
+    window.location.href = "../login.html"
+  }
   return new Utils((resolve, reject) => {
     $.ajax({
       method: 'post',