xujing 5 years ago
parent
commit
4cae41643f
3 changed files with 14 additions and 7 deletions
  1. 1
    1
      config/dev.js
  2. 7
    2
      src/pages/project/index.js
  3. 6
    4
      src/pages/project/newsbanner/index.js

+ 1
- 1
config/dev.js View File

9
     // WSS_HOST: '"ws://192.168.2.43:8080"',
9
     // WSS_HOST: '"ws://192.168.2.43:8080"',
10
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
10
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
11
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
11
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
12
-    Version: 'V3.5.24'
12
+    Version: 'V3.5.21'
13
   },
13
   },
14
   weapp: {},
14
   weapp: {},
15
   h5: {}
15
   h5: {}

+ 7
- 2
src/pages/project/index.js View File

33
     maskBanner: '',
33
     maskBanner: '',
34
     shareImg: '',
34
     shareImg: '',
35
     imgDocument: '',
35
     imgDocument: '',
36
+    newImg:'',
36
     // adImage: advImageOfApp,
37
     // adImage: advImageOfApp,
37
     bannerList: [],
38
     bannerList: [],
38
     helpGroupList: [],
39
     helpGroupList: [],
87
     getIndexShare().then(res => {
88
     getIndexShare().then(res => {
88
 
89
 
89
       const shareInfo = (res || []).filter(item => item.imgType === 'index')[0]
90
       const shareInfo = (res || []).filter(item => item.imgType === 'index')[0]
91
+      const newsInfo = (res || []).filter(item => item.imgType === 'indexNews')[0]
90
       this.setState({
92
       this.setState({
91
         shareImg: (shareInfo || {}).imgUrl,
93
         shareImg: (shareInfo || {}).imgUrl,
92
         imgDocument: (shareInfo || {}).imgDocument,
94
         imgDocument: (shareInfo || {}).imgDocument,
95
+        newImg: (newsInfo || {}).imgUrl,
93
       })
96
       })
97
+      
98
+      // indexNews
94
       console.log(shareInfo, '首页分享信息')
99
       console.log(shareInfo, '首页分享信息')
95
     })
100
     })
96
   }
101
   }
503
   }
508
   }
504
 
509
 
505
   render() {
510
   render() {
506
-    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList } = this.state
511
+    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList,newImg } = this.state
507
     const { curCity, unReadNum, userInfo: { person: { personType } } } = this.props
512
     const { curCity, unReadNum, userInfo: { person: { personType } } } = this.props
508
 
513
 
509
     return (
514
     return (
572
                   </View>
577
                   </View>
573
                 }
578
                 }
574
                 {/* 资讯 */}
579
                 {/* 资讯 */}
575
-                <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
580
+                <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} newImg = {newImg} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
576
               </View >
581
               </View >
577
               {/* 参加活动*/}
582
               {/* 参加活动*/}
578
               {
583
               {

+ 6
- 4
src/pages/project/newsbanner/index.js View File

4
 import dayjs from 'dayjs'
4
 import dayjs from 'dayjs'
5
 import { connect } from '@tarojs/redux'
5
 import { connect } from '@tarojs/redux'
6
 
6
 
7
-@connect(state => ({...state.city, ...state.user }))
7
+@connect(state => ({ ...state.city, ...state.user }))
8
 export default class SwiperBanner extends Component {
8
 export default class SwiperBanner extends Component {
9
   static options = {
9
   static options = {
10
     addGlobalClass: true,
10
     addGlobalClass: true,
48
 
48
 
49
   render() {
49
   render() {
50
     if (!this.state.list.length) return null;
50
     if (!this.state.list.length) return null;
51
-
51
+    const { newImg } = this.props
52
+    console.log(newImg,'newImg')
52
     return (
53
     return (
53
       <View className="notice-box" >
54
       <View className="notice-box" >
54
         <View style="display: flex;align-items: center;">
55
         <View style="display: flex;align-items: center;">
55
           <View className="left-text">
56
           <View className="left-text">
56
-            <View className="up"> 地产</View >
57
-            <View className="down"> 头条</View >
57
+            {newImg  && <Image style="width:76rpx ; height:76rpx" src={newImg} >{console.log(newImg,'newImg')}</Image>}
58
+            {!newImg  && <View><View className="up"> 地产</View >
59
+              <View className="down"> 头条</View ></View >}
58
           </View >
60
           </View >
59
           <Swiper
61
           <Swiper
60
             className='notice-swiper'
62
             className='notice-swiper'