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

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    // 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.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/pages/project/album/index.js

@@ -24,9 +24,15 @@ export default class Index extends Component {
 
 
   componentWillMount () {
-    const { id = '369b7d7e5bc6e6b91f2e8f5e775035e2' } = this.$router.params
-    const { projectDetail: { buildingId }, dispatchProjectDetail } = this.props
 
+
+    const { id = '369b7d7e5bc6e6b91f2e8f5e775035e2', current } = this.$router.params
+    const { projectDetail: { buildingId }, dispatchProjectDetail } = this.props
+    if (current) {
+      this.setState({
+        current,
+      })
+    }
     if (!buildingId) {
       dispatchProjectDetail(id)
     }
@@ -59,14 +65,17 @@ export default class Index extends Component {
     const { projectDetail: { buildingApartment = [] } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
     const listimg = list.filter(item => item.buildingImgList.length > 0)
-    console.log(listimg, '--------------')
+
     const { current } = this.state
     const imgList = (listimg[current] || {}).buildingImgList || []
+
     let _photosImgs = imgList.map(img => img.url)
 
     return (
       <View className='photos'>
         <View className="around-tab">
+          {console.log(listimg, '-----listimg---------')}
+          {console.log(imgList, '-------imgList-------')}
           {listimg.map((item, index) => {
             const { apartmentName } = item || {}
             const buildingImgList = item.buildingImgList || []
@@ -76,15 +85,13 @@ export default class Index extends Component {
             return (
               <View
                 key={current}
-                className={`around-tab__item ${current === index ? 'active' : ''}`}
+                className={`around-tab__item ${current == index ? 'active' : ''}`}
                 onClick={() => this.setState({ current: index })}
               >
                 {buildingImgList.length > 0 && <View className="around-tab-text"> {`${apartmentName}(${buildingImgList.length})`} </View>}
               </View>
             )
 
-
-
           })}
         </View>
         <View className='photos__item'>

src/pages/project/detail/index.js

@@ -172,7 +172,7 @@ export default class Index extends Component {
     queryActivityList(payload).then(res => {
       console.log(res, 'Activity')
       this.setState({
-        activityList: res || []
+        activityList: res.list || []
       })
     })
   }
@@ -245,9 +245,10 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum() {
+  toViewAlbum (index){
     const { buildingId } = this.state
-    this.navigateTo(`/pages/project/album/index?id=${buildingId}`)
+    console.log('1111111',index)
+    this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}` )
   }
 
   onViewFans() {
@@ -624,7 +625,7 @@ export default class Index extends Component {
             <View className='photos__type'>
               <View className='photos__type__title'>相册</View>
               <ScrollView scrollX>
-                <View className='photos__type__content' onClick={this.toViewAlbum}>
+                <View className='photos__type__content' >
 
                   <View className="around-tab">
                     {listimg.map((item, index) => {
@@ -635,19 +636,21 @@ export default class Index extends Component {
                       console.log(buildingImgUrl, 'buildingImgUrl')
 
                       // if (buildingImgUrl != null) {
-                      return (<View key={index + "listimg"}>
+                      return ( <View key={index + "listimg"}>
                         {buildingImgUrl != null && (<View
                           style={{ marginRight: '8px' }}
+                          
                         >
 
                           <View>
-                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} ></Image>
+                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} onClick={()=>this.toViewAlbum(index)}></Image>
                             <View style={{ width: '218rpx', display: 'flex', justifyContent: 'center' }} >
                               <View style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
                               <View> ({buildingImgList.length})</View>
                             </View>
                           </View>
-                        </View>)}</View>
+                        </View>)}
+                        </View>
                       )
                       // }
 
@@ -864,40 +867,22 @@ export default class Index extends Component {
     )
   }
   renderActivities() {
-    // renderGroup () {
-    //   const { groupList } = this.state
-    //   return (
-    //     <Block>
-    //       {groupList.length > 0 &&
-    //         <View className="activity">
-    //           <View className="title">拼团活动</View>
-    //           <View
-    //             style={{ position: 'relative' }}>
-    //             <HelpGroupBanner
-    //               style={{ height: '250rpx' }}
-    //               indicatorDots={false}
-    //               list={groupList}
-    //               onClick={this.handleGroupClick}>
-    //             </HelpGroupBanner>
-    //           </View>
-    //         </View>
-    //       }
-    //     </Block>
-    //   )
-    // }
+
+ 
     const { activityList } = this.state
+   
     return (
       <Block>
         {
           activityList.length > 0 && (
             <View className="activity" >
-              {console.log(activityList, '----activityList-----')}
+           
               <View className="section-head">
-                <Text className="section-head__title">热门活动</Text>
-                <View className="section-head__more" onClick={this.handleActivityMoreClick}>
-                  更多活动<Text className="iconfont icon-more"></Text>
-                </View>
-              </View>
+                 <Text className="section-head__title" style={{margin: '10rpx 0 40rpx 35rpx'}}>热门活动</Text>
+                 <View className="section-head__more"  style={{marginRight: '20rpx'}} onClick={this.handleActivityMoreClick}>
+                   更多活动<Text className="iconfont icon-more"></Text>
+                 </View>
+               </View>
               <View
                 style={{ position: 'relative' }}>
                 <HelpGroupBanner
@@ -912,26 +897,7 @@ export default class Index extends Component {
 
               </View>
             </View>
-            // <View classN                                                                                                                                                                                                                                                                                                                                                                                                                                                    ame="house-type">
-            //   <View className="section-head">
-            //     <Text className="section-head__title">热门活动</Text>
-            //     <View className="section-head__more" onClick={this.handleActivityMoreClick}>
-            //       更多活动<Text className="iconfont icon-more"></Text>
-            //     </View>
-            //   </View>
-            //   <ScrollView scrollX>
-            //     <View className="house-type__list" style="margin-top:10px">
-            //       {
-            //         activityList.map(item => (
-            //           <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this, item.dynamicId)}>
-            //             <Image mode="widthFix" src={getThumbnail(item.imgUrl)} className="news-item__pic"></Image>
-            //             <View className="news-item__title">{item.title}</View>
-            //           </View>
-            //         ))
-            //       }
-            //     </View>
-            //   </ScrollView>
-            // </View>
+      
           )
         }
       </Block>

src/pages/shop/index.js

@@ -3,7 +3,7 @@ import { getWindowHeight } from '@utils/style'
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
 import './index.scss'
-import {getThumbnail } from '@utils/tools'
+import { getThumbnail } from '@utils/tools'
 // import Search from '@components/search'
 import Banner from './banner'
 import ready from '@utils/ready'
@@ -37,10 +37,10 @@ export default class Shop extends Component {
     goodsList: [],
     user: {},
     current: 0,
-    points:0
+    points: 0
   }
 
-  componentDidShow() {
+  componentDidShow () {
 
     Taro.showLoading()
     ready.queue(() => {
@@ -53,7 +53,7 @@ export default class Shop extends Component {
     Taro.hideLoading()
   }
 
-  loadBannerList() {
+  loadBannerList () {
     const payload = {
       showPosition: 'mall',
       cityId: this.props.curCity.id
@@ -65,7 +65,7 @@ export default class Shop extends Component {
     })
   }
 
-  loadList() {
+  loadList () {
 
 
     Taro.showLoading()
@@ -88,7 +88,7 @@ export default class Shop extends Component {
     })
   }
 
-  loadGoodsBuilding() {
+  loadGoodsBuilding () {
     const payload = {
 
       cityId: this.props.curCity.id
@@ -115,7 +115,7 @@ export default class Shop extends Component {
     })
   }
 
-  handleClick(value) {
+  handleClick (value) {
 
     this.setState({
       current: value
@@ -136,32 +136,32 @@ export default class Shop extends Component {
 
   }
 
-  onViewDetail(item) {
+  onViewDetail (item) {
     Taro.navigateTo({
       url: `/pages/shop/detail/index?id=${item.goodsId}`
     })
   }
 
-  goPointRecords() {
+  goPointRecords () {
     const { person: { points } } = this.props.userInfo
     Taro.navigateTo({
       url: `/pages/shop/integralDetail/index?points=` + points
     })
   }
 
-  goPointRule() {
+  goPointRule () {
     Taro.navigateTo({
       url: `/pages/shop/rule/index`
     })
   }
 
-  handleLocationClick() {
+  handleLocationClick () {
     Taro.navigateTo({
       url: `/pages/city/index`
     })
   }
 
-  doSign() {
+  doSign () {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
       return
@@ -183,7 +183,7 @@ export default class Shop extends Component {
     })
   }
 
-  loadUserInfo() {
+  loadUserInfo () {
     // debugger
     queryUserInfo().then(user => {
       console.log(user, "user")
@@ -196,14 +196,14 @@ export default class Shop extends Component {
     })
   }
 
-  renderLogin() {
+  renderLogin () {
     return <Authorize></Authorize>
   }
   handleBannerClick = (item) => {
     console.log(this, "this")
     this.redirectTo(item)
   }
-  redirectTo({ targetId, contentType, buildingId } = {}) {
+  redirectTo ({ targetId, contentType, buildingId } = {}) {
     switch (contentType) {
       // 项目
       case 'project':
@@ -248,7 +248,7 @@ export default class Shop extends Component {
     }
   }
 
-  renderGoods() {
+  renderGoods () {
     const { goods: { records = [] } } = this.props
     const { goodsList, goodsBuilding, current } = this.state
 
@@ -261,9 +261,9 @@ export default class Shop extends Component {
             {
               goodsList.length &&
               goodsList.map(item => (
-                
+
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
-                  {console.log(item,'--item---')}
+                  {console.log(item, '--item---')}
                   <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
                   <View className="item__title">{item.goodsName}</View>
                   <View className="item__des">
@@ -288,7 +288,7 @@ export default class Shop extends Component {
         {
           goodsBuilding && goodsBuilding.length >= 2 &&
           <View className="list__wrap">
-            <View className="hot_title" style={{marginBottom:'0'}}>热门商品</View>
+            <View className="hot_title" style={{ marginBottom: '0' }}>热门商品</View>
             <AtTabs scroll tabDirection='horizontal' current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
 
               {goodsBuilding.map((l_item, index) => (
@@ -330,7 +330,7 @@ export default class Shop extends Component {
     )
   }
 
-  renderDetail() {
+  renderDetail () {
     const { user, points } = this.state
     const { userInfo: { person }, curCity } = this.props
     const { bannerList = [] } = this.state
@@ -389,7 +389,7 @@ export default class Shop extends Component {
     );
   }
 
-  render() {
+  render () {
     const { person: { phone, tel } } = this.props.userInfo
 
     return (

src/pages/shop/record/index.js

@@ -74,7 +74,7 @@ export default class Index extends Component {
 									<Image className="botttom_img" mode="aspectFill" src={item.image} />
 									<View className="bottom-right">
 										<View className="bottom-right-top">
-											<View className="product-name">{item.targetName}</View>
+											<View className="product-name" style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',width:'300rpx' }}>{item.targetName}</View>
 											<View className="product-score">{item.points}积分</View>
 										</View>
 										<View className="bottom-right-down">领取地址:{item.address}</View>

src/pages/shop/record/index.scss

@@ -61,6 +61,7 @@
 					width: 100%;
 					display: flex;
 					justify-content: space-between;
+			
 					.product-score{
 						color:rgba(255,59,51,1);
 					}