curCity

src/utils/login.js

@@ -26,22 +26,28 @@ export default function (payload, callback) {
 
         const { extraInfo, miniApp, person, miniAuthorized, avatarAuth, city } = data
         const { token, sessionKey } = miniApp
-        const { dispatch } = getStore()
+        const { dispatch, getState } = getStore()
+
         Taro.setStorageSync('token', token)
         Taro.setStorageSync('sessionKey', sessionKey)
-        
+
         dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
+        const { city: { curCity } } = getState()
 
-        if (city) {
-          dispatchCitySelected(city)(dispatch)
-        }
+        console.log(curCity, "curCity")
+
+        // if (!curCity) {
+          if (city) {
+            dispatchCitySelected(city)(dispatch)
+          }
+        // }
 
         // // 用户信息已授权获取成功
         // if (miniAuthorized || avatarAuth) {
 
         //   // 保存用户信息
         //   // dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
-          callback && callback(data)
+        callback && callback(data)
 
         // } else {