合并

MrShi

8 小时以前 edeeafd87e7573b8722f72983a412eba17fa6687

 mini-program/utils/http.interceptor.js

@@ -6,9 +6,21 @@
   
   // 请求拦截器
   uni.$u.http.interceptors.request.use((config) => {
      const Headtoken = vm.$store.state.token
      if (Headtoken) {
         config.header['token'] = Headtoken;
      if(config.data && config.data.tokenType===1){
         const HeadShoptoken = vm.$store.state.shopToken 
         if (HeadShoptoken) {
            config.header['token'] = HeadShoptoken;
         }
      }else if(config.params  && config.params.tokenType===1){
         const HeadShoptoken = vm.$store.state.shopToken 
         if (HeadShoptoken) {
            config.header['token'] = HeadShoptoken;
         }
      }else{
         const Headtoken = vm.$store.state.token
         if (Headtoken) {
            config.header['token'] = Headtoken;
         }
      }
      return config
   }, config => {
@@ -30,12 +42,19 @@
                     method: "GET",
                     data: { code },
                     success: (res) => {
<<<<<<< HEAD
                        isRefreshing = false
                        
                        vm.$store.commit('setToken', res.data.token)
                        vm.$store.commit('setUserInfo', res.data.member)
                        vm.$store.commit('setOpenId', res.data.member.openId)
                        vm.$store.commit('setToken', res.data.data.token)
                        vm.$store.commit('setUserInfo', res.data.data.member)
                        vm.$store.commit('setOpenId', res.data.data.member.openId)
                        
=======
                        isRefreshing = false 
                        vm.$store.commit('setToken', res.data.data.token)
                        vm.$store.commit('setUserInfo', res.data.data.member)
                        vm.$store.commit('setOpenId', res.data.data.openid)
>>>>>>> b9b64778f693ebe82fcbc97837b6012dadb3b084
                        // 已经刷新了token，将所有队列中的请求进行重试
                        requests.forEach(item => item(res.data.data))
                        requests = []