Merge remote-tracking branch 'origin/master'

jiangping

2024-07-22 b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233

 wechat_jiaxuan/utils/request.js

@@ -1,4 +1,5 @@
import { baseUrl } from "./config"
import { wxLoginCustomer } from '../api/index'

export function request(options){
  let loading = options.loading || '1' // 默认值1显示，否则不显示
@@ -19,9 +20,40 @@
        if (res.data.code === 200) {
          resolve(res.data || true)
        } else {
          if(res.data.code == 5111 && res.data.code == 5112){
            wx.navigateTo({
              url: '/pages/auth/auth',
          // if(res.data.code == 5112){
          //   wx.navigateTo({
          //     url: '/pages/auth/auth ',
          //   })
          // }
          if(res.data.code == 5111 || res.data.code == 5112){
            wx.login({
              timeout: 5000,
              success(res) {
                if (res.code) {
                  //发起网络请求
                  wxLoginCustomer({
                    code: res.code
                  }).then(res => {
                    console.log(res)
                    if (res && res.data.member) {
                      wx.switchTab({
                        url: '/pages/index/index',
                      })
                      wx.setStorageSync('member', res.data.member)
                      wx.setStorageSync('openid', res.data.member.openid)
                      wx.setStorageSync('sessionKey', res.data.sessionKey)
                      wx.setStorageSync('token', res.data.token)
                    } else {
                      console.log('登录失败！')
                    }
                  })
                } else {
                  console.log('登录失败！' + res)
                }
              },
              fail(err) {
                console.log(err)
              }
            })
          }
          res.data.message && wx.showToast({