林凡 5 lat temu
rodzic
commit
69d3908ca6
3 zmienionych plików z 8 dodań i 34 usunięć
  1. 0
    9
      config/dev.js
  2. 0
    9
      config/prod.js
  3. 8
    16
      src/pages/project/h5Page.js

+ 0
- 9
config/dev.js Wyświetl plik

@@ -5,18 +5,9 @@ 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"',
10
-    // HOST: '"https://lt.pawoma.cn"',
11
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-<<<<<<< HEAD
13 8
     HOST: '"http://192.168.2.52:8080"',
14 9
     WSS_HOST: '"ws://192.168.2.52:8080"',
15 10
     Version:'V3.5.2.2_1210'
16
-=======
17
-    // HOST: '"http://192.168.2.52:8080"',
18
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
19
->>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
20 11
   },
21 12
   weapp: {},
22 13
   h5: {}

+ 0
- 9
config/prod.js Wyświetl plik

@@ -5,18 +5,9 @@ module.exports = {
5 5
   defineConstants: {
6 6
     // HOST: '"http://192.168.0.218:8080"',
7 7
     // WSS_HOST: '"ws://192.168.0.218:8080"',
8
-<<<<<<< HEAD
9
-    // HOST: '"https://dev.jinchengjiaye.com"',
10
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
11 8
     HOST: '"https://lt.pawoma.cn"',
12 9
     WSS_HOST: '"wss://lt.pawoma.cn"',
13 10
     Version:'V3.5.2.2_1210'
14
-=======
15
-    HOST: '"https://dev.jinchengjiaye.com"',
16
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
17
-    // HOST: '"https://lt.pawoma.cn"',
18
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
19
->>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
20 11
   },
21 12
   weapp: {},
22 13
   h5: {}

+ 8
- 16
src/pages/project/h5Page.js Wyświetl plik

@@ -108,9 +108,14 @@ export default class Index extends Component {
108 108
           console.log(res, "解析二维码返回值")
109 109
         })
110 110
       }
111
-<<<<<<< HEAD
112
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID
113
-      getHFiveDetail(this.$router.params.id).then(res => {
111
+
112
+      console.log(this.$router, "this.$router")
113
+      const router = Taro.getStorageSync('router')
114
+      console.log(router, "router")
115
+      const hFiveId = this.$router.params.id || router.query.id || ""
116
+      console.log(hFiveId, "hFiveId")
117
+      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
118
+      getHFiveDetail(hFiveId).then(res => {
114 119
         if(res.status==1){
115 120
           this.setState({
116 121
             pageInfo: res
@@ -126,19 +131,6 @@ export default class Index extends Component {
126 131
             })
127 132
           })
128 133
         }
129
-=======
130
-      console.log(this.$router, "this.$router")
131
-      const router = Taro.getStorageSync('router')
132
-      console.log(router, "router")
133
-      const hFiveId = this.$router.params.id || router.query.id || ""
134
-      console.log(hFiveId, "hFiveId")
135
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
136
-      getHFiveDetail(hFiveId).then(res => {
137
-        // debugger
138
-        this.setState({
139
-          pageInfo: res
140
-        })
141
->>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
142 134
       })
143 135
       const { userInfo: { person: { avatarurl, phone } } } = this.props
144 136
       console.log(this.props, "this.propsthis.propsthis.props")