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

config/dev.js

@@ -9,7 +9,7 @@ module.exports = {
     // WSS_HOST: '"ws://192.168.2.43:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.21'
+    Version: 'V3.5.25'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -3,13 +3,13 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+    // HOST: '"https://dev.fangdeal.cn"',//测试
+    // WSS_HOST: '"wss://dev.fangdeal.cn"',
     HOST: '"https://wx.fangdeal.cn"',//正式
     WSS_HOST: '"wss://wx.fangdeal.cn"',
-    // HOST: '"https://wx.fangdeal.cn"',//正式
-    // WSS_HOST: '"wss://wx.fangdeal.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.24'
+    Version: 'V3.5.25'
   },
   weapp: {},
   h5: {}

ext.json

@@ -1,5 +0,0 @@
-{
-  "extEnable": true,
-  "extAppid": "wxd9ee3a9480a4e544",
-  "ext": {}
-}

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行互动",
-	"appid": "wxd9ee3a9480a4e544",
+	"appid": "wxd6f47a9bb3052175",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/components/consultant/index.js

@@ -45,7 +45,7 @@ export default class Index extends Component {
     }
     handleChatClick(data, e) {
         e.stopPropagation()
-        
+
         const { userInfo: { miniApp: { tpls }, person: { personId, name, nickname } } } = this.props
         const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId
         const realname = name || nickname
@@ -67,9 +67,9 @@ export default class Index extends Component {
 
     handleConsuItemClick(item) {
         Taro.navigateTo({
-          url: `/pages/card/index?id=${item.id}`
+            url: `/pages/card/index?id=${item.id}`
         })
-      }
+    }
     render() {
         const { show } = this.state
         const { data, style, smallStyle } = this.props

src/pages/card/index.js

@@ -62,6 +62,14 @@ export default class Index extends Component {
       this.initPageData()
     })
   }
+
+  componentDidShow() {
+      wx.setStorage({
+        key: "from-card",
+        data: "true"
+      })
+  }
+
   initPageData() {
 
     const id = this.$router.params.id

src/pages/project/banner/index.scss

@@ -27,6 +27,7 @@
       height: 100%!important;
       overflow: hidden;
       border-radius: 0;
+      image-rendering: pixelated;
     }
   }
 }

src/pages/project/detail/index.js

@@ -98,27 +98,38 @@ export default class Index extends Component {
         this.toggleGrantAvatar()
       }
 
-      const id = this.$router.params.id
+      this.loadData()
+
+      // const id = this.$router.params.id
+
+      // // 没有找到 id , 再重新找一次
+      // if (this.$router.params.scene) {
+      //   getQrCodeParams(this.$router.params.scene).then(res => {
+      //     console.log(res, "扫码参数")
+      //     this.setState({
+      //       qrcodeParams: res
+      //     })
+      //     this.initPageData(res.id)
+      //   }).catch(err => {
+      //     Taro.showToast({
+      //       title: '没有找到项目',
+      //       icon: 'none'
+      //     })
+      //   })
+      // } else {
+      //   console.log('有项目id,不请求扫码参数接口')
+      //   this.initPageData(id)
+      // }
+    })
+  }
+  componentDidShow() {
+    console.log('3366633', this.$router.params)
 
-      // 没有找到 id , 再重新找一次
-      if (this.$router.params.scene) {
-        getQrCodeParams(this.$router.params.scene).then(res => {
-          console.log(res, "扫码参数")
-          this.setState({
-            qrcodeParams: res
-          })
-          this.initPageData(res.id)
-        }).catch(err => {
-          Taro.showToast({
-            title: '没有找到项目',
-            icon: 'none'
-          })
-        })
-      } else {
-        console.log('有项目id,不请求扫码参数接口')
-        this.initPageData(id)
+      const fromCard = !!wx.getStorageSync('from-card')
+
+      if (fromCard) {
+        this.loadData()
       }
-    })
   }
 
   componentWillUnmount() {
@@ -144,6 +155,31 @@ export default class Index extends Component {
     }
   }
 
+  loadData() {
+    const id = this.$router.params.id
+
+    // 没有找到 id , 再重新找一次
+    if (this.$router.params.scene) {
+      getQrCodeParams(this.$router.params.scene).then(res => {
+        console.log(res, "扫码参数")
+        this.setState({
+          qrcodeParams: res
+        })
+        this.initPageData(res.id)
+      }).catch(err => {
+        Taro.showToast({
+          title: '没有找到项目',
+          icon: 'none'
+        })
+      })
+    } else {
+      console.log('有项目id,不请求扫码参数接口')
+      this.initPageData(id)
+    }
+
+    wx.removeStorageSync('from-card')
+  }
+
   currentPageAndParams() {
     const {
       projectDetail: { buildingId },
@@ -201,6 +237,7 @@ export default class Index extends Component {
     this.setState({
       buildingId: id
     }, () => {
+      console.log('12321312321321')
       this.loadDetail()
       this.loadNewsData()
       // this.loadActivityData()
@@ -287,7 +324,8 @@ export default class Index extends Component {
   }
 
   loadDetail() {
-    const { buildingId } = this.state
+    const sceneParams = this._$_scene || {}
+    const buildingId = this.state.buildingId || this.$router.params.id || sceneParams.id
     const { dispatchProjectDetail } = this.props
     this.setState({
       loaded: false,

src/pages/project/index.js

@@ -33,7 +33,7 @@ export default class Index extends Component {
     maskBanner: '',
     shareImg: '',
     imgDocument: '',
-    newImg:'',
+    newImg: '',
     // adImage: advImageOfApp,
     bannerList: [],
     helpGroupList: [],
@@ -94,7 +94,7 @@ export default class Index extends Component {
         imgDocument: (shareInfo || {}).imgDocument,
         newImg: (newsInfo || {}).imgUrl,
       })
-      
+
       // indexNews
       console.log(shareInfo, '首页分享信息')
     })
@@ -508,8 +508,9 @@ export default class Index extends Component {
   }
 
   render() {
-    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList,newImg } = this.state
+    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList, newImg } = this.state
     const { curCity, unReadNum, userInfo: { person: { personType } } } = this.props
+    console.log(personType, "personTypepersonTypepersonTypepersonType")
 
     return (
       <Block>
@@ -577,7 +578,7 @@ export default class Index extends Component {
                   </View>
                 }
                 {/* 资讯 */}
-                <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} newImg = {newImg} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
+                <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} newImg={newImg} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
               </View >
               {/* 参加活动*/}
               {