Merge remote-tracking branch 'origin/master'

jiangping

2024-07-24 680028df90e18299ea72d242a28a3ddcd9a0441c

 wechat_jiaxuan/app.js

@@ -13,37 +13,32 @@
      this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom;
    }
    // 授权登录
    const member = wx.getStorageSync('member')
    if (member && member.token) {
      
    } else {
      wx.login({
        timeout: 5000,
        success(res) {
          if (res.code) {
            //发起网络请求
            wxLoginCustomer({
              code: res.code
            }).then(res => {
              console.log(res)
              if (res && res.data.member) {
                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)
    wx.login({
      timeout: 5000,
      success(res) {
        if (res.code) {
          //发起网络请求
          wxLoginCustomer({
            code: res.code
          }).then(res => {
            console.log(res)
            if (res && res.data.member) {
              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)
      }
    })