@10yun/cv-mobile-ui 0.3.21 → 0.3.24

package/plugins/request.js

@@ -2,8 +2,7 @@
 function requestDownloadFile(apiUrl, paramData) {
   return requestApi('download', apiUrl, paramData);
 }
-function _baseResponse() {
-}
+function _baseResponse() {}
 function confirmEnding(str, target) {
   // 请把你的代码写在这里
   var start = str.length - target.length;
@@ -18,9 +17,9 @@ function showErrorMsg(msg) {
   uni.hideLoading();
   uni.hideToast();
   uni.showToast({
-    icon: "none",
+    icon: 'none',
     duration: 2000,
-    title: msg || '',
+    title: msg || ''
   });
 }
 
@@ -33,14 +32,14 @@ class RequestClass {
     this.baseURL = options.baseURL || '';
     this.requests = options.requests || {};
     /**
-     * 内置的，支持的 methods 
+     * 内置的，支持的 methods
      * 处理，需要转换的 methods
      */
     let inlayMehtod = ['PUT', 'PATCH', 'DELETE'];
     let supportMethod = options.needMethods || [];
     let needMethods = [];
     for (var i = 0; i < supportMethod.length; i++) {
-      let daxieItem = (supportMethod[i]).toUpperCase();
+      let daxieItem = supportMethod[i].toUpperCase();
       if (inlayMehtod.indexOf(daxieItem) !== -1) {
         needMethods.push(daxieItem);
       }
@@ -51,23 +50,25 @@ class RequestClass {
     let response = {
       statusName: 'status', // 规定数据状态的字段名称，默认：code
       statusCode: 200, // 规定成功的状态码，默认：0
-      msgName: 'msg',// 规定状态信息的字段名称，默认：msg
-      countName: 'total',// 规定数据总数的字段名称，默认：count
+      msgName: 'msg', // 规定状态信息的字段名称，默认：msg
+      countName: 'total', // 规定数据总数的字段名称，默认：count
       dataName: 'data' // 规定数据列表的字段名称，默认：data
     };
 
+    this.headers = Object.assign({}, {}, options.headers || {});
 
-    this.headers = Object.assign({}, {
-    }, (options.headers || {}));
-
-    this.creSett = Object.assign({}, {
-      timeout: 5000, // request timeout
-      // 表示跨域请求时是否需要使用凭证;
-      // 开启withCredentials后，服务器才能拿到你的cookie
-      // 当然后端服务器也要设置允许你获取你开启了才有用
-      // withCredentials: true, // 开启跨域身份凭证
-      retry: 2
-    }, {});
+    this.creSett = Object.assign(
+      {},
+      {
+        timeout: 5000, // request timeout
+        // 表示跨域请求时是否需要使用凭证;
+        // 开启withCredentials后，服务器才能拿到你的cookie
+        // 当然后端服务器也要设置允许你获取你开启了才有用
+        // withCredentials: true, // 开启跨域身份凭证
+        retry: 2
+      },
+      {}
+    );
 
     this._initReqHandle();
     // this.flagApi = this.flagApi.bind(this);
@@ -75,21 +76,27 @@ class RequestClass {
   /*初始化 request 句柄 */
   _initReqHandle() {
     var _this = this;
+  }
 
-
+  /**
+   * 设置flag参数
+   */
+  setFlag(options) {
+    this.flagMap = Object.assign({}, this.flagMap, options || {});
+    return this;
   }
   /**
    * 设置header参数
    */
   setHeaders(options) {
-    this.headers = Object.assign({}, this.headers, (options || {}));
+    this.headers = Object.assign({}, this.headers, options || {});
     return this;
   }
   /**
-  * 设置header参数
-  */
+   * 设置header参数
+   */
   setRequests(options) {
-    this.requests = Object.assign({}, this.requests, (options || {}));
+    this.requests = Object.assign({}, this.requests, options || {});
     return this;
   }
   /**
@@ -122,7 +129,15 @@ class RequestClass {
         uni.stopPullDownRefresh();
         this.storeHandle.dispatch('storeUser/ssLogout', false);
         this.jumpHandle.jumpsLogin();
-        return
+        return;
+        break;
+      // 无效凭证，请重新登录
+      case '100109':
+      case 100102:
+        uni.hideToast();
+        uni.stopPullDownRefresh();
+        this.storeHandle.dispatch('storeUser/ssLogout', false);
+        this.jumpHandle.jumpsLogin();
         break;
       case '8002':
       case 8002: // uni.login 微信注册
@@ -138,11 +153,12 @@ class RequestClass {
           content: apiResData.msg,
           showCancel: true,
           success: function (res) {
-            if (res.confirm) { } else {
-              console.log('用户点击取消')
+            if (res.confirm) {
+            } else {
+              console.log('用户点击取消');
             }
           }
-        })
+        });
         break;
       // 处理成功
       case '200':
@@ -170,25 +186,24 @@ class RequestClass {
           showCancel: false,
           success: function (res) {
             if (res.confirm) {
-              console.log('用户点击确定')
+              console.log('用户点击确定');
             }
           }
         });
         break;
     }
     //返回reject状态 会被最后catch捕获。
-    return (new Promise((resolve, reject) => { }));
-
+    return new Promise((resolve, reject) => {});
   }
   /**
    * 调用 API 统一 请求 方法
-   * 
+   *
    * @author ctocode-zhw
    * @version 2018-12-20
    * @param apiUrl 不需要域名，域名统一拼接，只填写相关请求接口 【必须】
    * @param reqData 提交参数
    * @returns
-   * 
+   *
    */
   apiAll(type, apiUrl, reqData) {
     var _this = this;
@@ -197,7 +212,7 @@ class RequestClass {
       header: this.headers
     };
     if (apiUrl.indexOf('http://') != -1 || apiUrl.indexOf('https://') != -1) {
-      request_setttings.url = apiUrl
+      request_setttings.url = apiUrl;
     }
 
     reqData = reqData || {};
@@ -237,10 +252,11 @@ class RequestClass {
         if (MetSupport.indexOf(typeDaxie) !== -1) {
           type = 'POST';
           request_setttings.header['X-HTTP-Method-Override'] = typeDaxie;
+        } else {
+          delete request_setttings.header['X-HTTP-Method-Override'];
         }
       }
 
-
       // 全部默认加上 login_type
       reqData.login_type = this.storeHandle.state.storeUser.has_login ? 1 : '';
       Object.assign(request_setttings, {
@@ -258,106 +274,120 @@ class RequestClass {
       // }
       $requestHandle = uni.request(request_setttings);
     }
-    return $requestHandle.then((uniRes) => {
-      // uniRes 为微信返回 + 接口返回 拼接的数据
-      if (uniRes[1].statusCode == 200) {
-        uni.hideNavigationBarLoading();
-        // apiResData 为 接口返回 拼接的数据，一般 success 成功，开发者只需要 apiResData
-        // let apiResData = JSON.parse(uniRes.data, true);
-        let apiResData = uniRes[1].data || {};
+    return $requestHandle
+      .then((uniRes) => {
+        // uniRes 为微信返回 + 接口返回 拼接的数据
+        if (uniRes[1].statusCode == 200) {
+          uni.hideNavigationBarLoading();
+          // apiResData 为 接口返回 拼接的数据，一般 success 成功，开发者只需要 apiResData
+          // let apiResData = JSON.parse(uniRes.data, true);
+          let apiResData = uniRes[1].data || {};
 
-        // upload需要json转数组
-        if (type == 'upload') {
-          apiResData = JSON.parse(apiResData, true);
+          // upload需要json转数组
+          if (type == 'upload') {
+            apiResData = JSON.parse(apiResData, true);
+          }
+          return _this.setResponse(apiResData);
+        } else {
+          uni.hideNavigationBarLoading();
+          uni.hideToast();
+          uni.hideLoading();
+          //
+          // uni.request({
+          // url: '',
+          // })
+          if (type == 'POST')
+            uni.showModal({
+              content: '加载错误！请稍后重试',
+              showCancel: false,
+              success: function (res) {
+                if (res.confirm) {
+                  console.log('用户点击确定');
+                } else {
+                  console.log('用户点击取消');
+                }
+              }
+            });
         }
-        return _this.setResponse(apiResData);
-      } else {
-        uni.hideNavigationBarLoading();
-        uni.hideToast()
+      })
+      .catch(function (uniRes) {
+        console.log('--catch--', uniRes);
+        uni.hideToast();
         uni.hideLoading();
-        // 
-        // uni.request({
-        // url: '',
-        // })
-        if (type == 'POST')
-          uni.showModal({
-            content: '加载错误！请稍后重试',
-            showCancel: false,
-            success: function (res) {
-              if (res.confirm) {
-                console.log('用户点击确定')
-              } else {
-                console.log('用户点击取消')
-              }
-            }
-          });
-      }
-    }).catch(function (uniRes) {
-      console.log('--catch--', uniRes);
-      uni.hideToast()
-      uni.hideLoading()
-      // uni.showModal({
-      // content: '请求超时！请检查网络',
-      // showCancel: false,
-      // success: function(res) {
-      // if (res.confirm) {
-      // console.log('用户点击确定')
-      // }
-      // }
-      // });
-    });
+        // uni.showModal({
+        // content: '请求超时！请检查网络',
+        // showCancel: false,
+        // success: function(res) {
+        // if (res.confirm) {
+        // console.log('用户点击确定')
+        // }
+        // }
+        // });
+      });
   }
   /**
-    * GET 请求
-    */
+   * GET 请求
+   */
   flagGet() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'GET', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'GET', argumentsArr);
   }
   urlGet() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'GET', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'GET', argumentsArr);
   }
   /**
-    * POST 请求
-    */
+   * POST 请求
+   */
   flagPost() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'POST', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'POST', argumentsArr);
   }
   urlPost() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'POST', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'POST', argumentsArr);
   }
   /**
-    * PUT 请求
-    */
+   * PUT 请求
+   */
   flagPut() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'PUT', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'PUT', argumentsArr);
   }
   urlPut() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'PUT', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'PUT', argumentsArr);
   }
   /**
-    * PATCH 请求
-    */
+   * PATCH 请求
+   */
   flagPatch() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'PATCH', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'PATCH', argumentsArr);
   }
   urlPatch() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'PATCH', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'PATCH', argumentsArr);
   }
   /**
-    * DELETE 请求
-    */
+   * DELETE 请求
+   */
   flagDel() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'DELETE', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'DELETE', argumentsArr);
   }
   urlDel() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'DELETE', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'DELETE', argumentsArr);
   }
   /* 图片上传通用 */
   flagUpImg() {
-    let argumentsArr = arguments; return this.unifyApi('flag', 'UPLOAD', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'UPLOAD', argumentsArr);
   }
   urlUpImg() {
-    let argumentsArr = arguments; return this.unifyApi('url', 'UPLOAD', argumentsArr);
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'UPLOAD', argumentsArr);
   }
   /**
    * 统一请求
@@ -376,7 +406,7 @@ class RequestClass {
       let apiFlag = argumentsArr[0];
       if (typeof apiFlag === 'string') {
         apiFlag = apiFlag || '';
-        apiUrl = apiFlag == '' ? '' : (this.flagMap[apiFlag] || '');
+        apiUrl = apiFlag == '' ? '' : this.flagMap[apiFlag] || '';
       }
       apiUrlNoMsg = ' flag' + methodType + '：传入的标示 { ' + `${apiFlag}` + ' }，未匹配到 apiUrl ';
     }
@@ -398,15 +428,15 @@ class RequestClass {
     if (argNum == 1) {
       return function (reqData) {
         return _this.apiAll(methodType, apiUrl, reqData);
-      }
+      };
     } else if (argNum == 2 || argNum == 3) {
       let reqData = {};
       let arg2Val = argumentsArr[1];
       let arg2Type = Object.prototype.toString.call(arg2Val);
       // let argType2_2 = typeof argumentsArr[1] === 'object';
-      if (arg2Type === "[object String]" || arg2Type === "[object Number]") {
+      if (arg2Type === '[object String]' || arg2Type === '[object Number]') {
         // console.log('----转换-----', parseInt(arg2Val), Number(arg2Val));
-        var isEndId = Number(arg2Val)
+        var isEndId = Number(arg2Val);
         if (!isNaN(isEndId)) {
           // console.log('---数字');
           let isEndStr = confirmEnding(apiUrl, '/');
@@ -418,11 +448,11 @@ class RequestClass {
         if (argNum == 3) {
           let arg3Val = argumentsArr[2];
           let arg3Type = Object.prototype.toString.call(arg3Val);
-          if (arg3Type === "[object Object]") {
+          if (arg3Type === '[object Object]') {
             reqData = arg3Val || {};
           }
         }
-      } else if (arg2Type === "[object Object]") {
+      } else if (arg2Type === '[object Object]') {
         reqData = arg2Val || {};
       }
       return _this.apiAll(methodType, apiUrl, reqData);
@@ -432,7 +462,6 @@ class RequestClass {
       });
     }
   }
-
 }
 
-export default RequestClass;
+export default RequestClass;

package/plugins/storage.js

@@ -1,4 +1,3 @@
-
 /**
  * 缓存数据优化
  * var cache = require('utils/cache.js');
@@ -12,7 +11,7 @@ class StorageClass {
     this.config = options;
   }
   /**
-   * 设置缓存 - 异步 
+   * 设置缓存 - 异步
    * @param  {[type]} key [键名]
    * @param  {[type]} data [键值]
    * @param  {[type]} t [时间、单位秒]
@@ -26,23 +25,23 @@ class StorageClass {
   set(key = '', data = '', t = 0) {
     const config = this.config;
     if (config.prefix) {
-      key = config.prefix + key
+      key = config.prefix + key;
     }
     if (config.suffix) {
-      key += config.prefix
+      key += config.prefix;
     }
     uni.setStorage({
       key: key,
       data: data,
-      success: () => { }
+      success: () => {}
     });
     /* 设置过期时间 */
     if (t) {
       let timestamp = parseInt(new Date().getTime());
       uni.setStorage({
         key: key + '_time',
-        data: timestamp + (t * 1000),
-        success: () => { }
+        data: timestamp + t * 1000,
+        success: () => {}
       });
     }
   }
@@ -50,26 +49,26 @@ class StorageClass {
     try {
       const config = this.config;
       if (config.prefix) {
-        key = config.prefix + key
+        key = config.prefix + key;
       }
       if (config.suffix) {
-        key += config.prefix
+        key += config.prefix;
       }
       uni.setStorageSync(key, data);
       /* 设置过期时间 */
       if (t) {
         let timestamp = parseInt(new Date().getTime());
-        uni.setStorageSync(key + '_time', timestamp + (t * 1000));
+        uni.setStorageSync(key + '_time', timestamp + t * 1000);
       }
     } catch (e) {
       console.error(e);
     }
   }
   /**
-   * 获取缓存 
+   * 获取缓存
    * @param  {[type]} k   [键名]
    * @param  {[type]} def [获取为空时默认]
-   * 
+   *
    * @使用方式 ==== 【读取缓存】
    *    默认值     cache.get('key')
    *    string    cache.get('key', '你好')
@@ -80,13 +79,13 @@ class StorageClass {
    * @param {String} key
    */
   get(param) {
-    param = Object.assign({ def: '' }, param)
+    param = Object.assign({ def: '' }, param);
     const config = this.config;
     if (config.prefix) {
-      param.key = config.prefix + '_' + param.key
+      param.key = config.prefix + '_' + param.key;
     }
     if (config.suffix) {
-      param.key += '_' + config.prefix
+      param.key += '_' + config.prefix;
     }
     //先获取时间
     var deadtime = 0;
@@ -116,18 +115,17 @@ class StorageClass {
     }
   }
   /**
-     * 根据key获取数据缓存 -  同步
-     * @param {String} key
-     */
+   * 根据key获取数据缓存 -  同步
+   * @param {String} key
+   */
   getSync(key, def = '') {
-
     try {
       const config = this.config;
       if (config.prefix) {
-        key = config.prefix + key
+        key = config.prefix + key;
       }
       if (config.suffix) {
-        key += config.prefix
+        key += config.prefix;
       }
 
       let deadtime = uni.getStorageSync(key + '_time');
@@ -139,7 +137,7 @@ class StorageClass {
         let timestamp = parseInt(new Date().getTime());
         if (deadtime > 0 && deadtime < timestamp) {
           //过期了
-          return def
+          return def;
         }
         return get_data(key);
       }
@@ -158,18 +156,18 @@ class StorageClass {
   remove(key) {
     const config = this.config;
     if (config.prefix) {
-      key = config.prefix + key
+      key = config.prefix + key;
     }
     if (config.suffix) {
-      key += config.prefix
+      key += config.prefix;
     }
     uni.removeStorage({
       key: key,
-      success: (res) => { }
+      success: (res) => {}
     });
     uni.removeStorage({
       key: key + '_time',
-      success: (res) => { }
+      success: (res) => {}
     });
   }
   /**
@@ -180,15 +178,15 @@ class StorageClass {
     try {
       const config = this.config;
       if (config.prefix) {
-        key = config.prefix + key
+        key = config.prefix + key;
       }
       if (config.suffix) {
-        key += config.prefix
+        key += config.prefix;
       }
       uni.removeStorageSync(key);
       uni.removeStorageSync(key + '_time');
     } catch (e) {
-      console.error(e)
+      console.error(e);
     }
   }
   /**
@@ -204,7 +202,7 @@ class StorageClass {
     try {
       uni.clearStorageSync();
     } catch (e) {
-      console.error(e)
+      console.error(e);
     }
   }
 
@@ -228,7 +226,6 @@ class StorageClass {
       console.log(e);
     }
   }
-
 }
-export default StorageClass
-// export default
+export default StorageClass;
+// export default