1002884655 пре 4 година
родитељ
комит
0f459a50f2

+ 18
- 0
src/pages.js Прегледај датотеку

@@ -232,6 +232,24 @@ const Other = [
232 232
       eventType: 'property',
233 233
     }
234 234
   },
235
+  {
236
+    name: '我的-物业缴费',
237
+    page: 'pages/WoDe/WoDeJiaoFei/index',
238
+    auth: ['avatar', 'phone', 'yezhu'],
239
+    track: {
240
+      event: 'detail',
241
+      eventType: 'property',
242
+    }
243
+  },
244
+  {
245
+    name: '我的-物业服务',
246
+    page: 'pages/WoDe/WoDeGongDan/index',
247
+    auth: ['avatar', 'phone', 'yezhu'],
248
+    track: {
249
+      event: 'detail',
250
+      eventType: 'property',
251
+    }
252
+  },
235 253
   {
236 254
     name: '我的-我的活动',
237 255
     page: 'pages/WoDe/WoDeHuoDong/index',

+ 3
- 0
src/pages/WoDe/WoDeGongDan/index.config.js Прегледај датотеку

@@ -0,0 +1,3 @@
1
+export default {
2
+  navigationBarTitleText: '物业服务'
3
+}

+ 20
- 0
src/pages/WoDe/WoDeGongDan/index.css Прегледај датотеку

@@ -0,0 +1,20 @@
1
+.WoDeHuoDong {
2
+  width: 100%;
3
+  height: 100%;
4
+  position: relative;
5
+  background: #f8f8f8;
6
+  overflow: hidden;
7
+}
8
+.WoDeHuoDong .Content {
9
+  padding: 0 30px;
10
+  position: relative;
11
+  overflow: hidden;
12
+}
13
+.WoDeHuoDong .Content > .ListItem {
14
+  position: relative;
15
+  overflow: hidden;
16
+  margin-bottom: 30px;
17
+}
18
+.WoDeHuoDong .Content > .ListItem:first-child {
19
+  margin-top: 30px;
20
+}

+ 38
- 0
src/pages/WoDe/WoDeGongDan/index.jsx Прегледај датотеку

@@ -0,0 +1,38 @@
1
+import React, { useState } from 'react'
2
+import ScrollPageRefresh from '@/components/ScrollPageRefresh'
3
+import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem'
4
+import { useModel } from '@/store'
5
+import '@/assets/css/reset.less'
6
+import '@/assets/css/iconfont.less'
7
+import './index.less'
8
+
9
+export default function WoDeGongDan () {
10
+
11
+  const { user } = useModel('user')
12
+  const [PageList, setPageList] = useState([])
13
+
14
+  const Refresh = (e) => { // 下拉刷新
15
+    setPageList(e)
16
+  }
17
+
18
+  const Push = (e) => { // 上拉加载
19
+    setPageList(PageList.concat(e))
20
+  }
21
+  
22
+
23
+  return (
24
+    <view className='WoDeGongDan'>
25
+      <ScrollPageRefresh ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
26
+        <view className='Content Activity'>
27
+          {
28
+            PageList.map((item, index) => (
29
+              <view className='ListItem' key={`ActivityItem-${index}`}>
30
+                <WuYeBaoXiuItem Data={item}></WuYeBaoXiuItem>
31
+              </view>
32
+            ))
33
+          }
34
+        </view>
35
+      </ScrollPageRefresh>
36
+    </view>
37
+  )
38
+}

+ 22
- 0
src/pages/WoDe/WoDeGongDan/index.less Прегледај датотеку

@@ -0,0 +1,22 @@
1
+.WoDeGongDan {
2
+  width: 100%;
3
+  height: 100%;
4
+  position: relative;
5
+  background: #f8f8f8;
6
+  overflow: hidden;
7
+
8
+  .Content {
9
+    padding: 0 30px;
10
+    position: relative;
11
+    overflow: hidden;
12
+
13
+    >.ListItem {
14
+      position: relative;
15
+      overflow: hidden;
16
+      margin-bottom: 30px;
17
+      &:first-child {
18
+        margin-top: 30px;
19
+      }
20
+    }
21
+  }
22
+}

+ 3
- 0
src/pages/WoDe/WoDeJiaoFei/index.config.js Прегледај датотеку

@@ -0,0 +1,3 @@
1
+export default {
2
+  navigationBarTitleText: '物业缴费'
3
+}

+ 20
- 0
src/pages/WoDe/WoDeJiaoFei/index.css Прегледај датотеку

@@ -0,0 +1,20 @@
1
+.WoDeHuoDong {
2
+  width: 100%;
3
+  height: 100%;
4
+  position: relative;
5
+  background: #f8f8f8;
6
+  overflow: hidden;
7
+}
8
+.WoDeHuoDong .Content {
9
+  padding: 0 30px;
10
+  position: relative;
11
+  overflow: hidden;
12
+}
13
+.WoDeHuoDong .Content > .ListItem {
14
+  position: relative;
15
+  overflow: hidden;
16
+  margin-bottom: 30px;
17
+}
18
+.WoDeHuoDong .Content > .ListItem:first-child {
19
+  margin-top: 30px;
20
+}

+ 36
- 0
src/pages/WoDe/WoDeJiaoFei/index.jsx Прегледај датотеку

@@ -0,0 +1,36 @@
1
+import React, { useState } from 'react'
2
+import ScrollPageRefresh from '@/components/ScrollPageRefresh'
3
+import WuYeJiaoFeiItem from '@/components/WuYeJiaoFeiItem'
4
+import '@/assets/css/reset.less'
5
+import '@/assets/css/iconfont.less'
6
+import './index.less'
7
+
8
+export default function WoDeJiaoFei () {
9
+
10
+  const [PageList, setPageList] = useState([])
11
+
12
+  const Refresh = (e) => { // 下拉刷新
13
+    setPageList(e)
14
+  }
15
+
16
+  const Push = (e) => { // 上拉加载
17
+    setPageList(PageList.concat(e))
18
+  }
19
+  
20
+
21
+  return (
22
+    <view className='WoDeJiaoFei'>
23
+      <ScrollPageRefresh ApiName={`getActivityList`} RequestParams={{ mine: 1 }} Refresh={Refresh} Push={Push}>
24
+        <view className='Content Activity'>
25
+          {
26
+            PageList.map((item, index) => (
27
+              <view className='ListItem' key={`ActivityItem-${index}`}>
28
+                <WuYeJiaoFeiItem Data={item}></WuYeJiaoFeiItem>
29
+              </view>
30
+            ))
31
+          }
32
+        </view>
33
+      </ScrollPageRefresh>
34
+    </view>
35
+  )
36
+}

+ 22
- 0
src/pages/WoDe/WoDeJiaoFei/index.less Прегледај датотеку

@@ -0,0 +1,22 @@
1
+.WoDeJiaoFei {
2
+  width: 100%;
3
+  height: 100%;
4
+  position: relative;
5
+  background: #f8f8f8;
6
+  overflow: hidden;
7
+
8
+  .Content {
9
+    padding: 0 30px;
10
+    position: relative;
11
+    overflow: hidden;
12
+
13
+    >.ListItem {
14
+      position: relative;
15
+      overflow: hidden;
16
+      margin-bottom: 30px;
17
+      &:first-child {
18
+        margin-top: 30px;
19
+      }
20
+    }
21
+  }
22
+}

+ 2
- 2
src/pages/WoDe/index.jsx Прегледај датотеку

@@ -14,8 +14,8 @@ export default function WoDe () {
14 14
   const [UserTab] = useState([
15 15
     { icon: 'iconrenzheng1', name: '业主认证', id: 1, router: '/pages/WoDe/WoDeRenZheng/index' },
16 16
     { icon: 'iconjifenguize', name: '积分明细', id: 2, router: '/pages/FuLi/JiFenMingXi/index' },
17
-    { icon: 'iconjiaofei', name: '物业缴费', id: 3, router: null },
18
-    { icon: 'iconfuwu1', name: '物业服务', id: 4, router: null }
17
+    { icon: 'iconjiaofei', name: '物业缴费', id: 3, router: '/pages/WoDe/WoDeJiaoFei/index' },
18
+    { icon: 'iconfuwu1', name: '物业服务', id: 4, router: '/pages/WoDe/WoDeGongDan/index' }
19 19
   ])
20 20
   const [MoreUserTab] = useState([
21 21
     { icon: 'iconerweima', name: '推荐二维码', id: 5, router: '/pages/WoDe/TuiJianErWeiMa/index' },

+ 2
- 2
src/utils/api.js Прегледај датотеку

@@ -18,11 +18,11 @@ const $api = {
18 18
     url: `${prefix}/user/signin`
19 19
   },
20 20
   deleteCheckingRenZheng: { // 删除审核中的房产
21
-    method: 'post',
21
+    method: 'delete',
22 22
     url: `${prefix}/user/verify/delete/:id`
23 23
   },
24 24
   deletePassRenZheng: { // 删除审核通过的房产
25
-    method: 'post',
25
+    method: 'delete',
26 26
     url: `${prefix}/current_user/verify/delete/:id`
27 27
   },
28 28
   getOwnerVerifyList: { // 获取业主认证列表