xcx 4 лет назад
Родитель
Сommit
cf3b54e179
1 измененных файлов: 12 добавлений и 1 удалений
  1. 12
    1
      src/pages/WuYe/BaoXiuFeiYong/index.jsx

+ 12
- 1
src/pages/WuYe/BaoXiuFeiYong/index.jsx Просмотреть файл

1
 import React, { useState, useEffect } from 'react'
1
 import React, { useState, useEffect } from 'react'
2
+<<<<<<< HEAD
2
 import Taro, { Current } from '@tarojs/taro'
3
 import Taro, { Current } from '@tarojs/taro'
4
+=======
5
+import Taro, { useRouter } from '@tarojs/taro'
6
+>>>>>>> fb306f05e5e66c8bd62a5225ca10b7caaf677cd0
3
 import SlidePopup from '@/components/SlidePopup/index'
7
 import SlidePopup from '@/components/SlidePopup/index'
4
 import UploadImg from '@/components/UploadImg/index'
8
 import UploadImg from '@/components/UploadImg/index'
5
 import Page from '@/layouts'
9
 import Page from '@/layouts'
11
 import './index.less'
15
 import './index.less'
12
 
16
 
13
 export default function BaoXiuFeiYong () {
17
 export default function BaoXiuFeiYong () {
18
+  const router = useRouter()
14
 
19
 
15
   const { user } = useModel('user')
20
   const { user } = useModel('user')
16
   const [ShowPopup, setShowPopup] = useState(false)
21
   const [ShowPopup, setShowPopup] = useState(false)
17
   const [PopupType, setPopupType] = useState(0)
22
   const [PopupType, setPopupType] = useState(0)
18
-  const [CurrnetBaoXiuId] = useState(Current.router.params !== null ? Current.router.params.id : null)
23
+  const [CurrnetBaoXiuId] = useState(router.params.id)
19
   const [DetailInfo, setDetailInfo] = useState(null)
24
   const [DetailInfo, setDetailInfo] = useState(null)
20
   const [BillInfo, setBillInfo] = useState(null)
25
   const [BillInfo, setBillInfo] = useState(null)
21
 
26
 
27
+<<<<<<< HEAD
22
   useEffect(() => {
28
   useEffect(() => {
23
     Init()
29
     Init()
24
   }, [CurrnetBaoXiuId])
30
   }, [CurrnetBaoXiuId])
31
+=======
32
+  useDidShow(() => {
33
+    Init()
34
+  })
35
+>>>>>>> fb306f05e5e66c8bd62a5225ca10b7caaf677cd0
25
 
36
 
26
   const Init = () => {
37
   const Init = () => {
27
     request({ ...apis.getGongDanDetail, args: { orgId: user.orgId }, params: { ticketId: CurrnetBaoXiuId } }).then((res) => { // 获取工单详情
38
     request({ ...apis.getGongDanDetail, args: { orgId: user.orgId }, params: { ticketId: CurrnetBaoXiuId } }).then((res) => { // 获取工单详情