screen

src/actions/project.js

@@ -1,11 +1,13 @@
 import {
   PROJECT_DETAIL,
-  PROJECT_LIST
+  PROJECT_LIST,
+  PROJECT_SCREEN
 } from '@constants/project'
 
 import {
   API_ITEMS_DETAIL,
-  API_ITEMS_LIST
+  API_ITEMS_LIST,
+  API_BANNER_LIST
 } from '@constants/api'
 
 import { createAction } from '@utils/redux'
@@ -30,3 +32,10 @@ export const dispatchProjectDetail = id => createAction({
   url: `${API_ITEMS_DETAIL}/${id}`,
   type: PROJECT_DETAIL
 })
+
+/**
+ * 获取开屏广告
+ *  @param {*} payload 
+ * 
+*/
+export const dispatchProjectScreen = (payload) => createAction({ url: `${API_BANNER_LIST}/screen`, payload, type: PROJECT_SCREEN })

src/constants/project.js

@@ -1,4 +1,5 @@
 export const PROJECT_LIST = 'PROJECT_LIST'
 export const PROJECT_DETAIL = 'PROJECT_DETAIL'
-
+export const PROJECT_SCREEN = 'PROJECT_SCREEN'
+export const SET_SCREEN_SHOWED = 'SET_SCREEN_SHOWED'
 export const LOCATION_CITY = 'LOCATION_CITY'

src/pages/city/index.js

@@ -40,7 +40,7 @@ export default class Index extends Component {
       list
     })
   }
-
+ 
   handleSelected(item) {
     this.props.dispatchCitySelected(item).then(res => {
       Taro.navigateBack({

src/pages/project/index.js

@@ -5,7 +5,6 @@ import ProjectItem from './item'
 import Banner from './banner'
 import HelpGroupBanner from './swiper'
 // import ActivityItem from '../activity/item'
-
 import ready from '@utils/ready'
 import { getLocationCity } from '@services/map'
 
@@ -14,6 +13,7 @@ import { queryNewsList, queryHelpGroup } from '@services/news'
 import { queryActivityList } from '@services/activity'
 import { dispatchCitySelected } from '@actions/city'
 import { ROLE_CODE, DECREASE_UNREADNUM } from '@constants/user'
+import { SET_SCREEN_SHOWED } from '@constants/project'
 import { getStore, connect } from '@tarojs/redux'
 import * as actions from '@actions/project'
 import { transferImage } from '@utils/tools'
@@ -85,6 +85,7 @@ export default class Index extends Component {
   componentDidShow() {
     if (this.props.curCity.id) {
       ready.queue(() => {
+        // debugger
         this.loadData()
       })
     }
@@ -153,6 +154,7 @@ export default class Index extends Component {
     this.loadBannerList()
     this.loadHelpGroupList()
     this.loadNewsList()
+    this.loadOpenScreenBanner()
     // this.loadActivityList()
     this.loadList()
 
@@ -163,32 +165,30 @@ export default class Index extends Component {
     const payload = {}
     if (curCity.id) {
       payload.cityId = curCity.id
-    } else {
-
     }
+
     // 获取开屏广告图
-    queryBanners('screen', payload).then(res => {
+    this.props.dispatchProjectScreen(payload).then(res => {
       const banner = res[0]
-      if (banner) {
+      debugger
+      const maskVisible = this.props.screenShow !== (banner || {}).contentId
+
+      if (maskVisible) {
         Taro.hideTabBar({
           animation: true
         })
       }
+
       this.setState({
-        maskVisible: banner ? true : false,
+        maskVisible,
         maskBanner: banner
+      }, () => {
+        const { dispatch } = getStore()
+        dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
       })
     })
   }
-  componentWillReceiveProps(nextProps) {
-    console.log(nextProps.curCity, "curCitycurCitycurCitycurCitycurCity")
-    console.log(this.state.maskBanner, "maskBannermaskBannermaskBannermaskBannermaskBanner")
-
-    if (!this.state.maskBanner && JSON.stringify(nextProps.curCity) != '{}') {
 
-      this.loadOpenScreenBanner()
-    }
-  }
   loadBannerList() {
     const { curCity } = this.props
     // 获取首页banner

src/reducers/project.js

@@ -1,12 +1,16 @@
 import {
   PROJECT_DETAIL,
-  PROJECT_LIST
+  PROJECT_LIST,
+  PROJECT_SCREEN,
+  SET_SCREEN_SHOWED,
 } from '@constants/project'
 
 
 const INITIAL_STATE = {
   proList: {},
-  projectDetail: {}
+  projectDetail: {},
+  screen: {},
+  screenShow: undefined,
 }
 
 export default function project(state = INITIAL_STATE, action) {
@@ -27,6 +31,19 @@ export default function project(state = INITIAL_STATE, action) {
         }
       }
     }
+    case PROJECT_SCREEN: {
+      return {
+        ...state,
+        screen: (action.payload || [])[0] || {}
+      }
+    }
+
+    case SET_SCREEN_SHOWED: {
+      return {
+        ...state,
+        screenShow: action.payload,
+      }
+    }
 
     default:
       return state