Merge remote-tracking branch 'origin/master'

jiangping

2024-05-31 6be28040e74e1ff7764478174a9b5d706fe4fc39

 h5/utils/service.js

@@ -2,7 +2,7 @@
export const http = function (options) {
   {
      return new Promise((resolve, reject) => {
         let token = uni.getStorageSync('token')
         let token = uni.getStorageSync('token') || ''
         // 在登录的时候需要储存 token uni.setStorageSync("authorization","这里是登录获取的token值")

         // uni.showLoading({
@@ -18,7 +18,7 @@
            method: options.method || 'GET',
            header: options.header || {
               // 根据实际接口设计 key 取 token 或者 authorization
               token: token,
               dm_user_token: token,
               "content-type": 'application/json'
            },
            success: (res) => {
@@ -28,8 +28,8 @@
               // 登录过期
               if (data.code === 401) {
                  uni.navigateTo({
                     url: '/packageA/loginAgain/loginAgain'
                  })
                     url: '/pages/staffLogin/login'
                  });
               }
               if (data.code !== 200) {
                  uni.showToast({
@@ -46,6 +46,7 @@
               uni.showToast({
                  title: '请求接口失败'
               })
					
               // 返回错误消息
               reject(err)
               uni.hideLoading()