张延森 5 lat temu
rodzic
commit
ddf4fd3937
4 zmienionych plików z 35 dodań i 23 usunięć
  1. 4
    4
      config/dev.js
  2. 5
    5
      config/prod.js
  3. 2
    2
      project.config.json
  4. 24
    12
      src/pages/project/index.js

+ 4
- 4
config/dev.js Wyświetl plik

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://47.101.36.130:8085"',//测试
6
     // HOST: '"http://47.101.36.130:8085"',//测试
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    HOST: '"https://dev.jinchengjiaye.com"',//测试
9
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
8
+    // HOST: '"https://dev.jinchengjiaye.com"',//测试
9
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
     // HOST: '"https://lt.pawoma.cn"',
10
     // HOST: '"https://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    // HOST: '"http://192.168.2.51:8080"',
13
-    // WSS_HOST: '"ws://192.168.2.51:8080"',
12
+    HOST: '"http://192.168.2.52:8080"',
13
+    WSS_HOST: '"ws://192.168.2.52:8080"',
14
     Version:'V3.5.2.2_12102'
14
     Version:'V3.5.2.2_12102'
15
   },
15
   },
16
   weapp: {},
16
   weapp: {},

+ 5
- 5
config/prod.js Wyświetl plik

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://192.168.0.218:8080"',
6
     // HOST: '"http://192.168.0.218:8080"',
7
     // WSS_HOST: '"ws://192.168.0.218:8080"',
7
     // WSS_HOST: '"ws://192.168.0.218:8080"',
8
-    HOST: '"https://dev.jinchengjiaye.com"',//测试
9
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
-    // HOST: '"https://lt.pawoma.cn"',
11
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    Version:'V3.5.2.2_12102'
8
+    // HOST: '"https://dev.jinchengjiaye.com"',//测试
9
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
+    HOST: '"https://lt.pawoma.cn"',
11
+    WSS_HOST: '"wss://lt.pawoma.cn"',
12
+    Version:'V3.5.2.2_2019-12-10'
13
   },
13
   },
14
   weapp: {},
14
   weapp: {},
15
   h5: {}
15
   h5: {}

+ 2
- 2
project.config.json Wyświetl plik

1
 {
1
 {
2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "mini-chengjiao",
3
 	"projectname": "mini-chengjiao",
4
-	"description": "知与行联调",
5
-	"appid": "wxd9ee3a9480a4e544",
4
+	"description": "尾房宝",
5
+	"appid": "wx755faa4b3ec76cd3",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 24
- 12
src/pages/project/index.js Wyświetl plik

36
     keywords: '',
36
     keywords: '',
37
     loaded: false,
37
     loaded: false,
38
     maskBanner: '',
38
     maskBanner: '',
39
-    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
39
+    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg',
40
+    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
40
     // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
41
     // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
42
+    adImage: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg',
41
     bannerList: [],
43
     bannerList: [],
42
     helpGroupList: [],
44
     helpGroupList: [],
43
     newsList: [],
45
     newsList: [],
169
     this.props.dispatchProjectScreen(payload).then(res => {
171
     this.props.dispatchProjectScreen(payload).then(res => {
170
       const banner = res[0]
172
       const banner = res[0]
171
 
173
 
172
-      const maskVisible = this.props.screenShow !== (banner || {}).contentId
174
+      const maskVisible = banner && this.props.screenShow !== (banner || {}).contentId
173
       // debugger
175
       // debugger
174
-      if (maskVisible && banner) {
176
+      if (maskVisible) {
175
         Taro.hideTabBar({
177
         Taro.hideTabBar({
176
           animation: true
178
           animation: true
177
         })
179
         })
179
 
181
 
180
       this.setState({
182
       this.setState({
181
         maskVisible,
183
         maskVisible,
182
-        maskBanner: banner
184
+        maskBanner: banner || {}
183
       }, () => {
185
       }, () => {
184
         const { dispatch } = getStore()
186
         const { dispatch } = getStore()
185
         dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
187
         dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
548
   }
550
   }
549
 
551
 
550
   renderMaskBanner() {
552
   renderMaskBanner() {
551
-    const { maskBanner } = this.state
553
+    const { maskBanner = {} } = this.state
552
     return (
554
     return (
553
       <View className="mask-banner">
555
       <View className="mask-banner">
554
         <View className="content">
556
         <View className="content">
576
 
578
 
577
   render() {
579
   render() {
578
     const { curCity } = this.props
580
     const { curCity } = this.props
579
-    const { newsList, achieve } = this.state
581
+    const { newsList, achieve, adImage } = this.state
580
     const { userInfo: { person: { personType, phone } } } = this.props
582
     const { userInfo: { person: { personType, phone } } } = this.props
581
     const { unReadNum, userInfo: { person } } = this.props
583
     const { unReadNum, userInfo: { person } } = this.props
582
     return (
584
     return (
622
                   (personType !== ROLE_CODE['CONSULTANT']) && (
624
                   (personType !== ROLE_CODE['CONSULTANT']) && (
623
                     <View className='section sectionn-customer' style={newsList.length ? "padding-bottom:0rpx;" : ""} >
625
                     <View className='section sectionn-customer' style={newsList.length ? "padding-bottom:0rpx;" : ""} >
624
                       <View className='section-content' onClick={this.toRecomonedPage.bind(this, personType)}>
626
                       <View className='section-content' onClick={this.toRecomonedPage.bind(this, personType)}>
625
-                        <Image src={require('@assets/index/logo.png')} className='logo_img' mode="widthFix"></Image>
626
-                        <View className='section-content_title'>
627
-                          <Text>推荐客户 赢积分好礼</Text>
628
-                          <Text>更多惊喜在积分商城等着你</Text>
629
-                        </View>
630
-                        <Image src={require('@assets/index/recommend.png')} className='section-content_img' mode="widthFix"></Image>
627
+                        {
628
+                          adImage ?
629
+                          (
630
+                            <Image src={adImage} style="width: 100%; height: 100%" mode="widthFix"></Image>
631
+                          ) :
632
+                          (
633
+                            <Block>
634
+                              <Image src={require('@assets/index/logo.png')} className='logo_img' mode="widthFix"></Image>
635
+                              <View className='section-content_title'>
636
+                                <Text>推荐客户 赢积分好礼</Text>
637
+                                <Text>更多惊喜在积分商城等着你</Text>
638
+                              </View>
639
+                              <Image src={require('@assets/index/recommend.png')} className='section-content_img' mode="widthFix"></Image>
640
+                            </Block>
641
+                          )
642
+                        }
631
                       </View>
643
                       </View>
632
                     </View>
644
                     </View>
633
                   )
645
                   )