张延森 2 年之前
父節點
當前提交
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,6 +27,9 @@
27 27
 import { computed, onMounted, reactive, ref } from "vue"
28 28
 import { useRouter, useRoute } from 'vue-router'
29 29
 import { getList } from "@/services/invoice";
30
+import { useModel } from "@zjxpcyc/vue-tiny-store";
31
+
32
+const { user } = useModel('user')
30 33
 
31 34
 const router = useRouter();
32 35
 const route = useRoute();
@@ -38,8 +41,9 @@ const loading = ref(false);
38 41
 const pagenavi = reactive({ pageNum: 1, pageSize: 10, total: 0 })
39 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 47
     const { records, ...pageInfo } = res;
44 48
     if (pageInfo.current === 1) {
45 49
       list.value = records || []

+ 2
- 2
src/pages/publicity/list.vue 查看文件

@@ -38,8 +38,8 @@ const loading = ref(false);
38 38
 const pagenavi = reactive({ pageNum: 1, pageSize: 10, total: 0 })
39 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 43
     const { records, ...pageInfo } = res;
44 44
     if (pageInfo.current === 1) {
45 45
       list.value = records || []

+ 4
- 4
src/store/models/user.js 查看文件

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