Commit dc29091a authored by 王李辉's avatar 王李辉

工作台加入通知公告样式

parent 21d86123
...@@ -15,12 +15,12 @@ import store from './store' ...@@ -15,12 +15,12 @@ import store from './store'
import './permission' import './permission'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import { prefix } from '@/common/js/utils' import { prefix } from '@/common/js/utils'
import { Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row, Image as VanImage, Badge,} from 'vant' import { Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row, Image as VanImage, Badge,NoticeBar } from 'vant'
import 'lib-flexible/flexible' import 'lib-flexible/flexible'
Vue.use(Divider).use(Popup).use(Overlay).use(Loading).use(Dialog).use(Toast).use(ContactCard).use(Form).use(AddressEdit).use(AddressList).use(Field).use(CellGroup).use(Cell).use(SwipeCell).use(Icon).use(Stepper).use(Card).use(Button).use(Swipe).use(SwipeItem).use(PullRefresh).use(List).use(Tab).use(Tabs).use(GoodsAction).use(GoodsActionIcon).use(GoodsActionButton).use(SubmitBar).use(Checkbox).use(CheckboxGroup).use(Search).use(Picker).use(Uploader).use(Notify) Vue.use(Divider).use(Popup).use(Overlay).use(Loading).use(Dialog).use(Toast).use(ContactCard).use(Form).use(AddressEdit).use(AddressList).use(Field).use(CellGroup).use(Cell).use(SwipeCell).use(Icon).use(Stepper).use(Card).use(Button).use(Swipe).use(SwipeItem).use(PullRefresh).use(List).use(Tab).use(Tabs).use(GoodsAction).use(GoodsActionIcon).use(GoodsActionButton).use(SubmitBar).use(Checkbox).use(CheckboxGroup).use(Search).use(Picker).use(Uploader).use(Notify)
.use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky) .use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky)
.use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage) .use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage).use(Badge).use(NoticeBar)
Vue.config.productionTip = false Vue.config.productionTip = false
new Vue({ new Vue({
router, router,
......
...@@ -10,7 +10,6 @@ router.beforeEach(async(to, from, next) => { ...@@ -10,7 +10,6 @@ router.beforeEach(async(to, from, next) => {
//next:一定要调用该方法来 resolve 这个钩子 //next:一定要调用该方法来 resolve 这个钩子
const hasToken = getToken()//确定用户是否已登录 const hasToken = getToken()//确定用户是否已登录
console.log(hasToken)
if (hasToken) { if (hasToken) {
if (to.path === '/login2') { if (to.path === '/login2') {
next({ path: '/message-center' }) next({ path: '/message-center' })
......
...@@ -27,7 +27,6 @@ service.interceptors.request.use(config => { ...@@ -27,7 +27,6 @@ service.interceptors.request.use(config => {
} }
return config return config
},error => { },error => {
console.log(error)
return Promise.reject(error) return Promise.reject(error)
}) })
service.interceptors.response.use(response => { service.interceptors.response.use(response => {
......
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
</template> </template>
<script> <script>
import { getFun,postFun } from '@/service/table' import { getFun, postFun } from "@/service/table";
import { setToken } from '@/utils/auth' import { setToken } from "@/utils/auth";
export default { export default {
data() { data() {
return { return {
...@@ -62,22 +62,17 @@ export default { ...@@ -62,22 +62,17 @@ export default {
password: "" password: ""
}; };
}, },
mounted() { mounted() {},
},
methods: { methods: {
onSubmit(values) { onSubmit(values) {
getFun('check/token',values).then((Response)=>{ getFun("check/token", values).then(Response => {
console.log(Response) console.log(Response);
if(Response.code==0){ if (Response.code == 0) {
this.$notify({ // 这里可以有登录成功的提示
message:'登录成功', setToken(Response.data);
background:'green', this.$router.push("/message-center");
duration: 1000 }
}) });
setToken(Response.data)
this.$router.push('/message-center')
}
})
} }
} }
}; };
...@@ -136,11 +131,11 @@ export default { ...@@ -136,11 +131,11 @@ export default {
padding-left: 20px; padding-left: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/ .van-field__error-message{ /deep/ .van-field__error-message {
padding-left: 20px; padding-left: 20px;
} }
} }
.passworld-wrap { .passworld-wrap {
position: relative; position: relative;
border-bottom: 1px solid #d2dcf5; border-bottom: 1px solid #d2dcf5;
.passworld-icon { .passworld-icon {
...@@ -154,13 +149,11 @@ export default { ...@@ -154,13 +149,11 @@ export default {
padding-left: 20px; padding-left: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/ .van-field__error-message{ /deep/ .van-field__error-message {
padding-left: 20px; padding-left: 20px;
} }
} }
} }
} }
} }
</style>
</style>
\ No newline at end of file
...@@ -7,6 +7,24 @@ ...@@ -7,6 +7,24 @@
</header> </header>
</van-sticky> </van-sticky>
<!-- 搜索 -->
<!-- <div class="search-wrap">
<van-search v-model="searchVal" placeholder="搜索" @search="onSearch" />
</div> -->
<!-- 滚动通知 -->
<van-notice-bar left-icon="volume-o" :scrollable="false" mode="link">
<van-swipe
vertical
class="notice-swipe"
:autoplay="3000"
:show-indicators="false"
>
<van-swipe-item>小安提示:您有2条待办事项需要处理</van-swipe-item>
<van-swipe-item>小安提示:您有2条待办事项需要处理</van-swipe-item>
</van-swipe>
</van-notice-bar>
<!-- 内容 --> <!-- 内容 -->
<div class="con"> <div class="con">
<!-- 消息中心 --> <!-- 消息中心 -->
...@@ -78,6 +96,7 @@ export default { ...@@ -78,6 +96,7 @@ export default {
}, },
data() { data() {
return { return {
searchVal: "",
newsCenterList: [ newsCenterList: [
// 消息中心的图标 // 消息中心的图标
{ {
...@@ -215,6 +234,10 @@ export default { ...@@ -215,6 +234,10 @@ export default {
this.$router.push(path); this.$router.push(path);
} }
}, },
// 搜索事件
onSearch(val) {
console.log(val);
},
// 请求工作台列表 // 请求工作台列表
getWorkList() { getWorkList() {
postWork("/mobile/menu").then(res => { postWork("/mobile/menu").then(res => {
...@@ -272,13 +295,14 @@ export default { ...@@ -272,13 +295,14 @@ export default {
padding: 10px 0 50px 0; padding: 10px 0 50px 0;
background-color: #f0f1f5; background-color: #f0f1f5;
/deep/ .van-grid-item__content--center { /deep/ .van-grid-item__content--center {
padding-left: 0px; // padding-left: 0px;
padding-right: 0px; // padding-right: 0px;
padding: 0.22667rem 0px;
}
/deep/ .van-icon__image {
width: auto;
height: 1rem;
} }
/deep/ .van-icon__image{
width: auto;
height: 1.2rem;
}
} }
.van-cell-group--inset { .van-cell-group--inset {
margin: 0 10px 10px; margin: 0 10px 10px;
...@@ -289,5 +313,8 @@ export default { ...@@ -289,5 +313,8 @@ export default {
/deep/ [class*="van-hairline"]::after { /deep/ [class*="van-hairline"]::after {
border: none; border: none;
} }
.notice-swipe {
height: 40px;
line-height: 40px;
}
</style> </style>
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 to comment