1002884655 3 gadus atpakaļ
vecāks
revīzija
5b102acddf

+ 2
- 2
config/dev.js Parādīt failu

@@ -3,8 +3,8 @@ module.exports = {
3 3
     NODE_ENV: '"development"'
4 4
   },
5 5
   defineConstants: {
6
-    // HOST: '"https://xlk.njyz.tech"',
7
-    HOST: '"http://127.0.0.1:8081"',
6
+    HOST: '"https://xlk.njyz.tech"',
7
+    // HOST: '"http://127.0.0.1:8081"',
8 8
     WSS_HOST: '"wss://xlk.njyz.tech"',
9 9
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
10 10
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

+ 50
- 47
src/pages/index/buildingDetail/components/BasicInfo/index.jsx Parādīt failu

@@ -1,4 +1,4 @@
1
-import { useState } from 'react'
1
+
2 2
 import Taro from '@tarojs/taro'
3 3
 import { ScrollView, Image } from '@tarojs/components'
4 4
 import AuthRole from '@/components/Auth/AuthRole'
@@ -48,41 +48,44 @@ export default function BasicInfo (props) {
48 48
       </view>
49 49
 
50 50
       {/* 项目列表 */}
51
-      <view className='ProjectList'>
52
-        <ScrollView scroll-x>
53
-          {
54
-            (Info.buildingProjectType || []).map((item, index) => (
55
-              <view className='ListItem' key={`List-${index}`}>
56
-                <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
57
-                <view>
58
-                  <view>
59
-                    <text>项目类型:</text>
60
-                    <text className='active black'>{item.buildingTypeName}</text>
61
-                  </view>
62
-                  <view>
63
-                    <text>房屋产权:</text>
64
-                    <text className='active'>{item.rightsYear}年</text>
65
-                    <text>装修标准:</text>
66
-                    <text className='active'>{item.decoration || '暂无'}</text>
67
-                  </view>
51
+      {
52
+        (Info.buildingProjectType || []).length > 0 &&
53
+        <view className='ProjectList'>
54
+          <ScrollView scroll-x>
55
+            {
56
+              (Info.buildingProjectType || []).map((item, index) => (
57
+                <view className='ListItem' key={`List-${index}`}>
58
+                  <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
68 59
                   <view>
69
-                    <text>项目参考价格:</text>
70
-                    {
71
-                      (item.startPrice || item.endPrice) &&
72
-                      <text className='active'>约{item.startPrice}-{item.endPrice}万/套</text>
73
-                    }
74
-                    {
75
-                      !(item.startPrice || item.endPrice) &&
76
-                      <text className='active'>暂无数据</text>
77
-                    }
60
+                    <view>
61
+                      <text>项目类型:</text>
62
+                      <text className='active black'>{item.buildingTypeName}</text>
63
+                    </view>
64
+                    <view>
65
+                      <text>房屋产权:</text>
66
+                      <text className='active'>{item.rightsYear}年</text>
67
+                      <text>装修标准:</text>
68
+                      <text className='active'>{item.decoration || '暂无'}</text>
69
+                    </view>
70
+                    <view>
71
+                      <text>项目参考价格:</text>
72
+                      {
73
+                        (item.startPrice || item.endPrice) &&
74
+                        <text className='active'>约{item.startPrice}-{item.endPrice}万/套</text>
75
+                      }
76
+                      {
77
+                        !(item.startPrice || item.endPrice) &&
78
+                        <text className='active'>暂无数据</text>
79
+                      }
80
+                    </view>
81
+                    <text className='SaleStatus active'>{item.marketStatus}</text>
78 82
                   </view>
79
-                  <text className='SaleStatus active'>{item.marketStatus}</text>
80 83
                 </view>
81
-              </view>
82
-            ))
83
-          }
84
-        </ScrollView>
85
-      </view>
84
+              ))
85
+            }
86
+          </ScrollView>
87
+        </view>
88
+      }
86 89
 
87 90
       {/* 隔断 */}
88 91
       <view className='CutLine'></view>
@@ -151,20 +154,20 @@ export default function BasicInfo (props) {
151 154
 
152 155
       {/* 围观 */}
153 156
       <view className='Views flex-h'>
154
-          <text>{Info.pvNum || 0}人围观</text>
155
-          <view className='flex-item'>
156
-            {
157
-              (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (
158
-                <view key={`ViewsItem-${index}`}>
159
-                  <Image mode='aspectFill' className='centerLabel' src={item.photoOravatar} />
160
-                </view>
161
-              ))
162
-            }
163
-            {
164
-              (Info?.uvList?.records || []).length > 8 &&
165
-              <text>...</text>
166
-            }
167
-          </view>
157
+        <text>{Info.pvNum || 0}人围观</text>
158
+        <view className='flex-item'>
159
+          {
160
+            (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (
161
+              <view key={`ViewsItem-${index}`}>
162
+                <Image mode='aspectFill' className='centerLabel' src={item.photoOravatar} />
163
+              </view>
164
+            ))
165
+          }
166
+          {
167
+            (Info?.uvList?.records || []).length > 8 &&
168
+            <text>...</text>
169
+          }
170
+        </view>
168 171
       </view>
169 172
 
170 173
       {/* 互动 */}

+ 36
- 18
src/pages/index/buildingDetail/index.jsx Parādīt failu

@@ -92,19 +92,28 @@ export default withLayout((props) => {
92 92
                 </view>
93 93
 
94 94
                 {/* 特价房源 */}
95
-                <view className='SpecialPriceHouse' style={{minHeight: 0}}>
96
-                  <SpecialPriceHouse List={DetailInfo?.specialRoomList}></SpecialPriceHouse>
97
-                </view>
95
+                {
96
+                  DetailInfo?.specialRoomList.length > 0 &&
97
+                  <view className='SpecialPriceHouse' style={{minHeight: 0}}>
98
+                    <SpecialPriceHouse List={DetailInfo?.specialRoomList}></SpecialPriceHouse>
99
+                  </view>
100
+                }
98 101
 
99 102
                 {/* 项目动态 */}
100
-                <view className='ProjectDynamic' style={{minHeight: 0}}>
101
-                  <ProjectDynamic List={DetailInfo?.trendList}></ProjectDynamic>
102
-                </view>
103
+                {
104
+                  DetailInfo?.trendList.length > 0 &&
105
+                  <view className='ProjectDynamic' style={{minHeight: 0}}>
106
+                    <ProjectDynamic List={DetailInfo?.trendList}></ProjectDynamic>
107
+                  </view>
108
+                }
103 109
 
104 110
                 {/* 置业顾问 */}
105
-                <view className='PropertyConsultant' style={{minHeight: 0}}>
106
-                  <PropertyConsultant Info={DetailInfo}></PropertyConsultant>
107
-                </view>
111
+                {
112
+                  (DetailInfo?.consultants || []).length > 0 &&
113
+                  <view className='PropertyConsultant' style={{minHeight: 0}}>
114
+                    <PropertyConsultant Info={DetailInfo}></PropertyConsultant>
115
+                  </view>
116
+                }
108 117
 
109 118
                 {/* 位置及周边 */}
110 119
                 <view className='Periphery' style={{minHeight: 0}}>
@@ -112,9 +121,12 @@ export default withLayout((props) => {
112 121
                 </view>
113 122
 
114 123
                 {/* 户型介绍 */}
115
-                <view className='HouseTypeIntro' style={{minHeight: 0}}>
116
-                  <HouseTypeIntro Info={houseTypeImages}></HouseTypeIntro>
117
-                </view>
124
+                {
125
+                  houseTypeImages.length > 0 &&
126
+                  <view className='HouseTypeIntro' style={{minHeight: 0}}>
127
+                    <HouseTypeIntro Info={houseTypeImages}></HouseTypeIntro>
128
+                  </view>
129
+                }
118 130
 
119 131
                 {/* 营销活动 */}
120 132
                 <view className='MarketingActivity' style={{minHeight: 0}}>
@@ -122,9 +134,12 @@ export default withLayout((props) => {
122 134
                 </view>
123 135
 
124 136
                 {/* 直播活动 */}
125
-                <view className='LivingActivity' style={{minHeight: 0}}>
126
-                  <LivingActivity Info={DetailInfo}></LivingActivity>
127
-                </view>
137
+                {
138
+                  (DetailInfo?.liveActivityList || []).length > 0 &&
139
+                  <view className='LivingActivity' style={{minHeight: 0}}>
140
+                    <LivingActivity Info={DetailInfo}></LivingActivity>
141
+                  </view>
142
+                }
128 143
 
129 144
                 {/* 新鲜资讯 */}
130 145
                 <view className='News' style={{minHeight: 0}}>
@@ -132,9 +147,12 @@ export default withLayout((props) => {
132 147
                 </view>
133 148
 
134 149
                 {/* 相册 */}
135
-                <view className='Pictures' style={{ display: PictureList.length ? 'block' : 'none' }}>
136
-                  <Pictures List={PictureList}></Pictures>
137
-                </view>
150
+                {
151
+                  PictureList.length > 0 &&
152
+                  <view className='Pictures'>
153
+                    <Pictures List={PictureList}></Pictures>
154
+                  </view>
155
+                }
138 156
 
139 157
                 {/* 免责声明 */}
140 158
                 <Disclaimer />

+ 3
- 1
src/pages/index/helpToFindHouse/index.jsx Parādīt failu

@@ -56,7 +56,9 @@ export default withLayout(() => {
56 56
       }
57 57
     })
58 58
     params.push({ question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
59
-    params.push({ question: '意向区域', result: AreaInfo.id, key: 'intentArea' })
59
+    if(CurrentDemandId !== 3) {
60
+      params.push({ question: '意向区域', result: AreaInfo.id, key: 'intentArea' })
61
+    }
60 62
     let payload = {}
61 63
     params.map((item) => {
62 64
       payload[item.key] = item.result || item.resultId

+ 5
- 3
src/pages/mine/addCustomer/index.jsx Parādīt failu

@@ -62,9 +62,11 @@ export default withLayout((props) => {
62 62
         params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
63 63
       }
64 64
       fetch({ url, method: 'post', payload: params }).then(() => {
65
-        Taro.showToast({ title: '添加成功', icon: 'none' })
66
-        Taro.navigateBack({ delta: 1 })
67
-        setCanSubmit(false)
65
+        Taro.showToast({ title: '添加成功', icon: 'none', duration: 2000 })
66
+        setTimeout(() => {
67
+          Taro.navigateBack({ delta: 1 })
68
+          setCanSubmit(false)
69
+        }, 2000)
68 70
       }).catch(() => {
69 71
         setCanSubmit(false)
70 72
       })