news detail

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.26"
+    Version: "V3.5.28"
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     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.26"
+    Version: "V3.5.28"
   },
   weapp: {},
   h5: {}

src/actions/project.js

@@ -39,9 +39,10 @@ export const dispatchIndexProjects = payload => createAction({
  * 获取项目信息
  * @param {*} id 
  */
-export const dispatchProjectDetail = id => createAction({
+export const dispatchProjectDetail = (id, params) => createAction({
   url: `${API_ITEMS_DETAIL}/${id}`,
-  type: PROJECT_DETAIL
+  type: PROJECT_DETAIL,
+  fetchOptions: params || {}
 })
 
 /**

src/pages/news/detail/index.js

@@ -15,6 +15,9 @@ import { ROLE_CODE } from '@/constants/user'
 import Consultant from '@/components/consultant'
 import AchievePhone from '@/components/achievePhone'
 import AchieveAvatar from '@/components/achieveAvatar'
+import { dispatchProjectDetail } from '@/actions/project'
+import * as actions from '@/actions/card'
+import ProjectItem from '../../project/item'
 // import AuthorizationComponent from '@/components/authorizationComponent'
 // import { reportClient } from '@/services/report'
 import {
@@ -27,7 +30,11 @@ import {
 import { connect } from '@tarojs/redux'
 import { share as shareSavePoint } from '@/utils/shareSavePoint'
 
-@connect(state => state.user)
+// @connect(state => state.user)
+@connect(
+  ({ user, card, project }) => ({ ...user, ...card, ...project }),
+  { dispatchProjectDetail, ...actions }
+)
 export default class NewsDetail extends Component {
   config = {
     navigationBarTitleText: '资讯详情'
@@ -244,6 +251,7 @@ export default class NewsDetail extends Component {
     const consultant = this.$router.params.consultant || qrcodeParams.consultant
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
     const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
+    const { dispatchProjectDetail } = this.props
     Taro.showLoading()
     console.log(newsId, "newsIdnewsIdnewsIdnewsIdnewsId")
     queryNewsDetail(newsId).then(res => {
@@ -264,6 +272,9 @@ export default class NewsDetail extends Component {
         })
         console.info('资讯详情')
       })
+      if (res.buildingId) {
+        dispatchProjectDetail(res.buildingId, { showToast: false, })
+      }
 
       this.setState({
         detail: res,
@@ -353,14 +364,15 @@ export default class NewsDetail extends Component {
       buildingId: buildingId || '',
       data: '{}'
     }, 'news')
-
-
   }
-
+  toProjectDetail = () => {
+    const { projectDetail: { buildingId } } = this.props
+    this.navigateTo(`/pages/project/detail/index?id=${buildingId}`)
+  }
   render() {
     const { webViewVisible, grantPhoneVisible, grantAvatarVisible, detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
-    const { userInfo = { person: {} } } = this.props
-    
+    const { userInfo = { person: {} }, cardInfo, projectDetail = {} } = this.props
+
     const achieveParams = {
       buildingId: detail.buildingId || '',
       targetName: detail.newsName || '',
@@ -403,6 +415,7 @@ export default class NewsDetail extends Component {
                   </View>
                 </ScrollView>
                 <Notice></Notice>
+                {projectDetail.buildingId && <View className="pro__info"><ProjectItem data={projectDetail} onClick={this.toProjectDetail.bind(this)} /></View>}
                 <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
                 {
                   consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>

src/pages/news/detail/index.scss

@@ -71,7 +71,10 @@
     margin-top: 30px;
   }
 }
-
+.pro__info {
+  padding: 30px  30px 50px 30px;
+  background: white;
+}
 
 .bot-nav {
   position: fixed;