瀏覽代碼

静态页面

1002884655 4 年之前
父節點
當前提交
c5988d58c7

+ 8
- 1
src/components/ScrollPageRefresh/index.jsx 查看文件

7
 
7
 
8
 export default function ScrollPageRefresh (props) {
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
   const [IsPullUp, setIsPullUp] = useState(false)
11
   const [IsPullUp, setIsPullUp] = useState(false)
12
   const [IsPullDown, setIsPullDown] = useState(false)
12
   const [IsPullDown, setIsPullDown] = useState(false)
13
   const [HasNextPage, setHasNextPage] = useState(true)
13
   const [HasNextPage, setHasNextPage] = useState(true)
22
     }
22
     }
23
   }, [PageNum])
23
   }, [PageNum])
24
 
24
 
25
+  useEffect(() => {
26
+    if (Reset) {
27
+      OnRefresh()
28
+      CloseReset()
29
+    }
30
+  }, [Reset])
31
+
25
   useEffect(() => {
32
   useEffect(() => {
26
     console.log(props.children)
33
     console.log(props.children)
27
   }, [])
34
   }, [])

+ 5
- 3
src/components/WuYeJiaoFei/index.jsx 查看文件

28
   const [BannerList, setBannerList] = useState([])
28
   const [BannerList, setBannerList] = useState([])
29
   const [checkedIds, setCheckedIds] = useState([])
29
   const [checkedIds, setCheckedIds] = useState([])
30
   const [totalPrice, setTotalPrice] = useState(0)
30
   const [totalPrice, setTotalPrice] = useState(0)
31
-  const [OrderId, setOrderId] = useState(null)
32
   const [IsEmpty, setIsEmpty] = useState(false)
31
   const [IsEmpty, setIsEmpty] = useState(false)
32
+  const [ToReset, setToReset] = useState(false)
33
 
33
 
34
   useEffect(() => {
34
   useEffect(() => {
35
     GetBanner()
35
     GetBanner()
40
       // 准备下单
40
       // 准备下单
41
       request({ ...apis.wxStartPay, data: { type: 'bill', idArray } }).then(res => {
41
       request({ ...apis.wxStartPay, data: { type: 'bill', idArray } }).then(res => {
42
         const outTradeNo = res.outTradeNo
42
         const outTradeNo = res.outTradeNo
43
-        setOrderId(res.outTradeNo)
44
         // 下单
43
         // 下单
45
         request({ ...apis.wxUnifiedOrder, args: { outTradeNo }, params: { type: 'bill' } }).then(res => {
44
         request({ ...apis.wxUnifiedOrder, args: { outTradeNo }, params: { type: 'bill' } }).then(res => {
46
           Taro.requestPayment({
45
           Taro.requestPayment({
107
               title: '缴费成功',
106
               title: '缴费成功',
108
               icon: 'success'
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
             // todo
112
             // todo
113
           }).catch(err => {
113
           }).catch(err => {
138
             RequestUrlData={{ type: 0 }}
138
             RequestUrlData={{ type: 0 }}
139
             Refresh={Refresh}
139
             Refresh={Refresh}
140
             Push={Push}
140
             Push={Push}
141
+            Reset={ToReset}
142
+            CloseReset={() => { setToReset(false) }}
141
             KeepChildren={
143
             KeepChildren={
142
               <view>
144
               <view>
143
                 {/* 大图 */}
145
                 {/* 大图 */}

+ 4
- 1
src/pages/HuoDong/HuoDongSign/index.jsx 查看文件

2
 import Taro, { Current } from '@tarojs/taro'
2
 import Taro, { Current } from '@tarojs/taro'
3
 import request, { apis } from '@/utils/request'
3
 import request, { apis } from '@/utils/request'
4
 import Page from '@/layouts'
4
 import Page from '@/layouts'
5
+import { useModel } from '@/store'
5
 import '@/assets/css/reset.less'
6
 import '@/assets/css/reset.less'
6
 import '@/assets/css/iconfont.less'
7
 import '@/assets/css/iconfont.less'
7
 import './index.less'
8
 import './index.less'
8
 
9
 
9
 export default function HuoDongDetail () {
10
 export default function HuoDongDetail () {
10
 
11
 
12
+  const { user, setUser } = useModel('user')
11
   const [DataLock, setDataLock] = useState(false)
13
   const [DataLock, setDataLock] = useState(false)
12
   const [HasSign, setHasSign] = useState(false)
14
   const [HasSign, setHasSign] = useState(false)
13
   const [CurrnetId] = useState(Current.router.params.id) // 当前活动id
15
   const [CurrnetId] = useState(Current.router.params.id) // 当前活动id
16
     if (!DataLock) {
18
     if (!DataLock) {
17
       setDataLock(true)
19
       setDataLock(true)
18
       request({ ...apis.activitySign, args: { id: CurrnetId } }).then(() => {
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
         setDataLock(false)
23
         setDataLock(false)
21
         setHasSign(true)
24
         setHasSign(true)
22
       }).catch((res) => {
25
       }).catch((res) => {

+ 2
- 2
src/pages/WoDe/index.jsx 查看文件

54
     if (DataLock || (user.havaSigned !== undefined && user.havaSigned - 0 === 1)) return
54
     if (DataLock || (user.havaSigned !== undefined && user.havaSigned - 0 === 1)) return
55
     setDataLock(true)
55
     setDataLock(true)
56
     request({ ...apis.userSign }).then(() => {
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
       setDataLock(false)
59
       setDataLock(false)
60
     }).catch((res) => {
60
     }).catch((res) => {
61
       Taro.showToast({ title: res, icon: 'none' })
61
       Taro.showToast({ title: res, icon: 'none' })