Skip to content

肖康 / cloudSystem

Go to a project
Commit 1282d0a7 by liangjianmin
Options

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

parents a158d841 e0e645b0
Expand all
Inline Side-by-side
Showing with 174 additions and 98 deletions
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;
}
......@@ -221,20 +221,35 @@ body {
overflow-x: hidden;
background: #F1F4FA;
}
.f-blue{color:#1969F9;}
.f-green{color:#3FBE1B;}
.f-yellow1{color:#CC8200;}
.f-red1{color:#FC1F00;}
.f-blue {
color: #1969F9;
}
.f-green {
color: #3FBE1B;
}
.f-yellow1 {
color: #CC8200;
}
.f-red1 {
color: #FC1F00;
}
/**element-ui 样式重写**/
.el-pagination{
.el-pagination {
text-align: right;
margin-top: 20px;
}
.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;
}
......@@ -249,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;
......@@ -282,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 {
......@@ -295,32 +310,39 @@ body {
}
}
//表格样式重写
.el-table {
color: #646B78;
}
.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
.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 {
th {
font-weight: normal;
}
.el-table__body tr.hover-row > td {
.el-table__body tr.hover-row>td {
background-color: #F1F8FF;
}
}
.th-all{
.th-all {
.el-table__header {
th {
background-color: #F1F4FA
}
}
}
.el-table__fixed {
.el-table__header {
th {
......@@ -335,7 +357,7 @@ body {
// .el-table th.is-leaf {
// border-bottom: 1px solid #D2D9E7;
// }
// .el-table--border td,
// .el-table--border th,
// .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
......@@ -352,46 +374,71 @@ 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;
}
}
//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:#fff!important;}
.el-tooltip__popper[x-placement="bottom"] .popper__arrow{border-bottom-color:#fff!important;}
//弹窗公共样式
.el-dialog__body {
padding:20px !important;
padding: 20px !important;
}
.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;
}
}
.el-icon-close {
font-size: 24px;
&:hover, &:focus {
&:hover,
&:focus {
color: #1969F9 !important;
}
......@@ -400,7 +447,7 @@ body {
.el-message-box__container {
text-align: center;
padding: 15px 0px;
padding : 15px 0px;
}
.el-message-box__message {
......@@ -408,12 +455,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;
}
......@@ -421,37 +468,40 @@ body {
content: "\E609";
}
.el-message-box__btns, .dialog-footer {
.el-message-box__btns,
.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;
&:hover,
&:focus {
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;
&:hover,
&:focus {
color : #fff;
background: #1969F9;
border: 1px solid #1969F9
border : 1px solid #1969F9
}
}
}
}
}
\ No newline at end of file
src/assets/css/store/list.less
......@@ -102,4 +102,26 @@
}
}
}
.price-more{
.more-search-btn{
width: 70px;
height: 26px;
background: #F1F4FA;
border-radius: 2px;
border: 1px solid #BEC9DF;
font-size: 12px;
color:#1969F9;
text-align: center;
transition: all 0.5s;
position: relative;
cursor: pointer;
&:hover{
border: 1px solid #1969F9;
}
}
}
}
\ No newline at end of file
src/assets/css/store/list.min.css
.store-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.store-con .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.store-con .search-btn:hover{background:#0050E0}.store-con .btn-nav{margin-top:11px;margin-bottom:22px}.store-con .btn-nav .update{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.store-con .btn-nav .update i{margin-left:3px}.store-con .btn-nav .update:hover{background:#FCA955;color:#fff}.store-con .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#E5EEFF;color:#1969F9;margin-left:10px;font-size:14px;transition:all .5s}.store-con .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.store-con .btn-nav .dcg.heti{width:56px;background:#fff}.store-con .btn-nav .dcg.heti:hover{background:#E5EEFF;color:#1969F9}.store-con .btn-nav .dcg.xjk{position:relative;left:-11px;border-left:1px solid #1969F9}.store-con .btn-nav .dcg.xjk:hover{border-left:1px solid #1969F9}.store-con .updatebox{position:relative}.store-con .updatebox .selectdw{height:36px;width:36px;position:absolute;top:1px;right:2px}.store-con .updatebox .selectdw .el-select{width:36px;border-left:1px solid #C0C4CC}.store-con .updatebox .selectdw .el-select input{border:0px;padding:0px;height:36px;width:36px;font-size:14px;color:#333;text-align:center}.store-con .updatebox .selectdw .el-select .el-input__prefix,.store-con .updatebox .selectdw .el-select .el-input__suffix{display:none!important}
\ No newline at end of file
.store-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.store-con .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.store-con .search-btn:hover{background:#0050E0}.store-con .btn-nav{margin-top:11px;margin-bottom:22px}.store-con .btn-nav .update{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.store-con .btn-nav .update i{margin-left:3px}.store-con .btn-nav .update:hover{background:#FCA955;color:#fff}.store-con .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#E5EEFF;color:#1969F9;margin-left:10px;font-size:14px;transition:all .5s}.store-con .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.store-con .btn-nav .dcg.heti{width:56px;background:#fff}.store-con .btn-nav .dcg.heti:hover{background:#E5EEFF;color:#1969F9}.store-con .btn-nav .dcg.xjk{position:relative;left:-11px;border-left:1px solid #1969F9}.store-con .btn-nav .dcg.xjk:hover{border-left:1px solid #1969F9}.store-con .updatebox{position:relative}.store-con .updatebox .selectdw{height:36px;width:36px;position:absolute;top:1px;right:2px}.store-con .updatebox .selectdw .el-select{width:36px;border-left:1px solid #C0C4CC}.store-con .updatebox .selectdw .el-select input{border:0px;padding:0px;height:36px;width:36px;font-size:14px;color:#333;text-align:center}.store-con .updatebox .selectdw .el-select .el-input__prefix,.store-con .updatebox .selectdw .el-select .el-input__suffix{display:none!important}.store-con .price-more .more-search-btn{width:70px;height:26px;background:#F1F4FA;border-radius:2px;border:1px solid #BEC9DF;font-size:12px;color:#1969F9;text-align:center;transition:all .5s;position:relative;cursor:pointer}.store-con .price-more .more-search-btn:hover{border:1px solid #1969F9}
\ 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':item.path==$route.path}" @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,6 +187,7 @@
if (tab_arr) {
this.tabs = JSON.parse(tab_arr);
}
let app_ = document.getElementById('app');
this.collapse = false
if (this.collapse) {
......
src/main.js
......@@ -50,7 +50,8 @@ router.afterEach((to, from, next) => {
tabOldJson = [
{
path: to.path,
title: to.meta.title
title: to.meta.title,
query:to.query
}
]
......
src/router/index.js
......@@ -52,7 +52,7 @@ const routes = [
path: '/listDetail',
name: 'ListDetail',
meta: {
title: '库存列表详情'
title: '库存导入详情'
},
component: () => import('../views/Store/listDetail.vue')
......
src/views/Store/enter.vue
......@@ -145,7 +145,7 @@
})
},
downwj() {
this.$http('get', "/api/uploadSku/downUploadCsv", {}).then(res => {
this.$http('post', "/api/uploadSku/downUploadCsv", {}).then(res => {
})
},
......
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