登录修改

parent 2caf1188
...@@ -101,7 +101,7 @@ const login = async () => { ...@@ -101,7 +101,7 @@ const login = async () => {
}) })
const res = await loginByPassword(formData.value) const res = await loginByPassword(formData.value)
userStore.login(res) userStore.login(res)
xma.closeToast() closeToast()
showToast('登录成功') showToast('登录成功')
router.pushTab({ name: 'home' }) router.pushTab({ name: 'home' })
} }
...@@ -127,7 +127,7 @@ const fastLoginBySgy = () => { ...@@ -127,7 +127,7 @@ const fastLoginBySgy = () => {
console.log(res) console.log(res)
userStore.login(res) userStore.login(res)
closeToast() closeToast()
xma.showToast({ showToast({
title: '登录成功', title: '登录成功',
icon: 'success' icon: 'success'
}) })
......
...@@ -65,6 +65,7 @@ const queryParams = reactive({ ...@@ -65,6 +65,7 @@ const queryParams = reactive({
materialTitle: '', materialTitle: '',
materialType: 3, materialType: 3,
typeClassify: null, typeClassify: null,
organizeId:0
}) })
const dataList = ref([]) const dataList = ref([])
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
@click="router.push({ name: 'account-userinfo' })"> @click="router.push({ name: 'account-userinfo' })">
<div class="user"> <div class="user">
<div class="nickname">{{ userStore.userinfo.user.name }}</div> <div class="nickname">{{ userStore.userinfo.user.name }}</div>
<div class="section" v-if="userStore.userinfo.organizeList"> <div class="section" v-if="organizeList">
{{ userStore.userinfo.organizeList[0].organName }} {{ organizeList[0].organName }}
</div> </div>
<div class="section" v-else>未知部门</div> <div class="section" v-else>未知部门</div>
</div> </div>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
@click="router.push({ name: 'account-userinfo' })">编辑资料</van-button> @click="router.push({ name: 'account-userinfo' })">编辑资料</van-button>
</div> </div>
<div class="area"> <div class="area">
<div class="a-prefecture a-box" @click="router.push({ name: 'prefecture' })"> <div class="a-prefecture a-box" @click="handleClassify()">
<div class="a-text">专区</div> <div class="a-text">专区</div>
</div> </div>
<div class="a-subject a-box" @click="router.push({ name: 'subject' })"> <div class="a-subject a-box" @click="router.push({ name: 'subject' })">
...@@ -72,6 +72,7 @@ import PictureList from './components/PictureList' ...@@ -72,6 +72,7 @@ import PictureList from './components/PictureList'
import { useInitScroll } from '@/hooks/useScroll' import { useInitScroll } from '@/hooks/useScroll'
import MoreOperations from './components/MoreOperations/index.vue' import MoreOperations from './components/MoreOperations/index.vue'
import Publish from './components/Publish/index.vue' import Publish from './components/Publish/index.vue'
import { selectOrganizeList } from '@/api/prefecture'
useInitScroll() useInitScroll()
const contentHeight = ref(50) const contentHeight = ref(50)
...@@ -96,6 +97,7 @@ const total = reactive({ ...@@ -96,6 +97,7 @@ const total = reactive({
onShow(() => { onShow(() => {
toLogin() toLogin()
getOrganizeList()
}) })
const toLogin = () => { const toLogin = () => {
...@@ -141,6 +143,26 @@ const morePopupRef = ref() ...@@ -141,6 +143,26 @@ const morePopupRef = ref()
const handleOperation = (e) => { const handleOperation = (e) => {
morePopupRef.value.open(e) morePopupRef.value.open(e)
} }
// 获取组织列表
const organizeList = ref([])
const getOrganizeList = async() => {
const data = {
userId: userStore.userinfo.user.id,
sysCode: import.meta.env.VITE_APP_SYSTEM_CODE,
moduleCode: 'practice-mediaCatalog'
}
const res = await selectOrganizeList(data)
organizeList.value = res.data
}
const handleClassify = async() => {
if(organizeList.value.length == 0) {
showToast('暂无可查看的专区')
return
}
router.push({ name: 'prefecture' })
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
<template> <template>
<template v-if="showHeader">
<Header backgroundBox="#ffffff"> <Header backgroundBox="#ffffff">
<div class="tools"> <div class="tools">
<van-search v-model="queryParams.materialTitle" shape="round" placeholder="请输入搜索关键词" @search="handleRefresh" <van-search v-model="queryParams.materialTitle" shape="round" placeholder="请输入搜索关键词" @search="handleRefresh"
@clear="handleRefresh" /> @clear="handleRefresh" />
</div> </div>
</Header> </Header>
</template>
<van-sticky :offset-top="contentHeight"> <van-sticky :offset-top="contentHeight">
<div class="header"> <div class="header">
<div class="menu"> <div class="menu">
<div class="organization" @click="openOrganizationPopup"> <div class="organization" @click="openOrganizationPopup" v-if="organize.organName">
<img src="../../static/image/prefecture-logo1.png"> <img src="../../static/image/prefecture-logo1.png">
<span>{{ organize.organName }}</span> <span>{{ organize.organName }}</span>
</div> </div>
......
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