xujing 5 vuotta sitten
vanhempi
commit
cbe91908d1

+ 1
- 1
config/dev.js Näytä tiedosto

@@ -11,7 +11,7 @@ module.exports = {
11 11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12 12
     // HOST: '"http://192.168.2.52:8080"',
13 13
     // WSS_HOST: '"ws://192.168.2.52:8080"',
14
-    Version: 'V3.5.2.2_121112'
14
+    Version: 'V3.5.2.2_12121'
15 15
   },
16 16
   weapp: {},
17 17
   h5: {}

+ 1
- 1
config/prod.js Näytä tiedosto

@@ -9,7 +9,7 @@ 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
-    Version:'V3.5.2.2_2019-12-11'
12
+    Version:'V3.5.2.2_2019-12-12'
13 13
   },
14 14
   weapp: {},
15 15
   h5: {}

+ 1
- 1
src/pages/person/login/index.js Näytä tiedosto

@@ -33,7 +33,7 @@ export default class Index extends Component {
33 33
     const {isClick}=this.state
34 34
     const Phone=this.state.tel
35 35
 
36
-    if (!(/^1[3|4|5|7|8|9][0-9]\d{4,8}$/.test(Phone)) || Phone.length != 11) {
36
+    if (!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(Phone)) || Phone.length != 11) {
37 37
         Taro.showToast({
38 38
           title: '输入的手机号格式不对,请重新输入',
39 39
           icon: 'none'

+ 1
- 1
src/pages/person/personDetail/editDetail/index.js Näytä tiedosto

@@ -89,7 +89,7 @@ export default class editDetail extends Component {
89 89
       this.Alert('请输入电话号码')
90 90
       return;
91 91
     }
92
-    if (!(/^1[3|4|5|7|8|9][0-9]\d{4,8}$/.test(this.state.phone)) || this.state.phone.length != 11) {
92
+    if (!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(this.state.phone)) || this.state.phone.length != 11) {
93 93
       this.Alert('请输入正确的手机号码');
94 94
       return false;
95 95
     }

+ 1
- 1
src/pages/project/detail/Around/index.js Näytä tiedosto

@@ -67,7 +67,7 @@ export default function Around(props) {
67 67
   return (
68 68
     <View className="around-box">
69 69
       <View className="around-header">
70
-        <PoiAround style="width: 100vw; height: 480rpx;" current={curMarker} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap}/>
70
+        <PoiAround style="width: 100vw; height: 500rpx;" current={curMarker} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap}/>
71 71
       </View>
72 72
       <View className="around-body">
73 73
         <Tab dataset={dataList} onChange={handleTabChange} />

+ 1
- 1
src/pages/project/detail/Around/style.scss Näytä tiedosto

@@ -7,7 +7,7 @@
7 7
     
8 8
   .around-header {
9 9
     width: 100%;
10
-    height: 480px;
10
+    height: 500px;
11 11
   }
12 12
 
13 13
   .around-body {

+ 2
- 20
src/pages/project/detail/index.js Näytä tiedosto

@@ -692,14 +692,14 @@ export default class Index extends Component {
692 692
     }
693 693
 
694 694
     return (
695
-      <Block>
695
+      <View style="margin-bottom:-5px">
696 696
         <View className="section circum">
697 697
           <View className="section-head">
698 698
             <Text className="section-head__title">位置及周边配套</Text>
699 699
           </View>
700 700
         </View>
701 701
         <Around building={building} onAction={this.openMap.bind(this)}></Around>
702
-      </Block>
702
+      </View>
703 703
     )
704 704
   }
705 705
 
@@ -887,10 +887,7 @@ export default class Index extends Component {
887 887
     )
888 888
   }
889 889
   renderActivities() {
890
-
891
-
892 890
     const { activityList } = this.state
893
-
894 891
     return (
895 892
       <Block>
896 893
         {
@@ -914,10 +911,8 @@ export default class Index extends Component {
914 911
                   onClick={this.handActivityItemClick}
915 912
                 >
916 913
                 </HelpGroupBanner>
917
-
918 914
               </View>
919 915
             </View>
920
-
921 916
           )
922 917
         }
923 918
       </Block>
@@ -1002,8 +997,6 @@ export default class Index extends Component {
1002 997
   //     videoPlayShow: 'flex'e.detail
1003 998
   //   })
1004 999
   // }
1005
-
1006
-
1007 1000
   renderVideo() {
1008 1001
     const { videoPlayShow } = this.state
1009 1002
     const { projectDetail } = this.props
@@ -1193,41 +1186,30 @@ export default class Index extends Component {
1193 1186
                   </View>
1194 1187
                   {/* 项目顾问 */}
1195 1188
                   {this.renderConsuler()}
1196
-
1197 1189
                   {/* 周边 */}
1198 1190
                   {this.rendercircum()}
1199
-
1200 1191
                   {/* 户型介绍 */}
1201 1192
                   {this.renderHouseTypeList()}
1202
-
1203 1193
                   {/* 助力活动 */}
1204 1194
                   {this.renderHelp()}
1205
-
1206 1195
                   {/* 拼团活动 */}
1207 1196
                   {this.renderGroup()}
1208
-
1209 1197
                   {/* 新鲜资讯 */}
1210 1198
                   {this.renderNews()}
1211
-
1212 1199
                   {/* 热门活动 */}
1213 1200
                   {this.renderActivities()}
1214
-
1215 1201
                   {/* 相册 */}
1216 1202
                   {this.renderPhotoAlbum()}
1217
-
1218 1203
                   {/* 免责声明 */}
1219 1204
                   {this.renderStatement()}
1220 1205
                 </View>
1221 1206
               </ScrollView>
1222
-
1223 1207
               {/* 生成海报 */}
1224 1208
               {
1225 1209
                 posterStatus && (<Poster data={posterData} toggle={this.togglePosterStatus}></Poster>)
1226 1210
               }
1227
-
1228 1211
               {/* 底部菜单 */}
1229 1212
               {this.renderBottomMenu()}
1230
-
1231 1213
               {/* <View className="tel-entrance" onClick={this.makePhoneCall}>
1232 1214
                 <Text className="iconfont icon-dianhua2"></Text>
1233 1215
                 <Text className="text">电话</Text>

+ 0
- 3
src/pages/project/detail/index.scss Näytä tiedosto

@@ -1067,17 +1067,14 @@
1067 1067
 
1068 1068
   &__item {
1069 1069
     flex: 1 0 auto;
1070
-
1071 1070
     font-size: 32px;
1072 1071
     color: #666;
1073 1072
     line-height: 44px;
1074 1073
     padding: 4px 0;
1075
-
1076 1074
     &.active {
1077 1075
       color: #BB9C79;
1078 1076
       border-bottom: 1px solid #C8B299;
1079 1077
     }
1080
-
1081 1078
     &+& {
1082 1079
       margin-left: 64px;
1083 1080
     }

+ 1
- 1
src/pages/report/detail/index.js Näytä tiedosto

@@ -163,7 +163,7 @@ export default class ReportDetail extends Component {
163 163
       this.Alert("请输入客户电话");
164 164
       return false;
165 165
     }
166
-    if (!(/^1[3|4|5|7|8|9][0-9]\d{4,8}$/.test(phone)) || phone.length != 11) {
166
+    if (!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(phone)) || phone.length != 11) {
167 167
       this.Alert('请输入正确的手机号码');
168 168
       return false;
169 169
     }