add guiyang loc

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://127.0.0.1:8080"',
-    WSS_HOST: '"ws://127.0.0.1:8080"',
+    // HOST: '"http://192.168.0.84:8080"',
+    // WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "橙蕉",
-	"appid": "wxe3b1e683853800b5",
+	"description": "知与行",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/components/BackHomeBtn/index.js

@@ -8,15 +8,72 @@ export default class Index extends Component {
   static defaultProps = {
     style: {}
   }
+  state ={
+    buttonTop: 0,
+    buttonLeft: 0,
+    windowHeight: '',
+    windowWidth: ''
+  }
+  componentDidShow(){
+    Taro.getSystemInfo({
+      success: function (res) {
+        console.log(res,"9999999999999")
+        realWindowWidth = res.windowWidth
+        realWindowHeight = res.windowHeight
+      }
+    })
+  
+  }
 
   handleClick() {
     Taro.switchTab({
       url: `/pages/project/index`
     })
   }
+  buttonStart=(e)=> {
+    console.log(e,"eeeeeeeeeeeee")
+    startPoint = e.touches[0]
+  }
+  buttonMove=(e)=> {
+    console.log(e,"888888888888888")
+    var endPoint = e.touches[e.touches.length - 1]
+    var translateX = endPoint.clientX - startPoint.clientX
+    var translateY = endPoint.clientY - startPoint.clientY
+    startPoint = endPoint
+    var buttonTop = this.state.buttonTop + translateY
+    var buttonLeft = this.state.buttonLeft + translateX
+    //判断是移动否超出屏幕
+    if (buttonLeft+50 >= this.state.windowWidth){
+      buttonLeft = this.state.windowWidth-50;
+    }
+    if (buttonLeft<=0){
+      buttonLeft=0;
+    }
+    if (buttonTop<=0){
+      buttonTop=0
+    }
+    if (buttonTop + 50 >= this.state.windowHeight){
+      buttonTop = this.state.windowHeight-50;
+    }
+    this.setState({
+      buttonTop: buttonTop,
+      buttonLeft: buttonLeft
+    })
+  }
+  buttonEnd=(e)=> {
+
+  }
+
   render() {
     return (
-      <View className="back-home" style={this.props.style} onClick={this.handleClick} >
+      // <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
+      //   <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
+      //   <Text className="text">首页</Text>
+      // </View>
+      <View className="back-home"
+       style={this.props.style} 
+       style='top:{this.state.buttonTop}px;left:{this.state.buttonLeft}px'
+       onClick={this.handleClick} ontouchmove={this.buttonMove} ontouchstart={this.buttonStart} ontouchend={this.buttonEnd} >
         {/* <Text className="iconfont icon-shouyeshouye"></Text> */}
         <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
         <Text className="text">首页</Text>

src/pages/activity/assembleItem/index.js

@@ -70,7 +70,7 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" src={data.mainImg} ></Image>
+        <Image className="pic" mode="aspectFill" src={data.mainImg} ></Image>
         <View className="title">{data.activityName}</View>
         {(!data.verificationCode && data.status == 1) &&
           <View className="time">参与截止时间: 

src/pages/activity/assistanceItem/index.js

@@ -69,7 +69,7 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        <Image className="pic" src={data.img} ></Image>
+        <Image className="pic" mode="aspectFill" src={data.img} ></Image>
         <View className="title">{data.title}</View>
         {(!data.verification && data.status == 1) &&
           <View className="time">参与截止时间:

src/pages/activity/detail/assemble.js

@@ -613,6 +613,7 @@ export default class Detail extends Component {
                 <View style="padding:0 40rpx 180rpx 40rpx">
                   <Image src={getThumbnail(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
                 </View>
+                { (actState === ActBeforeStart||(isStarter && actState === ActInProcess && groupState === GroupInProcess)||(!isStarter && actState === ActInProcess && groupState != GroupInProcess )||(!isStarter && actState === ActInProcess && groupState === GroupInProcess))&&
                 <View className="btn-fixed">
                   {
                     actState === ActBeforeStart &&
@@ -640,6 +641,7 @@ export default class Detail extends Component {
 
                   }
                 </View>
+                }
               </ScrollView>
 
               <action-sheet hidden={!actionSheetVisible} bindchange={this.toggleActionVisible}>

src/pages/activity/detail/index.js

@@ -206,6 +206,7 @@ export default class Detail extends Component {
           avatarurl: _avatarurl,//访问者头像
           poster: posters[0].posterImg,
           title: posters[0].posterTitle,//海报标题
+          posterDescription: posters[0].posterDescription,//海报标题
           createDate: createDate,//时间
         }
         resolve(data)
@@ -353,6 +354,8 @@ export default class Detail extends Component {
                     <import src='../../../components/wxParse/wxParse.wxml' />
                     <template is='wxParse' data='{{wxParseData:article.nodes}}' />
                   </View>
+                  <View style="color:#999;font-size:15px;margin:0 auto 90px auto;text-align:center">已经到底了~</View>
+
                 </View>
               </ScrollView>
 

src/pages/activity/detail/index.scss

@@ -190,7 +190,7 @@
   }
 
   &-con {
-    margin-bottom: 100px;
+    margin-bottom: 60px;
     &__title {
       font-size: 32px;
       font-weight: bold;

src/pages/activity/detail/poster.js

@@ -73,6 +73,18 @@ export default class Index extends Component {
         width: 560,
         zIndex: 999
       },
+      {
+        x: 30,
+        y: 890,
+        text: data.posterDescription||'活动描述',
+        fontSize: 28,
+        color: '#999',
+        baseLine: 'middle',
+        lineNum: 2,
+        lineHeight: 48,
+        width: 560,
+        zIndex: 999
+      },
       {
         x: 30,
         y: 1010,

src/pages/activity/item/index.js

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

src/pages/news/detail/index.js

@@ -169,6 +169,7 @@ export default class NewsDetail extends Component {
           nickname,//访问者名字
           avatarurl: _avatarurl,//访问者头像
           title: posters[0].posterTitle,//资讯海报标题
+          posterDescription: posters[0].posterDescription,//资讯海报描述
           createDate: createDate,//资讯时间
           poster: posters[0].posterImg
         }
@@ -220,7 +221,7 @@ export default class NewsDetail extends Component {
 
                   <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
                 </View>
-                <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={getThumbnail(detail.newsImg)}></Image>
+                {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={getThumbnail(detail.newsImg)}></Image> */}
                 <View className="detail-con">
                   <import src='../../../components/wxParse/wxParse.wxml' />
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />

src/pages/news/detail/poster.js

@@ -63,7 +63,7 @@ export default class Index extends Component {
       {
         x: 30,
         y: 820,
-        text: data.title,
+        text: data.title||'资讯标题',
         fontSize: 30,
         color: 'black',
         baseLine: 'middle',
@@ -73,6 +73,18 @@ export default class Index extends Component {
         width: 560,
         zIndex: 999
       },
+      {
+        x: 30,
+        y: 890,
+        text: data.posterDescription||'资讯描述',
+        fontSize: 28,
+        color: '#999',
+        baseLine: 'middle',
+        lineNum: 2,
+        lineHeight: 48,
+        width: 560,
+        zIndex: 999
+      },
       {
         x: 30,
         y: 1010,

src/pages/news/item.js

@@ -17,7 +17,7 @@ export default class NewsItem extends Component {
         <Image className="item-img" mode="aspectFill" 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')}</View>
+          <View className="item-con__date">于{dayjs(data.createDate).format('YYYY-MM-DD  HH:mm:ss')}发布</View>
         </View>
       </View>
     );

src/pages/news/item.scss

@@ -1,6 +1,6 @@
 @import "@styles/theme.scss";
 .item {
-  padding: 50px 0;
+  padding: 20px 0;
   border-bottom: solid 1px $border-color-light;
   display: flex;
   justify-content: space-between;
@@ -27,7 +27,7 @@
     }
 
     &__date {
-      font-size: $font-size-content;
+      font-size: 24px;
       color: $text-color-lighter;
 			margin-bottom: 20px;
     }

src/pages/policy/detail/index.js

@@ -13,7 +13,7 @@ import { connect } from '@tarojs/redux'
 @connect(state => state.user)
 export default class PolicyDetail extends Component {
   config = {
-    navigationBarTitleText: ''
+    navigationBarTitleText: '购房百科详情'
   }
 
   state = {
@@ -82,7 +82,7 @@ export default class PolicyDetail extends Component {
                   <View class="detail-title">{detail.title}</View>
                   <View className="detail-stat">
                     <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
-                    <View><Text className="iconfont icon-eye"></Text>{detail.publishUser || 0}</View>
+                    <View><Text className="iconfont icon-eye"></Text>{detail.pvNum || 0}</View>
                     {/* <View><Text className="iconfont icon-fenxiang1"></Text>{detail.shareNum || 0}</View> */}
                   </View>
                   <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={detail.policyImg}></Image>

src/pages/policy/index.js

@@ -11,7 +11,7 @@ let pageIndex = 1
 export default class Index extends Component {
 
   config = {
-    navigationBarTitleText: ''
+    navigationBarTitleText: '购房百科列表'
   }
 
   state = {

src/pages/policy/item/index.js

@@ -3,6 +3,7 @@ import dayjs from 'dayjs'
 import './item.scss'
 
 export default class PolicyItem extends Component {
+
   static defaultProps = {
     data: []
   }

src/pages/project/detail/index.js

@@ -2,6 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 
 import './index.scss'
 import Banner from '../banner'
+import HelpGroupBanner from '../swiper'
 import Poster from './poster'
 import ActivityItem from '../../activity/item'
 import BackHomeBtn from '@components/BackHomeBtn'
@@ -719,12 +720,12 @@ export default class Index extends Component {
           <View className="activity">
             <View className="title">助力活动</View>
             <View style={{ position: 'relative' }}>
-              <Banner
+              <HelpGroupBanner
                 style={{ height: '130px' }}
                 indicatorDots={false}
                 list={helpList}
                 onClick={this.handleHelpClick}>
-              </Banner>
+              </HelpGroupBanner>
             </View>
           </View>
         }
@@ -751,12 +752,12 @@ export default class Index extends Component {
             <View className="title">拼团活动</View>
             <View
               style={{ position: 'relative' }}>
-              <Banner
+              <HelpGroupBanner
                 style={{ height: '130px' }}
                 indicatorDots={false}
                 list={groupList}
                 onClick={this.handleGroupClick}>
-              </Banner>
+              </HelpGroupBanner>
             </View>
           </View>
         }
@@ -830,7 +831,7 @@ export default class Index extends Component {
                   {
                     activityList.map(item => (
                       <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this, item.dynamicId)}>
-                        <Image src={getThumbnail(item.imgUrl)} className="news-item__pic"></Image>
+                        <Image mode="aspectFill" src={getThumbnail(item.imgUrl)} className="news-item__pic"></Image>
                         <View className="news-item__title">{item.title}</View>
                       </View>
                     ))
@@ -861,7 +862,7 @@ export default class Index extends Component {
                   {
                     newsList.map(item => (
                       <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
-                        <Image src={getThumbnail(item.newsImg)} className="news-item__pic"></Image>
+                        <Image src={getThumbnail(item.newsImg)} mode="aspectFill" className="news-item__pic"></Image>
                         <View className="news-item__title">{item.newsName}</View>
                       </View>
                     ))

src/pages/project/detail/poster.js

@@ -63,7 +63,7 @@ export default class Index extends Component {
         width: 560,
         zIndex: 999
       },
-      ,{
+      {
         x: 30,
         y: 890,
         text: data.posterDescription,

src/pages/project/index.js

@@ -2,6 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import ProjectItem from './item'
 import Banner from './banner'
+import HelpGroupBanner from './swiper'
 import ActivityItem from '../activity/item'
 
 
@@ -505,7 +506,7 @@ export default class Index extends Component {
               position: 'relative', padding: '20px 20px 0 20px'
             }}>
 
-            <Banner
+            <HelpGroupBanner
               style={{
                 borderRadius: '6px',
                 height: '88px'
@@ -513,7 +514,7 @@ export default class Index extends Component {
               indicatorDots={false}
               list={helpGroupList}
               onClick={this.handleHelpGroupClick}>
-            </Banner>
+            </HelpGroupBanner>
           </View>
         }
 

src/pages/project/item/index.js

@@ -25,7 +25,7 @@ export default class Index extends Component {
     return (
       <View className='item' onClick={onClick.bind(this, data)}>
         <View className='item__top'>
-          <Image className='item__img' src={getThumbnail(imgSrc)}></Image>
+          <Image className='item__img' mode="aspectFill" src={getThumbnail(imgSrc)}></Image>
           {data.marketStatus &&
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
           <View className='item__right'>

src/pages/project/list/filter/index.js

@@ -129,7 +129,7 @@ export default class Index extends Component {
       if (selectedList.length === 1 && selectedList[0] === 0) {
         return ''
       }
-    
+
       // 类型
       if (tabIndex === 0) {
         let val = selectedList.map(index => curTabList[index])
@@ -197,8 +197,7 @@ export default class Index extends Component {
       maxPrice: e.detail.value
     })
   }
-
-  handleChangeKeywords(e) {
+  onInputText = e => {
     this.setState({
       keywords: e.detail.value
     })
@@ -299,7 +298,7 @@ export default class Index extends Component {
         <View className="search-box">
           <View className="search">
             <Text className="search-icon icon-sousuo iconfont"></Text>
-            <Input className="search-input" type="text" focus confirm-type="搜索" onConfirm={this.handleFilter} value={keywords} onChange={this.handleChangeKeywords} placeholder="请输入你想查询的楼盘"></Input>
+            <Input className="search-input" type="text" focus confirm-type="搜索" onConfirm={this.handleFilter} value={keywords} onInput={this.onInputText.bind(this)} placeholder="请输入你想查询的楼盘"></Input>
           </View>
           <View className="location" onClick={this.handleLocationClick}>
             <Text className="location-icon iconfont icon-daohangdizhi"></Text>

src/pages/project/swiper/index.js

@@ -0,0 +1,50 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
+// import { cdn } from '@constants/api'
+import './index.scss'
+import emptyImg  from '@assets/empty.png'
+import { getThumbnail} from '@utils/tools'
+
+export default class SwiperBanner extends Component {
+  static defaultProps = {
+    list: [],
+    indicatorDots: true,
+    style: {
+      height: '200px'
+    },
+    onClick: function () { }
+  }
+
+  onBannerClick(item) {
+    this.props.onClick(item)
+  }
+  render() {
+    const { list, style, indicatorDots, current } = this.props
+    return (
+      <View className='home-banner' style={style}>
+        <Swiper
+          className='home-banner__swiper'
+          circular
+          autoplay
+          indicatorDots={indicatorDots}
+          indicatorActiveColor='rgb(256,256,256)'
+        >
+          {list.map((item, index) => (
+            <SwiperItem
+              key={index}
+              onClick={this.onBannerClick.bind(this, item)}
+              className='home-banner__swiper-item'
+            >
+              <Image
+                mode="aspectFill"
+                style={style}
+                className='home-banner__swiper-item-img'
+                src={getThumbnail(item.image || item.url ||item.img||emptyImg)}
+              />
+            </SwiperItem>
+          ))}
+        </Swiper>
+      </View> 
+    )
+  }
+}

src/pages/project/swiper/index.scss

@@ -0,0 +1,23 @@
+@import "@styles/theme.scss";
+.home-banner {
+  width: 100%;
+  overflow: hidden;
+  height: 250px;
+}
+
+.home-banner__swiper {
+  // NOTE RN 的 Swiper 需要有高度，否则会报错
+  height: 100%;
+  &-item {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+
+    &-img {
+      width: 100%;
+      height: 100%!important;
+      overflow: hidden;
+      border-radius: 0;
+    }
+  }
+}

src/pages/shop/index.js

@@ -264,7 +264,7 @@ export default class Shop extends Component {
             {
               goodsList.map(item => (
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
-                  <Image className="item__img" src={item.imgUrl} />
+                  <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
                   <View className="item__title">{item.goodsName}</View>
                   <View className="item__des">
                     <View>
@@ -290,7 +290,7 @@ export default class Shop extends Component {
                     {
                       goodsList.map(item => (
                         <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
-                          <Image className="item__img" src={item.imgUrl} />
+                          <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
                           <View className="item__title">{item.goodsName}</View>
                           <View className="item__des">
                             <View>

src/pages/shop/index.scss

@@ -11,6 +11,9 @@
 .at-tabs__header{
   text-align: left;
 }
+.at-tabs__header::-webkit-scrollbar {
+  display:none;
+}
 // .bg {
 //   width: 100%;
 // }

src/pages/shop/record/index.js

@@ -71,7 +71,7 @@ export default class Index extends Component {
 									<View className="title-state">{item.status==0?"未领取":"已领取"}</View>
 								</View>
 								<View className="bottom">
-									<Image className="botttom_img" mode="aspectFit" src={item.image} />
+									<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>