xujing před 5 roky
rodič
revize
12fe85540f

+ 4
- 4
config/dev.js Zobrazit soubor

@@ -5,12 +5,12 @@ module.exports = {
5 5
   defineConstants: {
6 6
     // HOST: '"http://47.101.36.130:8085"',//测试
7 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 10
     // HOST: '"https://lt.pawoma.cn"',
11 11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    HOST: '"http://127.0.0.1:8080"',
13
-    WSS_HOST: '"ws://127.0.0.1:8080"',
12
+    // HOST: '"http://127.0.0.1:8080"',
13
+    // WSS_HOST: '"ws://127.0.0.1:8080"',
14 14
     Version: 'V3.5.3'
15 15
   },
16 16
   weapp: {},

+ 4
- 4
config/prod.js Zobrazit soubor

@@ -5,10 +5,10 @@ module.exports = {
5 5
   defineConstants: {
6 6
     // HOST: '"http://192.168.0.218:8080"',
7 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"',
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 12
     Version:'V3.5.2.3_2019-12-16'
13 13
   },
14 14
   weapp: {},

+ 12
- 10
src/components/consultant/index.js Zobrazit soubor

@@ -1,5 +1,6 @@
1 1
 import Taro, { Component } from '@tarojs/taro';
2 2
 import './index.scss'
3
+import { transferImage } from '@utils/tools'
3 4
 
4 5
 export default class Index extends Component {
5 6
     state = {
@@ -9,7 +10,8 @@ export default class Index extends Component {
9 10
         addGlobalClass: true,
10 11
     };
11 12
     static defaultProps = {
12
-        style: {}
13
+        style: {},
14
+        data: []
13 15
     }
14 16
     handleClick() {
15 17
         setTimeout(() => {
@@ -24,26 +26,26 @@ export default class Index extends Component {
24 26
                 show: true
25 27
             })
26 28
         }, 260)
27
-
28 29
     }
29 30
     render() {
30 31
         const { show } = this.state
32
+        const { data,style } = this.props
31 33
         return (
32
-            <View>
34
+            <View >
33 35
                 {/* {show && */}
34
-                <View className={show ? "consultant show" : "consultant hide"} style={this.props.style} onClick={this.handleClick}  >
36
+                <View className={show ? "consultant show" : "consultant hide"} style={style} onClick={this.handleClick}  >
35 37
                     <Image src={require('@assets/person/left.png')} className='left-img'></Image>
36
-                    <Image src="http://pic3.zhimg.com/50/v2-55f854baa56381deff541029d51662d0_hd.jpg" className='img'></Image>
37
-                    <View className="text">哈哈哈</View>
38
+                    <Image src={transferImage(data.touxiang)} className='img'></Image>
39
+                    <View className="text">{data.name}</View>
38 40
                 </View>
39 41
                 {/* } */}
40 42
                 {/* {!show && */}
41
-                <View className={show ? "consultant-more hide " : "consultant-more more-show "} style={this.props.style} >
43
+                <View className={show ? "consultant-more hide " : "consultant-more more-show "} style={style} >
42 44
                     <Image src={require('@assets/person/cancel.png')} onClick={this.handleClickTwo} className='cancel-img'></Image>
43
-                    <Image src="http://pic3.zhimg.com/50/v2-55f854baa56381deff541029d51662d0_hd.jpg" className='touxiang'></Image>
45
+                    <Image src={transferImage(data.touxiang)}  className='touxiang'></Image>
44 46
                     <View className="text">
45
-                        <View className="name">哈哈哈</View>
46
-                        <View className="company">南京橙蕉互动数字科技有限公司</View>
47
+                        <View className="name">{data.name}</View>
48
+                        <View className="company">{data.company}</View>
47 49
                     </View>
48 50
                     <Image src={require('@assets/person/phone.png')} className='phone-img'></Image>
49 51
                     <Image src={require('@assets/person/message.png')} className='message-img'></Image>

+ 5
- 4
src/pages/news/detail/index.js Zobrazit soubor

@@ -34,6 +34,7 @@ export default class NewsDetail extends Component {
34 34
     posterShow: 'none',
35 35
     posterData: {},
36 36
     posterVisible: false,
37
+    btnData: { name: '哈哈哈哈', touxiang: 'http://pic3.zhimg.com/50/v2-55f854baa56381deff541029d51662d0_hd.jpg', company: '南京橙蕉互动数字科技有限公司' }
37 38
   }
38 39
 
39 40
   componentWillMount() {
@@ -107,7 +108,7 @@ export default class NewsDetail extends Component {
107 108
     })
108 109
   }
109 110
   onShareAppMessage = () => {
110
-    const { detail: { shareContents,newsName, newsId, newsImg } } = this.state
111
+    const { detail: { shareContents, newsName, newsId, newsImg } } = this.state
111 112
     const { userInfo: { person: { personId } } } = this.props
112 113
     savePoint({
113 114
       event: 'share',
@@ -219,7 +220,7 @@ export default class NewsDetail extends Component {
219 220
     })
220 221
   }
221 222
   render() {
222
-    const { detail, loaded, isSaved, posterVisible, posterData, posterShow } = this.state
223
+    const { detail, loaded, isSaved, posterVisible, posterData, posterShow, btnData } = this.state
223 224
     return (
224 225
       <Block>
225 226
         {/* 生成海报 */}
@@ -244,10 +245,10 @@ export default class NewsDetail extends Component {
244 245
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />
245 246
                 </View>
246 247
               </ScrollView>
247
-              
248
+
248 249
               <Notice></Notice>
249 250
               <BackHomeBtn style="bottom:160px" ></BackHomeBtn>
250
-              {/* <Consultant></Consultant> */}
251
+              {/* <Consultant data={btnData}></Consultant> */}
251 252
 
252 253
               <View className="bot-nav flex">
253 254
                 <View className='btn poster-btn' style={{ display: posterShow }} onClick={() => { this.handleTogglePoster(true) }}>