静态页面

src/pages/FuLi/ShangPinDuiHuan/index.jsx

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
-import { useModel } from '@/store'
 import { Input } from '@tarojs/components'
 import Page from '@/layouts'
 import '@/assets/css/reset.less'
@@ -10,8 +9,7 @@ import './index.less'
 
 export default function ShangPinDuiHuan () {
 
-  const { user } = useModel('user')
-  const [CurrnetId] = useState(Current.router.params.id) // 当前id
+  const [CurrnetId] = useState(useRouter().params.id) // 当前id
   const [GoodsDetail, setGoodsDetail] = useState(null) // 商品详情
   const [DataLock, setDataLock] = useState(false) // 数据锁
   const [Count, setCount] = useState(1) // 商品兑换数量

src/pages/FuLi/ShangPinXiangQing/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import Page from '@/layouts'
@@ -11,7 +11,7 @@ import './index.less'
 export default function ShangPinXiangQing () {
 
   const { user } = useModel('user')
-  const [CurrnetId] = useState(Current.router.params.id) // 当前id
+  const [CurrnetId] = useState(useRouter().params.id) // 当前id
   const [GoodsDetail, setGoodsDetail] = useState(null) // 商品详情
 
   Taro.useShareAppMessage(() => {

src/pages/HuoDong/HuoDongDetail/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import { RichText, Input } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
@@ -23,7 +23,7 @@ export default function HuoDongDetail () {
   const [ShowJoinNumPopup, setShowJoinNumPopup] = useState(false)
   const [JoinNum, setJoinNum] = useState(null)
   const [ShowGetUserPhoneLayer, setShowGetUserPhoneLayer] = useState(false)
-  const [CurrnetHuoDongId] = useState(Current.router.params.id) // 当前活动id
+  const [CurrnetHuoDongId] = useState(useRouter().params.id) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
   const [Status, setStatus] = useState(null) // 参加活动状态 0-立即参与 1-未开始 2-去报名 3-已报名 4-去签到 5-已签到 6-已结束

src/pages/HuoDong/HuoDongSign/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import Page from '@/layouts'
 import { useModel } from '@/store'
@@ -12,7 +12,7 @@ export default function HuoDongDetail () {
   const { user, setUser } = useModel('user')
   const [DataLock, setDataLock] = useState(false)
   const [HasSign, setHasSign] = useState(false)
-  const [CurrnetId] = useState(Current.router.params.id) // 当前活动id
+  const [CurrnetId] = useState(useRouter().params.id) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
 

src/pages/HuoDong/ZiXunDetail/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { RichText } from '@tarojs/components'
 import toolclass from '@/utils/toolclass.js'
@@ -13,7 +13,7 @@ import './index.less'
 export default function ZiXunDetail () {
 
   const { user } = useModel('user')
-  const [CurrnetZiXunId] = useState(Current.router.params.id) // 当前查询资讯id
+  const [CurrnetZiXunId] = useState(useRouter().params.id) // 当前查询资讯id
   const [NewsDetail, setNewsDetail] = useState(null) // 资讯详情
 
   Taro.useShareAppMessage(() => {

src/pages/WoDe/TuiJianErWeiMa/index.jsx

@@ -24,7 +24,7 @@ export default function TuiJianErWeiMa () {
 
   useEffect(() => {
     if (QrCodeImg === null) {
-      // const page = Taro.Current.router.path
+      // const page = Taro.useRouter().path
       const page = '/pages/ShouYe/index'
       getQrCodeImage(getCardQrParam(user), page).then(x => setQrCodeImg(x))
     }

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { Input, Picker } from '@tarojs/components'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import Page from '@/layouts'
 import { useModel } from '@/store'
@@ -10,7 +10,7 @@ import './index.less'
 
 export default function YeZhuRenZheng () {
 
-  const [PageFrom] = useState(Current.router.params.from)
+  const [PageFrom] = useState(useRouter().params.from)
   const { user, setUser } = useModel('user')
   const [FormData, setFormData] = useState({ RealName: '', IdCard: '', Phone: '' })
   const [PhoneCode, setPhoneCode] = useState('')

src/pages/WoDe/YeZhuShenHe/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import SlidePopup from '@/components/SlidePopup/index'
@@ -12,7 +12,7 @@ export default function YeZhuShenHe () {
 
   const { user } = useModel('user')
   const [Status] = useState(1)
-  const [CurrnetId] = useState(Current.router.params.id) // 当前id
+  const [CurrnetId] = useState(useRouter().params.id) // 当前id
   const [PhoneList, setPhoneList] = useState([])
   const [ShowPopup, setShowPopup] = useState(false)
   const [Detail, setDetail] = useState(null)

src/pages/WuYe/BaoXiuDetail/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import toolclass from '@/utils/toolclass.js'
@@ -14,7 +14,7 @@ import './index.less'
 export default function BaoXiuDetail () {
 
   const { user } = useModel('user')
-  const [CurrnetBaoXiuId] = useState(Current.router.params.id)
+  const [CurrnetBaoXiuId] = useState(useRouter().params.id)
   const [DetailInfo, setDetailInfo] = useState(null)
   const [PhoneList, setPhoneList] = useState([])
   const [ShowPopup, setShowPopup] = useState(false)

src/pages/WuYe/BaoXiuFeiYong/index.jsx

@@ -1,9 +1,5 @@
-import React, { useState, useEffect } from 'react'
-<<<<<<< HEAD
-import Taro, { Current } from '@tarojs/taro'
-=======
+import React, { useState, useDidShow } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
->>>>>>> fb306f05e5e66c8bd62a5225ca10b7caaf677cd0
 import SlidePopup from '@/components/SlidePopup/index'
 import UploadImg from '@/components/UploadImg/index'
 import Page from '@/layouts'
@@ -24,15 +20,9 @@ export default function BaoXiuFeiYong () {
   const [DetailInfo, setDetailInfo] = useState(null)
   const [BillInfo, setBillInfo] = useState(null)
 
-<<<<<<< HEAD
-  useEffect(() => {
-    Init()
-  }, [CurrnetBaoXiuId])
-=======
   useDidShow(() => {
     Init()
   })
->>>>>>> fb306f05e5e66c8bd62a5225ca10b7caaf677cd0
 
   const Init = () => {
     request({ ...apis.getGongDanDetail, args: { orgId: user.orgId }, params: { ticketId: CurrnetBaoXiuId } }).then((res) => { // 获取工单详情

src/pages/WuYe/FuWuDetail/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import { RichText } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import toolclass from '@/utils/toolclass.js'
@@ -13,7 +13,7 @@ import './index.less'
 export default function WuYeFuWuDetail () {
 
   const { user } = useModel('user')
-  const [CurrnetId] = useState(Current.router.params.id) // 当前id
+  const [CurrnetId] = useState(useRouter().params.id) // 当前id
   const [DetailInfo, setDetailInfo] = useState(null) // 详情
 
   Taro.useShareAppMessage(() => {

src/pages/WuYe/FuWuList/index.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'
 import WuYeFuWuListItem from '@/components/WuYeFuWuListItem'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh'
 import Page from '@/layouts'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 // import { Input } from '@tarojs/components'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
@@ -12,8 +12,8 @@ export default function FuWuList () {
 
   const [PageList, setPageList] = useState([])
   const [IsEmpty, setIsEmpty] = useState(false)
-  const [PageTitle] = useState(Current.router.params.name)
-  const [PageType] = useState(Current.router.params.type)
+  const [PageTitle] = useState(useRouter().params.name)
+  const [PageType] = useState(useRouter().params.type)
 
   useEffect(() => {
     Taro.setNavigationBarTitle({ title: PageTitle })

src/pages/WuYe/GongGaoDetail/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import { RichText } from '@tarojs/components'
 import { useModel } from '@/store'
@@ -13,7 +13,7 @@ import './index.less'
 export default function WuYeGongGaoDetail () {
 
   const { user } = useModel('user')
-  const [CurrnetId] = useState(Current.router.params.id)
+  const [CurrnetId] = useState(useRouter().params.id)
   const [DetailInfo, setDetailInfo] = useState(null)
 
   Taro.useShareAppMessage(() => {

src/pages/WuYe/JiaoFeiDetail/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
 import SlidePopup from '@/components/SlidePopup/index'
 import Page from '@/layouts'
@@ -17,7 +17,7 @@ export default function JiaoFeiDetail () {
   const [PopupType, setPopupType] = useState(0)
   const [PhoneList, setPhoneList] = useState([])
 
-  const { id } = Current.router.params
+  const { id } = useRouter().params
   const paying = useRef(false)
   const order = useRef()
 

src/pages/WuYe/TianJiaBaoXiu/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import { Input, Textarea } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import Page from '@/layouts'
@@ -16,7 +16,7 @@ export default function WuYeTianJiaBaoXiu () {
   const [PhotoUrl, setPhotoUrl] = useState(null)
   const [repairType, setRepairType] = useState()
 
-  const rpType = Current.router.params.type
+  const rpType = useRouter().params.type
 
   const TitleChange = (e) => {
     setTitle(e.detail.value)

src/pages/WuYe/XiuGaiBaoXiu/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import Taro, { Current } from '@tarojs/taro'
+import Taro, { useRouter } from '@tarojs/taro'
 import { Input, Textarea } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
@@ -13,7 +13,7 @@ export default function WuYeXiuGaiBaoXiu () {
   const { user } = useModel('user')
   const [DataLock, setDataLock] = useState(false)
   const [DetailInfo, setDetailInfo] = useState(null)
-  const [CurrnetId] = useState(Current.router.params.id)
+  const [CurrnetId] = useState(useRouter().params.id)
   const [PhotoUrl, setPhotoUrl] = useState(null)
   const [repairType, setRepairType] = useState()