From e8201ba08ca9e4975ec8f66b0c2c52c4f3c12400 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 16 Mar 2024 20:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Forget.vue | 32 ++++++-------------
 src/views/login/components/Login.vue  |  2 +-
 src/views/message/content/List.vue    | 46 +++++++++++++++++++++------
 3 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue
index c89c744..8da8fd5 100644
--- a/src/views/login/components/Forget.vue
+++ b/src/views/login/components/Forget.vue
@@ -1,17 +1,8 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
 import { useMessage } from 'naive-ui'
-
-import { PageEnum } from '@/enums/pageEnum'
-import { useUserStore } from '@/store/modules/user'
-import { ResultEnum } from '@/enums/httpEnum'
-import { getFilter, setFilter } from '@/api/home/filter'
-import { getConfig } from '@/api/system/user'
 import { forgetPassword, getCode, updateSUser } from '@/api/login/login'
 
-import { asideMap } from '@/config/aside'
-
 const emit = defineEmits(['close', 'forget'])
 interface FormState {
   enterprisecode?: string
@@ -38,10 +29,6 @@ const formRefSure = ref()
 
 const message = useMessage()
 const loading = ref(false)
-const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME
-const userStore = useUserStore()
-const router = useRouter()
-const route = useRoute()
 const flag = ref(false)
 const formForget: FormForget = reactive({
   agentcode: '三方系统标识8',
@@ -60,9 +47,9 @@ const formInline: FormState = reactive({
 const formSure: FormSure = reactive({
   newPassword: '',
   rePasswrod: '',
-  loginname: '',
+  loginname: '13311111111',
 })
-const tab = ref(0)
+const tab = ref(1)
 const countTime = ref('获取验证码')
 const rules = {
   enterprisecode: { required: true, message: '请输入企业编码', trigger: 'blur' },
@@ -70,7 +57,7 @@ const rules = {
   password: { required: true, message: '请输入密码', trigger: 'blur' },
   phonecode: { required: true, message: '请输入验证码', trigger: 'blur' },
   newPassword: { required: true, message: '请输入新密码', trigger: 'blur' },
-  reenteredPassword: [
+  rePasswrod: [
     {
       required: true,
       message: '请再次输入密码',
@@ -85,11 +72,10 @@ const rules = {
 }
 
 function validatePasswordSame(rule: any, value: string): boolean {
-  return value === formInline.password
+  return value === formSure.newPassword
 }
 
 function handleSubmit(e) {
-  console.log(7890)
   e.preventDefault()
   formRef.value.validate(async (errors) => {
     if (!errors) {
@@ -107,6 +93,7 @@ function handleSubmit(e) {
         console.log(9999)
         const res = await forgetPassword(params)
         console.log(res)
+        tab.value = 1
       }
       finally {
         loading.value = false
@@ -120,17 +107,16 @@ function handleSubmit(e) {
 
 function handleSure(e) {
   e.preventDefault()
-  formRef.value.validate(async (errors) => {
+  formRefSure.value.validate(async (errors) => {
     if (!errors) {
-      const { newPassword, phone, phonecode, agentcode } = formForget
+      const { newPassword, rePasswrod, loginname } = formSure
       message.loading('登录中...')
       loading.value = true
 
       const params = {
         newPassword,
-        phone,
-        phonecode,
-        agentcode,
+        rePasswrod,
+        loginname,
       }
 
       try {
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index afe628f..b61032d 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -38,7 +38,7 @@ const show = ref(false)
 const formInline: FormState = reactive({
   enterprisecode: '三方系统标识8',
   username: '13311111111',
-  password: '123456',
+  password: '12345678l',
 })
 
 const formSms: FormSms = reactive({
diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue
index 601dffb..78166fe 100644
--- a/src/views/message/content/List.vue
+++ b/src/views/message/content/List.vue
@@ -9,6 +9,7 @@ import iconSystem from '@/assets/images/message/system.png'
 import iconArrowActive from '@/assets/images/message/arrow-active.png'
 import iconArrow from '@/assets/images/message/arrow.png'
 import iconClear from '@/assets/images/message/clear.png'
+import iconArrowDown from '@/assets/images/message/arrow-down.png'
 
 const emit = defineEmits(['goDetail'])
 
@@ -30,22 +31,18 @@ const state = reactive({
     },
   ],
   list: [] as any,
+  pageNo: 1,
 })
 
 const { list, tabList } = toRefs(state)
 
-const packagepagination = reactive({
-  pageNo: 1,
-  pageSize: 10,
-})
-
 const tab = ref(1)
 
-async function getList(value) {
+async function getList() {
   const res = await getMessageList({
-    pageNo: '1',
+    pageNo: state.pageNo,
     pageSize: '10',
-    msgCategory: value,
+    msgCategory: tab.value,
   })
   console.log(res)
   state.list = res.list
@@ -59,12 +56,17 @@ async function clearMsg() {
 
 function switchTab(type: number) {
   tab.value = type
-  getList(type)
+  getList()
 }
 
 function goDetail(item) {
   emit('goDetail', item.id)
 }
+
+function getMore() {
+  state.pageNo += 1
+  getList()
+}
 </script>
 
 <template>
@@ -129,6 +131,10 @@ function goDetail(item) {
             查看
           </div>
         </div>
+
+        <div class="more" @click="getMore">
+          查看更多<img class="icon-more" :src="iconArrowDown" alt="">
+        </div>
       </div>
     </div>
   </div>
@@ -143,6 +149,7 @@ function goDetail(item) {
   background: #FFF;
   border-radius: 3px;
   height: calc(100vh - 88px);
+  position: relative;
 
   .header{
     padding: 24px;
@@ -235,6 +242,27 @@ function goDetail(item) {
       margin-left: 24px;
       flex: 1;
 
+      .more{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 14px;
+        font-family: PingFang SC, PingFang SC-Regular;
+        text-align: left;
+        color: #666666;
+        position: absolute;
+        bottom: 40px;
+        left: 50%;
+        background: #fff;
+        cursor: pointer;
+
+        .icon-more{
+          width: 14px;
+          height: 14px;
+          margin-left: 6px;
+        }
+      }
+
       .item{
         display: flex;
         align-items: center;