登录bug

src/router/modules/message.ts

@@ -23,7 +23,7 @@ const routes: Array<RouteRecordRaw> = [
       permissions: ['worksheet-main'],
       svgname: 'worksheet',
       svgsize: 22,
-      sort: 2,
+      sort: 5,
       disabled: true,
       hidden: true,
     },

src/views/login/components/Forget.vue

@@ -49,7 +49,7 @@ const formSure: FormSure = reactive({
   rePasswrod: '',
   loginname: '13311111111',
 })
-const tab = ref(1)
+const tab = ref(0)
 const countTime = ref('获取验证码')
 const rules = {
   enterprisecode: { required: true, message: '请输入企业编码', trigger: 'blur' },
@@ -90,10 +90,11 @@ function handleSubmit(e) {
       }
 
       try {
-        console.log(9999)
         const res = await forgetPassword(params)
-        console.log(res)
+        if (res.code === 'OK') {
-        tab.value = 1
+          formSure.loginname = res.data.loginname
+          tab.value = 1
+        }
       }
       finally {
         loading.value = false

src/views/login/components/Login.vue

@@ -75,23 +75,24 @@ function handleSubmit(e) {
 
       try {
         const { code, message: msg } = await userStore.login(params)
-        await userStore.getInformation()
+        if (code === ResultEnum.SUCCESS) {
-        const response = await getFilter()
+          await userStore.getInformation()
-
+          const response = await getFilter()
-        // 添加个默认显示配置
+
-        if (response.data === null) {
+          // 添加个默认显示配置
-          const systemConfig = await getConfig()
+          if (response.data === null) {
-          const onList: string[] = []
+            const systemConfig = await getConfig()
-          Object.keys(systemConfig.data).forEach((key) => {
+            const onList: string[] = []
+            Object.keys(systemConfig.data).forEach((key) => {
             // 系统配置开启且个人配置开启
-            if (key.startsWith('iz') && systemConfig.data[key] === 'Y' && asideMap[key]?.isDefaultFilter)
+              if (key.startsWith('iz') && systemConfig.data[key] === 'Y' && asideMap[key]?.isDefaultFilter)
-              onList.push(key)
+                onList.push(key)
-          })
+            })
-          await setFilter({ searchcount: onList.join(',') })
+            await setFilter({ searchcount: onList.join(',') })
-        }
+          }
+
+          message.destroyAll()
 
-        message.destroyAll()
-        if (code === ResultEnum.SUCCESS) {
           const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
           message.success('登录成功，即将进入系统')
           if (route.name === LOGIN_NAME)
@@ -99,6 +100,7 @@ function handleSubmit(e) {
           else router.replace(toPath)
         }
         else {
+          message.destroyAll()
           message.info(msg || '登录失败')
         }
       }
@@ -126,24 +128,25 @@ function handleSmsSubmit(e) {
           agentcode,
           phonecode,
         })
+        const { code, message: msg } = res
+        if (code === ResultEnum.SUCCESS) {
         // const { code, message: msg } = await userStore.login(params)
-        await userStore.getInformation()
+          await userStore.getInformation()
-        const response = await getFilter()
+          const response = await getFilter()
-
+
-        // 添加个默认显示配置
+          // 添加个默认显示配置
-        if (response.data === null) {
+          if (response.data === null) {
-          const systemConfig = await getConfig()
+            const systemConfig = await getConfig()
-          const onList: string[] = []
+            const onList: string[] = []
-          Object.keys(systemConfig.data).forEach((key) => {
+            Object.keys(systemConfig.data).forEach((key) => {
             // 系统配置开启且个人配置开启
-            if (key.startsWith('iz') && systemConfig.data[key] === 'Y' && asideMap[key]?.isDefaultFilter)
+              if (key.startsWith('iz') && systemConfig.data[key] === 'Y' && asideMap[key]?.isDefaultFilter)
-              onList.push(key)
+                onList.push(key)
-          })
+            })
-          await setFilter({ searchcount: onList.join(',') })
+            await setFilter({ searchcount: onList.join(',') })
-        }
+          }
 
-        message.destroyAll()
+          message.destroyAll()
-        if (code === ResultEnum.SUCCESS) {
           const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
           message.success('登录成功，即将进入系统')
           if (route.name === LOGIN_NAME)
@@ -151,6 +154,7 @@ function handleSmsSubmit(e) {
           else router.replace(toPath)
         }
         else {
+          message.destroyAll()
           message.info(msg || '登录失败')
         }
       }
@@ -181,7 +185,6 @@ async function sendCode(value) {
     phone: 13311111111,
     agentcode: '三方系统标识8',
   })
-  console.log(res)
   startCount()
 }
 

src/views/message/content/Detail.vue

@@ -20,14 +20,14 @@ const taskDetailInfo = ref<any>({})
 async function getDetail() {
   const res = await msgOne({ id: props.id })
   console.log(res)
-  state.detail = res
   if (!state.detail.readFlag)
     clearMsg()
 
   if (res.code === 'OK')
-    message.info('清除标记成功')
+    state.detail = res.data
 
-  else message.error(res.message)
+  else
+    message.error(res.message)
 }
 
 async function clearMsg() {
@@ -57,7 +57,7 @@ getDetail()
             创建人：
           </div>
           <div class="value">
-            {{ detail.createBy }}
+            {{ detail.userNcame }}
           </div>
         </div>
         <div class="form-item flex">

src/views/message/content/List.vue

@@ -13,7 +13,7 @@ import iconArrowDown from '@/assets/images/message/arrow-down.png'
 
 const emit = defineEmits(['goDetail'])
 
-const totalCount = ref(0)
+const hasNextPage = ref(false)
 
 const state = reactive({
   tabList: [
@@ -44,23 +44,37 @@ async function getList() {
     pageSize: '10',
     msgCategory: tab.value,
   })
-  console.log(res)
+  if (res.code === 'OK') {
-  state.list = res.list
+    hasNextPage.value = res.data.hasNextPage
+    state.list = state.list.concat(res.data.list)
+  }
 }
 
-getList('1')
+getList()
 
 async function clearMsg() {
   const res = await readAllMsg({ msgCategory: tab.value })
+  if (res.code === 'OK') {
+    state.list = []
+    state.pageNo = 1
+    getList()
+  }
 }
 
 function switchTab(type: number) {
   tab.value = type
+  state.list = []
+  state.pageNo = 1
   getList()
 }
 
 function goDetail(item) {
-  emit('goDetail', item.id)
+  if (tab.value === 1) {
+
+  }
+  else {
+    emit('goDetail', item.id)
+  }
 }
 
 function getMore() {
@@ -132,7 +146,7 @@ function getMore() {
           </div>
         </div>
 
-        <div class="more" @click="getMore">
+        <div v-if="hasNextPage" class="more" @click="getMore">
           查看更多<img class="icon-more" :src="iconArrowDown" alt="">
         </div>
       </div>
@@ -241,6 +255,10 @@ function getMore() {
     .list{
       margin-left: 24px;
       flex: 1;
+      overflow-y: auto;
+      padding-bottom: 97px;
+      box-sizing: border-box;
+      height: calc(100vh - 88px - 76px);
 
       .more{
         display: flex;