xujing 5 gadus atpakaļ
vecāks
revīzija
57c7dc1e10

+ 4
- 4
config/dev.js Parādīt failu

@@ -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://192.168.2.52:8080"',
13
-    WSS_HOST: '"ws://192.168.2.52:8080"',
12
+    // HOST: '"http://192.168.2.52:8080"',
13
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
14 14
   },
15 15
   weapp: {},
16 16
   h5: {}

+ 1
- 1
src/pages/activity/detail/index.js Parādīt failu

@@ -413,7 +413,7 @@ export default class Detail extends Component {
413 413
                   <Text className="page-section__title">报名信息</Text>
414 414
                   <View className='page-content'>
415 415
                     <Input className='inputName' onInput={this.onInputText.bind(this)} type='text' placeholder='请输入姓名' />
416
-                    <Picker mode='aspectFill' range={this.state.selector} onChange={this.onChange}>
416
+                    <Picker mode='selector' range={this.state.selector} onChange={this.onChange}>
417 417
                       <View className='picker'>
418 418
                         <Text>参加人数</Text>
419 419
                         <Text className='content'>{this.state.selectorChecked}</Text>

+ 1
- 1
src/pages/project/index.scss Parādīt failu

@@ -427,7 +427,7 @@ height:172px;
427 427
 .houses {
428 428
   box-shadow:0px 2px 12px 2px rgba(29,29,29,0.09);
429 429
   background: white;
430
-  padding: 30px 30px 20px 30px;
430
+  padding: 30px 30px 0 30px;
431 431
   // .section-content{
432 432
   //   .item:last-of-type{
433 433
   //     border:none;

+ 1
- 1
src/pages/project/item/index.scss Parādīt failu

@@ -3,7 +3,7 @@
3 3
 
4 4
 .item {
5 5
   position: relative;
6
-  padding: 30px 0;
6
+  padding: 40px 0;
7 7
   border-bottom: 1px solid $border-color-light;
8 8
 
9 9
 //&:last-child {

+ 24
- 20
src/pages/project/middlePage.js Parādīt failu

@@ -14,30 +14,32 @@ export default class Index extends Component {
14 14
   state = {
15 15
     avatarVisible: true,
16 16
     phoneVisible: false,
17
-    pageInfo:{}
17
+    webViewVisible: false,
18
+    pageInfo: {}
18 19
   }
19 20
   componentWillMount() {
20
- 
21
+
21 22
 
22 23
     ready.queue(() => {
23
-      getHFiveDetail(this.$router.params.id).then(res=>{
24
+      getHFiveDetail(this.$router.params.id).then(res => {
24 25
         this.setState({
25
-          pageInfo:res
26
+          pageInfo: res
26 27
         })
27 28
       })
28
-      const { userInfo:{person} } = this.props
29
-      if (person.avatarurl ) {
29
+      const { userInfo: { person } } = this.props
30
+      if (person.avatarurl) {
30 31
         // 头像手机号都有
31
-        if(person.phone){
32
+        if (person.phone) {
32 33
           this.setState({
33
-            avatarVisible:false,
34
+            avatarVisible: false,
34 35
             phoneVisible: false,
36
+            webViewVisible:true,
35 37
           })
36
-        }else{
38
+        } else {
37 39
           this.onAvatarSuccess();
38 40
         }
39
-      }else{
40
-        if(person.phone){
41
+      } else {
42
+        if (person.phone) {
41 43
           this.setState({
42 44
             phoneVisible: false,
43 45
           })
@@ -49,7 +51,7 @@ export default class Index extends Component {
49 51
   // 授权头像成功
50 52
   onAvatarSuccess() {
51 53
     this.setState({
52
-      avatarVisible:false,
54
+      avatarVisible: false,
53 55
       phoneVisible: true,
54 56
     })
55 57
     console.log("授权头像成功!")
@@ -79,7 +81,6 @@ export default class Index extends Component {
79 81
           icon: 'none'
80 82
         })
81 83
         return
82
-        // this.toPage(false)
83 84
       }
84 85
     })
85 86
   }
@@ -91,19 +92,20 @@ export default class Index extends Component {
91 92
           icon: 'none'
92 93
         })
93 94
       } else {
94
-      console.log('授权手机成功')
95
-      this.setState({
96
-        phoneVisible: false,
97
-      })
95
+        console.log('授权手机成功')
96
+        this.setState({
97
+          phoneVisible: false,
98
+          webViewVisible:true,
99
+        })
98 100
       }
99 101
     })
100 102
   }
101 103
 
102 104
   renderMaskBanner() {
103
-    const { avatarVisible, phoneVisible,pageInfo } = this.state
105
+    const { avatarVisible, phoneVisible, pageInfo } = this.state
104 106
     return (
105 107
       <View>
106
-        <Image src={pageInfo.middleImg||bgImg} mode='widthFix' className='bg_img'></Image>
108
+        <Image src={pageInfo.middleImg || bgImg} mode='widthFix' className='bg_img'></Image>
107 109
         <View className="middle-page">
108 110
           {avatarVisible &&
109 111
             <View className="content">
@@ -114,7 +116,7 @@ export default class Index extends Component {
114 116
             </View>
115 117
           }
116 118
           {phoneVisible &&
117
-          <Button className="phone-btn" open-type="getPhoneNumber" lang="zh_CN" onGetphonenumber={this.getPhoneNumber}>点击授权查看详情</Button>
119
+            <Button className="phone-btn" open-type="getPhoneNumber" lang="zh_CN" onGetphonenumber={this.getPhoneNumber}>点击授权查看详情</Button>
118 120
           }
119 121
 
120 122
         </View>
@@ -122,9 +124,11 @@ export default class Index extends Component {
122 124
     )
123 125
   }
124 126
   render() {
127
+    const { pageInfo,webViewVisible } = this.state
125 128
     return (
126 129
       <Block>
127 130
         {this.renderMaskBanner()}
131
+        {webViewVisible&&<WebView src={pageInfo.h5Address} />}
128 132
       </Block>
129 133
     )
130 134
   }