xujing 5 years ago
parent
commit
701c8f69ab

+ 2
- 2
config/dev.js View File

@@ -9,8 +9,8 @@ module.exports = {
9 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://192.168.2.51:8080"',
13
+    // WSS_HOST: '"ws://192.168.2.51:8080"',
14 14
     Version: 'V3.5.3'
15 15
   },
16 16
   weapp: {},

+ 0
- 2
src/pages/project/detail/Around/Pannel.js View File

@@ -77,8 +77,6 @@ export default class Pannel extends Component {
77 77
     const { manualData = [] } = this.props.dataset || {}
78 78
     const activeKey = this.props.active
79 79
 
80
-    const fixdHeight = this.props.style || 'height: 300rpx'
81
-
82 80
     return (
83 81
       // <ScrollView scrollY style={fixdHeight} scrollTop={this.state.currentMarkerPos} onScroll={this.bindScroll}>
84 82
         <View className="around-pannel">

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

@@ -71,7 +71,7 @@ export default function Around(props) {
71 71
       </View>
72 72
       <ScrollView
73 73
         enableBackToTop
74
-        style=" padding-top: 818rpx; background: transparent;"
74
+        style=" padding-top: 800rpx; background: transparent;"
75 75
         scrollY>
76 76
         <View className="around-box" style="border-radius: 40rpx 40rpx 0 0;">
77 77
           <View className="building-con">
@@ -79,7 +79,7 @@ export default function Around(props) {
79 79
               <View className="building-name">{detail.buildingName}</View>
80 80
               <View className="building-address"><Image className="location" src={require('@assets/location.png')}></Image>{detail.address}</View>
81 81
             </View>
82
-            <View className="building-go" onClick={goto}>前往</View>
82
+            <View className="building-go" onClick={goto}>前往<Image className="goto" src={require('@assets/goto.png')}></Image></View>
83 83
           </View>
84 84
           <View className="around-body">
85 85
             <Tab dataset={dataList} className="around-tab" onChange={handleTabChange} />

+ 9
- 4
src/pages/project/detail/Around/style.scss View File

@@ -131,19 +131,17 @@
131 131
     color: #333;
132 132
   }
133 133
   .location{
134
-    width: 26px;
134
+    width: 25px;
135 135
     height: 30px;
136 136
     margin-right: 10px;
137 137
   }
138 138
   .building-address{
139 139
     font-size: 28px;
140 140
     color: #666;
141
-    display: flex;
142
-    align-items: center;
143 141
     margin-top: 8px;
142
+    width: 520px;
144 143
   }
145 144
   .building-go{
146
-    width:130px;
147 145
     height:72px;
148 146
     line-height: 72px;
149 147
     background:rgba(246,182,29,1);
@@ -151,5 +149,12 @@
151 149
     font-size: 28px;
152 150
     color:#fff;
153 151
     padding:0 20px;
152
+    display: flex;
153
+    align-items: center;
154
+    .goto{
155
+      width:44px;
156
+      height:44px;
157
+      margin-left: 20px;
158
+    }
154 159
   }
155 160
 }

+ 3
- 10
src/pages/project/detail/index.js View File

@@ -76,9 +76,7 @@ export default class Index extends Component {
76 76
       const router = Taro.getStorageSync('router')
77 77
       const consultant = this.$router.params.consultant || router.query.consultant
78 78
       if (consultant) {
79
-        console.log(consultant, "$$$$$$$$$$$$$$$$$$$$$$$$$$$4444")
80 79
         getCardDetail(consultant).then(res => {
81
-          console.log(res, "$$$$$$$$$$$$$$$$$$$$$$$$$$$")
82 80
           this.setState({
83 81
             consultData: res,
84 82
             consultShow: true
@@ -292,7 +290,6 @@ export default class Index extends Component {
292 290
   }
293 291
 
294 292
   onShareAppMessage = () => {
295
-    console.log(this.props, "his.props")
296 293
     const {
297 294
       projectDetail: { shareContents, buildingName, buildingId, poster },
298 295
       userInfo: { person: { personId, personType, userId } }
@@ -660,11 +657,8 @@ export default class Index extends Component {
660 657
 
661 658
     const listimg = list.filter(item => item.buildingImgList.length > 0)
662 659
 
663
-
664 660
     return (
665
-
666
-
667
-      <Block> {console.log(list, 'list')}
661
+      <Block> 
668 662
         {listimg.length > 0 &&
669 663
           (
670 664
             <View className='photos__type'>
@@ -678,7 +672,7 @@ export default class Index extends Component {
678 672
                       const buildingImgList = item.buildingImgList
679 673
                       const buildingImgUrl = buildingImgList.length > 0 ? buildingImgList[0].url : null
680 674
 
681
-                      console.log(buildingImgUrl, 'buildingImgUrl')
675
+                      // console.log(buildingImgUrl, 'buildingImgUrl')
682 676
 
683 677
                       // if (buildingImgUrl != null) {
684 678
                       return (<View key={index + "listimg"}>
@@ -929,7 +923,6 @@ export default class Index extends Component {
929 923
         {
930 924
           activityList.length > 0 && (
931 925
             <View className="activity" >
932
-
933 926
               <View className="section-head">
934 927
                 <Text className="section-head__title" style={{ margin: '10rpx 0 40rpx 35rpx' }}>热门活动</Text>
935 928
                 <View className="section-head__more" style={{ marginRight: '20rpx' }} onClick={this.handleActivityMoreClick}>
@@ -1086,7 +1079,7 @@ export default class Index extends Component {
1086 1079
   }
1087 1080
 
1088 1081
   changeCurrent(current) {
1089
-    console.log(current, 'current')
1082
+    // console.log(current, 'current')
1090 1083
     this.setState({
1091 1084
       current: current + 1
1092 1085
     })

+ 1
- 1
src/pages/project/detail/index.scss View File

@@ -785,7 +785,7 @@
785 785
   position: fixed;
786 786
   top: 0;
787 787
   width: 100%;
788
-  height: 600px;
788
+  height: 500px;
789 789
 
790 790
   &-img {
791 791
     width: 100%;

+ 1
- 26
src/pages/project/detail/map.js View File

@@ -1,13 +1,9 @@
1 1
 import Taro, { Component } from '@tarojs/taro';
2
-import { View } from '@tarojs/components'
3 2
 import './index.scss'
4 3
 import Around from './Around/index'
5
-import AchievePhone from '@components/achievePhone'
6
-import { savePoint, updatePoint } from '@services/common'
7
-import dayjs from 'dayjs'
4
+import { savePoint } from '@services/common'
8 5
 import 'dayjs/locale/zh-cn' // 按需加载
9 6
 import ready from '@utils/ready'
10
-import { getQrCodeParams } from '@utils/qrcode'
11 7
 import { connect } from '@tarojs/redux'
12 8
 import { dispatchProjectDetail } from '@actions/project'
13 9
 
@@ -33,33 +29,12 @@ export default class Index extends Component {
33 29
 
34 30
         })
35 31
     }
36
-    componentWillUnmount() {
37
-        const { recordId } = this.state
38
-        recordId && updatePoint(recordId)
39
-    }
40
-
41 32
     initPageData(id) {
42 33
 
43
-        // const id='82b54f4a1f5b981df572253792afbfa1' 
44 34
         this.setState({
45 35
             buildingId: id
46 36
         }, () => {
47 37
             this.loadDetail()
48
-
49
-            // 埋点
50
-            //   savePoint({
51
-            //     event: 'detail',
52
-            //     eventType: 'building',
53
-            //     propertyName: '项目详情',
54
-            //     targetId: id,
55
-            //     buildingId: id,
56
-            //     data: '{}'
57
-            //   }).then(res => {
58
-            //     this.setState({
59
-            //       recordId: res.recordId
60
-            //     })
61
-            //     console.log('项目详情')
62
-            //   })
63 38
         })
64 39
     }
65 40