eoss-mobiles 0.2.13 → 0.2.15

package/packages/theme-chalk/src/retrial-auth.scss

@@ -0,0 +1,28 @@
+@import './common/var.scss';
+.em-retrial-auth {
+  &-box {
+    padding: 10px;
+    background-color: #fff;
+    border-radius: 5px;
+    .van-cell {
+      padding-left: 0px;
+      padding-right: 0px;
+    }
+  }
+  &-icon-box{
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    padding: 20px 0px 10px 0px;
+    &-item{
+     margin:0px 5px;
+      display: inline-block;
+      padding: 7px;
+      background-color:#D9D9D9 ;
+      border-radius: 50%;
+    }
+    .active{
+      background-color:$--color-primary;
+    }
+  }
+}

package/src/config/api.js

@@ -2,6 +2,9 @@ import $ from '../utils/util';
 var activiti = '/bpm';
 var pending = '/bpm';
 var mecp = $.getStorage('flowPath') || '';
+export const initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化二级身份权限验证页面
+export const getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
+export const codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth';// 二级身份验证-验证码验证
 // 获取机构/用户/角色/群组等选择器
 export const selectObject = '/api/v1/mecpSys/selectObject.json';
 // // 获取代码表数据

package/src/index.js

@@ -40,6 +40,7 @@ import Stepper from '../packages/stepper/index.js';
 import Esign from '../packages/esign/index.js';
 import Pagination from '../packages/pagination/index.js';
 import Swipe from '../packages/swipe/index.js';
+import RetrialAuth from '../packages/retrial-auth/index.js';
 import PullRefresh from '../packages/pull-refresh/index.js';
 import NoticeBar from '../packages/notice-bar/index.js';
 
@@ -84,6 +85,7 @@ const components = [
   Esign,
   Pagination,
   Swipe,
+  RetrialAuth,
   PullRefresh,
   NoticeBar
 ];
@@ -99,7 +101,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.2.13',
+  version: '0.2.15',
   install,
   Button,
   ButtonGroup,
@@ -140,6 +142,7 @@ export default {
   Esign,
   Pagination,
   Swipe,
+  RetrialAuth,
   PullRefresh,
   NoticeBar
 };

package/src/utils/axios.js

@@ -1,189 +1,166 @@
 import Axios from 'axios';
-// import Vue from 'vue';
 import { Toast } from 'eoss-mobile-vant';
 import $ from './util';
 import qs from 'qs';
 let apiUrl = $.getStorage('host');
-let http = Axios.create({
-  baseURL: apiUrl,
-  timeout: 60000,
-  headers: {
-    // clientKey: 'csjk'
-  },
-  withCredentials: false
-});
-http.interceptors.request.use(
-  config => {
-    let data = {};
-    if (config.method === 'post') {
-      // 特殊处理在线考试接口1
-      if (config.url.search('HGtest') !== -1) {
-        config.headers['Content-Type'] = 'application/json;';
-        // config.data = qs.stringify(data);
-        Object.assign(data, config.data);
-      } else if (config.url.search('/outsidedirector/business/update') !== -1) {
-        delete config.data.userId;
-      } else if (config.url.indexOf('decisionSuperviseMeet') !== -1) {
-        config.headers['Content-Type'] = 'application/x-www-form-urlencoded';
-        Object.assign(data, config.data);
-        config.data = qs.stringify(data);
+
+const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
+  let http = Axios.create({
+    baseURL: apiUrl,
+    timeout: 60000,
+    headers: {
+      // clientKey: 'csjk'
+    },
+    withCredentials: false
+  });
+  http.interceptors.request.use(
+    config => {
+      if (type === 'post' && format) {
+        config.data = qs.stringify(params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] =
+            'application/x-www-form-urlencoded;charset=UTF-8';
+        }
       } else {
-        config.headers['Content-Type'] =
-          'application/x-www-form-urlencoded;charset=UTF-8';
-        if (
-          Object.prototype.toString
-            .call(config.data)
-            .slice(8, -1)
-            .toLowerCase() !== 'formdata'
-        ) {
-          Object.assign(data, config.data);
-          config.data = qs.stringify(data);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
         }
+        config.data = params;
       }
-    } else {
-      Object.assign(config.params, data);
-      config.headers['Content-Type'] = 'application/json;';
-    }
-    if ($.getStorage('token')) {
-      config.headers.Authorization = $.getStorage('token');
-    }
-    if ($.getStorage('deviceId')) {
-      config.headers.deviceId = $.getStorage('deviceId');
-    }
 
-    let a = '/config/';
+      if ($.getStorage('token')) {
+        config.headers.Authorization = $.getStorage('token');
+      }
+      if ($.getStorage('deviceId')) {
+        config.headers.deviceId = $.getStorage('deviceId');
+      }
 
-    if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
-      config.headers.clientKey = $.getStorage('clientKey') || 'csjk2';
-    }
-    if (config.url.search('api/financePhone/') !== -1) {
-      config.baseURL = 'https://release.cdgzjg.cn/';
-    }
-    if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
-      config.headers = {
-        token: sessionStorage.getItem('token'),
-        oueside_token: sessionStorage.getItem('token'),
-        deviceId: '432a320f99793e39',
-        Authorization: sessionStorage.getItem('token')
-      };
-    }
-    if (config.url.search('/getmyAccount.json') !== -1) {
-      delete config.params.userId;
-    }
-    if (config.url.search('/sso2/authCenter') !== -1) {
-      delete config.headers.clientKey;
-      delete config.headers.deviceId;
-    }
-    if (config.url.search('/appInfo') !== -1) {
-      config.headers.deviceId = $.getStorage('deviceId');
-      delete config.headers.clientKey;
-    }
-    if (
-      config.url.search('getPresetCustomInfo') !== -1 ||
-      config.url.search('registerNew') !== -1
-    ) {
-      // config.baseURL = "/api";
-      config.headers.token = $.getStorage('token');
-    }
-    if (
-      config.url.search('mecp/overtime') !== -1 ||
-      config.url.search('mecp/leave') !== -1 ||
-      config.url.search('contractext') !== -1 ||
-      config.url.search('getSysParam') !== -1
-    ) {
-      delete config.headers.deviceId;
-    }
-    // if(config.url.search('getVehicleMaintenanceInfoForAPP') !== -1 ) {
-    //   delete config.headers.deviceId
-    //   delete config.headers.Authorization
-    //   delete config.headers.clientKey
-    // }
-    if (config.url.search('/bpm') !== -1) {
-      // config.baseURL = "/api";
-      // config.headers.Authorization = $.getStorage('token');
-      // config.headers.Deviceunique = $.getStorage('deviceunique');
-      // config.headers.Ssid = $.getStorage('ssid');
-      // delete config.headers.deviceId;
-      // delete config.headers.clientKey;
-    }
-    return config;
-  },
-  error => {
-    return Promise.error(error);
-  }
-);
-// 响应拦截器
-http.interceptors.response.use(
-  response => {
-    if (response.status === 200) {
-      if (response.data.rCode === 64 || response.data.rCode === 27) {
-        $.H5TokenInvalid();
-      } else {
-        return Promise.resolve(response.data);
+      let a = '/config/';
+
+      if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
+        config.headers.clientKey = $.getStorage('clientKey') || 'csjk2';
       }
-    } else {
-      return Promise.reject(response);
-    }
-  },
-  error => {
-    if (error && error.response) {
-      if (error.response.status) {
-        switch (error.response.status) {
-          case 400:
-            error.message = '错误请求';
-            break;
-          case 401:
-            error.message = '未授权，请重新登录';
-            break;
-          case 403:
-            error.message = '登录过期，请重新登录';
-            $.removeStorage('userId');
-            break;
-          case 404:
-            error.message = '网络请求不存在';
-            break;
-          case 405:
-            error.message = '请求方法错误';
-            break;
-          case 408:
-            error.message = '请求超时';
-            break;
-          case 500:
-            error.message = '服务器端出错';
-            break;
-          case 501:
-            error.message = '网络未实现';
-            break;
-          case 502:
-            error.message = '网络错误';
-            break;
-          case 503:
-            error.message = '服务不可用';
-            break;
-          case 504:
-            error.message = '网络超时';
-            break;
-          case 505:
-            error.message = 'http版本不支持该请求';
-            break;
-          default:
-            error.message = `连接错误${error.response.status}`;
+      if (config.url.search('api/financePhone/') !== -1) {
+        config.baseURL = 'https://release.cdgzjg.cn/';
+      }
+      if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
+        config.headers = {
+          token: sessionStorage.getItem('token'),
+          oueside_token: sessionStorage.getItem('token'),
+          deviceId: '432a320f99793e39',
+          Authorization: sessionStorage.getItem('token')
+        };
+      }
+      if (config.url.search('/getmyAccount.json') !== -1) {
+        delete config.params.userId;
+      }
+      if (config.url.search('/sso2/authCenter') !== -1) {
+        delete config.headers.clientKey;
+        delete config.headers.deviceId;
+      }
+      if (config.url.search('/appInfo') !== -1) {
+        config.headers.deviceId = $.getStorage('deviceId');
+        delete config.headers.clientKey;
+      }
+      if (
+        config.url.search('getPresetCustomInfo') !== -1 ||
+        config.url.search('registerNew') !== -1
+      ) {
+        config.headers.token = $.getStorage('token');
+      }
+      if (
+        config.url.search('mecp/overtime') !== -1 ||
+        config.url.search('mecp/leave') !== -1 ||
+        config.url.search('contractext') !== -1 ||
+        config.url.search('getSysParam') !== -1
+      ) {
+        delete config.headers.deviceId;
+      }
+      return config;
+    },
+    error => {
+      return Promise.error(error);
+    }
+  );
+  http.interceptors.response.use(
+    response => {
+      if (response.status === 200) {
+        if (response.data.rCode === 64 || response.data.rCode === 27) {
+          $.H5TokenInvalid();
+        } else {
+          return Promise.resolve(response.data);
         }
       } else {
-        error.message = '接口出现问题，无法请求';
+        return Promise.reject(response.data);
       }
-    }
-    Toast({
-      message: error.message,
-      duration: 1500,
-      forbidClick: true
-    });
-    return Promise.reject(error);
+    },
+    error => {
+      if (error && error.response) {
+        if (error.response.status) {
+          switch (error.response.status) {
+            case 400:
+              error.message = '错误请求';
+              break;
+            case 401:
+              error.message = '未授权，请重新登录';
+              break;
+            case 403:
+              error.message = '登录过期，请重新登录';
+              $.removeStorage('userId');
+              break;
+            case 404:
+              error.message = '网络请求不存在';
+              break;
+            case 405:
+              error.message = '请求方法错误';
+              break;
+            case 408:
+              error.message = '请求超时';
+              break;
+            case 500:
+              error.message = '服务器端出错';
+              break;
+            case 501:
+              error.message = '网络未实现';
+              break;
+            case 502:
+              error.message = '网络错误';
+              break;
+            case 503:
+              error.message = '服务不可用';
+              break;
+            case 504:
+              error.message = '网络超时';
+              break;
+            case 505:
+              error.message = 'http版本不支持该请求';
+              break;
+            default:
+              error.message = `连接错误${error.response.status}`;
+          }
+        } else {
+          error.message = '接口出现问题，无法请求';
+        }
+      }
+      Toast({
+        message: error.message,
+        duration: 1500,
+        forbidClick: true
+      });
+      return Promise.reject(error);
+    }
+  );
+  if (type === 'get' || type === 'GET') {
+    return http.get(url, params, headers, format);
+  } else {
+    return http.post(url, params, headers, format);
   }
-);
+};
+
+// 响应拦截器
 
 const base = {
-  get: (url, params = {}) => {
+  get: (url, params = {}, headers = {}, format = false) => {
     if (params.params && url.search('registerNew') === -1) {
       params.params.userId = params.params.userId
         ? params.params.userId
@@ -201,17 +178,22 @@ const base = {
         params.userId = 'u1b9f3ce4731649e0b665af015d74c19b';
       }
     }
-    return http.get(url, {
-      params
-    });
+    return ajax(
+      url,
+      {
+        params
+      },
+      headers,
+      format
+    );
   },
-  post: (url, params = {}) => {
+  post: (url, params, headers, format) => {
     if (params.params) {
       params.params.userId = params.params.userId || $.getStorage('userId');
     } else {
       params.userId = params.userId || $.getStorage('userId');
     }
-    return http.post(url, params);
+    return ajax(url, params, headers, format, 'post');
   }
 };
 export default base;

package/src/utils/http.js

@@ -3,19 +3,29 @@ const request = options => {
   let fn;
   switch (options.type) {
     case 'post':
-      fn = base.post(options.url, options.params);
+      fn = base.post(
+        options.url,
+        options.params,
+        options.headers,
+        options.format
+      );
       break;
     case 'POST':
-      fn = base.post(options.url, options.params);
+      fn = base.post(
+        options.url,
+        options.params,
+        options.headers,
+        options.format
+      );
       break;
     case 'get':
-      fn = base.get(options.url, options.params);
+      fn = base.get(options.url, options.params, options.headers = {});
       break;
     case 'GET':
-      fn = base.get(options.url, options.params);
+      fn = base.get(options.url, options.params, options.headers = {});
       break;
     default:
-      fn = base.get(options.url, options.params);
+      fn = base.get(options.url, options.params, options.headers = {});
   }
   return fn;
 };