代码提交

store/store.js

@@ -2,60 +2,69 @@ import { defineStore } from 'pinia'
 
 import cookie from '@/utils/cookie'
 import { getUserInfo } from '@/api/user'
-import { getAddressDel, getAddressDefault, getAddressAddAndEdit, getAddressList, getAddressCityList } from '@/api/address'
-import { navigateTo } from '@/utils/router'
+import { getAddressCityList, getAddressList } from '@/api/address'
+import { useRouter } from "@/hooks/useRouter";
+
+const {push} = useRouter()
 
 export const useMainStore = defineStore('main', {
-  state: () => ({
-    user: null,
-    address: [],
-    areaList: [],
-    selectAddress: null,
-  }),
-  getters: {
-    defaultAddress(state) {
-      return state.address?.filter(item => item.isDefault)?.[0]
+    state: () => ({
+        user: null,
+        address: [],
+        areaList: [],
+        selectAddress: null,
+        moreLoading: true,
+        cartId: null
+    }),
+    getters: {
+        defaultAddress(state) {
+            return state.address?.filter(item => item.isDefault)?.[0]
+        },
     },
-  },
-  actions: {
-    setAccessToken(user) {
-      cookie.set('accessToken', user)
-      return getUserInfo()
+    actions: {
+        setAccessToken(user) {
+            cookie.set('accessToken', user)
+            return getUserInfo()
+        },
+        setSelectAddress(id) {
+            this.selectAddress = this.address.filter(item => item.id == id)[0]
+        },
+        async getUserInfo(user) {
+            let res = await getUserInfo()
+            this.user = res
+            return res
+        },
+        restAddress() {
+            this.address = []
+            this.moreLoading = true
+        },
+        async getAddressList(page) {
+            let res = await getAddressList({page: page})
+            if (res.length) {
+                this.address = this.address.concat(res)
+            } else {
+                this.moreLoading = false
+            }
+            // console.log('--> % getUserInfo % res:\n', res)
+        },
+        async getAddressCityList() {
+            let res = await getAddressCityList()
+            this.areaList = res
+        },
+        init() {
+            let accessToken = cookie.get('accessToken')
+            if (accessToken) {
+                return getUserInfo()
+            }
+            return null
+        },
+        logout() {
+            this.user = null
+            this.address = []
+            this.areaList = []
+            this.selectAddress = null
+            cookie.remove('accessToken')
+            push({url: '/pages/login/guid'}, {type: "redirectTo"})
+        },
     },
-    setSelectAddress(id) {
-      console.log('--> % setSelectAddress % id:\n', id)
-      this.selectAddress = this.address.filter(item => item.id == id)[0]
-    },
-    async getUserInfo(user) {
-      let res = await getUserInfo()
-      this.user = res
-      return res
-    },
-    async getAddressList(user) {
-      let res = await getAddressList()
-      this.selectAddress = res.filter(item => item.isDefault)[0]
-      this.address = res
-      // console.log('--> % getUserInfo % res:\n', res)
-    },
-    async getAddressCityList() {
-      let res = await getAddressCityList()
-      this.areaList = res
-      // console.log("--> % getAddressCityList % this:\n", this)
-      // console.log('--> % getAddressCityList % res:\n', res)
-    },
-    init() {
-      let accessToken = cookie.get('accessToken')
-      if (accessToken) {
-        return getUserInfo()
-      }
-      return null
-    },
-    logout() {
-      this.user = null
-      this.address = []
-      this.areaList = []
-      this.selectAddress = null
-      navigateTo('/pages/login/login')
-    },
-  },
 })