Skip to content

肖康 / cloudSystem

Go to a project
Commit 94c7338e by 肖康
Options

Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem 

# Conflicts:
#	src/assets/css/public/common.less
#	src/assets/css/public/common.min.css
parents 63532b41 33fa5160
Expand all
Inline Side-by-side
Showing with 205 additions and 103 deletions
src/assets/css/login/index.less
......@@ -43,6 +43,7 @@ html, body, #app {
.t2 {
font-size: 12px;
color: #666666;
letter-spacing: 10px;
}
}
}
......@@ -104,6 +105,7 @@ html, body, #app {
background: transparent;
border-left: 1px solid #BEC9DF;
margin-left: 12px;
letter-spacing: 1px;
&::-webkit-input-placeholder {
color: #A1ACC1;
......@@ -121,6 +123,10 @@ html, body, #app {
&:focus-within {
border: 1px solid #1969F9;
}
&.error {
border: 1px solid #FF1D00;
}
}
.code-box {
......@@ -137,8 +143,19 @@ html, body, #app {
&::-webkit-input-placeholder {
color: #A1ACC1;
}
&:focus {
border: 1px solid #1969F9;
}
}
}
&.error {
.l {
input {
border: 1px solid #FF1D00;
}
}
}
.r {
......@@ -179,7 +196,7 @@ html, body, #app {
height: 42px;
line-height: 42px;
text-align: center;
background: #A1ACC1;
background: #1969F9;
border-radius: 2px;
font-size: 20px;
color: #ffffff;
......@@ -191,6 +208,10 @@ html, body, #app {
&.active {
background: #1969F9;
}
&:hover {
background: #0050E0;
}
}
}
}
......
src/assets/css/login/index.min.css
......@@ -39,6 +39,7 @@ body,
.user-box .head-box .head-wrap .text .t2 {
font-size: 12px;
color: #666666;
letter-spacing: 10px;
}
.user-box .section {
width: 100%;
......@@ -94,6 +95,7 @@ body,
background: transparent;
border-left: 1px solid #BEC9DF;
margin-left: 12px;
letter-spacing: 1px;
}
.user-box .section .section-wrap .login-box .bar .input-box .inp::-webkit-input-placeholder {
color: #A1ACC1;
......@@ -108,6 +110,9 @@ body,
.user-box .section .section-wrap .login-box .bar .input-box:focus-within {
border: 1px solid #1969F9;
}
.user-box .section .section-wrap .login-box .bar .input-box.error {
border: 1px solid #FF1D00;
}
.user-box .section .section-wrap .login-box .bar .code-box .l input {
width: 210px;
height: 43px;
......@@ -120,6 +125,12 @@ body,
.user-box .section .section-wrap .login-box .bar .code-box .l input::-webkit-input-placeholder {
color: #A1ACC1;
}
.user-box .section .section-wrap .login-box .bar .code-box .l input:focus {
border: 1px solid #1969F9;
}
.user-box .section .section-wrap .login-box .bar .code-box.error .l input {
border: 1px solid #FF1D00;
}
.user-box .section .section-wrap .login-box .bar .code-box .r {
width: 118px;
height: 43px;
......@@ -152,7 +163,7 @@ body,
height: 42px;
line-height: 42px;
text-align: center;
background: #A1ACC1;
background: #1969F9;
border-radius: 2px;
font-size: 20px;
color: #ffffff;
......@@ -164,4 +175,7 @@ body,
.user-box .section .section-wrap .login-box .bar .btn-submit.active {
background: #1969F9;
}
.user-box .section .section-wrap .login-box .bar .btn-submit:hover {
background: #0050E0;
}
/*# sourceMappingURL=index.min.css.map */
\ No newline at end of file
src/assets/css/login/index.min.css.map
{"version":3,"sources":["index.less"],"names":[],"mappings":"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","file":"index.min.css"}
\ No newline at end of file
{"version":3,"sources":["index.less"],"names":[],"mappings":"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","file":"index.min.css"}
\ No newline at end of file
src/assets/css/public/common.less
html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust : 100%;
-ms-text-size-adjust: 100%;
}
html * {
outline : 0;
-webkit-text-size-adjust : none !important;
outline: 0;
-webkit-text-size-adjust: none !important;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
}
html,
body {
font-family : PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
font-style : normal;
-webkit-font-smoothing : antialiased;
font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size : 14px;
color : #646B78;
font-size: 14px;
color: #646B78;
}
body,
......@@ -56,7 +56,7 @@ header,
menu,
nav,
section {
margin : 0;
margin: 0;
padding: 0;
}
......@@ -64,8 +64,8 @@ button,
input,
select,
textarea {
font-size : 100%;
border : none;
font-size: 100%;
border: none;
-webkit-appearance: none;
}
......@@ -77,7 +77,7 @@ input[type=submit] {
table {
border-collapse: collapse;
border-spacing : 0;
border-spacing: 0;
}
ol,
......@@ -92,7 +92,7 @@ h3,
h4,
h5,
h6 {
font-size : 100%;
font-size: 100%;
font-weight: 500;
}
......@@ -116,20 +116,20 @@ img {
}
.clr:after {
content : ".";
clear : both;
height : 0;
content: ".";
clear: both;
height: 0;
visibility: hidden;
display : block;
display: block;
}
.fl {
float : left;
float: left;
_display: inline;
}
.fr {
float : right;
float: right;
_display: inline;
}
......@@ -147,38 +147,38 @@ img {
.lineBlock {
display : inline-block;
*display : inline;
zoom : 1;
display: inline-block;
*display: inline;
zoom: 1;
letter-spacing: normal;
word-spacing : normal;
word-spacing: normal;
}
.lbBox {
font-size : 0 !important;
font-size: 0 !important;
*word-spacing: -1px !important;
}
.emptys {
margin-left : -1px;
width : 1px;
height : 100%;
font-size : 0;
margin-left: -1px;
width: 1px;
height: 100%;
font-size: 0;
vertical-align: middle;
}
.boxsiz {
-webkit-box-sizing: border-box;
box-sizing : border-box;
box-sizing: border-box;
}
.column {
display : flex;
display: flex;
flex-direction: column;
}
.row {
display : flex;
display: flex;
flex-direction: row;
}
......@@ -204,16 +204,16 @@ img {
.boxFlex {
-webkit-box-flex: 1;
-moz-box-flex : 1;
-webkit-flex : 1;
-ms-flex : 1;
flex : 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
html,
body {
width : 100%;
height : 100%;
width: 100%;
height: 100%;
-webkit-overflow-scrolling: touch;
}
......@@ -245,10 +245,10 @@ body {
}
.el-message--info {
min-width : auto !important;
border : 0px !important;
min-width: auto !important;
border: 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
top : 100px !important;
top: 100px !important;
.el-icon-info {
display: none;
......@@ -264,10 +264,10 @@ body {
//表单样式重写
.el-input__inner {
height : 38px;
height: 38px;
border-radius: 2px;
border : 1px solid #BEC9DF;
font-size : 14px;
border: 1px solid #BEC9DF;
font-size: 14px;
&:focus {
border: 1px solid #387FFF;
......@@ -297,8 +297,8 @@ body {
}
.el-message--info {
min-width : auto !important;
border : 0px !important;
min-width: auto !important;
border: 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
.el-icon-info {
......@@ -311,7 +311,6 @@ body {
}
//表格样式重写
.el-table {
color: #646B78;
......@@ -320,7 +319,7 @@ body {
.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #1969F9;
border-color : #1969F9;
border-color: #1969F9;
}
.el-table__header {
......@@ -328,7 +327,7 @@ body {
font-weight: normal;
}
.el-table__body tr.hover-row>td {
.el-table__body tr.hover-row > td {
background-color: #F1F8FF;
}
......@@ -374,15 +373,15 @@ body {
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius : 8px;
background : #fff;
width : 18px;
border-radius: 8px;
background: #fff;
width: 18px;
-webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2);
}
.el-table__body-wrapper::-webkit-scrollbar-track {
border-radius: 0;
background : #D2D9E7;
background: #D2D9E7;
}
......@@ -401,12 +400,25 @@ body {
height : 28px;
line-height: 28px;
span {
width: 50%;
}
//js跟随提示框
.el-tooltip__popper {
border: 0px !important;
box-shadow: 0px 0px 10px #ccc;
.boxxrth2021 {
width: 150px;
background: #fff;
font-size: 12px;
color: #333;
p {
height: 28px;
line-height: 28px;
span {
width: 50%;
}
}
}
.el-tooltip__popper[x-placement="top"] .popper__arrow{border-top-color:#387FFF!important;}
.el-tooltip__popper[x-placement="bottom"] .popper__arrow{border-bottom-color:#387FFF!important;}
......@@ -419,19 +431,19 @@ body {
}
.el-dialog__title {
font-size : 14px;
color : #333;
font-size: 14px;
color: #333;
font-weight: bold;
position : relative;
position: relative;
&::after {
content : "";
position : absolute;
width : 5px;
height : 22px;
content: "";
position: absolute;
width: 5px;
height: 22px;
background: #1969F9;
left : -20px;
top : 2px;
left: -20px;
top: 2px;
}
}
......@@ -448,7 +460,7 @@ body {
.el-message-box__container {
text-align: center;
padding : 15px 0px;
padding: 15px 0px;
}
.el-message-box__message {
......@@ -456,12 +468,12 @@ body {
}
.el-message-box__message p {
color : #333;
color: #333;
font-size: 16px;
}
.el-message-box__status.el-icon-error {
color : #FC1F00 !important;
color: #FC1F00 !important;
font-size: 25px !important;
}
......@@ -473,34 +485,34 @@ body {
.dialog-footer {
.el-button {
width : 76px;
height : 34px;
text-align : center;
line-height : 34px;
background : #E8ECF4;
border : 1px solid #E8ECF4;
width: 76px;
height: 34px;
text-align: center;
line-height: 34px;
background: #E8ECF4;
border: 1px solid #E8ECF4;
border-radius: 2px;
color : #8391AD;
font-size : 14px;
padding : 0px;
color: #8391AD;
font-size: 14px;
padding: 0px;
&:hover,
&:focus {
color : #8391AD;
color: #8391AD;
background: #E8ECF4;
border : 1px solid #E8ECF4
border: 1px solid #E8ECF4
}
&.el-button--primary {
border : 1px solid #1969F9;
color : #fff;
border: 1px solid #1969F9;
color: #fff;
background: #1969F9;
&:hover,
&:focus {
color : #fff;
color: #fff;
background: #1969F9;
border : 1px solid #1969F9
border: 1px solid #1969F9
}
}
......
src/assets/css/public/common.min.css.map
{"version":3,"sources":["common.less"],"names":[],"mappings":"AAAA;EACE,8BAAA;EACA,0BAAA;;AAGF,IAAK;EACH,UAAA;EACA,yCAAA;EACA,6CAAA;;AAGF;AACA;EACE,8CAA0D,6BAA1D;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;EACA,eAAA;EACA,cAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,SAAA;EACA,UAAA;;AAGF;AACA;AACA;AACA;EACE,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AACL,KAAK;AACL,KAAK;EACH,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AACA;AACA;EACE,gBAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;EACE,eAAA;EACA,gBAAA;;AAGF;AACA;AACA;EACE,kBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,YAAA;;AAGF;EACE,QAAA;EACA,WAAA;;AAGF,IAAI;EACF,SAAY,GAAZ;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;;AAGF;EACE,WAAA;EACA,gBAAA;;AAGF;EACE,YAAA;EACA,gBAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,sBAAA;;AAGF;EACE,sBAAA;;AAIF;EACE,qBAAA;EACA,gBAAA;EACA,OAAA;EACA,sBAAA;EACA,oBAAA;;AAGF;EACE,uBAAA;EACA,mBAAA;;AAGF;EACE,iBAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,sBAAA;;AAGF;EACE,8BAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,mBAAA;;;AAIF;EACE,8BAAA;;;AAIF;EACE,6BAAA;;;AAIF;EACE,uBAAA;;;AAIF;EACE,mBAAA;;AAGF;EACE,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;EACA,OAAA;;AAGF;AACA;EACE,WAAA;EACA,YAAA;EACA,iCAAA;;AAGF;EACE,kBAAA;EACA,mBAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;;AAIF;EACE,iBAAA;EACA,gBAAA;;AAGF;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;EACA,qBAAA;;AAJF,iBAME;EACE,aAAA;;AAPJ,iBAUE;EACE,WAAA;;AAIJ;EACE,aAAA;;AADF,MAIE;EACE,YAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;;AAEA,MANF,iBAMG;EACC,yBAAA;;AAXN,MAeE;EACE,WAAA;;AAhBJ,MAmBE,iBAAgB;EACd,YAAA;;AApBJ,MAuBE,WAAW,UAAS,SAAU;AAvBhC,MAwBE,iBAAgB;AAxBlB,MAyBE,iBAAgB,UAAU;EACxB,qBAAA;;AA1BJ,MA6BE;EACE,YAAA;;AA9BJ,MAiCE,iBAAiB;EACf,kBAAA;;AAlCJ,MAqCE;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;;AAxCJ,MAqCE,kBAKE;EACE,aAAA;;AA3CN,MAqCE,kBASE;EACE,WAAA;;AA/CN,MAsDE;EACE,cAAA;;AAvDJ,MA0DE,oBAAmB,WAAY;AA1DjC,MA2DE,oBAAmB,iBAAkB;EACnC,yBAAA;EACA,qBAAA;;AA7DJ,MAgEE,kBACE;EACE,mBAAA;;AAlEN,MAgEE,kBAKE,gBAAgB,GAAE,UAAU;EAC1B,yBAAA;;AAtEN,MA4EE,QACE,kBACE;EACE,yBAAA;;AA/ER,MAoFE,iBACE,kBACE;EACE,yBAAA;;AAvFR,MA8GE,wBAAuB;EACrB,WAAA;;AA/GJ,MAkHE,wBAAuB;EACrB,kBAAA;EACA,gBAAA;EACA,WAAA;EACA,oDAAA;;AAtHJ,MAyHE,wBAAuB;EACrB,gBAAA;EACA,mBAAA;;AAMF;EACE,qBAAA;EACA,6BAAA;;AAFF,mBAGE;EACE,YAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;;AAPJ,mBAGE,aAKE;EACE,YAAA;EACA,iBAAA;;AAVN,mBAGE,aAKE,EAIE;EACE,UAAA;;AAMR,mBAAmB,mBAAoB;EAAe,sBAAA;;AACtD,mBAAmB,sBAAuB;EAAe,yBAAA;;AAK3D;EACE,wBAAA;;AAGF;EACE,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;;AAEA,iBAAC;EACC,SAAY,EAAZ;EACA,kBAAA;EACA,UAAA;EACA,YAAA;EACA,mBAAA;EACA,WAAA;EACA,QAAA;;AAIJ;EACE,eAAA;;AAEA,cAAC;AACD,cAAC;EACC,cAAA;;AAMJ;EACE,kBAAA;EACA,iBAAA;;AAGF;EACE,qBAAA;;AAGF,wBAAyB;EACvB,WAAA;EACA,eAAA;;AAGF,uBAAuB;EACrB,cAAA;EACA,0BAAA;;AAGF,sBAAsB;EACpB,SAAS,OAAT;;AAGF,qBAGE;AAFF,cAEE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,iBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,YAAA;;AAEA,qBAZF,WAYG;AAAD,cAZF,WAYG;AACD,qBAbF,WAaG;AAAD,cAbF,WAaG;EACC,cAAA;EACA,mBAAA;EACA,yBAAA;;AAGF,qBAnBF,WAmBG;AAAD,cAnBF,WAmBG;EACC,yBAAA;EACA,WAAA;EACA,mBAAA;;AAEA,qBAxBJ,WAmBG,mBAKE;AAAD,cAxBJ,WAmBG,mBAKE;AACD,qBAzBJ,WAmBG,mBAME;AAAD,cAzBJ,WAmBG,mBAME;EACC,WAAA;EACA,mBAAA;EACA,yBAAA","file":"common.min.css"}
\ No newline at end of file
{"version":3,"sources":["common.less"],"names":[],"mappings":"AAAA;EACE,8BAAA;EACA,0BAAA;;AAGF,IAAK;EACH,UAAA;EACA,yCAAA;EACA,6CAAA;;AAGF;AACA;EACE,8CAA8C,6BAA9C;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;EACA,eAAA;EACA,cAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,SAAA;EACA,UAAA;;AAGF;AACA;AACA;AACA;EACE,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AACL,KAAK;AACL,KAAK;EACH,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AACA;AACA;EACE,gBAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;EACE,eAAA;EACA,gBAAA;;AAGF;AACA;AACA;EACE,kBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,YAAA;;AAGF;EACE,QAAA;EACA,WAAA;;AAGF,IAAI;EACF,SAAS,GAAT;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;;AAGF;EACE,WAAA;EACA,gBAAA;;AAGF;EACE,YAAA;EACA,gBAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,sBAAA;;AAGF;EACE,sBAAA;;AAIF;EACE,qBAAA;EACA,gBAAA;EACA,OAAA;EACA,sBAAA;EACA,oBAAA;;AAGF;EACE,uBAAA;EACA,mBAAA;;AAGF;EACE,iBAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,sBAAA;;AAGF;EACE,8BAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,mBAAA;;;AAIF;EACE,8BAAA;;;AAIF;EACE,6BAAA;;;AAIF;EACE,uBAAA;;;AAIF;EACE,mBAAA;;AAGF;EACE,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;EACA,OAAA;;AAGF;AACA;EACE,WAAA;EACA,YAAA;EACA,iCAAA;;AAGF;EACE,kBAAA;EACA,mBAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;;AAIF;EACE,iBAAA;EACA,gBAAA;;AAGF;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;EACA,qBAAA;;AAJF,iBAME;EACE,aAAA;;AAPJ,iBAUE;EACE,WAAA;;AAIJ;EACE,aAAA;;AADF,MAIE;EACE,YAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;;AAEA,MANF,iBAMG;EACC,yBAAA;;AAXN,MAeE;EACE,WAAA;;AAhBJ,MAmBE,iBAAgB;EACd,YAAA;;AApBJ,MAuBE,WAAW,UAAS,SAAU;AAvBhC,MAwBE,iBAAgB;AAxBlB,MAyBE,iBAAgB,UAAU;EACxB,qBAAA;;AA1BJ,MA6BE;EACE,YAAA;;AA9BJ,MAiCE,iBAAiB;EACf,kBAAA;;AAlCJ,MAqCE;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;;AAxCJ,MAqCE,kBAKE;EACE,aAAA;;AA3CN,MAqCE,kBASE;EACE,WAAA;;AA/CN,MAqDE;EACE,cAAA;;AAtDJ,MAyDE,oBAAmB,WAAY;AAzDjC,MA0DE,oBAAmB,iBAAkB;EACnC,yBAAA;EACA,qBAAA;;AA5DJ,MA+DE,kBACE;EACE,mBAAA;;AAjEN,MA+DE,kBAKE,gBAAgB,GAAE,UAAW;EAC3B,yBAAA;;AArEN,MA2EE,QACE,kBACE;EACE,yBAAA;;AA9ER,MAmFE,iBACE,kBACE;EACE,yBAAA;;AAtFR,MA6GE,wBAAuB;EACrB,WAAA;;AA9GJ,MAiHE,wBAAuB;EACrB,kBAAA;EACA,gBAAA;EACA,WAAA;EACA,oDAAA;;AArHJ,MAwHE,wBAAuB;EACrB,gBAAA;EACA,mBAAA;;AAOJ;EACE,sBAAA;EACA,6BAAA;;AAFF,mBAIE;EACE,YAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;;AARJ,mBAIE,aAME;EACE,YAAA;EACA,iBAAA;;AAZN,mBAIE,aAME,EAIE;EACE,UAAA;;AAOR,mBAAmB,mBAAoB;EACrC,sBAAA;;AAGF,mBAAmB,sBAAuB;EACxC,yBAAA;;AAKF;EACE,wBAAA;;AAGF;EACE,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;;AAEA,iBAAC;EACC,SAAS,EAAT;EACA,kBAAA;EACA,UAAA;EACA,YAAA;EACA,mBAAA;EACA,WAAA;EACA,QAAA;;AAIJ;EACE,eAAA;;AAEA,cAAC;AACD,cAAC;EACC,cAAA;;AAMJ;EACE,kBAAA;EACA,iBAAA;;AAGF;EACE,qBAAA;;AAGF,wBAAyB;EACvB,WAAA;EACA,eAAA;;AAGF,uBAAuB;EACrB,cAAA;EACA,0BAAA;;AAGF,sBAAsB;EACpB,SAAS,OAAT;;AAGF,qBAGE;AAFF,cAEE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,iBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,YAAA;;AAEA,qBAZF,WAYG;AAAD,cAZF,WAYG;AACD,qBAbF,WAaG;AAAD,cAbF,WAaG;EACC,cAAA;EACA,mBAAA;EACA,yBAAA;;AAGF,qBAnBF,WAmBG;AAAD,cAnBF,WAmBG;EACC,yBAAA;EACA,WAAA;EACA,mBAAA;;AAEA,qBAxBJ,WAmBG,mBAKE;AAAD,cAxBJ,WAmBG,mBAKE;AACD,qBAzBJ,WAmBG,mBAME;AAAD,cAzBJ,WAmBG,mBAME;EACC,WAAA;EACA,mBAAA;EACA,yBAAA","file":"common.min.css"}
\ No newline at end of file
src/assets/css/store/listDetail.min.css
.listDetail .detail-nav{background:#fff;padding:20px;font-size:14px;color:#333;padding-top:28px}.listDetail .detail-nav span{margin-right:45px}.listDetail .data-box{padding:20px;padding-top:5px;background:#fff}
\ No newline at end of file
.listDetail .detail-nav {
background: #fff;
padding: 20px;
font-size: 14px;
color: #333;
padding-top: 28px;
}
.listDetail .detail-nav span {
margin-right: 45px;
}
.listDetail .data-box {
padding: 20px;
padding-top: 5px;
background: #fff;
}
/*# sourceMappingURL=listDetail.min.css.map */
\ No newline at end of file
src/assets/css/store/listDetail.min.css.map
{"version":3,"sources":["listDetail.less"],"names":[],"mappings":"AAAA,WACI;EACI,gBAAA;EACA,aAAA;EACA,eAAA;EACA,WAAA;;AALR,WACI,YAKI;EACI,kBAAA","file":"listDetail.min.css"}
\ No newline at end of file
{"version":3,"sources":["listDetail.less"],"names":[],"mappings":"AAAA,WACI;EACI,gBAAA;EACA,aAAA;EACA,eAAA;EACA,WAAA;EAIA,iBAAA;;AATR,WACI,YAKI;EACI,kBAAA;;AAPZ,WAWI;EACI,aAAA;EACA,gBAAA;EACA,gBAAA","file":"listDetail.min.css"}
\ No newline at end of file
src/components/menu.vue
......@@ -8,7 +8,7 @@
<font class="fl">概况</font>
</a>
<a class="item fl" :class="{'act':(JSON.stringify(item)==JSON.stringify({path: $route.path,title: $route.meta.title,query:$route.query}))}" @click="tabUrl(item)" v-for="item in tabs">
<a class="item fl" :class="{'act':(JSON.stringify(item)==JSON.stringify({path: $route.path,title: $route.meta.title,query:$route.query}))}" @click="tabUrl(item)" v-for="item in tabs">
<font class="fl">{{item.title}}</font>
<span class="icon iconfont fl" @click.stop="closetab(item.path)"></span>
</a>
......@@ -187,7 +187,7 @@
if (tab_arr) {
this.tabs = JSON.parse(tab_arr);
}
let app_ = document.getElementById('app');
this.collapse = false
if (this.collapse) {
......@@ -209,9 +209,9 @@
})
},
tabUrl(item){
this.$router.push({ path: item.path,query:item.query })
},
tabUrl(item) {
this.$router.push({path: item.path, query: item.query})
},
changePwd() {
this.dialogVisible = true;
},
......@@ -328,6 +328,7 @@
text-align: center;
background: #1969F9;
box-shadow: 0px 2px 42px -8px rgba(206, 214, 219, 0.5);
font-size: 20px;
}
.tab-box {
......@@ -588,12 +589,33 @@
}
}
.el-submenu {
position: relative;
}
.el-submenu:hover {
&::after {
content: "";
position: absolute;
left: 0px;
top: 7px;
width: 5px;
height: 30px;
background: #1969F9;
}
}
.el-menu-item:focus,
.el-menu-item:hover,
.el-submenu__title:hover {
background: #F1F4FA;
}
.el-submenu__title:hover span {
color: #1969F9;
}
.el-submenu.is-opened,
.indextab.is-active {
position: relative;
......
src/views/User/login.vue
......@@ -19,18 +19,18 @@
<p class="tit">欢迎登录云芯系统</p>
<div class="bar">
<form>
<div class="input-box lbBox">
<div class="input-box lbBox" :class="errorClass1 ? 'error':''">
<i class="iconfont iconuser va-m"></i>
<input type="text" placeholder="请输入手机号" class="inp va-m" v-model="form.mobile" autocomplete="off"/>
<b class="lineBlock emptys"></b>
</div>
<div class="input-box lbBox">
<div class="input-box lbBox" :class="errorClass2 ? 'error':''">
<i class="iconfont icondenglu-mimabeifen va-m"></i>
<input :type='pwdFlag?"password":"text"' placeholder="请输入登录密码" class="inp va-m" v-model="form.password"/>
<a href="javascript:;" class="iconfont eye" :class="pwdFlag ? 'iconyincang':'iconyanjing'" @click="changePwd()"></a>
<b class="lineBlock emptys"></b>
</div>
<div class="code-box clr">
<div class="code-box clr" :class="errorClass3 ? 'error':''">
<div class="fl l">
<input type="text" placeholder="请输入验证码" v-model="form.captcha"/>
</div>
......@@ -66,6 +66,9 @@
status2: false,
loading: true,
imgSrc: '',
errorClass1: false,
errorClass2: false,
errorClass3: false,
form: {
mobile: '',
password: '',
......@@ -79,11 +82,17 @@
deep: true,
handler: function (newV, oldV) {
let obj = newV;
let myreg = /^[1][3,4,5,7,8][0-9]{9}$/;
if (obj.captcha || obj.password || obj.mobile) {
this.errror_text = '';
this.errorClass1 = false;
this.errorClass2 = false;
this.errorClass3 = false;
}
if (obj.captcha && obj.password && obj.mobile) {
if (myreg.test(obj.mobile)) {
this.active = true;
} else {
this.active = false;
......@@ -111,19 +120,23 @@
var myreg = /^[1][3,4,5,7,8][0-9]{9}$/;
if (!this.form.mobile) {
this.errror_text = '请输入手机号';
this.errorClass1 = true;
return false;
}
if (!myreg.test(this.form.mobile)) {
this.errror_text = '请输入正确的手机号';
this.errorClass1 = true;
return false;
}
if (!this.form.password) {
this.errror_text = '请输入登录密码';
this.errorClass2 = true;
return false;
}
if (!this.form.captcha) {
this.errror_text = '请输入验证码';
this.errorClass3 = true;
return false;
}
......@@ -146,8 +159,12 @@
} else {
window.location.href = '/';
}
} else if (res.err_code === 102) {
this.errror_text = res.err_msg;
this.errorClass3 = true;
this.updateCp();
} else {
Message(res.err_msg);
this.errror_text = res.err_msg;
this.updateCp();
}
}).catch(err => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment