许静 5 年前
父节点
当前提交
3d6b412116

+ 58
- 1
src/components/BackHomeBtn/index.js 查看文件

8
   static defaultProps = {
8
   static defaultProps = {
9
     style: {}
9
     style: {}
10
   }
10
   }
11
+  state ={
12
+    buttonTop: 0,
13
+    buttonLeft: 0,
14
+    windowHeight: '',
15
+    windowWidth: ''
16
+  }
17
+  componentDidShow(){
18
+    Taro.getSystemInfo({
19
+      success: function (res) {
20
+        console.log(res,"9999999999999")
21
+        realWindowWidth = res.windowWidth
22
+        realWindowHeight = res.windowHeight
23
+      }
24
+    })
25
+  
26
+  }
11
 
27
 
12
   handleClick() {
28
   handleClick() {
13
     Taro.switchTab({
29
     Taro.switchTab({
14
       url: `/pages/project/index`
30
       url: `/pages/project/index`
15
     })
31
     })
16
   }
32
   }
33
+  buttonStart=(e)=> {
34
+    console.log(e,"eeeeeeeeeeeee")
35
+    startPoint = e.touches[0]
36
+  }
37
+  buttonMove=(e)=> {
38
+    console.log(e,"888888888888888")
39
+    var endPoint = e.touches[e.touches.length - 1]
40
+    var translateX = endPoint.clientX - startPoint.clientX
41
+    var translateY = endPoint.clientY - startPoint.clientY
42
+    startPoint = endPoint
43
+    var buttonTop = this.state.buttonTop + translateY
44
+    var buttonLeft = this.state.buttonLeft + translateX
45
+    //判断是移动否超出屏幕
46
+    if (buttonLeft+50 >= this.state.windowWidth){
47
+      buttonLeft = this.state.windowWidth-50;
48
+    }
49
+    if (buttonLeft<=0){
50
+      buttonLeft=0;
51
+    }
52
+    if (buttonTop<=0){
53
+      buttonTop=0
54
+    }
55
+    if (buttonTop + 50 >= this.state.windowHeight){
56
+      buttonTop = this.state.windowHeight-50;
57
+    }
58
+    this.setState({
59
+      buttonTop: buttonTop,
60
+      buttonLeft: buttonLeft
61
+    })
62
+  }
63
+  buttonEnd=(e)=> {
64
+
65
+  }
66
+
17
   render() {
67
   render() {
18
     return (
68
     return (
19
-      <View className="back-home" style={this.props.style} onClick={this.handleClick} >
69
+      // <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
70
+      //   <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
71
+      //   <Text className="text">首页</Text>
72
+      // </View>
73
+      <View className="back-home"
74
+       style={this.props.style} 
75
+       style='top:{this.state.buttonTop}px;left:{this.state.buttonLeft}px'
76
+       onClick={this.handleClick} ontouchmove={this.buttonMove} ontouchstart={this.buttonStart} ontouchend={this.buttonEnd} >
20
         {/* <Text className="iconfont icon-shouyeshouye"></Text> */}
77
         {/* <Text className="iconfont icon-shouyeshouye"></Text> */}
21
         <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
78
         <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
22
         <Text className="text">首页</Text>
79
         <Text className="text">首页</Text>

+ 1
- 1
src/pages/activity/assembleItem/index.js 查看文件

70
     const { data, style } = this.props
70
     const { data, style } = this.props
71
     return (
71
     return (
72
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
72
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
73
-        <Image className="pic" src={data.mainImg} ></Image>
73
+        <Image className="pic" mode="aspectFill" src={data.mainImg} ></Image>
74
         <View className="title">{data.activityName}</View>
74
         <View className="title">{data.activityName}</View>
75
         {(!data.verificationCode && data.status == 1) &&
75
         {(!data.verificationCode && data.status == 1) &&
76
           <View className="time">参与截止时间: 
76
           <View className="time">参与截止时间: 

+ 1
- 1
src/pages/activity/assistanceItem/index.js 查看文件

69
     const { data, style } = this.props
69
     const { data, style } = this.props
70
     return (
70
     return (
71
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
71
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
72
-        <Image className="pic" src={data.img} ></Image>
72
+        <Image className="pic" mode="aspectFill" src={data.img} ></Image>
73
         <View className="title">{data.title}</View>
73
         <View className="title">{data.title}</View>
74
         {(!data.verification && data.status == 1) &&
74
         {(!data.verification && data.status == 1) &&
75
           <View className="time">参与截止时间:
75
           <View className="time">参与截止时间:

+ 2
- 0
src/pages/activity/detail/index.js 查看文件

354
                     <import src='../../../components/wxParse/wxParse.wxml' />
354
                     <import src='../../../components/wxParse/wxParse.wxml' />
355
                     <template is='wxParse' data='{{wxParseData:article.nodes}}' />
355
                     <template is='wxParse' data='{{wxParseData:article.nodes}}' />
356
                   </View>
356
                   </View>
357
+                  <View style="color:#999;font-size:15px;margin:0 auto 90px auto;text-align:center">已经到底了~</View>
358
+
357
                 </View>
359
                 </View>
358
               </ScrollView>
360
               </ScrollView>
359
 
361
 

+ 1
- 1
src/pages/activity/detail/index.scss 查看文件

190
   }
190
   }
191
 
191
 
192
   &-con {
192
   &-con {
193
-    margin-bottom: 100px;
193
+    margin-bottom: 60px;
194
     &__title {
194
     &__title {
195
       font-size: 32px;
195
       font-size: 32px;
196
       font-weight: bold;
196
       font-weight: bold;

+ 1
- 1
src/pages/activity/item/index.js 查看文件

16
     const { data, style } = this.props
16
     const { data, style } = this.props
17
     return (
17
     return (
18
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
18
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
19
-        <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg || data.imgUrl)}></Image>
19
+         <Image className="pic" mode="aspectFill" src={getThumbnail(data.mainImg || data.imgUrl)}></Image>
20
         <View className="box">
20
         <View className="box">
21
           <View className="title">{data.title}</View>
21
           <View className="title">{data.title}</View>
22
           {
22
           {

+ 1
- 1
src/pages/news/detail/index.js 查看文件

221
 
221
 
222
                   <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
222
                   <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
223
                 </View>
223
                 </View>
224
-                <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={getThumbnail(detail.newsImg)}></Image>
224
+                {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={getThumbnail(detail.newsImg)}></Image> */}
225
                 <View className="detail-con">
225
                 <View className="detail-con">
226
                   <import src='../../../components/wxParse/wxParse.wxml' />
226
                   <import src='../../../components/wxParse/wxParse.wxml' />
227
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />
227
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />

+ 2
- 2
src/pages/policy/detail/index.js 查看文件

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

+ 1
- 1
src/pages/policy/index.js 查看文件

11
 export default class Index extends Component {
11
 export default class Index extends Component {
12
 
12
 
13
   config = {
13
   config = {
14
-    navigationBarTitleText: ''
14
+    navigationBarTitleText: '购房百科列表'
15
   }
15
   }
16
 
16
 
17
   state = {
17
   state = {

+ 1
- 0
src/pages/policy/item/index.js 查看文件

3
 import './item.scss'
3
 import './item.scss'
4
 
4
 
5
 export default class PolicyItem extends Component {
5
 export default class PolicyItem extends Component {
6
+
6
   static defaultProps = {
7
   static defaultProps = {
7
     data: []
8
     data: []
8
   }
9
   }

+ 7
- 6
src/pages/project/detail/index.js 查看文件

2
 
2
 
3
 import './index.scss'
3
 import './index.scss'
4
 import Banner from '../banner'
4
 import Banner from '../banner'
5
+import HelpGroupBanner from '../swiper'
5
 import Poster from './poster'
6
 import Poster from './poster'
6
 import ActivityItem from '../../activity/item'
7
 import ActivityItem from '../../activity/item'
7
 import BackHomeBtn from '@components/BackHomeBtn'
8
 import BackHomeBtn from '@components/BackHomeBtn'
719
           <View className="activity">
720
           <View className="activity">
720
             <View className="title">助力活动</View>
721
             <View className="title">助力活动</View>
721
             <View style={{ position: 'relative' }}>
722
             <View style={{ position: 'relative' }}>
722
-              <Banner
723
+              <HelpGroupBanner
723
                 style={{ height: '130px' }}
724
                 style={{ height: '130px' }}
724
                 indicatorDots={false}
725
                 indicatorDots={false}
725
                 list={helpList}
726
                 list={helpList}
726
                 onClick={this.handleHelpClick}>
727
                 onClick={this.handleHelpClick}>
727
-              </Banner>
728
+              </HelpGroupBanner>
728
             </View>
729
             </View>
729
           </View>
730
           </View>
730
         }
731
         }
751
             <View className="title">拼团活动</View>
752
             <View className="title">拼团活动</View>
752
             <View
753
             <View
753
               style={{ position: 'relative' }}>
754
               style={{ position: 'relative' }}>
754
-              <Banner
755
+              <HelpGroupBanner
755
                 style={{ height: '130px' }}
756
                 style={{ height: '130px' }}
756
                 indicatorDots={false}
757
                 indicatorDots={false}
757
                 list={groupList}
758
                 list={groupList}
758
                 onClick={this.handleGroupClick}>
759
                 onClick={this.handleGroupClick}>
759
-              </Banner>
760
+              </HelpGroupBanner>
760
             </View>
761
             </View>
761
           </View>
762
           </View>
762
         }
763
         }
830
                   {
831
                   {
831
                     activityList.map(item => (
832
                     activityList.map(item => (
832
                       <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this, item.dynamicId)}>
833
                       <View className="news-item" key={item.dynamicId} onClick={this.handActivityItemClick.bind(this, item.dynamicId)}>
833
-                        <Image src={getThumbnail(item.imgUrl)} className="news-item__pic"></Image>
834
+                        <Image mode="aspectFill" src={getThumbnail(item.imgUrl)} className="news-item__pic"></Image>
834
                         <View className="news-item__title">{item.title}</View>
835
                         <View className="news-item__title">{item.title}</View>
835
                       </View>
836
                       </View>
836
                     ))
837
                     ))
861
                   {
862
                   {
862
                     newsList.map(item => (
863
                     newsList.map(item => (
863
                       <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
864
                       <View className="news-item" key={item.newsId} onClick={this.handNewsItemClick.bind(this, item.newsId)}>
864
-                        <Image src={getThumbnail(item.newsImg)} className="news-item__pic"></Image>
865
+                        <Image src={getThumbnail(item.newsImg)} mode="aspectFill" className="news-item__pic"></Image>
865
                         <View className="news-item__title">{item.newsName}</View>
866
                         <View className="news-item__title">{item.newsName}</View>
866
                       </View>
867
                       </View>
867
                     ))
868
                     ))

+ 3
- 2
src/pages/project/index.js 查看文件

2
 import './index.scss'
2
 import './index.scss'
3
 import ProjectItem from './item'
3
 import ProjectItem from './item'
4
 import Banner from './banner'
4
 import Banner from './banner'
5
+import HelpGroupBanner from './swiper'
5
 import ActivityItem from '../activity/item'
6
 import ActivityItem from '../activity/item'
6
 
7
 
7
 
8
 
475
               position: 'relative', padding: '20px 20px 0 20px'
476
               position: 'relative', padding: '20px 20px 0 20px'
476
             }}>
477
             }}>
477
 
478
 
478
-            <Banner
479
+            <HelpGroupBanner
479
               style={{
480
               style={{
480
                 borderRadius: '6px',
481
                 borderRadius: '6px',
481
                 height: '88px'
482
                 height: '88px'
483
               indicatorDots={false}
484
               indicatorDots={false}
484
               list={helpGroupList}
485
               list={helpGroupList}
485
               onClick={this.handleHelpGroupClick}>
486
               onClick={this.handleHelpGroupClick}>
486
-            </Banner>
487
+            </HelpGroupBanner>
487
           </View>
488
           </View>
488
         }
489
         }
489
 
490
 

+ 1
- 1
src/pages/project/item/index.js 查看文件

25
     return (
25
     return (
26
       <View className='item' onClick={onClick.bind(this, data)}>
26
       <View className='item' onClick={onClick.bind(this, data)}>
27
         <View className='item__top'>
27
         <View className='item__top'>
28
-          <Image className='item__img' src={getThumbnail(imgSrc)}></Image>
28
+          <Image className='item__img' mode="aspectFill" src={getThumbnail(imgSrc)}></Image>
29
           {data.marketStatus &&
29
           {data.marketStatus &&
30
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
30
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
31
           <View className='item__right'>
31
           <View className='item__right'>

+ 50
- 0
src/pages/project/swiper/index.js 查看文件

1
+import Taro, { Component } from '@tarojs/taro'
2
+import { View, Swiper, SwiperItem, Image } from '@tarojs/components'
3
+// import { cdn } from '@constants/api'
4
+import './index.scss'
5
+import emptyImg  from '@assets/empty.png'
6
+import { getThumbnail} from '@utils/tools'
7
+
8
+export default class SwiperBanner extends Component {
9
+  static defaultProps = {
10
+    list: [],
11
+    indicatorDots: true,
12
+    style: {
13
+      height: '200px'
14
+    },
15
+    onClick: function () { }
16
+  }
17
+
18
+  onBannerClick(item) {
19
+    this.props.onClick(item)
20
+  }
21
+  render() {
22
+    const { list, style, indicatorDots, current } = this.props
23
+    return (
24
+      <View className='home-banner' style={style}>
25
+        <Swiper
26
+          className='home-banner__swiper'
27
+          circular
28
+          autoplay
29
+          indicatorDots={indicatorDots}
30
+          indicatorActiveColor='rgb(256,256,256)'
31
+        >
32
+          {list.map((item, index) => (
33
+            <SwiperItem
34
+              key={index}
35
+              onClick={this.onBannerClick.bind(this, item)}
36
+              className='home-banner__swiper-item'
37
+            >
38
+              <Image
39
+                mode="aspectFill"
40
+                style={style}
41
+                className='home-banner__swiper-item-img'
42
+                src={getThumbnail(item.image || item.url ||item.img||emptyImg)}
43
+              />
44
+            </SwiperItem>
45
+          ))}
46
+        </Swiper>
47
+      </View> 
48
+    )
49
+  }
50
+}

+ 23
- 0
src/pages/project/swiper/index.scss 查看文件

1
+@import "@styles/theme.scss";
2
+.home-banner {
3
+  width: 100%;
4
+  overflow: hidden;
5
+  height: 250px;
6
+}
7
+
8
+.home-banner__swiper {
9
+  // NOTE RN 的 Swiper 需要有高度,否则会报错
10
+  height: 100%;
11
+  &-item {
12
+    display: flex;
13
+    flex-direction: row;
14
+    justify-content: center;
15
+
16
+    &-img {
17
+      width: 100%;
18
+      height: 100%!important;
19
+      overflow: hidden;
20
+      border-radius: 0;
21
+    }
22
+  }
23
+}

+ 2
- 2
src/pages/shop/index.js 查看文件

264
             {
264
             {
265
               goodsList.map(item => (
265
               goodsList.map(item => (
266
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
266
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
267
-                  <Image className="item__img" src={item.imgUrl} />
267
+                  <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
268
                   <View className="item__title">{item.goodsName}</View>
268
                   <View className="item__title">{item.goodsName}</View>
269
                   <View className="item__des">
269
                   <View className="item__des">
270
                     <View>
270
                     <View>
290
                     {
290
                     {
291
                       goodsList.map(item => (
291
                       goodsList.map(item => (
292
                         <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
292
                         <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
293
-                          <Image className="item__img" src={item.imgUrl} />
293
+                          <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
294
                           <View className="item__title">{item.goodsName}</View>
294
                           <View className="item__title">{item.goodsName}</View>
295
                           <View className="item__des">
295
                           <View className="item__des">
296
                             <View>
296
                             <View>

+ 3
- 0
src/pages/shop/index.scss 查看文件

11
 .at-tabs__header{
11
 .at-tabs__header{
12
   text-align: left;
12
   text-align: left;
13
 }
13
 }
14
+.at-tabs__header::-webkit-scrollbar {
15
+  display:none;
16
+}
14
 // .bg {
17
 // .bg {
15
 //   width: 100%;
18
 //   width: 100%;
16
 // }
19
 // }

+ 1
- 1
src/pages/shop/record/index.js 查看文件

71
 									<View className="title-state">{item.status==0?"未领取":"已领取"}</View>
71
 									<View className="title-state">{item.status==0?"未领取":"已领取"}</View>
72
 								</View>
72
 								</View>
73
 								<View className="bottom">
73
 								<View className="bottom">
74
-									<Image className="botttom_img" mode="aspectFit" src={item.image} />
74
+									<Image className="botttom_img" mode="aspectFill" src={item.image} />
75
 									<View className="bottom-right">
75
 									<View className="bottom-right">
76
 										<View className="bottom-right-top">
76
 										<View className="bottom-right-top">
77
 											<View className="product-name">{item.targetName}</View>
77
 											<View className="product-name">{item.targetName}</View>