张延森 2 лет назад
Родитель
Сommit
05e77c5ccc
3 измененных файлов: 12 добавлений и 8 удалений
  1. 6
    2
      src/pages/invoice/history.vue
  2. 2
    2
      src/pages/publicity/list.vue
  3. 4
    4
      src/store/models/user.js

+ 6
- 2
src/pages/invoice/history.vue Просмотреть файл

27
 import { computed, onMounted, reactive, ref } from "vue"
27
 import { computed, onMounted, reactive, ref } from "vue"
28
 import { useRouter, useRoute } from 'vue-router'
28
 import { useRouter, useRoute } from 'vue-router'
29
 import { getList } from "@/services/invoice";
29
 import { getList } from "@/services/invoice";
30
+import { useModel } from "@zjxpcyc/vue-tiny-store";
31
+
32
+const { user } = useModel('user')
30
 
33
 
31
 const router = useRouter();
34
 const router = useRouter();
32
 const route = useRoute();
35
 const route = useRoute();
38
 const pagenavi = reactive({ pageNum: 1, pageSize: 10, total: 0 })
41
 const pagenavi = reactive({ pageNum: 1, pageSize: 10, total: 0 })
39
 const finished = computed(() => pagenavi.pageNum * pagenavi.pageSize > pagenavi.total)
42
 const finished = computed(() => pagenavi.pageNum * pagenavi.pageSize > pagenavi.total)
40
 
43
 
41
-const queryData = (params) => {
42
-  getList(invoiceId, params).then(res => {
44
+const queryData = (params = {}) => {
45
+  console.log('-------------', user.personId)
46
+  getList(invoiceId, { ...params, personId: user.personId }).then(res => {
43
     const { records, ...pageInfo } = res;
47
     const { records, ...pageInfo } = res;
44
     if (pageInfo.current === 1) {
48
     if (pageInfo.current === 1) {
45
       list.value = records || []
49
       list.value = records || []

+ 2
- 2
src/pages/publicity/list.vue Просмотреть файл

38
 const pagenavi = reactive({ pageNum: 1, pageSize: 10, total: 0 })
38
 const pagenavi = reactive({ pageNum: 1, pageSize: 10, total: 0 })
39
 const finished = computed(() => pagenavi.pageNum * pagenavi.pageSize > pagenavi.total)
39
 const finished = computed(() => pagenavi.pageNum * pagenavi.pageSize > pagenavi.total)
40
 
40
 
41
-const queryData = (params) => {
42
-  getList(invoiceId, params).then(res => {
41
+const queryData = (params = {}) => {
42
+  getList(invoiceId, { ...params, invoiceId }).then(res => {
43
     const { records, ...pageInfo } = res;
43
     const { records, ...pageInfo } = res;
44
     if (pageInfo.current === 1) {
44
     if (pageInfo.current === 1) {
45
       list.value = records || []
45
       list.value = records || []

+ 4
- 4
src/store/models/user.js Просмотреть файл

1
-import { ref } from 'vue'
1
+import { reactive } from 'vue'
2
 import { login, current } from '@/services/user'
2
 import { login, current } from '@/services/user'
3
 import { setToken } from '@/utils/token'
3
 import { setToken } from '@/utils/token'
4
 
4
 
5
 export default function useUser() {
5
 export default function useUser() {
6
-  const user = ref()
6
+  const user = reactive({})
7
 
7
 
8
   const signIn = (code) => {
8
   const signIn = (code) => {
9
     return login(code).then((res) => {
9
     return login(code).then((res) => {
10
       const { person, token } = res
10
       const { person, token } = res
11
-      user.value = person
11
+      Object.assign(user, person)
12
       setToken(token)
12
       setToken(token)
13
     })
13
     })
14
   }
14
   }
15
 
15
 
16
   const getCurrent = () => {
16
   const getCurrent = () => {
17
     return current().then((res) => {
17
     return current().then((res) => {
18
-      user.value = res
18
+      Object.assign(user, res)
19
     })
19
     })
20
   }
20
   }
21
   
21