lf

config/dev.js

   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST: '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
-<<<<<<< HEAD
     HOST: '"http://192.168.2.52:8080"',
     WSS_HOST: '"ws://192.168.2.52:8080"',
     Version:'V3.5.2.2_1210'
-=======
-    // HOST: '"http://192.168.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
->>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
   },
   weapp: {},
   h5: {}

config/prod.js

   defineConstants: {
     // HOST: '"http://192.168.0.218:8080"',
     // WSS_HOST: '"ws://192.168.0.218:8080"',
-<<<<<<< HEAD
-    // HOST: '"https://dev.jinchengjiaye.com"',
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     HOST: '"https://lt.pawoma.cn"',
     WSS_HOST: '"wss://lt.pawoma.cn"',
     Version:'V3.5.2.2_1210'
-=======
-    HOST: '"https://dev.jinchengjiaye.com"',
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
->>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
   },
   weapp: {},
   h5: {}

src/pages/project/h5Page.js

           console.log(res, "解析二维码返回值")
         })
       }
-<<<<<<< HEAD
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID
-      getHFiveDetail(this.$router.params.id).then(res => {
+
+      console.log(this.$router, "this.$router")
+      const router = Taro.getStorageSync('router')
+      console.log(router, "router")
+      const hFiveId = this.$router.params.id || router.query.id || ""
+      console.log(hFiveId, "hFiveId")
+      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
+      getHFiveDetail(hFiveId).then(res => {
         if(res.status==1){
           this.setState({
             pageInfo: res
             })
           })
         }
-=======
-      console.log(this.$router, "this.$router")
-      const router = Taro.getStorageSync('router')
-      console.log(router, "router")
-      const hFiveId = this.$router.params.id || router.query.id || ""
-      console.log(hFiveId, "hFiveId")
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
-      getHFiveDetail(hFiveId).then(res => {
-        // debugger
-        this.setState({
-          pageInfo: res
-        })
->>>>>>> 7a04f681842a549f9f6b650f1bf35926f30961d7
       })
       const { userInfo: { person: { avatarurl, phone } } } = this.props
       console.log(this.props, "this.propsthis.propsthis.props")