Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/app.js

@@ -1,49 +1,42 @@
-import '@tarojs/async-await'
-import Taro, { Component } from '@tarojs/taro'
-import './app.scss'
+import "@tarojs/async-await";
+import Taro, { Component } from "@tarojs/taro";
+import "./app.scss";
 import "@/styles/icon.scss";
 import "@/components/wxParse/wxParse.scss";
-import Index from './pages/auth/index'
-import { Provider } from '@tarojs/redux'
-import { parseQueryString } from '@/utils/tools'
-import { trackUserSource } from '@/utils/track'
-import { getCardDetail } from '@/services/card'
+import Index from "./pages/auth/index";
+import { Provider } from "@tarojs/redux";
+import { parseQueryString } from "@/utils/tools";
+import { trackUserSource } from "@/utils/track";
+import { getCardDetail } from "@/services/card";
 
 import {
   getCodeScene,
   savePoint,
   queryCityList,
-  getPreloadData,
-} from '@/services/common'
+  getPreloadData
+} from "@/services/common";
 
-import {
-  queryUserInfo
-} from '@/services/user'
+import { queryUserInfo } from "@/services/user";
 
-import {
-  CITY_LIST
-} from '@/constants/city'
-import {
-  ASSIGN_UNREADNUM,
-  INCREASE_UNREADNUM
-} from '@/constants/user'
-import { UPDATE_PRELOAD, SYNC_SYSTEMINFO } from '@/constants/common'
-import ready from '@/utils/ready'
-import login from '@/utils/login'
-import store from './store'
-import socket from '@/utils/im'
+import { CITY_LIST } from "@/constants/city";
+import { ASSIGN_UNREADNUM, INCREASE_UNREADNUM } from "@/constants/user";
+import { UPDATE_PRELOAD, SYNC_SYSTEMINFO } from "@/constants/common";
+import ready from "@/utils/ready";
+import login from "@/utils/login";
+import store from "./store";
+import socket from "@/utils/im";
 
 // const store = configStore()
 
 // for dev
-global.store = store
+global.store = store;
 
 class App extends Component {
   config = {
-    debug: process.env.NODE_ENV === 'development',
+    debug: process.env.NODE_ENV === "development",
     permission: {
       "scope.userLocation": {
-        "desc": "你的位置信息将用于显示当前区域信息"
+        desc: "你的位置信息将用于显示当前区域信息"
       }
     },
     navigateToMiniProgramAppIdList: [
@@ -52,7 +45,7 @@ class App extends Component {
       "wx74767bf0b684f7d3",
       "wx6fa58869f7b65e7f",
       "wxc4f812079fc9ff0d",
-      "wx60d176f873ca2d67",
+      "wx60d176f873ca2d67"
     ],
     // eslint-disable-next-line no-undef
     pages: preval`
@@ -65,82 +58,82 @@ class App extends Component {
       module.exports = getPages().subPackages
     `,
     window: {
-      backgroundTextStyle: 'light',
-      navigationBarBackgroundColor: '#BB9C79',
-      navigationBarTitleText: '',
-      navigationBarTextStyle: 'white',
+      backgroundTextStyle: "light",
+      navigationBarBackgroundColor: "#BB9C79",
+      navigationBarTitleText: "",
+      navigationBarTextStyle: "white"
       // navigationStyle:'custom'
     },
     tabBar: {
-      color: '#666',
-      selectedColor: '#BB9C79',
+      color: "#666",
+      selectedColor: "#BB9C79",
 
       list: [
         {
           pagePath: "pages/project/index",
           text: "首页",
-          iconPath: './assets/tabbar/index1.png',
-          selectedIconPath: './assets/tabbar/index2.png',
+          iconPath: "./assets/tabbar/index1.png",
+          selectedIconPath: "./assets/tabbar/index2.png"
         },
         {
           pagePath: "pages/shop/index",
           text: "赚好礼",
-          iconPath: './assets/tabbar/shop1.png',
-          selectedIconPath: './assets/tabbar/shop2.png',
+          iconPath: "./assets/tabbar/shop1.png",
+          selectedIconPath: "./assets/tabbar/shop2.png"
         },
         {
           pagePath: "pages/activity/activity",
           text: "活动资讯",
-          iconPath: './assets/tabbar/activity1.png',
-          selectedIconPath: './assets/tabbar/activity2.png',
+          iconPath: "./assets/tabbar/activity1.png",
+          selectedIconPath: "./assets/tabbar/activity2.png"
         },
         {
           pagePath: "pages/person/index",
           text: "我的地盘",
-          iconPath: './assets/tabbar/mine1.png',
-          selectedIconPath: './assets/tabbar/mine2.png',
+          iconPath: "./assets/tabbar/mine1.png",
+          selectedIconPath: "./assets/tabbar/mine2.png"
         }
       ]
     },
-  }
+    restartStrategy: "homePageAndLatestPage"
+  };
 
   // 更新埋点时长
   updateTrack;
 
   componentDidHide() {
     if (this.updateTrack) {
-      this.updateTrack()
-      this.updateTrack = undefined
+      this.updateTrack();
+      this.updateTrack = undefined;
     }
 
     // ready.close()
-    socket.closeSocket()
+    socket.closeSocket();
   }
 
   componentDidShow() {
-
-    const updateManager = wx.getUpdateManager()
-    updateManager.onCheckForUpdate(function (res) {
+    const updateManager = wx.getUpdateManager();
+    updateManager.onCheckForUpdate(function(res) {
       // 请求完新版本信息的回调
-      console.info('新版本是否更新:', res.hasUpdate)
-    })
+      console.info("新版本是否更新:", res.hasUpdate);
+    });
 
-    updateManager.onUpdateReady(function () {
+    updateManager.onUpdateReady(function() {
       wx.showModal({
-        title: '更新提示',
-        content: '新版本已经准备好，是否重启应用？',
+        title: "更新提示",
+        content: "新版本已经准备好，是否重启应用？",
         success(res) {
           if (res.confirm) {
             // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-            updateManager.applyUpdate()
+            updateManager.applyUpdate();
           }
         }
-      })
-    })
+      });
+    });
 
-    socket.reconnect()
+    socket.reconnect();
 
-    this.initData()
+    this.initData();
   }
 
   componentDidMount() {
@@ -149,17 +142,17 @@ class App extends Component {
 
   componentWillMount() {
     // 预加载数据
-    this.wxPreloadData()
+    this.wxPreloadData();
 
     // 获取系统信息
     wx.getSystemInfo({
-      success: (res) => {
+      success: res => {
         store.dispatch({
           type: SYNC_SYSTEMINFO,
-          payload: res,
-        })
+          payload: res
+        });
       }
-    })
+    });
 
     // console.info('app componentWillMount', params)
     // this.initData()
@@ -167,8 +160,8 @@ class App extends Component {
 
   componentWillUnmount() {
     if (this.updateTrack) {
-      this.updateTrack()
-      this.updateTrack = undefined
+      this.updateTrack();
+      this.updateTrack = undefined;
     }
     // this.initData()
   }
@@ -186,112 +179,124 @@ class App extends Component {
     // })
     // wx.setBackgroundFetchToken()
     wx.getBackgroundFetchData({
-      fetchType: 'pre',
-      success: (res) => {
-        console.log('[preload]: ', res)
+      fetchType: "pre",
+      success: res => {
+        console.log("[preload]: ", res);
         // store.dispatch({
         //   type: UPDATE_PRELOAD,
         //   payload: res.fetchedData,
         // })
       }
-    })
+    });
   }
 
-  _mounted = false
+  _mounted = false;
 
   initData() {
-    console.info('router1', this.$router)
-    console.info('ready status1', ready)
-    const enterOptions = wx.getEnterOptionsSync()
-    console.log(enterOptions, "enterOptionsenterOptionsenterOptionsenterOptionsenterOptions")
-
-    if (Object.keys(enterOptions.query).indexOf('recommender') > -1) {
-      Taro.setStorageSync('recommender', enterOptions.query.recommender)
-      Taro.setStorageSync('consultantId', enterOptions.query.consultant)
-    }
+    console.info("router1", this.$router);
+    console.info("ready status1", ready);
+    // 清空全局置业顾问Id
+    Taro.removeStorageSync("consultantId");
+
     // 获取城市列表
     // queryCityList().then(payload => {
     //   store.dispatch({ type: CITY_LIST, payload })
     // })
 
-    this.getLocation().then((loc) => {
+    this.getLocation().then(loc => {
       // 获取router参数
       this.getRouterParams().then(router => {
-        Taro.setStorageSync('router', router)
-        console.info('router2:', JSON.stringify(router))
-        console.info('-----------')
-        const { query: payload } = router
+        Taro.setStorageSync("router", router);
+        console.info("router2:", router);
+        console.info("-----------");
+        const { query: payload } = router;
 
-        payload.path = router.path
-        payload.scene = router.scene
+        payload.path = router.path;
+        payload.scene = router.scene;
 
         if (loc) {
-          payload.lon = loc.lon
-          payload.lat = loc.lat
+          payload.lon = loc.lon;
+          payload.lat = loc.lat;
         }
 
         // login
         login(payload, res => {
           // 清空本地缓存
           if (!this._mounted) {
-
-            Taro.removeStorageSync('activityPageIndex')
-            Taro.removeStorageSync('newsPageIndex')
-            Taro.removeStorageSync('buildingPageIndex')
-            Taro.removeStorageSync('followPageIndex')
-            Taro.removeStorageSync('clinchPageIndex')
+            Taro.removeStorageSync("activityPageIndex");
+            Taro.removeStorageSync("newsPageIndex");
+            Taro.removeStorageSync("buildingPageIndex");
+            Taro.removeStorageSync("followPageIndex");
+            Taro.removeStorageSync("clinchPageIndex");
             // Taro.removeStorageSync('extendContent')
-            Taro.setStorageSync('extendContent', [])
-            // Taro.setStorageSync('recommender', payload.recommender)
-            // Taro.setStorageSync('consultantId', payload.consultant)
+            Taro.setStorageSync("extendContent", []);
             // 获取分享人
-            this._mounted = true
+            this._mounted = true;
           }
-          console.log(payload, "payloadpayloadpayloadpayloadpayloadpayloadpayload啦啦啦啦啦")
-
 
+          console.log(
+            payload,
+            "payloadpayloadpayloadpayloadpayloadpayloadpayload啦啦啦啦啦"
+          );
+          Taro.setStorageSync("recommender", payload.recommender);
+          Taro.setStorageSync("consultantId", payload.consultant);
 
           // 获取未读消息
-          const { person: { personId } } = res
+          const {
+            person: { personId }
+          } = res;
 
           queryUserInfo(personId).then(info => {
-            const { unReadNum } = info
+            const { unReadNum } = info;
             store.dispatch({ type: ASSIGN_UNREADNUM, payload: { unReadNum } });
             socket.createSocket({ id: personId });
             socket.onMessage(data => {
-              store.dispatch({ type: INCREASE_UNREADNUM })
-            })
-          })
+              store.dispatch({ type: INCREASE_UNREADNUM });
+            });
+          });
           // 埋点
           // const t = setTimeout(() => {
-          trackUserSource(this.$router.params).then(res => this.updateTrack = res)
+          trackUserSource(this.$router.params).then(
+            res => (this.updateTrack = res)
+          );
 
           // }, 1000)
-        })
-      })
-    })
+        });
+      });
+    });
   }
 
-
   getRouterParams() {
     return new Promise(resolve => {
-      console.log('------getRouterParams------>', this.$router)
-      const router = this.$router.params
+      console.log("------getRouterParams------>", this.$router);
+      const router = this.$router.params;
       const originQuery = { ...router.query };
-      let { query: { scene: paramsId, consultant }, scene } = router
+      let {
+        query: { scene: paramsId, consultant },
+        scene
+      } = router;
 
       // query 里面如果跟同级场景一样, 说明是小程序原生场景值
       if (paramsId === scene) {
-        paramsId = undefined
+        paramsId = undefined;
       }
 
       if (paramsId) {
         // 扫码进入
         getCodeScene(paramsId).then(res => {
-          let params = JSON.parse(res).scene
-          console.log(params, "paramsparamsparamsparamsparamsparamsparamsparamsparamsparams")
+          let params = JSON.parse(res).scene;
+          console.log(
+            params,
+            "paramsparamsparamsparamsparamsparamsparamsparamsparamsparams"
+          );
 
-          let { from: _from, recommender: _recommender, consultant, id, ...left } = parseQueryString(params) || {}
+          let {
+            from: _from,
+            recommender: _recommender,
+            consultant,
+            id,
+            ...left
+          } = parseQueryString(params) || {};
 
           router.query = Object.assign(router.query, {
             originQuery,
@@ -302,55 +307,54 @@ class App extends Component {
             consultant,
             params,
             targetId: id,
-            ...left,
-          })
-          Taro.setStorageSync('recommender', router.query.recommender)
-          Taro.setStorageSync('consultantId', router.query.consultant)
-          resolve(router)
-        })
-      } else {
+            ...left
+          });
 
+          resolve(router);
+        });
+      } else {
         router.query = Object.assign(router.query, {
           originQuery,
-          paramsId: router.query.id || '',
-          from: router.query.from || 'search',
-          recommender: router.query.recommender || '',
-          targetId: router.query.id || '',
-          consultant: router.query.consultant || '',
-        })
-
-        resolve(router)
+          paramsId: router.query.id || "",
+          from: router.query.from || "search",
+          recommender: router.query.recommender || "",
+          targetId: router.query.id || "",
+          consultant: router.query.consultant || ""
+        });
+
+        resolve(router);
       }
-
-    })
+    });
   }
 
   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,
-          })
-        }
+    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()
-      })
-    })
+          console.error(err);
+          resolve();
+        });
+    });
   }
 
   // 在 App 类中的 render() 函数没有实际作用
@@ -360,8 +364,8 @@ class App extends Component {
       <Provider store={store}>
         <Index />
       </Provider>
-    )
+    );
   }
 }
 
-Taro.render(<App />, document.getElementById('app'))
+Taro.render(<App />, document.getElementById("app"));