zls

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.238:8080"',
-    WSS_HOST: '"ws://192.168.0.238:8080"',
+    HOST: '"http://192.168.0.218:8080"',
+    WSS_HOST: '"ws://192.168.0.218:8080"',
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -3,12 +3,12 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    // HOST: '"http://192.168.0.218:8080"',
-    // WSS_HOST: '"ws://192.168.0.218:8080"',
+    HOST: '"http://192.168.0.72:8080"',
+    WSS_HOST: '"ws://192.168.0.72:8080"',
     // HOST:  '"https://dev.jinchengjiaye.com"',
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    HOST: '"https://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
+    //   HOST: '"https://lt.pawoma.cn"',
+    //   WSS_HOST: '"wss://lt.pawoma.cn"',
   },
   weapp: {},
   h5: {}

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -162,6 +162,7 @@ class App extends Component {
       this.getRouterParams().then(router => {
         Taro.setStorageSync('router', router)
         console.info('router2:', router)
+        console.info('-----------')
         const { query: payload } = router
         // login
         login(payload, res => {

src/pages/activity/detail/assistance.js

@@ -515,7 +515,7 @@ export default class Detail extends Component {
             <View className="ass-page">
               <Notice></Notice>
               <View className="detail-banner">
-                <Image mode="widthFix" src={getThumbnail(detail.img)} className="detail-banner__img"></Image>
+                <Image mode="aspectFill" src={getThumbnail(detail.img)} className="detail-banner__img"></Image>
 
                 <View className="rest-time">
                   <Text className="row-label">{actState === ActBeforeStart ? '距活动开始 :' : (actState === ActInProcess ? '活动剩余时间 :' : '')} </Text>
@@ -612,7 +612,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="widthFix" style="width:100%;margin-bottom:20px;"></Image>
+                  <Image src={getThumbnail(detail.activityInstructions)} mode="aspectFill" style="width:100%;margin-bottom:20px;"></Image>
                 </View>
 
               </ScrollView>

src/pages/activity/detail/index.js

@@ -318,7 +318,7 @@ export default class Detail extends Component {
             <View>
               <Notice></Notice>
               <View className="detail-banner">
-                <Image mode="widthFix" src={getThumbnail(detail.imgUrl)} className="detail-banner__img"></Image>
+                <Image mode="aspectFill" src={getThumbnail(detail.imgUrl)} className="detail-banner__img"></Image>
               </View>
               <ScrollView
                 scrollY
@@ -369,13 +369,13 @@ export default class Detail extends Component {
                 {
                   posterShow && (
                     <Button className='btn poster-btn' onClick={() => { this.togglePosterStatus(true) }}>
-                      <Image mode="widthFix" src={require('@assets/tupian_3@3x.png')} className="btn-icon"></Image>
+                      <Image mode="aspectFill" src={require('@assets/tupian_3@3x.png')} className="btn-icon"></Image>
                       <Text className="txt">海报</Text>
                     </Button>
                   )
                 }
                 <Button className="btn share-btn" open-type="share">
-                  <Image mode="widthFix" src={require('@assets/fasong@3x.png')} className="btn-icon"></Image>
+                  <Image mode="aspectFill" src={require('@assets/fasong@3x.png')} className="btn-icon"></Image>
                   <Text className="txt">分享</Text>
                 </Button>
 
@@ -407,7 +407,7 @@ export default class Detail extends Component {
                   <Text className="page-section__title">报名信息</Text>
                   <View className='page-content'>
                     <Input className='inputName' onInput={this.onInputText.bind(this)} type='text' placeholder='请输入姓名' />
-                    <Picker mode='selector' range={this.state.selector} onChange={this.onChange}>
+                    <Picker mode='aspectFill' range={this.state.selector} onChange={this.onChange}>
                       <View className='picker'>
                         <Text>参加人数</Text>
                         <Text className='content'>{this.state.selectorChecked}</Text>

src/pages/activity/detail/index.scss

@@ -23,7 +23,7 @@
 .detail-banner {
   position: relative;
   overflow: hidden;
-  height: 624px;
+  height: 600px;
   width: 100%;
 
   &__img {

src/pages/activity/item/index.scss

@@ -71,7 +71,7 @@
   }
   .pic {
     width: 100%;
-    height:332px;
+    height:388px;
     display: block;
   }
 

src/pages/agent/become/index.js

@@ -122,7 +122,7 @@ export default class Index extends Component {
     const { userInfo: { person: { phone } } } = this.props
     return (
       <View className='page'>
-        <Image src={bannerImg} className='banner' mode='widthFix'></Image>
+        <Image src={bannerImg} className='banner' mode='aspectFill'></Image>
         <View className='become_agent'>
           {/* <View className='agent_type'>
             <Text className='agent_title'>经纪人类型</Text>

src/pages/agent/index.js

@@ -87,7 +87,7 @@ export default class Index extends Component {
         {/* 生成海报 */}
         {posterVisible && (<Poster data={posterData} toggle={this.toggleMakePosterModal}></Poster>)}
         <View className='page'>
-          <Image src={topImg} className='top_img' mode='widthFix'></Image>
+          <Image src={topImg} className='top_img' mode='aspectFill'></Image>
           <View className='agent_info'>
             <Image src={agent.avatarurl} className='agent_avatar'></Image>
             <View className='agent_info-center'>

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="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>
+          <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>
           {/* <Image className='client__img' src={headImg}></Image> */}
         </View>
         <View className='progress__infor'>

src/pages/card/index.js

@@ -432,10 +432,10 @@ export default class Index extends Component {
             <ScrollView scrollY>
               <View className='mycard__user__info'>
                 <View className='mycard__user__imgox'>
-                  <Image className='mycard__user__img' src={picture} mode="widthFix"></Image>
+                  <Image className='mycard__user__img' src={picture} mode="aspectFill"></Image>
                   <Image src={picture} mode="aspectFill" className='head__img'></Image>
                 </View>
-                <Image src={require('@assets/person/top.png')} className='top-img' mode="widthFix"></Image>
+                <Image src={require('@assets/person/top.png')} className='top-img' mode="aspectFill"></Image>
               </View>
 
               <View className='mycard__user__information'>
@@ -464,7 +464,7 @@ export default class Index extends Component {
 
                 </View>
                 <View className='row medal'>
-                  <Image mode="widthFix" className="img" src={require('@assets/person/jinpai.png')}></Image>
+                  <Image mode="aspectFill" className="img" src={require('@assets/person/jinpai.png')}></Image>
                   <Text>金牌置业顾问</Text>
                 </View>
 

src/pages/im/msgItem/index.js

@@ -62,7 +62,7 @@ export default class MsgItem extends Component {
       )
     }
     if (row.messageType === 'image') {
-      return (<Image className="item__content-img" mode="widthFix" src={row.message} onClick={this.onPreviewImg.bind(this, row)} />)
+      return (<Image className="item__content-img" mode="aspectFill" src={row.message} onClick={this.onPreviewImg.bind(this, row)} />)
     }
 
     return (<View className="item__content-txt">{row.message}</View>)

src/pages/news/item.js

@@ -14,7 +14,7 @@ export default class NewsItem extends Component {
     const { data } = this.props
     return (
       <View className="item" key={data.newsId} onClick={this.handleClick}>
-        <Image className="item-img" mode="aspectFill" src={getThumbnail(data.newsImg)}></Image>
+        <Image className="item-img"  src={getThumbnail(data.newsImg)}></Image>
         <View className="item-con">
           <View className="item-con__title">{data.newsName}</View>
           <View className="item-con__date">于{dayjs(data.createDate).format('YYYY-MM-DD  HH:mm:ss')}发布</View>

src/pages/news/item.scss

@@ -4,16 +4,16 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-	margin:0 30px;
+	// margin:0 30px;
 
   &-img {
-    width: 350px;
-    height: 160px;
-    margin-right: 30px;
+    width:220px;
+height:176px;
+    // margin-right: 60px;
   }
 
   &-con {
-    width: 100%;
+    width:450px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;

src/pages/person/index.js

@@ -5,7 +5,7 @@ import { ROLE_CODE } from '@constants/user'
 import { queryUserInfo, doUserSignin } from '@services/user'
 import { connect } from '@tarojs/redux'
 import Notice from '@components/Notice'
-import { getCodeMessage, putRegisterConsultant} from '@services/getCode'
+import { getCodeMessage, putRegisterConsultant } from '@services/getCode'
 import * as actions from '@actions/user'
 import Authorize from '@components/authorize'
 
@@ -90,8 +90,8 @@ export default class Person extends Component {
       }
     }
     else {
-   
-    
+
+
       putRegisterConsultant().then(res => {
         // console.log("匹配成功，请退出小程序重新登录即可")
         Taro.showToast({
@@ -100,7 +100,8 @@ export default class Person extends Component {
       }).catch(err => {
         console.error(err)
         Taro.showToast({
-          title: "匹配失败，请联系相关管理人员"
+          title: "匹配失败，请联系相关管理人员",
+          icon: "none"
         })
       })
     }
@@ -157,7 +158,7 @@ export default class Person extends Component {
       <View className="person">
         <Notice></Notice>
         <View className="info">
-          <Image className="bg" src={require('@assets/mine/background.png')} mode='widthFix'></Image>
+          <Image className="bg" src={require('@assets/mine/background.png')} mode='aspectFill'></Image>
           <View className="content">
             <View className="info-block">
               <View className="avatar" onClick={this.goPersonDetail}>
@@ -169,14 +170,14 @@ export default class Person extends Component {
                 <View className="info-text__name">{user.name ? user.name : user.nickname}</View>
                 <View className="info-text__intro">积分 {user.points || 0}</View>
               </View>
-              {
+              {/* {
                 user.personType != 'customer' && (
                   <Navigator url={`/pages/person/spread/index`} className="tuiguang">
                     <Image style="width:40px;height:36px" src={require('@assets/mine/tuiguangma.png')} ></Image>
                     <View className="info-text__intro" style="margin:4px 0 0 4px">推广码</View>
                   </Navigator>
                 )
-              }
+              } */}
             </View>
             {/* <View
               className={`sign__btn ${user.havaSigned && 'signed'}`}
@@ -195,16 +196,16 @@ export default class Person extends Component {
         <View>
           {
             menus.map((group, ginx) => {
-           
+
               return (
                 <Block key={`grp-${ginx}`}>
                   {
                     group.map((menu, inx) => {
                       return (
-                        <View onClick={() => this.redirectTo(menu.url)} className="menu-item-con" key={`menu-${inx}`}>
+                        <View onClick={() => this.redirectTo(menu.url)} style={{ color: menu.style }} className="menu-item-con" key={`menu-${inx}`}>
                           <Image className="left-icon" src={menu.icon} ></Image>
                           <View className="menu-maintext">
-                            <Text className="menu-name">{menu.name}</Text>
+                            <Text className="menu-name" style={ menu.style }>{menu.name}</Text>
                             <Text className="right-icon"></Text>
                           </View>
                         </View>

src/pages/person/menus.js

@@ -38,13 +38,15 @@ const menus = [
       icon: icons.homepage,
       extends: undefined,
       userTypes: [CONSULTANT],
+      style: '',
     },
     {
       name: '盘客工具',
       url: '/pages/person/customerAnalysis/index',
       icon: icons.homepage,
       extends: undefined,
-      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+      userTypes: [ CONSULTANT],
+      style: '',
     },
     // {
     //   name: '成为经纪人',
@@ -59,6 +61,7 @@ const menus = [
       icon: icons.recommend,
       extends: undefined,
       userTypes: [CUSTOMER,ESTATE_AGENT, CHANNEL_AGENT],
+      style: '',
     },
     // {
     //   name: '发展经纪人',
@@ -149,12 +152,14 @@ const menus = [
       icon: icons.development,
       extends: undefined,
       userTypes: [CUSTOMER,ESTATE_AGENT],
+      style: {color:'#888888'},
     },
     {
       name: '成为置业顾问',
       url: '',
       icon: icons.consultant,
       extends: undefined,
+      style: {color:'#888888'},
       userTypes: [CUSTOMER,ESTATE_AGENT],
     },
 

src/pages/project/banner/index.js

@@ -21,7 +21,7 @@ export default class SwiperBanner extends Component {
  
     const current = event.detail.current
    
-    this.props.onChange(current)
+    this.props.onChange|| this.props.onChange(current)
   
    
   
@@ -32,6 +32,8 @@ export default class SwiperBanner extends Component {
   }
   render () {
     const { list, style, indicatorDots, current } = this.props
+
+    console.log('banner',list)
     return (
       <View className='home-banner' style={style}>
         <Swiper

src/pages/project/detail/index.js

@@ -1,5 +1,5 @@
 import Taro, { Component } from '@tarojs/taro';
-import { View, Video } from '@tarojs/components'
+import { View, Video, SwiperItem, Swiper } from '@tarojs/components'
 import './index.scss'
 import Banner from '../banner'
 import HelpGroupBanner from '../swiper'
@@ -55,10 +55,12 @@ export default class Index extends Component {
     current: 1,
     btnstate: 1,// 1显示视频 0显示图片
     albumCurrent: 0,
+    videoPlayShow: 'flex',
   }
 
   componentWillMount () {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
+
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
       const id = this.$router.params.id || router.query.id
@@ -97,6 +99,7 @@ export default class Index extends Component {
 
   loadHelpGroupList () {
     const { buildingId } = this.state
+
     queryHelpGroup({ buildingId: buildingId }).then(res => {
       console.log(res, "buildingId")
       const helpList = []
@@ -574,28 +577,28 @@ export default class Index extends Component {
 
     const { albumCurrent } = this.state
 
-  
-  
+
+
     return (
 
-   
+
       <Block>
-        { list.length > 0 &&
+        {list.length > 0 &&
           (
             <View className='photos__type'>
               <View className='photos__type__title'>相册</View>
               <ScrollView scrollX>
                 <View className='photos__type__content' onClick={this.toViewAlbum}>
-          
+
                   <View className="around-tab">
                     {list.map((item, index) => {
-                      const { apartmentName} = item || {}
-                      const  buildingImgList = item.buildingImgList
-                     
-                    
+                      const { apartmentName } = item || {}
+                      const buildingImgList = item.buildingImgList
+
+
                       return (
                         <View
-                          style={{ marginRight: '8px' }}                  
+                          style={{ marginRight: '8px' }}
                         >
                           {/* {`${label}(${num})`} */}
                           <View>
@@ -703,7 +706,7 @@ export default class Index extends Component {
             <View className="title">助力活动</View>
             <View style={{ position: 'relative' }}>
               <HelpGroupBanner
-                style={{ height: '130px' }}
+                style={{ height: '250rpx' }}
                 indicatorDots={false}
                 list={helpList}
                 onClick={this.handleHelpClick}>
@@ -731,11 +734,12 @@ export default class Index extends Component {
       <Block>
         {groupList.length > 0 &&
           <View className="activity">
+            {console.log(groupList, '----groupList-----')}
             <View className="title">拼团活动</View>
             <View
               style={{ position: 'relative' }}>
               <HelpGroupBanner
-                style={{ height: '130px' }}
+                style={{ height: '250rpx' }}
                 indicatorDots={false}
                 list={groupList}
                 onClick={this.handleGroupClick}>
@@ -796,31 +800,69 @@ 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="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 className="activity">
+              {console.log(activityList, '----activityList-----')}
+              <View className="title">热门活动</View>
+              <View
+                style={{ position: 'relative' }}>
+                <HelpGroupBanner
+                  style={{ height: '250rpx' }}
+                  activityStyle={{ height: '334rpx' }}
+                  indicatorDots={false}
+                  list={activityList}
+                  type='activity'
+                // onClick={this.handleGroupClick}
+                >
+                </HelpGroupBanner>
+
               </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="aspectFill" src={getThumbnail(item.imgUrl)} className="news-item__pic"></Image>
-                        <View className="news-item__title">{item.title}</View>
-                      </View>
-                    ))
-                  }
-                </View>
-              </ScrollView>
             </View>
+            // <View className="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>
@@ -857,9 +899,39 @@ export default class Index extends Component {
       </Block>
     )
   }
+  plagVideo () {
+    let videoContext = wx.createVideoContext('myVideo')
+    console.log()
+    // this.setState({
+    //   videoPlayShow: 'none'
+    // })
+    videoContext.play()
+  }
+
+  onPlay () {
+    
+    console.log()
+    this.setState({
+      videoPlayShow: 'none'
+    })
+   
+  }
+
+  onPause () {
+   
+    this.setState({
+      videoPlayShow: 'flex'
+    })
+  
+  }
 
   renderVideo () {
+    const {videoPlayShow}  = this.state
     const { projectDetail } = this.props
+    const { videoImage } = projectDetail
+    const imgSrc = videoImage[0].url
+
+
     return (
       <View
         className="pro__banner"
@@ -868,21 +940,39 @@ export default class Index extends Component {
         <Video
           src={projectDetail.videoUrl}
           // src='http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
-          poster={getThumbnail(projectDetail.videoImage)}
+          poster={getThumbnail(imgSrc)}
           // poster='http://misc.aotu.io/booxood/mobile-video/cover_900x500.jpg'
           style={{
-            height: '278rpx',
-            width: '375rpx'
+            height: '600rpx',
+            width: '750rpx'
           }}
-          controls={true}
-          autoplay={false}
-        
-          initialTime='0'
-          id='video'
-          loop={false}
-          muted={false}
+          id='myVideo'
+          controls={false}
+          // autoplay={false}
+
+          // initialTime='0'
+         
+          // loop={false}
+          // muted={false}
           show-mute-btn='true'
+          onPlay={this.onPlay}
+          show-center-play-btn='false'
+          onPause= {this.onPause}
+          // show-center-play-btn= 'f'
         ></Video>
+        <Button className='pro__banner-btn' onClick={this.plagVideo} style={{ display: videoPlayShow  }}>
+          <Image src={require('@assets/play.png')} mode='scaleToFill' className='pro__banner-btn-img'></Image>
+        </Button>
+
+        {/* <Button className='pro__banner-btn' onClick={this.plagVideo} style={{ display: videoPlayShow }}>
+          <Image src={require('@assets/play.png')} mode='scaleToFill' className='pro__banner-btn-img'></Image>style={{ display: posterShow }}
+        </Button>
+
+        <Button className='pro__banner-btn' onClick={this.plagVideo} style={{ display: videoPlayShow }}>
+          <Image src={require('@assets/play.png')} mode='scaleToFill' className='pro__banner-btn-img'></Image>
+        </Button> */}
+
+      
       </View>
     )
   }
@@ -918,7 +1008,7 @@ export default class Index extends Component {
                     // current
                     onChange={this.changeCurrent.bind(this)}
                     style={{
-                      height: '278px'
+                      height: '600rpx'
                     }}
 
                   ></Banner>
@@ -928,7 +1018,7 @@ export default class Index extends Component {
 
               {btnstate === 1 && projectDetail.videoUrl != null && this.renderVideo()}
 
-        
+
               {btnstate === 1 && projectDetail.videoUrl != null && (<View className='media-btn'>
                 <View className='video-btn' style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }} >视频</View>
                 <View className='img-btn' onClick={() => this.setState({ btnstate: 0 })}>图片</View>

src/pages/project/detail/index.scss

@@ -48,7 +48,7 @@
 
 
   .wrap {
-    padding-top: 556px;
+    padding-top: 580px;
     background: transparent;
   }
 
@@ -116,11 +116,11 @@
     width: 320px;
     float: left;
     margin-bottom: 30px;
-    margin-right: 20px;
+    margin-right: 36px;
 
     &__pic {
-      width: 320px;
-      height: 240px;
+      width: 336px;
+      height: 268px;
       border-radius: 10px;
       background-color: #eee;
     }
@@ -793,13 +793,28 @@
     right: 5%;
     bottom: 30px;
   }
+
+  &-btn {
+    width: 110px;
+    height: 78px;
+    position: absolute;
+    top: 242px;
+    left: 320px;
+    padding: 0;
+    background: none;
+    &-img{
+      width: 110px;
+      height: 78px;
+    }
+  }
+
 }
 
 // 户型
 .house-type {
   position: relative;
   width: 100%;
-  padding: 40px;
+  padding: 30px;
   background: #fff;
   margin: 20px 0;
 

src/pages/project/index.js

@@ -47,7 +47,7 @@ export default class Index extends Component {
     vertical: true
   }
 
-  componentWillMount() {
+  componentWillMount () {
     this.qqmapsdk = new QQMapWX({
       key: 'TIIBZ-ZJG33-52T3L-Y3X4Q-NWKLV-KUB3B'
     })
@@ -70,7 +70,7 @@ export default class Index extends Component {
     })
   }
 
-  componentDidShow() {
+  componentDidShow () {
     if (this.props.curCity.id) {
       ready.queue(() => {
         this.loadData()
@@ -78,16 +78,24 @@ export default class Index extends Component {
     }
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
-  getLocation() {
-    const { cityList } = this.props
+  getLocation () {
+    const { cityList, userInfo: { person: { org } } } = this.props
+    let defaultCity = cityList.filter(item => {
+      return item.id == org.defaultCityId
+    })
+
+
+    console.log('-----defaultCity-->', defaultCity)
     Taro.getLocation().then(location => {
       Taro.setStorageSync('lat', location.latitude)
       Taro.setStorageSync('lon', location.longitude)
+
+
       this.qqmapsdk.reverseGeocoder({
         location,
         success: (res) => {
@@ -95,23 +103,32 @@ export default class Index extends Component {
           let city = res.result.address_component.city
 
           console.log('-----city-->', city)
+          console.log('-----cityList-->', cityList)
+
 
           let curCity = cityList.filter(item => {
             return item.name == city
           })
+
+
+
+
           Taro.showToast({
             title: `当前定位城市:${(curCity[0] || {}).name}`,
             icon: 'none',
           })
-          this.updateCity(curCity[0] || cityList[0])
+
+          this.updateCity(curCity[0] || defaultCity[0])
         },
         fail: (error) => {
+
+
           Taro.showToast({
             title: `定位城市错误...`,
             icon: 'none',
           })
           console.error(err)
-          this.updateCity(cityList[0])
+          this.updateCity(defaultCity[0])
         },
       })
     }).catch(err => {
@@ -127,140 +144,19 @@ export default class Index extends Component {
         })
       }
       console.error(err)
-      this.updateCity(cityList[0])
+      this.updateCity(defaultCity[0])
     })
   }
 
-  updateCity(payload) {
-    const NanJing = {
-      citycode: "025",
-      id: 320100,
-      initial: "N",
-      lat: "32.041544",
-      leveltype: 2,
-      lng: "118.767413",
-      name: "南京市",
-      parentid: 320000,
-      pinyin: "Nanjing",
-      shortname: "南京",
-      status: 1,
-      zipcode: "320100"
-    }
-
-    const GuiYang = {
-      citycode: "0851",
-      id: 520100,
-      initial: "G",
-      lat: "26.578343",
-      leveltype: 2,
-      lng: "106.713478",
-      name: "贵阳市",
-      parentid: 520000,
-      pinyin: "Nanjing",
-      shortname: "贵阳",
-      status: 1,
-      zipcode: "520100"
-    }
-    const LiuZhou = {
-      citycode: "0772",
-      id: 450200,
-      initial: "L",
-      lat: "24.314617",
-      leveltype: 2,
-      lng: "109.411703",
-      name: "柳州市",
-      parentid: 450000,
-      pinyin: "Liuzhou",
-      shortname: "柳州",
-      status: "1",
-      zipcode: "545001",
-    }
-    const KunMing = {
-      citycode: "0871",
-      id: 530100,
-      initial: "K",
-      lat: "25.040609",
-      leveltype: 2,
-      lng: "102.712251",
-      name: "昆明市",
-      parentid: 530000,
-      pinyin: "Kunming",
-      shortname: "昆明",
-      status: "1",
-      zipcode: "650500",
-    }
-    const HuZhou = {
-      citycode: "0572",
-      id: 330500,
-      initial: "H",
-      lat: "30.867198",
-      leveltype: 2,
-      lng: "120.102398",
-      name: "湖州市",
-      parentid: 330000,
-      pinyin: "Huzhou",
-      shortname: "湖州",
-      status: "1",
-      zipcode: "313000",
-    }
-
-
-    const appId = accountInfo.miniProgram.appId;
-    let params;
-
-    switch (appId) {
-      // 知与行
-      case 'wxd6f47a9bb3052175':
-        params = NanJing;
-        break;
-      // 橙蕉
-      case 'wxe3b1e683853800b5':
-        params = GuiYang;
-        break;
-      // 香颂
-      case 'wx09cd665abf378db7':
-        params = LiuZhou;
-        break;
-      // 诚通公园里
-      case 'wx7c72475f7f354d17':
-        params = HuZhou;
-        break;
-      // 北京城建
-      case 'wx766cfc5d8429c927':
-        params = NanJing;
-        break;
-      // 云南昊居
-      case 'wx03aca9d7d9b0b7f1':
-        params = KunMing;
-        break;
-      // 奥园金基
-      case 'wx7183d7d918a426d3':
-        params = NanJing;
-        break;
-      // 南京楼市
-      case 'wxb2175cd2ead31a60':
-        params = NanJing;
-        break;
-      // 融创
-      case 'wxe9e01aa4a3568f52':
-        params = NanJing;
-        break;
-      // 尾房宝
-      case 'wx755faa4b3ec76cd3':
-        params = NanJing;
-        break;
+  updateCity (payload) {
 
-      default:
-        params = payload;
-        break;
-    }
 
-    this.props.dispatchCitySelected(params).then(res => {
+    this.props.dispatchCitySelected(payload).then(res => {
       this.loadData()
     })
   }
 
-  loadData() {
+  loadData () {
     this.loadBannerList()
     this.loadHelpGroupList()
     this.loadNewsList()
@@ -268,7 +164,7 @@ export default class Index extends Component {
     this.loadList()
   }
 
-  loadOpenScreenBanner() {
+  loadOpenScreenBanner () {
     const payload = {
       // showPosition: 'index'
     }
@@ -286,7 +182,7 @@ export default class Index extends Component {
       })
     })
   }
-  loadBannerList() {
+  loadBannerList () {
     const { curCity } = this.props
     // 获取首页banner
     const payload = {
@@ -308,7 +204,7 @@ export default class Index extends Component {
     })
   }
 
-  loadHelpGroupList() {
+  loadHelpGroupList () {
     queryHelpGroup({ cityId: this.props.curCity.id, buildingId: '' }).then(res => {
       console.log(res, "res")
       this.setState({
@@ -319,7 +215,7 @@ export default class Index extends Component {
   }
 
 
-  loadNewsList() {
+  loadNewsList () {
     const { curCity } = this.props
     const payload = {
       pageNumber: 1,
@@ -335,7 +231,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityList() {
+  loadActivityList () {
     const { curCity } = this.props
     const payload = {
       pageNumber: 1,
@@ -353,7 +249,7 @@ export default class Index extends Component {
     })
   }
 
-  loadList() {
+  loadList () {
     const { keywords } = this.state
     const { curCity } = this.props
 
@@ -405,7 +301,7 @@ export default class Index extends Component {
     }
   }
 
-  onViewDetail(item) {
+  onViewDetail (item) {
     Taro.navigateTo({
       url: `/pages/project/detail/index?id=${item.buildingId}`
     })
@@ -416,7 +312,7 @@ export default class Index extends Component {
     this.redirectTo(item)
   }
 
-  redirectTo({ targetId, contentType, buildingId } = {}) {
+  redirectTo ({ targetId, contentType, buildingId } = {}) {
     switch (contentType) {
       // 项目
       case 'project':
@@ -461,7 +357,7 @@ export default class Index extends Component {
     }
   }
 
-  handleHelpGroupClick(item) {
+  handleHelpGroupClick (item) {
     if (item.type == 1) {
       Taro.navigateTo({
         url: '/pages/activity/detail/assistance?id=' + item.activityId
@@ -473,7 +369,7 @@ export default class Index extends Component {
     }
   }
 
-  handleMaskClose() {
+  handleMaskClose () {
     this.setState({
       maskVisible: false
     })
@@ -498,23 +394,23 @@ export default class Index extends Component {
     })
   }
 
-  handleMaskBannerClick(data) {
+  handleMaskBannerClick (data) {
     this.redirectTo(data)
   }
 
-  handleLocationClick() {
+  handleLocationClick () {
     Taro.navigateTo({
       url: `/pages/city/index`
     })
   }
 
-  handleToHouseList() {
+  handleToHouseList () {
     Taro.navigateTo({
       url: '/pages/project/list/index'
     })
   }
 
-  handleProItemClick() {
+  handleProItemClick () {
     Taro.navigateTo({
       url: '/pages/project/list/index'
     })
@@ -524,11 +420,11 @@ export default class Index extends Component {
   // CHANNEL_AGENT: 'channel agent', // 渠道经纪人
   // DRIFT: 'drift', // 游客
   // CUSTOMER: 'customer' // 客户
-  toRecomonedPage() {
+  toRecomonedPage () {
     const {
       userInfo: { person: { personType } }
     } = this.props
-    if (personType === ROLE_CODE['DRIFT'] ||  !personType) {
+    if (personType === ROLE_CODE['DRIFT'] || !personType) {
       // 游客或者客户 区别是否有电话
       Taro.navigateTo({
         url: `/pages/agent/become/index`
@@ -540,17 +436,17 @@ export default class Index extends Component {
       console.log(this.props.curCity.id, "this.props.curCity.id")
     }
   }
-  toMapHouse() {
+  toMapHouse () {
     Taro.navigateTo({
       url: `/pages/project/map/index`
     })
   }
 
 
-  renderProjectList() {
+  renderProjectList () {
     const { proList: { records } } = this.props
     const { helpGroupList } = this.state
-    console.log(records,'proList')
+    console.log(records, 'proList')
     return (
       <Block>
         {
@@ -580,18 +476,18 @@ export default class Index extends Component {
           )
         }
 
-        {console.log(helpGroupList,'helpGroupList')}
+        {console.log(helpGroupList, 'helpGroupList')}
         {
           helpGroupList.length > 0 &&
           <View
             style={{
-              position: 'relative', padding: '20px 20px 0 20px'
+              position: 'relative', padding: '20px 15px 0 15px'
             }}>
 
             <HelpGroupBanner
               style={{
                 borderRadius: '6px',
-                height: '88px'
+                height: '230rpx'
               }}
               indicatorDots={false}
               list={helpGroupList}
@@ -605,12 +501,11 @@ export default class Index extends Component {
     )
   }
 
-  renderMaskBanner() {
+  renderMaskBanner () {
     const { maskBanner } = this.state
     return (
       <View className="mask-banner">
         <View className="content">
-          {console.log(maskBanner,'maskBanner')}
           <Image
             mode="widthFix"
             className="img"
@@ -624,7 +519,7 @@ export default class Index extends Component {
   }
 
 
-  render() {
+  render () {
     const { curCity } = this.props
     const { newsList } = this.state
     const { userInfo: { person: { personType } } } = this.props
@@ -640,20 +535,20 @@ export default class Index extends Component {
               <View className="section section-top" style={{ marginTop: 0, paddingTop: 0 }}>
                 <View
                   style={{
-                    height: '250px', position: 'relative'
+                    height: '600rpx', position: 'relative'
                   }}>
                   {
                     this.state.visBanner && (
                       <Banner
                         style={{
-                          height: '250px'
+                          height: '600rpx'
                         }}
                         indicatorDots={true}
                         list={this.state.bannerList}
                         onClick={this.handleBannerClick}
-                        onChange={()=>(1)}
-                        >
-                    
+                        onChange={() => (1)}
+                      >
+
                       </Banner>
                     )
                   }

src/pages/project/index.scss

@@ -79,7 +79,7 @@
 
 .section {
   background: white;
-  padding: 20px 35px;
+  padding: 30px;
 
   &-head {
     @extend .flex;
@@ -140,7 +140,7 @@
 
 .sectionn-customer {
   margin-top: 0;
-
+  
   .section-content {
     display: flex;
     justify-content: space-between;
@@ -148,15 +148,19 @@
     background:rgba(248,240,237,1);
     box-shadow:0px 2px 4px 0px rgba(187,156,121,0.22);
     border-radius:12px;
-    padding: 0px 20px;
+    width:690px;
+height:172px;
+    // padding: 0px 20px;
 
     .section-content_img{
-      width: 204px;
-      height: 132px;
+      width: 124px;
+      height: 138px;
+      margin-right: 20px;
     }
     .logo_img{
-      width:108px;
-      height:88px;
+      width:130px;
+      height:106px;
+      margin-left: 20px;
     }
     &_title {
       display: flex;
@@ -386,7 +390,7 @@
 .houses {
   box-shadow:0px 2px 12px 2px rgba(29,29,29,0.09);
   background: white;
-  padding: 30px 40px 20px 40px;
+  padding: 30px 30px 20px 30px;
   // .section-content{
   //   .item:last-of-type{
   //     border:none;

src/pages/project/item/index.scss

@@ -15,8 +15,8 @@
     position: relative;
     .item__img {
       width: 100%;
-      height: 332px;
-      border-radius: 20px;
+      height:388px;
+      border-radius: 12px;
     }
     .item__status{
       position: absolute;

src/pages/project/swiper/index.js

@@ -1,5 +1,5 @@
 import Taro, { Component } from '@tarojs/taro'
-import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
+import { View, Swiper, SwiperItem, Image, Block } from '@tarojs/components'
 // import { cdn } from '@constants/api'
 import './index.scss'
 import emptyImg from '@assets/empty.png'
@@ -12,6 +12,10 @@ export default class SwiperBanner extends Component {
     style: {
       height: '200px'
     },
+    type:'',
+    // activityStyle: {
+    //   height: '200px'
+    // },
     onClick: function () { }
   }
 
@@ -19,10 +23,12 @@ export default class SwiperBanner extends Component {
     this.props.onClick(item)
   }
   render () {
-    const { list, style, indicatorDots, current } = this.props
+    const { list, style, indicatorDots, current, activityStyle,type } = this.props
+
+    const styles = activityStyle ? activityStyle : style
     return (
-      <View className='home-banner' style={style}>
-        {console.log(this.props, '---list---')}
+      <View className='home-banner' style={styles}>
+
         <Swiper
           className='home-banner__swiper'
           circular
@@ -36,13 +42,16 @@ export default class SwiperBanner extends Component {
               key={index}
               onClick={this.onBannerClick.bind(this, item)}
               className='home-banner__swiper-item'
-            >  {console.log(item, '---item1111---')}
-              <Image
-                mode="aspectFill"
-                style={style}
-                className='home-banner__swiper-item-img'
-                src={getThumbnail(item.bannerListImg || item.image || item.url || item.img || emptyImg)}
-              />
+            >
+              <View style={{ display: 'block' }}>
+                <Image
+                  mode="aspectFill"
+                  style={style}
+                  className='home-banner__swiper-item-img'
+                  src={getThumbnail(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || emptyImg)}
+                />
+                {type=='activity' && <View className='home-banner__swiper-item__title'> {item.title}</View>}
+              </View>
             </SwiperItem>
           ))}
         </Swiper>

src/pages/project/swiper/index.scss

@@ -1,23 +1,53 @@
+@import "@styles/mixins.scss";
 @import "@styles/theme.scss";
 .home-banner {
   width: 100%;
   overflow: hidden;
-  height: 250px;
+  height: 400px;
 }
 
 .home-banner__swiper {
   // NOTE RN 的 Swiper 需要有高度，否则会报错
+  // @extend .flex;
+  // align-items: flex-start;
   height: 100%;
   &-item {
+    width: 100%;
     display: flex;
     flex-direction: row;
     justify-content: center;
 
     &-img {
-      width: 100%;
-      height: 100%!important;
+      width: 750px;
+      // height: 100%!important;
       overflow: hidden;
       border-radius: 0;
     }
+    &__title {
+            margin:20px 30px 0;
+            font-size:28px;
+font-family:PingFangSC-Regular,PingFang SC;
+font-weight:400;
+color:rgba(0,0,0,1);
+line-height:30px;
+          }
+
   }
 }
+// &-item {
+//     width: 320px;
+//     float: left;
+//     margin-bottom: 30px;
+//     margin-right: 20px;
+
+//     &__pic {
+//       width: 320px;
+//       height: 256px;
+//       border-radius: 10px;
+//       background-color: #eee;
+//     }
+
+//     &__title {
+//       margin-top: 20px;
+//       font-size: $font-size-title;
+//     }

src/pages/shop/index.scss

@@ -28,19 +28,20 @@
 .user_box{
   height: 300px;
   background-color:$primary-color; 
-  padding: 20px;
+  padding: 20px 40px;
   .user_con{
   padding:20px 40px;
   background-color: #fff;
   border-radius: 12px;
   position: relative;
-  height: 260px;
+  height: 254px;
   .bg{
     position: absolute;
     top:0;
     left:0;
-    width: 100%;
-    height: 100%;
+
+    width: 670px;
+    height: 254px;
     border-radius: 12px;
 
   }
@@ -176,8 +177,8 @@
     border-radius:12px;
 
     &__img {
-      width: 100%;
-      height: 320px;
+      width:336px;
+      height:336px;
       border-radius: 12px 12px 0 0;
     }
     // &__exchange {

src/pages/shop/record/index.js

@@ -65,7 +65,7 @@ export default class Index extends Component {
           records.length === 0 ? <EmptyPage text="暂无兑换记录哦~" /> : (
             records.map(item => (
               <View className="list-item" key={item.recId} onClick={this.onViewDetail.bind(this, item)}>
-								<Image className="cardBg"  src={item.status==0?require('@assets/person/card2.png'):require('@assets/person/card1.png')}/>
+								<Image className="cardBg" mode="aspectFill"  src={item.status==0?require('@assets/person/card2.png'):require('@assets/person/card1.png')}/>
 								<View className="top">
 									<View className="title-time">兑换时间:{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>
 									<View className="title-state">{item.status==0?"未领取":"已领取"}</View>

src/pages/shop/record/index.scss

@@ -48,8 +48,8 @@
 			left: 0;
 			display:flex;
 			.botttom_img{
-				width:174px;
-				height:127px;
+				width:200px;
+				height:200px;
 				border-radius:7px;
 				margin-left: 27px;
 			}