Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.84:8080"',
-    WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://192.168.0.72:8080"',
+    WSS_HOST: '"ws://192.168.0.72:8080"',
   },
   weapp: {},
   h5: {}

src/pages/activity/detail/assistance.js

@@ -617,7 +617,7 @@ export default class Detail extends Component {
                 </View>
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
                 <View style="padding:0 40rpx">
-                  <Image src={getThumbnail(detail.activityInstructions)} mode="aspectFill" style="width:100%;margin-bottom:20px;"></Image>
+                  <Image src={getThumbnail(detail.activityInstructions)} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
                 </View>
 
               </ScrollView>

src/pages/activity/item/index.js

@@ -17,7 +17,7 @@ export default class Item extends Component {
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
         {console.log(data,'----data-----')}
-         <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg || data.imgUrl)}></Image>
+         <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg ||data.listImgUrl|| data.imgUrl)}></Image>
         <View className="box">
           <View className="title">{data.title}</View>
           {

src/pages/agent/progress/index.js

@@ -150,8 +150,8 @@ export default class Index extends Component {
       <View className='client__progress'>
         <View className='client__infor'>
           <View className='clieng__name'>{detail.name}</View>
-          <View className='clieng__build'><Image mode="aspectFill" className='build__img' src={buildImg}></Image>意向楼盘：{detail.intention || '暂无'}</View>
-          <View className='clieng__phone'><Image mode="aspectFill" className='phone__img' src={phoneImg}></Image>{detail.phone || '暂无'}</View>
+          <View className='clieng__build'><Image mode="widthFix" className='build__img' src={buildImg}></Image>意向楼盘：{detail.intention || '暂无'}</View>
+          <View className='clieng__phone'><Image mode="widthFix" className='phone__img' src={phoneImg}></Image>{detail.phone || '暂无'}</View>
           {/* <Image className='client__img' src={headImg}></Image> */}
         </View>
         <View className='progress__infor'>

src/pages/policy/item/item.scss

@@ -1,4 +1,5 @@
 @import "@styles/theme.scss";
+
 .item {
   border-bottom: solid 1px $border-color-light;
   display: flex;
@@ -6,8 +7,8 @@
   align-items: center;
 
   &-img {
-    width: 350px;
-    height: 160px;
+    width: 220px;
+    height: 176px;
     margin-right: 30px;
   }
 
@@ -29,5 +30,4 @@
       margin-bottom: 20px;
     }
   }
-}
-
+}

src/pages/project/album/index.js

@@ -64,34 +64,27 @@ export default class Index extends Component {
 
     return (
       <View className='photos'>
-        <ScrollView scrollX>
-          <View className='photos__type__content'>
-            {console.log(list, '2225555555')}
-            <View className="around-tab">
-              {list.map((item, index) => {
-                const { apartmentName } = item || {}
-                const buildingImgList = item.buildingImgList || []
-
-                console.log(item, '22333333222')
-                return (<View>
-                  {buildingImgList.length>0&&
-                  <View
-                    // style={{ padding: '0 20px ' }}
-                    key={current}
-                    className={`around-tab__item ${current === index ? 'active' : ''}`}
-                    onClick={() => this.setState({ current: index })}
-                  >
-
-                    <View>
-                      <View style={{  textAlign: 'center' }}>  {`${apartmentName}(${buildingImgList.length})`} </View>
-                    </View>
-                  </View>}
-                  </View>
-                )
-              })}
-            </View>
-          </View>
-        </ScrollView>
+        <View className="around-tab">
+          {list.map((item, index) => {
+            const { apartmentName } = item || {}
+            const buildingImgList = item.buildingImgList || []
+
+            console.log(buildingImgList, 'buildingImgList.length')
+           
+              return ( 
+               <View
+                  key={current}
+                  className={`around-tab__item ${current === index ? 'active' : ''}`}
+                  onClick={() => this.setState({ current: index })}
+                >
+                  {`${apartmentName}(${buildingImgList.length})`}
+                </View>
+              )
+            
+       
+
+          })}
+        </View>
         <View className='photos__item'>
           {imgList.map((item, index) => {
             console.log(item, '299999933333222')

src/pages/project/detail/index.js

@@ -615,7 +615,7 @@ export default class Index extends Component {
                               <View style={{ textAlign: 'center', width: '218rpx', display: 'flex' }}>
                                 <View style={{ textAlign: 'center', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
 
-                                <View>({buildingImgList.length})</View>
+                                <View  style={{  textAlign: 'center' }}>({buildingImgList.length})</View>
                               </View>
                             </View>
                           </View>)}</View>