Browse Source

Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

1002884655 3 years ago
parent
commit
a25996089c

+ 4
- 4
config/index.js View File

29
   },
29
   },
30
   copy: {
30
   copy: {
31
     patterns: [
31
     patterns: [
32
-      { from: 'src/native/', to: 'dist/native/' },
32
+      // { from: 'src/native/', to: 'dist/native/' },
33
     ],
33
     ],
34
     options: {
34
     options: {
35
     }
35
     }
37
   framework: 'react',
37
   framework: 'react',
38
   mini: {
38
   mini: {
39
     compile: {
39
     compile: {
40
-      exclude: [
41
-        path.resolve(__dirname, '..', 'src/native/')
42
-      ]
40
+      // exclude: [
41
+      //   path.resolve(__dirname, '..', 'src/native/')
42
+      // ]
43
     },
43
     },
44
     postcss: {
44
     postcss: {
45
       pxtransform: {
45
       pxtransform: {

+ 4
- 4
config/prod.js View File

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    // HOST: '"https://xlj.newlandsh.com"', //正式
7
-    // WSS_HOST: '"wss://xlj.newlandsh.com"',
8
-    HOST: '"https://xlk.njyz.tech"', //正式
9
-    WSS_HOST: '"wss://xlk.njyz.tech"',
6
+    HOST: '"https://xlj.newlandsh.com"', //正式
7
+    WSS_HOST: '"wss://xlj.newlandsh.com"',
8
+    // HOST: '"https://xlk.njyz.tech"', //正式
9
+    // WSS_HOST: '"wss://xlk.njyz.tech"',
10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

+ 1
- 0
src/components/Picker/index.jsx View File

49
       onChange={handleChange}
49
       onChange={handleChange}
50
       value={inx}
50
       value={inx}
51
       range={dicts}
51
       range={dicts}
52
+      mode={mode||'selector'}
52
       {...leftProps}
53
       {...leftProps}
53
     >
54
     >
54
       <View>{text || placeholder || '请选择'}</View>
55
       <View>{text || placeholder || '请选择'}</View>

+ 1
- 1
src/constants/api.js View File

145
 export const API_MANAGE_CUSTOMER_LIST = resolvePath('marking/customers')
145
 export const API_MANAGE_CUSTOMER_LIST = resolvePath('marking/customers')
146
 export const API_TOBE_MANAGER = resolvePath('marketing')
146
 export const API_TOBE_MANAGER = resolvePath('marketing')
147
 export const API_MY_BUILDINGIDS = resolvePath('building/mine')
147
 export const API_MY_BUILDINGIDS = resolvePath('building/mine')
148
-export const API_MARKETING_VISIT = resolvePath('marketing/visit')
148
+export const API_MARKETING_VISIT = resolvePath('marking//visit')
149
 
149
 
150
 
150
 
151
 // report
151
 // report

+ 5
- 2
src/pages/mine/changeVisit/index.jsx View File

69
   }, [buildingId])
69
   }, [buildingId])
70
 
70
 
71
   useEffect(() => {
71
   useEffect(() => {
72
-    if (CurrentStatusId - 0 !== 3) {
72
+    if (CurrentStatusId - 0 !== 3 && buildingId) {
73
       fetch({ url: `${API_BUILDING_HOUSE_TYPE}?buildingId=${buildingId}&pageSize=${500}`, method: 'get' }).then((res) => {
73
       fetch({ url: `${API_BUILDING_HOUSE_TYPE}?buildingId=${buildingId}&pageSize=${500}`, method: 'get' }).then((res) => {
74
         setHouseTypeList(res.records || [])
74
         setHouseTypeList(res.records || [])
75
       })
75
       })
76
     }
76
     }
77
-  }, [CurrentStatusId])
77
+  }, [CurrentStatusId, buildingId])
78
 
78
 
79
   const CutStatus = (item) => {
79
   const CutStatus = (item) => {
80
     return () => {
80
     return () => {
101
   const InputChange = (key, e) => {
101
   const InputChange = (key, e) => {
102
     let resData = { ...FormData }
102
     let resData = { ...FormData }
103
     resData[key] = e.detail.value
103
     resData[key] = e.detail.value
104
+    console.log('---------resData---------', resData)
104
     setFormData({ ...resData })
105
     setFormData({ ...resData })
105
   }
106
   }
106
 
107
 
108
+  console.log('---------FormData---------', FormData)
109
+
107
   const PickerChange = (key, e) => {
110
   const PickerChange = (key, e) => {
108
     let resData = { ...FormData }
111
     let resData = { ...FormData }
109
     if (key === 'realtyConsultant') {
112
     if (key === 'realtyConsultant') {

+ 1
- 1
src/pages/mine/components/ResidentListItem/index.jsx View File

18
           <text className='Status'>已报备</text>
18
           <text className='Status'>已报备</text>
19
         }
19
         }
20
         {
20
         {
21
-          data.customerStatus - 0 === 2 && !(data.type === 'report' && data.channelStatus === 3) &&
21
+          data.type === 'report' && (data.channelStatus - 0) === 1 &&
22
           <text className='Status' onClick={() => { Taro.navigateTo({ url: `/pages/mine/sureVisit/index?id=${data.id}` }) }}>到访确认</text>
22
           <text className='Status' onClick={() => { Taro.navigateTo({ url: `/pages/mine/sureVisit/index?id=${data.id}` }) }}>到访确认</text>
23
         }
23
         }
24
       </view>
24
       </view>

+ 4
- 3
src/pages/mine/sureVisit/index.jsx View File

11
 import './index.scss'
11
 import './index.scss'
12
 
12
 
13
 export default withLayout((props) => {
13
 export default withLayout((props) => {
14
-  const { id } = props
14
+  const { router } = props
15
+  const { id } = router.params
15
 
16
 
16
   const [loading, setLoading] = useState(false)
17
   const [loading, setLoading] = useState(false)
17
   const [channelCustomer, setChannelCustomer] = useState({})
18
   const [channelCustomer, setChannelCustomer] = useState({})
56
         recommendPerson: channelCustomer.recommendPerson,
57
         recommendPerson: channelCustomer.recommendPerson,
57
         realtyConsultant: consultant,
58
         realtyConsultant: consultant,
58
         imageUrl,
59
         imageUrl,
59
-        visitDate: `${visitDate}T12.00.00.000Z`,  // 随便造了一个时刻
60
+        visitDate: `${visitDate}T12:00:00.000Z`,  // 随便造了一个时刻
60
         remark,
61
         remark,
61
         channelId: channelCustomer.channelId,
62
         channelId: channelCustomer.channelId,
62
       }
63
       }
66
     fetch({ url: API_MARKETING_VISIT, payload, method: 'PUT' }).then((res) => {
67
     fetch({ url: API_MARKETING_VISIT, payload, method: 'PUT' }).then((res) => {
67
       setLoading(false)
68
       setLoading(false)
68
       Taro.showToast({
69
       Taro.showToast({
69
-        url: '操作成功',
70
+        title: '操作成功',
70
         icon: 'none'
71
         icon: 'none'
71
       })
72
       })
72
       const t = setTimeout(() => {
73
       const t = setTimeout(() => {