Bladeren bron

fix:删除util里面多余文件内容

chenzhen2 1 jaar geleden
bovenliggende
commit
78b20c28b1
7 gewijzigde bestanden met toevoegingen van 67 en 66 verwijderingen
  1. 2 2
      src/api/user.js
  2. 2 2
      src/common/request.js
  3. 1 34
      src/common/utils.js
  4. 3 3
      src/pages/auth/index.wpy
  5. 5 1
      src/pages/index.wpy
  6. 32 22
      src/service/user.js
  7. 22 2
      src/utils/index.js

+ 2 - 2
src/api/user.js

@@ -53,7 +53,7 @@ function getCompanyByPhone(params) {
 }
 
 // 根据code获取手机号
-function getPhoneNumber(code) {
+function getHttpPhoneNumber(code) {
   return $http({
     url: `${config.duoduoenvService}userNew/wechat/getPhoneNumber?code=${code}`,
     method: 'get'
@@ -72,7 +72,7 @@ function refreshToken(refreshToken) {
 export {
   getCompmayUsers,
   getUserInfo,
-  getPhoneNumber,
+  getHttpPhoneNumber,
   getCompanyByPhone,
   register,
   login,

+ 2 - 2
src/common/request.js

@@ -37,7 +37,7 @@ function commonParams() {
     url = url + `&userId=${storeUser().userId}`
   }
   if (storeToken()) {
-    url = url + `&saga_token=${storeToken()}`
+    url = url + `&saga-token=${storeToken()}`
   }
   return url;
 }
@@ -66,7 +66,7 @@ export default function (info) {
   const token = store.state.user.token;
   if (token) {
     info.header = Object.assign(
-      { 'saga_token': token }
+      { 'saga-token': token }
       , info.header)
   }
 

+ 1 - 34
src/common/utils.js

@@ -5,47 +5,14 @@ import {
 import moment from 'moment';
 
 export default {
-  genId,
-  getGenderDesc,
-  getTwoNum,
-  getFutureDayList,
-  getWeekDesc,
-  getHourList,
-  getHourObj,
-  payItemsC2S,
-  payItemsS2C,
-  invitationS2C,
   formateTime,
-  getHour12Desc,
-  addUrlVersion,
-  addUrlParams,
-  getPeriodTimeDesc,
-  getDateSimpleDesc,
-  getDateDesc,
   debounce,
-  formatepmValueToStatusText,
-  getPmfromHttpResult,
   getUrlParams,
-  // 刷新接口
-  refreshCode,
   // 轮训获取
   getQrcode,
   formateEnvIndicatorValue,
   random,
-  getTextHcho,
-  getTextCO2,
-  getTextHumidity,
-  getTextPM,
-  getEnvIndectorDesc,
-  formatePassLinkToText,
-  formatePassLinkItemToText,
-  generateImgRandomStr,
-  getSearchRegEx,
-  formateInvitationPassLink,
-  formateDateDurationTime,
-  transformColorHex2Rgba,
-  isDeepColor,
-  previewAgreement
+  getSearchRegEx
 };
 
 let seed = 0;

+ 3 - 3
src/pages/auth/index.wpy

@@ -144,9 +144,9 @@ wepy.page({
       console.log(detail);
       store.commit('setUserPhone', 15321277745);
       // wx.setStorage('userPhone', 15321277745);
-      wx.navigateTo({
-        url: '/pages/bindTenant/index'
-      });
+      // wx.navigateTo({
+      //   url: '/pages/bindTenant/index'
+      // });
     },
     goBindTenant() {
       console.log('被点击了');

+ 5 - 1
src/pages/index.wpy

@@ -81,6 +81,7 @@ wepy.page({
     goBindTenant() {
       this.goAuth();
     },
+    // 判断用户是否认证过
     checkTenantRegist() {
       wxLogin(1)
         .then(res => {
@@ -108,8 +109,11 @@ wepy.page({
         .catch(error => {});
     },
     goHome() {
+      // wx.navigateTo({
+      //   url: '/packagesEnv/pages/home/index'
+      // });
       wx.navigateTo({
-        url: '/packagesEnv/pages/home/index'
+        url: '/pages/auth/index'
       });
     },
     goAuth() {

+ 32 - 22
src/service/user.js

@@ -176,28 +176,38 @@ function getCompanyDataByPhone() {
 
 // 登录续约
 function refreshTokenPage() {
-  refreshToken().then(res => {
-    if (res.result == 'success') {
-      let data = res.data || []
-      let tokenInfo = {
-        expireTime: data.expireTime,
-        startTime: data.startTime,
-        refreshTokenExpireTime: data.refreshTokenExpireTime,
-        refreshToken: data.refreshToken
-      };
-      store.commit('setToken', data.token);
-      store.commit('setActivated', data.isActivated);
-      store.commit('setTokenInfo', tokenInfo);
-      if (data.isActivated && data.isActivated == 1) {
-        store.commit('setUserInfo', data.tokenUser);
-      } else {
-        wx.redirectTo({ url: '/pages/index' });
-        store.commit('setUserInfo', {});
+  return new Promise((resolve, reject) => {
+    refreshToken().then(res => {
+      if (res.result == 'success') {
+        let data = res.data || []
+        let tokenInfo = {
+          expireTime: data.expireTime,
+          startTime: data.startTime,
+          refreshTokenExpireTime: data.refreshTokenExpireTime,
+          refreshToken: data.refreshToken
+        };
+        store.commit('setToken', data.token);
+        store.commit('setActivated', data.isActivated);
+        store.commit('setTokenInfo', tokenInfo);
+        if (data.isActivated && data.isActivated == 1) {
+          store.commit('setUserInfo', data.tokenUser);
+          resolve(data)
+        } else {
+          store.commit('setToken', '')
+          // store.commit('setUserInfo', {});
+          wx.redirectTo({ url: '/pages/index' });
+          resolve(data)
+        }
       }
-    }
-  }).catch(() => {
-    wxLogin()
+    }).catch(() => {
+      resolve("续约失败")
+      store.commit('setToken', '')
+      wx.redirectTo({ url: '/pages/index' });
+      // store.commit('setUserInfo', {});
+      // wxLogin()
+    })
   })
+
 }
 // 检查是否登录过以及过期
 function checkLoginNew() {
@@ -207,9 +217,9 @@ function checkLoginNew() {
   } else {
     let flag = checkTokenIsValid()
     if (flag == 1) {
-      refreshTokenPage(); // 续约
+      return refreshTokenPage(); // 续约
     } else if (flag == 2) { // 重新登录
-      wxLogin();
+      return wxLogin();
     } else if (flag == 3) {  // 后续补定时器定时续约逻辑
 
     }

+ 22 - 2
src/utils/index.js

@@ -1,4 +1,4 @@
-
+import store from '@/store';
 function getMiniProgram() {
     const miniProgram = wx.getAccountInfoSync();
     return miniProgram;
@@ -21,10 +21,30 @@ function getTimeStamp() {
     return timeStamp;
 }
 
+// http请求通用参数
+function commonParams() {
+    // openid=${storeUser().openId}&
+    let url = `pubname=${config.brsgServer.pubname}`
+    if (storeUser().projectId) {
+        url = url + `&projectId=${storeUser().projectId}`
+    }
+    if (storeUser().userName) {
+        url = url + `&userName=${storeUser().userName}`
+    }
+    if (storeUser().userId) {
+        url = url + `&userId=${storeUser().userId}`
+    }
+    if (storeToken()) {
+        url = url + `&saga-token=${storeToken()}`
+    }
+    return url;
+}
+
 
 export {
     getAppId,
     getVersion,
     getTimeStamp,
-    getMiniProgram
+    getMiniProgram,
+    commonParams
 }