Skip to content

肖康 / cloudSystem

Go to a project
Commit bde12adc by LJM
Options

bug

parent 025bfed0
Inline Side-by-side
Showing with 116 additions and 95 deletions
src/assets/css/goods/brand.less
.brandxk{ .brandxk {
.brand-con{ .brand-con {
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
border: 1px solid #E5EBF6; border: 1px solid #E5EBF6;
padding:20px; padding: 20px;
} }
.search-btn{
.search-btn {
cursor: pointer; cursor: pointer;
width: 76px; width: 76px;
height: 37px; height: 37px;
...@@ -13,17 +14,19 @@ ...@@ -13,17 +14,19 @@
background: #1969F9; background: #1969F9;
border-radius: 2px; border-radius: 2px;
font-size: 14px; font-size: 14px;
color:#fff; color: #fff;
text-align: center; text-align: center;
&:hover{
&:hover {
background: #0050E0; background: #0050E0;
} }
} }
.btn-nav{
.btn-nav {
margin-top: 11px; margin-top: 11px;
margin-bottom: 22px; margin-bottom: 22px;
.dcg{ .dcg {
width: 66px; width: 66px;
height: 26px; height: 26px;
border-radius: 2px; border-radius: 2px;
...@@ -31,29 +34,34 @@ ...@@ -31,29 +34,34 @@
line-height: 26px; line-height: 26px;
border: 1px solid #1969F9; border: 1px solid #1969F9;
background: #E5EEFF;; background: #E5EEFF;;
color:#1969F9; color: #1969F9;
margin-right: 10px; margin-right: 10px;
font-size: 14px; font-size: 14px;
transition: all 0.5s; transition: all 0.5s;
&:hover{
&:hover {
background: #1969F9; background: #1969F9;
cursor: pointer; cursor: pointer;
color:#fff; color: #fff;
} }
&.delbtn{
border:1px solid #FC1F00; &.delbtn {
border: 1px solid #FC1F00;
background: #FFE7E3; background: #FFE7E3;
color:#FC1F00; color: #FC1F00;
&:hover{
&:hover {
background: #FF715D; background: #FF715D;
color:#fff; color: #fff;
} }
} }
&.updatex{
&.updatex {
} }
} }
.updatex{
.updatex {
width: 66px; width: 66px;
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
...@@ -61,19 +69,21 @@ ...@@ -61,19 +69,21 @@
background: #FFEEDD; background: #FFEEDD;
border: 1px solid #FF870D; border: 1px solid #FF870D;
border-radius: 2px; border-radius: 2px;
color:#FF870D; color: #FF870D;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
width: 66px; width: 66px;
&:hover{
&:hover {
background: #FCA955; background: #FCA955;
color:#fff; color: #fff;
} }
} }
} }
.brand-img{
.brand-img {
width: 80%; width: 80%;
height: 40px; height: 40px;
......
src/assets/css/goods/goods.less
...@@ -4,31 +4,31 @@ ...@@ -4,31 +4,31 @@
font-size: 20px; font-size: 20px;
} }
color:#666; color: #666;
&:hover { &:hover {
color : #1969F9; color: #1969F9;
cursor: pointer; cursor: pointer;
} }
} }
.goods-con { .goods-con {
background : #FFFFFF; background: #FFFFFF;
border-radius: 4px; border-radius: 4px;
border : 1px solid #E5EBF6; border: 1px solid #E5EBF6;
padding : 20px; padding: 20px;
} }
.search-btn { .search-btn {
cursor : pointer; cursor: pointer;
width : 76px; width: 76px;
height : 37px; height: 37px;
line-height : 37px; line-height: 37px;
background : #1969F9; background: #1969F9;
border-radius: 2px; border-radius: 2px;
font-size : 14px; font-size: 14px;
color : #fff; color: #fff;
text-align : center; text-align: center;
&:hover { &:hover {
background: #0050E0; background: #0050E0;
...@@ -36,37 +36,36 @@ ...@@ -36,37 +36,36 @@
} }
.btn-nav { .btn-nav {
margin-top : 11px; margin-top: 11px;
margin-bottom: 22px; margin-bottom: 22px;
.dcg { .dcg {
width : 66px; width: 66px;
height : 26px; height: 26px;
border-radius: 2px; border-radius: 2px;
text-align : center; text-align: center;
line-height : 26px; line-height: 26px;
border : 1px solid #1969F9; border: 1px solid #1969F9;
background : #E5EEFF; background: #E5EEFF;;
; color: #1969F9;
color : #1969F9;
margin-right: 10px; margin-right: 10px;
font-size : 14px; font-size: 14px;
transition : all 0.5s; transition: all 0.5s;
&:hover { &:hover {
background: #1969F9; background: #1969F9;
cursor : pointer; cursor: pointer;
color : #fff; color: #fff;
} }
&.delbtn { &.delbtn {
border : 1px solid #FC1F00; border: 1px solid #FC1F00;
background: #FFE7E3; background: #FFE7E3;
color : #FC1F00; color: #FC1F00;
&:hover { &:hover {
background: #FF715D; background: #FF715D;
color : #fff; color: #fff;
} }
} }
...@@ -74,47 +73,49 @@ ...@@ -74,47 +73,49 @@
} }
.updatex { .updatex {
width : 66px; width: 66px;
height : 26px; height: 26px;
line-height : 26px; line-height: 26px;
text-align : center; text-align: center;
background : #FFEEDD; background: #FFEEDD;
border : 1px solid #FF870D; border: 1px solid #FF870D;
border-radius: 2px; border-radius: 2px;
color : #FF870D; color: #FF870D;
font-size : 14px; font-size: 14px;
cursor : pointer; cursor: pointer;
width : 66px; width: 66px;
&:hover { &:hover {
background: #FCA955; background: #FCA955;
color : #fff; color: #fff;
} }
} }
} }
.brand-img { .brand-img {
width : 80%; width: 80%;
height: 80; height: 80;
} }
.xktitle{ .xktitle {
border-left: 5px solid #1969F9; border-left: 5px solid #1969F9;
height:38px; height: 38px;
line-height: 38px; line-height: 38px;
background: #f3f3f3; background: #f3f3f3;
padding-left:20px; padding-left: 20px;
font-weight: bold; font-weight: bold;
color:#333; color: #333;
} }
.infoboxpx{
padding:15px; .infoboxpx {
padding-bottom:30px; padding: 15px;
.el-col{ padding-bottom: 30px;
margin-top:15px;
.el-col {
margin-top: 15px;
} }
} }
} }
\ No newline at end of file
src/components/menu.vue
...@@ -242,13 +242,16 @@ export default { ...@@ -242,13 +242,16 @@ export default {
this.tabs = JSON.parse(tab_arr); this.tabs = JSON.parse(tab_arr);
} }
let app_ = document.getElementById('app'); let app_ = document.getElementById('app');
this.collapse = false this.collapse = false;
if (this.collapse) { if (to.path == '/login') {
app_.setAttribute('style', 'padding-left:62px'); app_.setAttribute('style', 'padding:0');
} else { } else {
app_.setAttribute('style', 'padding-left:226px'); if (this.collapse) {
app_.setAttribute('style', 'padding-left:62px');
} else {
app_.setAttribute('style', 'padding-left:226px');
}
} }
} }
}, },
mounted() { mounted() {
...@@ -267,12 +270,14 @@ export default { ...@@ -267,12 +270,14 @@ export default {
}, },
tabUi() { tabUi() {
let tab_arr = sessionStorage.getItem('tabs') let tab_arr = sessionStorage.getItem('tabs')
if (tab_arr.length >= 9) { if (tab_arr) {
this.$nextTick(() => { if (tab_arr.length >= 9) {
if (this.$refs.scrollboxinner.clientWidth > this.$refs.scrollbox.clientWidth) { this.$nextTick(() => {
document.querySelector('.tab-box').scrollLeft = 12000000; if (this.$refs.scrollboxinner.clientWidth > this.$refs.scrollbox.clientWidth) {
} document.querySelector('.tab-box').scrollLeft = 12000000;
}) }
})
}
} }
}, },
tabUrl(item) { tabUrl(item) {
......
src/main.js
...@@ -8,6 +8,7 @@ import axios from 'axios' ...@@ -8,6 +8,7 @@ import axios from 'axios'
import {hideLoading, showLoading} from './ajax/loading'; import {hideLoading, showLoading} from './ajax/loading';
import Util from "./tool"; import Util from "./tool";
//加载全局样式 //加载全局样式
import '@/assets/css/public/common.min.css' import '@/assets/css/public/common.min.css'
import '@/assets/css/font/iconfont.css' import '@/assets/css/font/iconfont.css'
...@@ -17,7 +18,7 @@ Vue.config.productionTip = false; ...@@ -17,7 +18,7 @@ Vue.config.productionTip = false;
Vue.prototype.$ELEMENT = { Vue.prototype.$ELEMENT = {
size: 'mini', size: 'mini',
zIndex: 3000 zIndex: 30000
}; };
//加载过滤器 //加载过滤器
...@@ -29,7 +30,7 @@ Vue.use(directive); ...@@ -29,7 +30,7 @@ Vue.use(directive);
//处理顶部导航TAB //处理顶部导航TAB
router.afterEach((to, from, next) => { router.afterEach((to, from, next) => {
if (to.path == "/" || to.path == "/login" || to.path == '/notfound' || to.path == '/bindError') { if (to.path == "/" || to.path == "/login" || to.path == '/notfound' || to.path == '/bindError') {
return return;
} }
let tabOldArr = sessionStorage.getItem('tabs'); let tabOldArr = sessionStorage.getItem('tabs');
let tabOldJson; let tabOldJson;
...@@ -62,21 +63,23 @@ axios.interceptors.request.use((config) => { ...@@ -62,21 +63,23 @@ axios.interceptors.request.use((config) => {
if (config.loading) { if (config.loading) {
showLoading(); showLoading();
} }
return config; return config;
}, (err) => { }, (err) => {
return Promise.reject(err) return Promise.reject(err)
}) })
axios.interceptors.response.use(res => { axios.interceptors.response.use(res => {
hideLoading(); hideLoading();
if (res.data.code == 101) { if (res.data.code == 101) {
//token验证失败 //token验证失败
var path_ = window.location.hash var path = window.location.hash;
path_ = path_.substr(1) path = path.substr(1)
console.log(path_) router.push({
window.location.href = '/#/login?referer=' + encodeURI(path_); path: "/login",
query: {
referer: encodeURI(path)
}
})
} }
return res.data; return res.data;
}, error => { }, error => {
...@@ -95,7 +98,6 @@ router.beforeEach((to, from, next) => { ...@@ -95,7 +98,6 @@ router.beforeEach((to, from, next) => {
} else { } else {
let token = Util.getCookie('token') || ''; let token = Util.getCookie('token') || '';
if (!token) { if (!token) {
window.userInfo = "" window.userInfo = ""
var path_ = window.location.hash var path_ = window.location.hash
path_ = path_.substr(1) path_ = path_.substr(1)
......
src/views/OrderTrack/goods.vue
...@@ -177,8 +177,6 @@ export default { ...@@ -177,8 +177,6 @@ export default {
}); });
return false; return false;
} }
this.$router.push({ this.$router.push({
path: "/OrderTrackPurAdd", path: "/OrderTrackPurAdd",
query: { query: {
......
src/views/User/login.vue
...@@ -201,4 +201,7 @@ export default { ...@@ -201,4 +201,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/login/index.min.css"; @import "../../assets/css/login/index.min.css";
#app ::v-deep {
padding: 0 !important;
}
</style> </style>
\ No newline at end of file
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