1002884655 4 年 前
コミット
c5988d58c7
共有4 個のファイルを変更した19 個の追加7 個の削除を含む
  1. 8
    1
      src/components/ScrollPageRefresh/index.jsx
  2. 5
    3
      src/components/WuYeJiaoFei/index.jsx
  3. 4
    1
      src/pages/HuoDong/HuoDongSign/index.jsx
  4. 2
    2
      src/pages/WoDe/index.jsx

+ 8
- 1
src/components/ScrollPageRefresh/index.jsx ファイルの表示

@@ -7,7 +7,7 @@ import './index.less'
7 7
 
8 8
 export default function ScrollPageRefresh (props) {
9 9
 
10
-  const { KeepChildren = null, SearchKey = null, IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
10
+  const { Reset = false, CloseReset = () => {}, KeepChildren = null, SearchKey = null, IsEmpty = false, ApiName = '', ListRefresh = true, ListName = 'records', RequestParams = {}, RequestData = null, RequestUrlData = null, PageSize = 10, Refresh = () => { }, Push = () => { }, RefreshBg = 'none' } = props
11 11
   const [IsPullUp, setIsPullUp] = useState(false)
12 12
   const [IsPullDown, setIsPullDown] = useState(false)
13 13
   const [HasNextPage, setHasNextPage] = useState(true)
@@ -22,6 +22,13 @@ export default function ScrollPageRefresh (props) {
22 22
     }
23 23
   }, [PageNum])
24 24
 
25
+  useEffect(() => {
26
+    if (Reset) {
27
+      OnRefresh()
28
+      CloseReset()
29
+    }
30
+  }, [Reset])
31
+
25 32
   useEffect(() => {
26 33
     console.log(props.children)
27 34
   }, [])

+ 5
- 3
src/components/WuYeJiaoFei/index.jsx ファイルの表示

@@ -28,8 +28,8 @@ export default function WuYeJiaoFei () {
28 28
   const [BannerList, setBannerList] = useState([])
29 29
   const [checkedIds, setCheckedIds] = useState([])
30 30
   const [totalPrice, setTotalPrice] = useState(0)
31
-  const [OrderId, setOrderId] = useState(null)
32 31
   const [IsEmpty, setIsEmpty] = useState(false)
32
+  const [ToReset, setToReset] = useState(false)
33 33
 
34 34
   useEffect(() => {
35 35
     GetBanner()
@@ -40,7 +40,6 @@ export default function WuYeJiaoFei () {
40 40
       // 准备下单
41 41
       request({ ...apis.wxStartPay, data: { type: 'bill', idArray } }).then(res => {
42 42
         const outTradeNo = res.outTradeNo
43
-        setOrderId(res.outTradeNo)
44 43
         // 下单
45 44
         request({ ...apis.wxUnifiedOrder, args: { outTradeNo }, params: { type: 'bill' } }).then(res => {
46 45
           Taro.requestPayment({
@@ -107,7 +106,8 @@ export default function WuYeJiaoFei () {
107 106
               title: '缴费成功',
108 107
               icon: 'success'
109 108
             })
110
-            Taro.navigateTo({ url: `/pages/WuYe/JiaoFeiDetail/index?id=${res.orderId}` })
109
+            setToReset(true)
110
+            // Taro.navigateTo({ url: `/pages/WuYe/JiaoFeiDetail/index?id=${res.orderId}` })
111 111
             // 页面刷新
112 112
             // todo
113 113
           }).catch(err => {
@@ -138,6 +138,8 @@ export default function WuYeJiaoFei () {
138 138
             RequestUrlData={{ type: 0 }}
139 139
             Refresh={Refresh}
140 140
             Push={Push}
141
+            Reset={ToReset}
142
+            CloseReset={() => { setToReset(false) }}
141 143
             KeepChildren={
142 144
               <view>
143 145
                 {/* 大图 */}

+ 4
- 1
src/pages/HuoDong/HuoDongSign/index.jsx ファイルの表示

@@ -2,12 +2,14 @@ import React, { useState } from 'react'
2 2
 import Taro, { Current } from '@tarojs/taro'
3 3
 import request, { apis } from '@/utils/request'
4 4
 import Page from '@/layouts'
5
+import { useModel } from '@/store'
5 6
 import '@/assets/css/reset.less'
6 7
 import '@/assets/css/iconfont.less'
7 8
 import './index.less'
8 9
 
9 10
 export default function HuoDongDetail () {
10 11
 
12
+  const { user, setUser } = useModel('user')
11 13
   const [DataLock, setDataLock] = useState(false)
12 14
   const [HasSign, setHasSign] = useState(false)
13 15
   const [CurrnetId] = useState(Current.router.params.id) // 当前活动id
@@ -16,7 +18,8 @@ export default function HuoDongDetail () {
16 18
     if (!DataLock) {
17 19
       setDataLock(true)
18 20
       request({ ...apis.activitySign, args: { id: CurrnetId } }).then(() => {
19
-        Taro.showToast({ title: '签到成功', icon: 'none' })
21
+        Taro.showToast({ title: '签到成功,积分+1', icon: 'none' })
22
+        setUser({ ...user, points: user.points - 0 > 0 ? user.points - 0 + 1 : 1 })
20 23
         setDataLock(false)
21 24
         setHasSign(true)
22 25
       }).catch((res) => {

+ 2
- 2
src/pages/WoDe/index.jsx ファイルの表示

@@ -54,8 +54,8 @@ export default function WoDe () {
54 54
     if (DataLock || (user.havaSigned !== undefined && user.havaSigned - 0 === 1)) return
55 55
     setDataLock(true)
56 56
     request({ ...apis.userSign }).then(() => {
57
-      Taro.showToast({ title: '签到成功', icon: 'none' })
58
-      setUser({ ...user, havaSigned: 1 })
57
+      Taro.showToast({ title: '签到成功,积分+1', icon: 'none' })
58
+      setUser({ ...user, havaSigned: 1, points: user.points - 0 > 0 ? user.points - 0 + 1 : 1 })
59 59
       setDataLock(false)
60 60
     }).catch((res) => {
61 61
       Taro.showToast({ title: res, icon: 'none' })