screen

config/dev.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://dev.fangdeal.cn"', //测试
-    WSS_HOST: '"wss://dev.fangdeal.cn"',
-    // HOST: '"http://192.168.2.43:8080"',
-    // WSS_HOST: '"ws://192.168.2.43:8080"',
+    // HOST: '"https://dev.fangdeal.cn"', //测试
+    // WSS_HOST: '"wss://dev.fangdeal.cn"',
+    HOST: '"http://192.168.2.43:8080"',
+    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.28"

src/pages/project/detail/index.js

@@ -84,6 +84,8 @@ export default class Index extends Component {
     qrcodeParams: '',
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
+    maskVisible: false,
+    extendContent: []
   }
 
   componentWillPreload(params) {
@@ -125,11 +127,11 @@ export default class Index extends Component {
   componentDidShow() {
     console.log('3366633', this.$router.params)
 
-      const fromCard = !!wx.getStorageSync('from-card')
+    const fromCard = !!wx.getStorageSync('from-card')
 
-      if (fromCard) {
-        this.loadData()
-      }
+    if (fromCard) {
+      this.loadData()
+    }
   }
 
   componentWillUnmount() {
@@ -336,8 +338,11 @@ export default class Index extends Component {
     })
 
     dispatchProjectDetail(buildingId).then(res => {
+      const maskVisible = (res.extendContent || []).length
       this.setState({
         loaded: true,
+        maskVisible,
+        extendContent: res.extendContent[0],
         // circumOpts: newCircumOpts,
         isSaved: res.isSave
       }, () => {
@@ -1504,9 +1509,95 @@ export default class Index extends Component {
       </View>
     );
   }
+  handleMaskBannerClick(data) {
+    this.redirectTo(data)
+  }
+  redirectTo({ targetId, contentType, buildingId } = {}) {
+    switch (contentType) {
+      // 项目
+      case 'project':
+        Taro.navigateTo({
+          url: '/pages/project/detail/index?id=' + buildingId
+        })
+        return;
 
+      // 活动
+      case 'activity':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/index?id=' + targetId
+        })
+        return;
+
+      // 助力
+      case 'help':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assistance?id=' + targetId
+        })
+        return;
+
+      // 拼团
+      case 'group':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assemble?id=' + targetId
+        })
+        return;
+
+      // 资讯
+      case 'news':
+        Taro.navigateTo({
+          url: '/pages/news/detail/index?id=' + targetId
+        })
+        return;
+      // h5
+      case 'h5':
+        Taro.navigateTo({
+          url: '/pages/project/h5Page?id=' + targetId
+        })
+        return;
+      // live
+      case 'live':
+        Taro.navigateTo({
+          url: '/onlineSelling/pages/live/index?id=' + targetId
+        })
+        return;
+      // salesBatch
+      case 'salesBatch':
+        Taro.navigateTo({
+          url: `/onlineSelling/pages/houseList/index?id=${targetId}`
+        })
+        return;
+
+      // 其他
+      case 'others':
+      default:
+        this.handleMaskClose()
+        return;
+    }
+  }
+  handleMaskClose() {
+    this.setState({
+      maskVisible: false
+    })
+  }
+  renderMaskBanner() {
+
+    const { extendContent = [] } = this.state
+    return (
+      <View className="mask-banner">
+        <View className="content">
+          <Image
+            mode="widthFix"
+            className="img"
+            src={transferImage(extendContent.image)}
+            onClick={this.handleMaskBannerClick.bind(this, extendContent)}>
+          </Image>
+          <Icon className="iconfont close icon-buoumaotubiao20" onClick={this.handleMaskClose}></Icon>
+        </View>
+      </View>
+    )
+  }
   render() {
-    const { grantPhoneVisible, grantAvatarVisible, posterStatus, posterData, loaded, btnstate, consultData, consultShow } = this.state
+    const { grantPhoneVisible, grantAvatarVisible, maskVisible, posterStatus, posterData, loaded, btnstate, consultData, consultShow } = this.state
     const { projectDetail, userInfo = { person: {} } } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
@@ -1533,6 +1624,9 @@ export default class Index extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
+
+        {maskVisible && this.renderMaskBanner()}
+
         {
           loaded && (
             <View className='detail'>

src/pages/project/detail/index.scss

@@ -200,6 +200,42 @@
   }
 }
 
+.mask-banner {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  left: 0;
+  top: 0;
+  z-index: 9999;
+  background: rgba(0, 0, 0, 0.8);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+
+  .content {
+    width: 500px;
+    height: 600px;
+    position: absolute;
+    left: 50%;
+    top: 40%;
+    margin-left: -250px;
+    transform: translateY(-50%);
+    text-align: center;
+
+    .img {
+      width: 100%;
+      height: 600px;
+      border-radius: 30px;
+    }
+
+    .close {
+      font-size: 48px;
+      color: white;
+    }
+  }
+}
+
 .bt-nav {
   position: fixed;
   width: 100%;

src/pages/project/index.js

@@ -141,7 +141,7 @@ export default class Index extends Component {
 
     queryExtContents({ cityId: curCity.id }).then(res => {
       // 开屏广告
-      const maskBanner = (res || []).filter(x => x.showType === 'screen')[0] || {}
+      const maskBanner = (res || []).filter(x => x.showType === 'screen' && x.showPosition === 'index')[0] || {}
       const maskVisible = maskBanner.contentId && this.props.screenShow !== maskBanner.contentId
 
       // 首页 banner