静态页面

src/pages/city/index.js

@@ -19,13 +19,11 @@ export default class Index extends Component {
     keywords: ''
   }
 
-  componentWillMount() {
-
+  componentWillMount () {
     this.initData()
-    console.log(this.props,"this.props.citylist")
   }
 
-  initData() {
+  initData () {
     queryCityList().then(cityList => {
       const list = cityList.reduce((prev, cur) => {
         if (prev[cur.initial]) {
@@ -33,22 +31,36 @@ export default class Index extends Component {
         } else {
           prev[cur.initial] = [cur]
         }
-  
+
         return prev
       }, {})
-  
+
       this.setState({
         list
       })
     })
   }
- 
-  handleSelected(item) {
-    this.props.dispatchCitySelected(item).then(res => {
-      Taro.navigateBack({
-        delta: 1
+
+  handleSelected (item) {
+    if (this.$router.params.from === 'buildinglist' && item.id !== this.props.curCity.id) {
+      let pages = Taro.getCurrentPages()
+      let prevPage = pages[pages.length - 2]
+      prevPage.setData({
+        CityChanged: true
+      }, () => {
+        this.props.dispatchCitySelected({...item, CityChanged: true}).then(res => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        })
       })
-    })
+    } else {
+      this.props.dispatchCitySelected(item).then(res => {
+        Taro.navigateBack({
+          delta: 1
+        })
+      })
+    }
   }
 
   handleSearch = (keywords) => {
@@ -62,7 +74,7 @@ export default class Index extends Component {
     })
   }
 
-  render() {
+  render () {
     const { curCity } = this.props
     const { searchList, list, keywords } = this.state
     const keys = Object.keys(list)

src/pages/dichan/index.js

@@ -53,9 +53,9 @@ export default class Index extends Component {
     const { filterOpt } = this.state
     const currentPage = page || this.state.pageIndex
     const payload = Object.assign({ pageSize, pageNumber: currentPage, }, filterOpt)
-    if (curCity.id) {
-      payload.cityId = curCity.id
-    }
+    // if (curCity.id) {
+    //   payload.cityId = curCity.id
+    // }
     return getItemList(payload)
   }
   render () {

src/pages/project/list/filter/index.js

@@ -111,7 +111,7 @@ export default class Index extends Component {
 
   handleLocationClick() {
     Taro.navigateTo({
-      url: `/pages/city/index`
+      url: `/pages/city/index?from=buildinglist`
     })
   }
 

src/pages/project/list/index.js

@@ -17,6 +17,7 @@ export default class Index extends Component {
   }
 
   state = {
+    CityChanged: false,
     list: [],
     hasMore: true,
     isEmpty: false,
@@ -56,7 +57,7 @@ export default class Index extends Component {
     const { filterOpt } = this.state
     const currentPage = page || this.state.pageIndex
     const payload = Object.assign({ pageSize, pageNumber: currentPage, }, filterOpt)
-    if (curCity.id) {
+    if (curCity.id && curCity.CityChanged !== undefined && curCity.CityChanged) {
       payload.cityId = curCity.id
     }
     return getItemList(payload)