Merge remote-tracking branch 'origin/master'

doum

21 小时以前 5f277fef6d2c6538e2158ed14bb14d5a60a43912

 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 => {
@@ -18,7 +30,7 @@
   // 响应拦截器
   uni.$u.http.interceptors.response.use((response) => {
      // 登录过期
      if (response.data.code === 401) {
      if (response.data.code === 5111) {
         if (!isRefreshing) {   // 是否已经执行刷新
            isRefreshing = true
            uni.login({
@@ -26,12 +38,14 @@
               success: async function (loginRes) {
                  let { code } = loginRes;
                  uni.request({
                     url: vm.$baseUrl + 'mobile/system/login',
                     url: vm.$baseUrl + 'web/account/wxLogin',
                     method: "GET",
                     data: { code },
                     success: (res) => {
                        isRefreshing = false
                        vm.$store.commit('setToken', res.data.data)
                        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)
                        // 已经刷新了token，将所有队列中的请求进行重试
                        requests.forEach(item => item(res.data.data))
                        requests = []