xcx 4 лет назад
Родитель
Сommit
6dcaea66c8

+ 2
- 2
config/dev.js Просмотреть файл

@@ -3,8 +3,8 @@ module.exports = {
3 3
     NODE_ENV: '"development"'
4 4
   },
5 5
   defineConstants: {
6
-    // HOST: '"https://xs.ycjcjy.com"'
7
-    HOST: '"http://127.0.0.1:6060"'
6
+    HOST: '"https://xs.ycjcjy.com"'
7
+    // HOST: '"http://127.0.0.1:6060"'
8 8
   },
9 9
   mini: {
10 10
     debugReact: true

+ 4
- 4
src/components/WuYeFuWu/index.jsx Просмотреть файл

@@ -109,18 +109,18 @@ export default function WuYeFuWu () {
109 109
                   </view>
110 110
                 </view>
111 111
               </view> */}
112
-              {/* <view>
113
-                <view>
112
+              <view>
113
+                <view onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/GongGongFuWu/index` }) }}>
114 114
                   <view className='centerLabel'>
115 115
                     <view className='Icon'>
116
-                      <text className='iconfont icongonggongfuwu'></text>
116
+                      <image mode='aspectFit' src='https://zhiyun-image.oss-accelerate.aliyuncs.com/miniapp/upload/images/1608544670576-微信图片_20201221175016.png'></image>
117 117
                     </view>
118 118
                     <view className='Name'>
119 119
                       <text>公共服务</text>
120 120
                     </view>
121 121
                   </view>
122 122
                 </view>
123
-              </view> */}
123
+              </view>
124 124
               {
125 125
                 typeList.map((item, index) => (
126 126
                   <view key={`TypeList-${index}`}>

+ 9
- 0
src/pages.js Просмотреть файл

@@ -48,6 +48,15 @@ const Property = [
48 48
       eventType: 'property',
49 49
     }
50 50
   },
51
+  {
52
+    name: '物业-公共服务列表',
53
+    page: 'pages/WuYe/GongGongFuWu/index',
54
+    auth: ['avatar', 'phone', 'yezhu'],
55
+    track: {
56
+      event: 'list',
57
+      eventType: 'property',
58
+    }
59
+  },
51 60
   {
52 61
     name: '物业-服务详情',
53 62
     page: 'pages/WuYe/FuWuDetail/index',

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

@@ -29,7 +29,7 @@ export default function YeZhuShenHe () {
29 29
   }
30 30
 
31 31
   const GetWuYePhoneList = () => { // 获取物业电话
32
-    request({ ...apis.getWuYePhone }).then((res) => {
32
+    request({ ...apis.getWuYePhone, params: { type: 'prop' } }).then((res) => {
33 33
       setPhoneList(res || [])
34 34
     })
35 35
   }

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

@@ -38,7 +38,7 @@ export default function BaoXiuDetail () {
38 38
   const Init = () => {
39 39
     request({ ...apis.getGongDanDetail, args: { orgId: user.orgId }, params: { ticketId: CurrnetBaoXiuId } }).then((res) => { // 获取工单详情
40 40
       setDetailInfo(res)
41
-      request({ ...apis.getWuYePhone }).then((cRes) => { // 获取物业电话
41
+      request({ ...apis.getWuYePhone, params: { type: 'prop' } }).then((cRes) => { // 获取物业电话
42 42
         setPhoneList(cRes || [])
43 43
       })
44 44
     })

+ 10
- 6
src/pages/WuYe/BaoXiuQuYu/index.css Просмотреть файл

@@ -11,6 +11,16 @@
11 11
   position: relative;
12 12
   overflow: hidden;
13 13
 }
14
+.WuYeBaoXiuQuYu > view.AdvContent > view {
15
+  width: 100%;
16
+  padding-bottom: 30%;
17
+  background: #fff;
18
+  border-radius: 10px;
19
+}
20
+.WuYeBaoXiuQuYu > view.AdvContent > view image {
21
+  width: 100%;
22
+  height: 100%;
23
+}
14 24
 .WuYeBaoXiuQuYu > view:first-child {
15 25
   margin-top: 30px;
16 26
 }
@@ -34,12 +44,6 @@
34 44
   font-weight: bold;
35 45
   line-height: 60px;
36 46
 }
37
-.WuYeBaoXiuQuYu > view > view > view > text:first-child {
38
-  font-weight: normal;
39
-  font-size: 40px;
40
-  color: #F35844;
41
-  margin-right: 20px;
42
-}
43 47
 .WuYeBaoXiuQuYu > view > view > text {
44 48
   display: block;
45 49
   font-size: 24px;

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

@@ -22,6 +22,11 @@ export default function WuYeBaoXiuQuYu () {
22 22
   return (
23 23
     <Page>
24 24
       <view className='WuYeBaoXiuQuYu'>
25
+        <view className='AdvContent'>
26
+          <view>
27
+            <image mode='aspectFill' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20201223144943.png' className='centerLabel'></image>
28
+          </view>
29
+        </view>
25 30
         {
26 31
           TypeList.map((item, index) => (
27 32
             <view key={`WuYeBaoXiuQuYu-${index}`}>
@@ -37,11 +42,6 @@ export default function WuYeBaoXiuQuYu () {
37 42
             </view>
38 43
           ))
39 44
         }
40
-        <view className='AdvContent'>
41
-          <view>
42
-            <image mode='aspectFill' src={null} className='centerLabel'></image>
43
-          </view>
44
-        </view>
45 45
       </view>
46 46
     </Page>
47 47
   )

+ 4
- 0
src/pages/WuYe/BaoXiuQuYu/index.less Просмотреть файл

@@ -17,6 +17,10 @@
17 17
         padding-bottom: 30%;
18 18
         background: #fff;
19 19
         border-radius: 10px;
20
+        image {
21
+          width: 100%;
22
+          height: 100%;
23
+        }
20 24
       }
21 25
     }
22 26
 

+ 3
- 0
src/pages/WuYe/GongGongFuWu/index.config.js Просмотреть файл

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

+ 37
- 0
src/pages/WuYe/GongGongFuWu/index.css Просмотреть файл

@@ -0,0 +1,37 @@
1
+.GongGongFuWu {
2
+  width: 100%;
3
+  height: 100%;
4
+  overflow: hidden;
5
+}
6
+.GongGongFuWu > .GongGongFuWuContent {
7
+  padding: 0 30px;
8
+  position: relative;
9
+  overflow: hidden;
10
+}
11
+.GongGongFuWu > .GongGongFuWuContent .ListItem {
12
+  align-items: center;
13
+  border-bottom: 2px solid #f8f8f8;
14
+  position: relative;
15
+  overflow: hidden;
16
+}
17
+.GongGongFuWu > .GongGongFuWuContent .ListItem > text {
18
+  font-size: 30px;
19
+  color: #999;
20
+}
21
+.GongGongFuWu > .GongGongFuWuContent .ListItem > view {
22
+  padding: 10px 0;
23
+  margin-right: 20px;
24
+  position: relative;
25
+  overflow: hidden;
26
+}
27
+.GongGongFuWu > .GongGongFuWuContent .ListItem > view > text {
28
+  display: block;
29
+  font-size: 26px;
30
+  line-height: 36px;
31
+  color: #06a7e4;
32
+}
33
+.GongGongFuWu > .GongGongFuWuContent .ListItem > view > text:first-child {
34
+  font-size: 30px;
35
+  color: #333;
36
+  margin-bottom: 10px;
37
+}

+ 39
- 0
src/pages/WuYe/GongGongFuWu/index.jsx Просмотреть файл

@@ -0,0 +1,39 @@
1
+import React, { useState, useEffect } from 'react'
2
+import Page from '@/layouts'
3
+import Taro from '@tarojs/taro'
4
+import request, { apis } from '@/utils/request'
5
+// import { Input } from '@tarojs/components'
6
+import '@/assets/css/reset.less'
7
+import '@/assets/css/iconfont.less'
8
+import './index.less'
9
+
10
+export default function GongGongFuWu () {
11
+
12
+  const [PageList, setPageList] = useState([])
13
+
14
+  useEffect(() => {
15
+    request({ ...apis.getWuYePhone, params: { type: 'common' } }).then((res) => { // 获取公共电话
16
+      setPageList(res || [])
17
+    })
18
+  }, [])
19
+
20
+  return (
21
+    <Page>
22
+      <view className='GongGongFuWu'>
23
+        <view className='GongGongFuWuContent'>
24
+          {
25
+            PageList.map((item, index) => (
26
+              <view className='ListItem flex-h' key={`FuWuItem-${index}`} onClick={() => { Taro.makePhoneCall({ phoneNumber: item.tel }) }}>
27
+                <view className='flex-item'>
28
+                  <text>{item.name}</text>
29
+                  <text>{item.tel}</text>
30
+                </view>
31
+                <text className='iconfont iconjiantouright'></text>
32
+              </view>
33
+            ))
34
+          }
35
+        </view>
36
+      </view>
37
+    </Page>
38
+  )
39
+}

+ 43
- 0
src/pages/WuYe/GongGongFuWu/index.less Просмотреть файл

@@ -0,0 +1,43 @@
1
+.GongGongFuWu {
2
+  width: 100%;
3
+  height: 100%;
4
+  overflow: hidden;
5
+
6
+  >.GongGongFuWuContent {
7
+    padding: 0 30px;
8
+    position: relative;
9
+    overflow: hidden;
10
+
11
+    .ListItem {
12
+      align-items: center;
13
+      border-bottom: 2px solid #f8f8f8;
14
+      position: relative;
15
+      overflow: hidden;
16
+
17
+      >text {
18
+        font-size: 30px;
19
+        color: #999;
20
+      }
21
+
22
+      >view {
23
+        padding: 10px 0;
24
+        margin-right: 20px;
25
+        position: relative;
26
+        overflow: hidden;
27
+
28
+        >text {
29
+          display: block;
30
+          font-size: 26px;
31
+          line-height: 36px;
32
+          color: #06a7e4;
33
+
34
+          &:first-child {
35
+            font-size: 30px;
36
+            color: #333;
37
+            margin-bottom: 10px;
38
+          }
39
+        }
40
+      }
41
+    }
42
+  }
43
+}

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

@@ -105,7 +105,7 @@ export default function JiaoFeiDetail () {
105 105
   }
106 106
 
107 107
   const Init = () => {
108
-    request({ ...apis.getWuYePhone }).then((res) => { // 获取物业电话
108
+    request({ ...apis.getWuYePhone, params: { type: 'prop' } }).then((res) => { // 获取物业电话
109 109
       setPhoneList(res || [])
110 110
     })
111 111
   }