Pārlūkot izejas kodu

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

张延森 5 gadus atpakaļ
vecāks
revīzija
b8dbf4fb93

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

@@ -9,8 +9,8 @@ module.exports = {
9 9
     WSS_HOST: '"wss://dev.pawoma.cn"',
10 10
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
11 11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
12
-    // HOST: '"https://lt.pawoma.cn"',
13
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
12
+    HOST: '"https://lt.pawoma.cn"',
13
+    WSS_HOST: '"wss://lt.pawoma.cn"',
14 14
     // HOST: '"http://127.0.0.1:8080"',
15 15
     // WSS_HOST: '"ws://127.0.0.1:8080"',
16 16
     Version: 'V3.5.9'

+ 1
- 1
project.config.json Parādīt failu

@@ -2,7 +2,7 @@
2 2
 	"miniprogramRoot": "dist/",
3 3
 	"projectname": "mini-chengjiao",
4 4
 	"description": "知与行联调",
5
-	"appid": "wxd861316a7493c1ee",
5
+	"appid": "wxd6f47a9bb3052175",
6 6
 	"setting": {
7 7
 		"urlCheck": false,
8 8
 		"es6": false,

+ 2
- 2
src/pages/project/detail/index.js Parādīt failu

@@ -1155,9 +1155,9 @@ export default class Index extends Component {
1155 1155
                       <View className="rest-info">
1156 1156
                         <View className='house-type__name'>{item.apartmentName || ''}</View>
1157 1157
                         <View className='construction__area'>
1158
-                          <Text>建面{item.buildingArea ? item.buildingArea + 'm²' : '待定'}</Text>
1158
+                          <Text>{item.buildingArea ? '建筑面积约' + item.buildingArea + 'm²' : '建筑面积待定'}</Text>
1159 1159
                           {
1160
-                            item.insideArea ? <Text>套内{item.insideArea}m²</Text> : <Text>套内待定</Text>
1160
+                            item.insideArea ? <Text>使用面积约{item.insideArea}m²</Text> : <Text>使用面积待定</Text>
1161 1161
                           }
1162 1162
                         </View>
1163 1163
                       </View>

+ 2
- 2
src/pages/project/index.js Parādīt failu

@@ -625,13 +625,13 @@ export default class Index extends Component {
625 625
               <View className="section section-top" style={{ marginTop: 0, paddingTop: 0 }}>
626 626
                 <View
627 627
                   style={{
628
-                    height: '500rpx', position: 'relative'
628
+                    height: '464rpx', position: 'relative'
629 629
                   }}>
630 630
                   {
631 631
                     this.state.visBanner && (
632 632
                       <Banner
633 633
                         style={{
634
-                          height: '500rpx'
634
+                          height: '464rpx'
635 635
                         }}
636 636
                         indicatorDots={false}
637 637
                         list={this.state.bannerList}