吃个甘蔗嚼一年 3 years ago
parent
commit
1c74bf24aa
2 changed files with 42 additions and 29 deletions
  1. 1
    1
      src/components/CollectList/MyCollect/index.jsx
  2. 41
    28
      src/pages/index/tabs/Guide.jsx

+ 1
- 1
src/components/CollectList/MyCollect/index.jsx View File

@@ -66,7 +66,7 @@ export default (props) => {
66 66
                 />
67 67
                 <CouponMedia.Body >
68 68
                   <View className='cpn-card-text'>
69
-                    {item.lng}
69
+                    {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
70 70
                   </View>
71 71
                   <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
72 72
                     <Text className='cpn-card-text_mn'>¥{`${formatPrice(item.averagePrice)}元`}</Text>

+ 41
- 28
src/pages/index/tabs/Guide.jsx View File

@@ -61,7 +61,7 @@ export default (props) => {
61 61
     goContent()
62 62
   })
63 63
 
64
-  const geiZy = () => {
64
+  const getGuidelist = () => {
65 65
     setLoading(true)
66 66
     getExtendContent('room', roomId, { pageSize: 500 }).then((res) => {
67 67
       // setExtend(res.records || [])
@@ -82,8 +82,8 @@ export default (props) => {
82 82
         setLoading(false)
83 83
       })
84 84
       //更多指引
85
-      geiZy()
86
-      getRecommendList({ location: taRoomContent.location }).then((res) => {
85
+      getGuidelist()
86
+      getRecommendList({ location: taRoomContent.location || '' }).then((res) => {
87 87
         setPackage(res || [])
88 88
         setLoading(false)
89 89
       })
@@ -169,23 +169,24 @@ export default (props) => {
169 169
                 </view>
170 170
               </view>
171 171
               {/* --------房屋位置-------- */}
172
-              {
173
-                !taRoomContent.location ? <view></view>
174
-                  :
175
-                  <view className='room-box-info-HouLocation'>
176
-                    <view className='room-bi-name-HouLocation' >
177
-                      <view className='room-bin-title-HouLocation'>房屋位置</view>
178
-                      <view className='room-bint-nameInfo-HouLocation'>
179
-                        <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
180
-                        <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
181
-                          <image className='room-bintn-image-HouLocation' src={GPS} />
182
-                          <text className='room-bintn-text-HouLocation'>去这里</text>
183
-                        </view>
184
-                      </view>
172
+
173
+
174
+              <view className='room-box-info-HouLocation'>
175
+                <view className='room-bi-name-HouLocation' >
176
+                  <view className='room-bin-title-HouLocation'>房屋位置</view>
177
+                  <view className='room-bint-nameInfo-HouLocation'>
178
+                    <view className='room-bint-nameInfo-bool-HouLocation' >{taRoomContent?.address}</view>
179
+                    <view className='room-bintn-button-HouLocation' onClick={() => { goRoomMap() }} style={{ display: wifiButtonStyle }}>
180
+                      <image className='room-bintn-image-HouLocation' src={GPS} />
181
+                      <text className='room-bintn-text-HouLocation'>去这里</text>
185 182
                     </view>
186 183
                   </view>
184
+                </view>
185
+              </view>
186
+
187
+
188
+
187 189
 
188
-              }
189 190
 
190 191
 
191 192
               {/* --------停车场-------- */}
@@ -208,19 +209,31 @@ export default (props) => {
208 209
 
209 210
 
210 211
               {/* --------无线网-------- */}
211
-              <view className='room-box-info-WIFIContent'>
212
-                <view className='room-bi-name-WIFIContent' >
213
-                  <view className='room-bin-title-WIFIContent'>WiFi信息</view>
214
-                  <view className='room-bint-nameInfo-WIFIContent'>
215
-                    <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称:{taRoomContent?.wifiName}</view>
216
-                    <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码:{taRoomContent?.wifiPassword}</view>
217
-                    <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
218
-                      <image className='room-bintn-image-WIFIContent' src={copy_logo} />
219
-                      <text className='room-bintn-text-WIFIContent'>复制</text>
212
+
213
+
214
+              {
215
+                !taRoomContent.wifiName && !taRoomContent.wifiPassword ? <view></view>
216
+                  :
217
+
218
+                  <view className='room-box-info-WIFIContent'>
219
+                    <view className='room-bi-name-WIFIContent' >
220
+                      <view className='room-bin-title-WIFIContent'>WiFi信息</view>
221
+                      <view className='room-bint-nameInfo-WIFIContent'>
222
+                        <view className='room-bint-nameInfo-bool-WIFIContent-wifi' >名称:{taRoomContent?.wifiName}</view>
223
+                        <view className='room-bint-nameInfo-bool-WIFIContent-password' >密码:{taRoomContent?.wifiPassword}</view>
224
+                        <view className='room-bintn-button-WIFIContent' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
225
+                          <image className='room-bintn-image-WIFIContent' src={copy_logo} />
226
+                          <text className='room-bintn-text-WIFIContent'>复制</text>
227
+                        </view>
228
+                      </view>
220 229
                     </view>
221 230
                   </view>
222
-                </view>
223
-              </view>
231
+
232
+              }
233
+
234
+
235
+
236
+
224 237
 
225 238
               <view className='Guide-Content-box'  >
226 239
                 <view className='title-image' style={{ display: guideStyle }} >