feats

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST: '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST: '"https://dev.jinchengjiaye.com"',//测试
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.2.51:8080"',
-    // WSS_HOST: '"ws://192.168.2.51:8080"',
+    HOST: '"http://127.0.0.1:8080"',
+    WSS_HOST: '"ws://127.0.0.1:8080"',
     Version: 'V3.5.6'
   },
   weapp: {},

project.config.json

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

src/actions/project.js

@@ -7,7 +7,8 @@ import {
 import {
   API_ITEMS_DETAIL,
   API_ITEMS_LIST,
-  API_BANNER_LIST
+  API_BANNER_LIST,
+  API_INDEX_PROJECTS,
 } from '@/constants/api'
 
 import { createAction } from '@/utils/redux'
@@ -23,6 +24,16 @@ export const dispatchProjectList = payload => createAction({
   payload
 })
 
+/**
+ * 获取楼盘列表
+ * @param {*} payload 
+ */
+export const dispatchIndexProjects = payload => createAction({
+  url: `${API_INDEX_PROJECTS}`,
+  type: PROJECT_LIST,
+  payload
+})
+
 
 /**
  * 获取项目信息

src/app.js

@@ -11,7 +11,8 @@ import { trackUserSource } from '@/utils/track'
 import {
   getCodeScene,
   savePoint,
-  queryCityList
+  queryCityList,
+  getPreloadData,
 } from '@/services/common'
 
 import {
@@ -158,6 +159,7 @@ class App extends Component {
   componentDidHide() {
     if (this.updateTrack) {
       this.updateTrack()
+      this.updateTrack = undefined
     }
 
     // ready.close()
@@ -166,7 +168,10 @@ class App extends Component {
 
   componentDidShow() {
     // 埋点
-    trackUserSource(this.$router.params).then(res => this.updateTrack = res)
+    const t = setTimeout(() => {
+      trackUserSource(this.$router.params).then(res => this.updateTrack = res)
+      clearTimeout(t)
+    }, 1000)
 
     const updateManager = wx.getUpdateManager()
     updateManager.onCheckForUpdate(function (res) {
@@ -189,7 +194,7 @@ class App extends Component {
 
     socket.reconnect()
   }
-  
+
   componentDidMount() {
     // console.info('app componentDidMount')
   }
@@ -202,18 +207,35 @@ class App extends Component {
     this.initData()
   }
 
+  componentWillUnmount() {
+    if (this.updateTrack) {
+      this.updateTrack()
+      this.updateTrack = undefined
+    }
+  }
+
   wxPreloadData () {
-    wx.setBackgroundFetchToken()
-    wx.getBackgroundFetchData({
-      fetchType: 'pre',
-      success: (res) => {
-        console.log('[preload]: ', res)
-        store.dispatch({
-          type: UPDATE_PRELOAD,
-          payload: res.fetchedData,
-        })
-      }
-    })
+    // getPreloadData({
+    //   appid: wx.getAccountInfoSync().miniProgram.appId,
+    //   timestamp: (new Date).valueOf(),
+    // }).then((res) => {
+    //   console.log('[preload]: ', res)
+    //   store.dispatch({
+    //     type: UPDATE_PRELOAD,
+    //     payload: res,
+    //   })
+    // })
+    // wx.setBackgroundFetchToken()
+    // wx.getBackgroundFetchData({
+    //   fetchType: 'pre',
+    //   success: (res) => {
+    //     console.log('[preload]: ', res)
+    //     store.dispatch({
+    //       type: UPDATE_PRELOAD,
+    //       payload: res.fetchedData,
+    //     })
+    //   }
+    // })
   }
 
   initData () {
@@ -222,39 +244,40 @@ class App extends Component {
     console.info('ready status1', ready)
 
     // 获取城市列表
-    queryCityList().then(payload => {
-      store.dispatch({ type: CITY_LIST, payload })
-    })
+    // queryCityList().then(payload => {
+    //   store.dispatch({ type: CITY_LIST, payload })
+    // })
+
+    this.getLocation().then((loc) => {
+      // 获取router参数
+      this.getRouterParams().then(router => {
+        Taro.setStorageSync('router', router)
+        console.info('router2:', router)
+        console.info('-----------')
+        const { query: payload } = router
+
+        payload.path = router.path
+        payload.scene = router.scene
+
+        if (loc) {
+          payload.lon = loc.lon
+          payload.lat = loc.lat
+        }
 
-    // 获取router参数
-    this.getRouterParams().then(router => {
-      Taro.setStorageSync('router', router)
-      console.info('router2:', router)
-      console.info('-----------')
-      const { query: payload } = router
-
-      payload.path = router.path
-      payload.scene = router.scene
-
-      // login
-      login(payload, res => {
-        // 获取未读消息
-        const { person: { personId } } = res
-        queryUserInfo(personId).then(info => {
-          const { unReadNum } = info
-          store.dispatch({ type: ASSIGN_UNREADNUM, payload: { unReadNum } });
-          socket.createSocket({ id: personId });
-          socket.wss.onMessage(data => {
-            store.dispatch({ type: INCREASE_UNREADNUM })
+        // login
+        login(payload, res => {
+          // 获取未读消息
+          const { person: { personId } } = res
+
+          queryUserInfo(personId).then(info => {
+            const { unReadNum } = info
+            store.dispatch({ type: ASSIGN_UNREADNUM, payload: { unReadNum } });
+            socket.createSocket({ id: personId });
+            socket.wss.onMessage(data => {
+              store.dispatch({ type: INCREASE_UNREADNUM })
+            })
           })
         })
-
-        const data = Object.assign({}, payload, {
-          event: 'start',
-          propertyName: '进入小程序',
-          data: ''
-        })
-        savePoint(data)
       })
     })
   }
@@ -303,6 +326,35 @@ class App extends Component {
       
     })
   }
+
+  getLocation() {
+    return new Promise((resolve) => {
+      Taro.getLocation().then(location => {
+        Taro.setStorageSync('lat', location.latitude)
+        Taro.setStorageSync('lon', location.longitude)
+
+        resolve({lon: location.longitude, lat: location.latitude})
+      }).catch(err => {
+        if (err.errMsg === 'getLocation:fail auth deny') {
+          Taro.showModal({
+            content: '请同意授权您的定位功能',
+            showCancel: false,
+            duration: 3000,
+          })
+        } else {
+          Taro.showToast({
+            title: `定位失败, 请手动选择城市: ${err.errMsg}`,
+            icon: 'none',
+            duration: 3000,
+          })
+        }
+
+        console.error(err)
+        resolve()
+      })
+    })
+  }
+
   // 在 App 类中的 render() 函数没有实际作用
   // 请勿修改此函数
   render() {

src/constants/api.js

@@ -13,6 +13,7 @@ export const pathname = '/api/wx'
 const resolvePath = api => `${host + pathname}/${api}`
 
 // common
+export const API_PRELOAD = resolvePath('preload')
 export const API_QRCODE = resolvePath('qrcode')
 export const API_BANNER_LIST = resolvePath('extendContent')
 export const API_QUERY_CODE_SCENE = resolvePath('qrcode/scene')
@@ -51,6 +52,7 @@ export const API_ITEMS_TYPE = resolvePath('tdBuildingType')
 export const API_ACTIVITY_GROUP = resolvePath('helpActivityAndGroup')
 export const API_LOCATION_CITYP = resolvePath('location/city')
 export const API_TACUSTOMIMG = resolvePath('taCustomImg')
+export const API_INDEX_PROJECTS = resolvePath('building/main')
 // /wx/location/city?location=lon,lat
 
 

src/pages/city/index.js

@@ -3,8 +3,8 @@ import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/city'
 import { ScrollView } from '@tarojs/components';
 import './index.scss'
-
 import Search from '@/components/search'
+import { queryCityList } from '@/services/common'
 
 @connect(state => state.city, { ...actions })
 export default class Index extends Component {
@@ -20,24 +20,26 @@ export default class Index extends Component {
   }
 
   componentWillMount() {
+
     this.initData()
     console.log(this.props,"this.props.citylist")
   }
 
   initData() {
-    const { cityList } = this.props
-    const list = cityList.reduce((prev, cur) => {
-      if (prev[cur.initial]) {
-        prev[cur.initial].push(cur)
-      } else {
-        prev[cur.initial] = [cur]
-      }
-
-      return prev
-    }, {})
-
-    this.setState({
-      list
+    queryCityList().then(cityList => {
+      const list = cityList.reduce((prev, cur) => {
+        if (prev[cur.initial]) {
+          prev[cur.initial].push(cur)
+        } else {
+          prev[cur.initial] = [cur]
+        }
+  
+        return prev
+      }, {})
+  
+      this.setState({
+        list
+      })
     })
   }
  
@@ -50,10 +52,10 @@ export default class Index extends Component {
   }
 
   handleSearch = (keywords) => {
-    const { cityList } = this.props
+    const { list } = this.state
+
+    const searchList = list.filter(item => (item.name.includes(keywords)))
 
-    const searchList = cityList.filter(item => (item.name.includes(keywords)))
-    console.log(searchList, "-----------searchList----------")
     this.setState({
       searchList,
       keywords

src/pages/project/index.js

@@ -8,7 +8,7 @@ import BannerTwo from './swiper'
 // import ActivityItem from '../activity/item'
 import ready from '@/utils/ready'
 import { getLocationCity } from '@/services/map'
-import { queryBanners, savePoint, updatePoint } from '@/services/common'
+import { queryBanners, savePoint, updatePoint, queryExtContents } from '@/services/common'
 import { queryHelpGroup } from '@/services/news'
 import { getIndexShare } from '@/services/user'
 // import { queryActivityList } from '@/services/activity'
@@ -19,11 +19,11 @@ import { getStore, connect } from '@tarojs/redux'
 import * as actions from '@/actions/project'
 import { transferImage } from '@/utils/tools'
 import Notice from '@/components/Notice'
-import { getIndexPreloadData } from '@/utils/preload'
+// import { getIndexPreloadData } from '@/utils/preload'
 // import Authorize from '@/components/authorize'
 // import * as noticeType from '@/constants/common.js'
 
-const { miniProgram: { appId } } = wx.getAccountInfoSync();
+// const { miniProgram: { appId } } = wx.getAccountInfoSync();
 
 @connect(
   state => ({ ...state.project, ...state.city, ...state.user, system: state.system }),
@@ -52,16 +52,18 @@ export default class Index extends Component {
     achieve: false,
     propagandaBanner: [],
     newsShow: false,
+    city: null,
   }
 
   componentWillMount() {
+    Taro.hideTabBar()
+
     ready.queue(() => {
 
-      Taro.hideTabBar()
-      this.getLocation()
-      this.getIndexShareInfo()
+      const city = this.state.city || this.props.curCity
+      this.loadData({ curCity: city })
 
-      Taro.setNavigationBarTitle({ title: this.props.userInfo.miniApp.name })
+      this.getIndexShareInfo()
 
       savePoint({
         event: 'index',
@@ -76,6 +78,11 @@ export default class Index extends Component {
       })
     })
   }
+
+  componentDidMount() {
+    // Taro.setNavigationBarTitle({ title: this.props.userInfo.miniApp.name })
+  }
+
   getIndexShareInfo() {
     getIndexShare().then(res => {
 
@@ -96,13 +103,13 @@ export default class Index extends Component {
     })
   }
   componentDidShow() {
+    // this.getIndexShareInfo()
 
-    this.getIndexShareInfo()
-    if (this.props.curCity.id) {
+    const city = this.state.city || this.props.curCity
+    if (city && city.id) {
       ready.queue(() => {
         // Taro.hideTabBar()
-        this.loadData()
-
+        this.loadData({ curCity: city })
       })
     }
   }
@@ -112,91 +119,93 @@ export default class Index extends Component {
     recordId && updatePoint(recordId)
   }
 
-  getLocation() {
-    const { cityList, userInfo: { person: { org } } } = this.props
-    let defaultCity = cityList.filter(item => {
-      return item.id == org.defaultCityId
-    })[0]
-    // console.log('-----defaultCity-->', defaultCity)
-
-    Taro.getLocation().then(location => {
-      Taro.setStorageSync('lat', location.latitude)
-      Taro.setStorageSync('lon', location.longitude)
-
-      const payload = { location: `${location.longitude},${location.latitude}` }
+  // getLocation() {
+  //   Taro.getLocation().then(location => {
+  //     Taro.setStorageSync('lat', location.latitude)
+  //     Taro.setStorageSync('lon', location.longitude)
+
+  //     const payload = { location: `${location.longitude},${location.latitude}` }
+
+  //     getLocationCity(payload).then(res => {
+  //       if (!res || !res.id) {
+  //         Taro.showToast({
+  //           title: '未查询到当前城市信息, 请手动选择',
+  //           icon: 'none',
+  //           duration: 3000,
+  //         })
+  //       } else {
+  //         this.setState({ city: res })
+  //         this.loadData({ curCity: res })
+  //         this.updateCity(res)
+  //       }
+  //     }).catch(err => {
+  //       console.error(err)
+
+  //       Taro.showToast({
+  //         title: '服务错误, 请手动选择城市',
+  //         icon: 'none',
+  //         duration: 3000,
+  //       })
+  //     })
+  //   }).catch(err => {
+  //     if (err.errMsg === 'getLocation:fail auth deny') {
+  //       Taro.showModal({
+  //         content: '请同意授权您的定位功能',
+  //         showCancel: false,
+  //         duration: 3000,
+  //       })
+  //     } else {
+  //       Taro.showToast({
+  //         title: `定位失败, 请手动选择城市: ${err.errMsg}`,
+  //         icon: 'none',
+  //         duration: 3000,
+  //       })
+  //     }
+
+  //     console.error(err)
+  //   })
+  // }
+
+  // updateCity(payload) {
+  //   this.props.dispatchCitySelected(payload)
+  // }
+
+  loadData(props = {}) {
+    this.loadHelpGroupList(props)
+    this.loadList(props)
+    this.loadExtContents(props)
+  }
+
+  loadExtContents(props) {
+    const curCity = this.state.city || props.curCity
 
-      getLocationCity(payload).then(res => {
-
-        let curCity = cityList.filter(item => {
-          return item.name == res.name || ''
-        })
-        // console.log('-----curCity-->', curCity)
-        this.updateCity(curCity[0] || defaultCity)
-      }).catch(err => {
-        Taro.showToast({
-          title: `定位错误: ${err.message}`,
-          icon: 'none',
-        })
-        console.error(err)
-        this.updateCity(defaultCity)
-      })
-    }).catch(err => {
-      if (err.errMsg === 'getLocation:fail auth deny') {
-        Taro.showModal({
-          content: '请同意授权您的定位功能',
-          showCancel: false,
-        })
-      } else {
-        Taro.showToast({
-          title: `定位失败: ${err.errMsg}`,
-          icon: 'none',
-        })
-      }
-      console.error(err)
-      this.updateCity(defaultCity)
-    })
-  }
-  updateCity(payload) {
-    this.props.dispatchCitySelected(payload).then(res => {
-      this.loadData()
+    this.setState({
+      visBanner: false,
+      visPropagandaBanner: false
     })
-  }
-
-  loadData() {
-    this.loadBannerList()
-    this.loadHelpGroupList()
-    this.loadOpenScreenBanner()
-    // this.loadActivityList()
-    this.loadList()
 
-  }
-  loadOpenScreenBanner() {
-    const { curCity } = this.props
-
-    const payload = {}
-    if (curCity.id) {
-      payload.cityId = curCity.id
-    }
+    queryExtContents({ cityId: curCity.id }).then(res => {
+      // 开屏广告
+      const maskBanner = (res || []).filter(x => x.showType === 'screen')[0] || {}
+      const maskVisible = maskBanner.contentId && this.props.screenShow !== maskBanner.contentId
+      
+      // 首页 banner
+      const bannerList = (res || []).filter(x => x.showType === 'banner' && x.showPosition === 'index')
 
-    // 获取开屏广告图
-    this.props.dispatchProjectScreen(payload).then(res => {
-      const banner = res[0]
-
-      const maskVisible = banner && this.props.screenShow !== (banner || {}).contentId
-      if (maskVisible) {
-        Taro.hideTabBar()
-      } else {
-        Taro.showTabBar()
-      }
+      // 首页 宣传位
+      const propagandaBanner = (res || []).filter(x => x.showType === 'propaganda')
 
       this.setState({
         maskVisible,
-        maskBanner: banner || {}
+        visBanner: true,
+        visPropagandaBanner: true,
+        maskBanner,
+        bannerList,
+        propagandaBanner,
       }, () => {
         if (Taro.getStorageSync('firstLoading') != '8') {
           const { dispatch } = getStore()
-          dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
-
+          dispatch({ type: SET_SCREEN_SHOWED, payload: maskBanner.contentId })
         } else {
           Taro.setStorageSync('firstLoading', '6')
         }
@@ -204,46 +213,9 @@ export default class Index extends Component {
     })
   }
 
-  loadBannerList() {
-    const { curCity } = this.props
-    // 获取首页banner
-    const payload = {
-      showPosition: 'index'
-    }
-    if (curCity.id) {
-      payload.cityId = curCity.id
-
-      var propagandaParams = {
-        cityId: curCity.id
-      }
-
-    }
-    this.setState({
-      visBanner: false,
-      visPropagandaBanner: false
-    })
-
-
-    queryBanners('banner', payload).then(res => {
-      this.setState({
-        visBanner: true,
-        bannerList: res || [],
-      })
-    })
-    queryBanners('propaganda', propagandaParams).then(res => {
-      this.setState({
-        visPropagandaBanner: true,
-        propagandaBanner: res || [],
-
-      })
-      console.log(this.state.visPropagandaBanner, "visPropagandaBanner")
-    })
-
+  loadHelpGroupList(props) {
+    const curCity = this.state.city || props.curCity
 
-  }
-
-  loadHelpGroupList() {
-    const { curCity } = this.props
     queryHelpGroup({ cityId: curCity.id, buildingId: '' }).then(res => {
       this.setState({
         helpGroupList: res || []
@@ -252,9 +224,9 @@ export default class Index extends Component {
   }
 
 
-  loadList() {
+  loadList(props) {
     const { keywords } = this.state
-    const { curCity } = this.props
+    const curCity = this.state.city || props.curCity
 
     const payload = {
       name: keywords,
@@ -264,7 +236,8 @@ export default class Index extends Component {
       payload.cityId = curCity.id
     }
     Taro.showLoading()
-    this.props.dispatchProjectList(payload).then(res => {
+ 
+    this.props.dispatchIndexProjects(payload).then(res => {
       if (!this.state.loaded && res.records.length <= 0) {
         // let city = {
         //   name: '南京市',

src/services/activity.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_ACTIVITY_LIST,
   API_ACTIVITY_DETAIL,

src/services/agent.js

@@ -1,5 +1,6 @@
 
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_AGENT_LIST,
   API_REGISTER_AGENT,

src/services/card.js

@@ -1,5 +1,6 @@
 
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_CARDS_LIST,
   API_CARDS_APPLY,

src/services/chat.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_CHAT_SEND,
   API_CHAT_HISTORY,

src/services/checkin.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_CHECKIN_DETAILS,
   API_CHECKIN_ACTIVE

src/services/client.js

@@ -1,5 +1,6 @@
 
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_CLIENT_LIST,
   API_RECOMENT_CLIENT,

src/services/common.js

@@ -1,7 +1,7 @@
-
-
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
+  API_PRELOAD,
   API_QRCODE,
   API_BANNER_LIST,
   API_QUERY_CODE_SCENE,
@@ -10,6 +10,13 @@ import {
   API_TEMPLATE_TYPE,
 } from '@/constants/api'
 
+/**
+ * 预加载数据
+ *  @param {*} payload
+ * 
+*/
+export const getPreloadData = payload => fetch({ url: API_PRELOAD, payload, method: 'GET' })
+
 /**
  * 获取二维码
  *  @param {*} payload
@@ -34,11 +41,17 @@ export const getCodeScene = scene => fetch({ url: `${API_QUERY_CODE_SCENE}/${sce
 */
 export const queryBanners = (type, payload) => fetch({ url: `${API_BANNER_LIST}/${type}`, payload })
 
+/**
+ * 获取 banner , 首屏等一些信息
+ * @param {*} payload 
+ */
+export const queryExtContents = payload => fetch({ url: API_BANNER_LIST, payload })
+
 /**
  * 新增埋点
  * @param {*} payload 
  */
-export const savePoint = (payload) => fetch({ url: API_BURIED_POINT, payload, method: 'POST' })
+export const savePoint = (payload) => fetch({ url: API_BURIED_POINT, payload, method: 'POST' }, 2)
 
 
 /**
@@ -46,7 +59,7 @@ export const savePoint = (payload) => fetch({ url: API_BURIED_POINT, payload, me
  * @param {*} id 
  * @param {*} payload
  */
-export const updatePoint = (id, payload) => fetch({ url: `${API_BURIED_POINT}/${id}`, payload, method: 'PUT' })
+export const updatePoint = (id, payload) => fetch({ url: `${API_BURIED_POINT}/${id}`, payload, method: 'PUT' }, 2)
 
 
 /**

src/services/feedback.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_FEEDBACK_SUBMIT
 } from '@/constants/api'

src/services/getCode.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_GET_CODE,
   API_PUT_REGISTER,

src/services/item.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_ITEMS_LIST,
   API_ITEMS_DETAIL,

src/services/login.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import Qs from 'qs'
 import {
   API_USER_LOGIN

src/services/map.js

@@ -1,6 +1,5 @@
-
-
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_LOCATION_CITYP
 

src/services/news.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_NEWS_LIST,
   API_NEWS_FAVOR,

src/services/person.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_MY_CUSTOMER,
   API_CUSTOMER_LIST,

src/services/policy.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_POLICY_LIST,
 } from '@/constants/api'

src/services/report.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_REPORT_LIST,
   API_REPORT_CLIENT,

src/services/user.js

@@ -1,4 +1,5 @@
-import { fetch } from '@/utils/request'
+// import { fetch } from '@/utils/request'
+import { fetchQ as fetch } from '@/utils/requestQueue'
 import {
   API_USER_INFO,
   API_USER_PHONE,

src/utils/login.js

@@ -4,6 +4,8 @@ import { USER_INFO } from '@/constants/user'
 import { wxLogin } from '@/services/login'
 import { sceneInShare } from '@/utils/tools'
 import ready from '@/utils/ready'
+import { dispatchCitySelected } from '@/actions/city'
+
 let loading = false
 export default function (payload, callback) {
   const { path, scene, ...params } = payload
@@ -22,20 +24,24 @@ export default function (payload, callback) {
 
         loading = false
 
-        const { extraInfo, miniApp, person, miniAuthorized, avatarAuth } = data
+        const { extraInfo, miniApp, person, miniAuthorized, avatarAuth, city } = data
         const { token, sessionKey } = miniApp
         const { dispatch } = getStore()
         Taro.setStorageSync('token', token)
         Taro.setStorageSync('sessionKey', sessionKey)
+        
         dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
 
+        if (city) {
+          dispatchCitySelected(city)(dispatch)
+        }
 
         // // 用户信息已授权获取成功
         // if (miniAuthorized || avatarAuth) {
 
         //   // 保存用户信息
         //   // dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
-        //   callback && callback(data)
+          callback && callback(data)
 
         // } else {
 

src/utils/request.js

@@ -29,88 +29,12 @@ export const setStorage = function (key, data) {
  * @param {*} options
  */
 export const fetch = async (options) => {
-  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true } = options
-  const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
-  // debugger
-  return Taro.request({
-    url,
-    method,
-    data: payload,
-    header: {
-      'content-type': 'application/json',
-      'authorization': `Bearer ${Taro.getStorageSync('token')}`,
-      'appId': appId,
-      'x-action': 'miniapp',
-      'x-version': Version,
-    }
-  }).then(async (res) => {
-    if (res.statusCode === 500) {
-      Taro.showToast({
-        title: "请检查网络",
-        icon: 'none'
-      })
-      console.error(res)
-      throw new Error('请检查网络')
-    }
-
-    const { data, code, message } = res.data
-    if (code === CODE_SUCCESS) {
-      return data
-    } else {
-      const isExpired = (code === CODE_AUTH_EXPIRED || code === CODE_UNLOGIN)
-      const defaultMsg = isExpired ? '登录失效' : message
-      if (isExpired && autoLogin) {
-        // token失效，重新登录后，跳转到首页
-        login({}, () => {
-          Taro.switchTab({
-            url: '/pages/project/index'
-          })
-        })
-      } else {
-        if (showMessage) {
-          Taro.showToast({
-            title: defaultMsg,
-            icon: 'none'
-          })
-        }
-      }
-      if (showMessage) {
-
-        Taro.showToast({
-          title: message,
-          icon: 'none'
-        })
-      }
-
-      throw res.data
-    }
-  }).catch((err) => {
-    rtLog.error('[request]', "==================================")
-    rtLog.error('[request]', err)
-    rtLog.error('[request]', url)
-    rtLog.error('[request]', wx.getLaunchOptionsSync())
-    rtLog.error('[request]', "==================================")
-
-    let errMessage = `请求失败: ${err.errMsg}`
-    if (err.errMsg) {
-      errMessage = '请检查网络'
-    }
-
-    if (err.message) {
-      console.error('请求失败', err.message)
-      errMessage = err.message.indexOf('java') > -1 ? '服务内部错误' : err.message
-    }
-
-    if (showMessage) {
-      Taro.showToast({
-        title: errMessage,
-        icon: 'none',
-        duration: 3000
-      })
-    }
+  const opts = optionBuilder(options)
 
-    throw new Error(errMessage)
-  })
+  // debugger
+  return Taro.request(opts[0])
+    .then((res) => reqSuccess(res, opts))
+    .catch((err) => reqFail(err, opts))
 }
 
 export const uploadFiles = async (files) => {
@@ -146,3 +70,104 @@ export const uploadFiles = async (files) => {
 
   return Promise.all(uploads)
 }
+
+export function optionBuilder(options) {
+  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true } = options
+  const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
+
+  return [
+    {
+      url,
+      method,
+      data: payload,
+      header: {
+        'content-type': 'application/json',
+        'authorization': `Bearer ${Taro.getStorageSync('token')}`,
+        'appId': appId,
+        'x-action': 'miniapp',
+        'x-version': Version,
+      }
+    },
+    {
+      showMessage,
+      autoLogin
+    }
+  ]
+}
+
+export function reqSuccess (res, opts) {
+  const [, settings] = opts || []
+  const { showMessage, autoLogin = true } = settings || {}
+
+  if (res.statusCode === 500) {
+    Taro.showToast({
+      title: "请检查网络",
+      icon: 'none'
+    })
+    console.error(res)
+    throw new Error('请检查网络')
+  }
+
+  const { data, code, message } = res.data
+  if (code === CODE_SUCCESS) {
+    return data
+  } else {
+    const isExpired = (code === CODE_AUTH_EXPIRED || code === CODE_UNLOGIN)
+    const defaultMsg = isExpired ? '登录失效' : message
+    if (isExpired && autoLogin) {
+      // token失效，重新登录后，跳转到首页
+      login({}, () => {
+        Taro.switchTab({
+          url: '/pages/project/index'
+        })
+      })
+    } else {
+      if (showMessage) {
+        Taro.showToast({
+          title: defaultMsg,
+          icon: 'none'
+        })
+      }
+    }
+    if (showMessage) {
+
+      Taro.showToast({
+        title: message,
+        icon: 'none'
+      })
+    }
+
+    throw res.data
+  }
+}
+
+export function reqFail (err, opts) {
+  const [reqParams, settings] = opts || []
+  const { showMessage } = settings || {}
+
+  rtLog.error('[request]', "==================================")
+  rtLog.error('[request]', err)
+  rtLog.error('[request]', reqParams.url)
+  rtLog.error('[request]', wx.getLaunchOptionsSync())
+  rtLog.error('[request]', "==================================")
+
+  let errMessage = `请求失败: ${err.errMsg}`
+  if (err.errMsg) {
+    errMessage = '请检查网络'
+  }
+
+  if (err.message) {
+    console.error('请求失败', err.message)
+    errMessage = err.message.indexOf('java') > -1 ? '服务内部错误' : err.message
+  }
+
+  if (showMessage) {
+    Taro.showToast({
+      title: errMessage,
+      icon: 'none',
+      duration: 3000
+    })
+  }
+
+  throw new Error(errMessage)
+}

src/utils/requestQueue.js

@@ -0,0 +1,80 @@
+import { fetch } from './request'
+import { times } from './tools'
+
+// 高级队列, 先执行高级队列
+// 高级队列一般放置, 影响页面显示及交互的请求
+const tq = [];
+
+// 再执行中级队列
+// 中级队列一般放置, 与页面及交互无关的请求, 比如数据更新之类的
+const mq = [];
+
+// 最后执行低级队列
+// 低级队列一般放置, 与业务无关的请求, 比如埋点之类的
+const lq = [];
+
+// 汇总队列
+const qs = [tq, mq, lq];
+
+// 当前 request loop 是否执行中
+let isProcessing = false
+
+// 执行一个队列
+function execQ(qt) {
+  const qLen = qs[qt].length
+  if (process.env.NODE_ENV === 'development') {
+    console.log(`[request-queue] [${qt}]: 当前队列长度 ${qLen}`, qs[qt])
+  }
+
+  if (qLen === 0) {
+    return Promise.resolve()
+  }
+
+  return new Promise((resolve) => {
+    times(qLen).forEach(() => {
+
+      const current = qs[qt].shift()
+      const [options, success, fail] = current
+
+      fetch(options).then((res) => {
+        success(res)
+      }).catch((err) => {
+        fail(err)
+      })
+
+    })
+
+    resolve()
+  })
+}
+
+// 添加任务队列, 如果空闲状态则立即执行
+function addToQs(qt, job) {
+  qs[qt].push(job)
+
+  if (!isProcessing) {
+    startQs()
+  }
+}
+
+async function startQs() {
+  isProcessing = true
+
+  await execQ(0)
+  await execQ(1)
+  await execQ(2)
+
+  if (qs.reduce((s,q) => s + q.length, 0) > 0) {
+    await startQs()
+  }
+
+  isProcessing = false
+}
+
+export function fetchQ(options, queueType) {
+  return new Promise((resolve, reject) => {
+    // 默认放置高级队列
+    const qt = queueType || 0
+    addToQs(qt, [options, resolve, reject])
+  })
+}