1007395918@qq.com 5 vuotta sitten
vanhempi
commit
1ed9d57ac6

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

@@ -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.pawoma.cn"',//测试
9
-    // WSS_HOST: '"wss://dev.pawoma.cn"',
8
+    HOST: '"https://dev.pawoma.cn"',//测试
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.10'

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

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

+ 1
- 1
project.config.json Näytä tiedosto

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

BIN
src/onlineSelling/assets/explain.png Näytä tiedosto


BIN
src/onlineSelling/assets/record.png Näytä tiedosto


BIN
src/onlineSelling/assets/share.png Näytä tiedosto


+ 32
- 15
src/onlineSelling/components/HouseGrid/Unit.js Näytä tiedosto

@@ -1,22 +1,39 @@
1
+import Taro, { Component, render } from '@tarojs/taro'
1 2
 import { View, Text } from "@tarojs/components";
2 3
 import Floor from "./Floor";
3 4
 import './unit.scss'
4 5
 
5
-export default function Unit(props) {
6
-  const {termName, blockName, unitName, floorList = [] } = props.dataset || {}
7 6
 
8
-  return (
9
-    <View className="unit">
10
-      <View className="head">
11
-        <Text className="item">{termName}</Text>
12
-        <Text className="item">{blockName}</Text>
13
-        <Text className="item">{unitName}</Text>
14
-      </View>
15
-      <View className="body">
16
-        {floorList.map((floor) => {
17
-          return <Floor key={floor.floorId} dataset={floor} onRoomClick={props.onRoomClick} />
18
-        })}
7
+export default class Unit extends Component {
8
+
9
+  onShowMoreClick = (item) => {
10
+
11
+    if (!item.noshow) {
12
+      item.noshow = true
13
+    } else {
14
+      item.noshow = false
15
+    }
16
+    this.setState({})
17
+  }
18
+  render() {
19
+    const { termName, blockName, unitName, noshow = false, floorList = [] } = this.props.dataset || {}
20
+    return (
21
+      <View className="unit">
22
+        <View className="head" onClick={() => this.onShowMoreClick(this.props.dataset)} >
23
+          <View>
24
+            <Text className="item">{termName}</Text>
25
+            <Text className="item">{blockName}</Text>
26
+            <Text className="item">{unitName}</Text>
27
+          </View>
28
+          <Image className="arrow" style={!noshow ? 'transform:rotate(90deg);' : ''} src={require('@/assets/person/arrow2.png')} mode="widthFix"></Image>
29
+        </View>
30
+        <View className="body" >
31
+          {!noshow && floorList.map((floor) => {
32
+            return <Floor key={floor.floorId} dataset={floor} onRoomClick={this.props.onRoomClick} />
33
+          })}
34
+        </View>
19 35
       </View>
20
-    </View>
21
-  )
36
+    )
37
+  }
38
+
22 39
 }

+ 7
- 1
src/onlineSelling/components/HouseGrid/unit.scss Näytä tiedosto

@@ -6,11 +6,17 @@
6 6
     line-height: 1.8em;
7 7
     color: #333;
8 8
     background-color: #F2F2F2;
9
-
9
+    display: flex;
10
+    align-items: center;
11
+    justify-content: space-between;
10 12
     .item {
11 13
       display: inline-block;
12 14
       margin-right: 32px;
13 15
     }
16
+    .arrow{
17
+      width: 16px;
18
+      transition: transform 0.6s ;
19
+    }
14 20
   }
15 21
 
16 22
   .body {

+ 3
- 3
src/onlineSelling/pages/houseList/index.scss Näytä tiedosto

@@ -54,13 +54,13 @@
54 54
     }
55 55
 
56 56
     .record {
57
-      background: #f2f2f2;
58
-      color: #333;
57
+      background: #BB9C79;
58
+      color: #fff;
59 59
       width: 58%;
60 60
     }
61 61
 
62 62
     .share {
63
-      background: #BB9C79;
63
+      background: #FF7500;
64 64
       color: #fff;
65 65
       width: 32%;
66 66
     }