@10yun/cv-mobile-ui 0.4.11 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.4.11",
+  "version": "0.5.1",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "",
   "license": "Apache-2.0",

package/plugins/MessageBox.js

@@ -39,8 +39,8 @@ MessageBox['confirm'] = (content, title) => {
       title: title || '提示',
       content: String(content || '') || '？？',
       confirmText: '确定',
-      showCancel: showCancel || true,
-      cancelText: cancelText || '取消',
+      showCancel: true,
+      cancelText: '取消',
       success: function (modalRes) {
         if (modalRes.confirm) {
           res(modalRes);

package/plugins/MessageTip.js

@@ -13,7 +13,7 @@ const MessageTip = function (options) {
 
     let setting = {
       title: options.message || '提示',
-      duration: options.duration || 1500,
+      duration: options.duration || 1200,
       icon: typeIcon || 'none',
       mask: true
     };
@@ -33,9 +33,9 @@ const MessageTip = function (options) {
 MessageTip['info'] = (title, duration, icon) => {
   uni.showToast({
     title: title || '提示',
-    duration: duration || 3500,
-    icon: icon || 'none',
-    mask: true
+    duration: duration || 1200,
+    icon: icon || 'none'
+    // mask: true
   });
 };
 // 成功提示

package/plugins/request.js

@@ -12,7 +12,12 @@ function confirmEnding(str, target) {
   }
   return false;
 }
-
+function _hideUniapp() {
+  uni.hideLoading();
+  uni.hideToast();
+  uni.hideNavigationBarLoading();
+  uni.stopPullDownRefresh();
+}
 function showErrorMsg(msg) {
   uni.hideLoading();
   uni.hideToast();
@@ -58,10 +63,13 @@ class RequestClass {
 
     this.headers = Object.assign({}, {}, options.headers || {});
 
+    this.canshuOpt = {};
+
+    /* 新创建 axios 实例配置 */
     this.creSett = Object.assign(
       {},
       {
-        timeout: 5000, // request timeout
+        timeout: options.timeout || 5000, // request timeout
         // 表示跨域请求时是否需要使用凭证;
         // 开启withCredentials后，服务器才能拿到你的cookie
         // 当然后端服务器也要设置允许你获取你开启了才有用
@@ -100,14 +108,28 @@ class RequestClass {
   }
   /**
    * 设置header参数
+   * @param {Object} options
+   * @returns {Class} this
    */
+  setDefHeaders(options) {
+    this.headers = Object.assign({}, this.headers, options || {});
+    this.reqObj.defaults.headers = this.headers;
+    return this;
+  }
   setHeaders(options) {
     this.headers = Object.assign({}, this.headers, options || {});
     return this;
   }
   /**
-   * 设置header参数
+   * 设置requests参数
+   * @param {Object} options
+   * @returns {Class} this
    */
+  setDefRequests(options) {
+    this.requests = Object.assign({}, this.requests, options || {});
+    this.reqObj.defaults.requests = this.requests;
+    return this;
+  }
   setRequests(options) {
     this.requests = Object.assign({}, this.requests, options || {});
     return this;
@@ -116,46 +138,40 @@ class RequestClass {
    * 设置响应
    */
   setResponse(apiResData) {
-    var apiResStatus = apiResData.status || 0;
+    var apiResStatus = apiResData.status || -1;
     // 这里根据后端提供的数据进行对应的处理
     switch (apiResStatus) {
       // 没有凭证，请登录
       case '100101':
       case 100101:
-        uni.hideToast();
-        uni.stopPullDownRefresh();
+        _hideUniapp();
         this.storeHandle.dispatch('storeUser/ssLogout', false);
         this.jumpHandle.jumpsLogin();
         break;
       // 无效凭证，请重新登录
       case '100102':
       case 100102:
-        uni.hideToast();
-        uni.stopPullDownRefresh();
+        _hideUniapp();
         this.storeHandle.dispatch('storeUser/ssLogout', false);
         this.jumpHandle.jumpsLogin();
         break;
       // 凭证过期，请重新登录
       case '100103':
       case 100103:
-        uni.hideToast();
-        uni.stopPullDownRefresh();
+        _hideUniapp();
         this.storeHandle.dispatch('storeUser/ssLogout', false);
         this.jumpHandle.jumpsLogin();
         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 微信注册
-        uni.hideToast();
-        uni.stopPullDownRefresh();
+        _hideUniapp();
         this.jumpHandle.jumpsLogin();
         break;
       case '13001':
@@ -177,18 +193,14 @@ class RequestClass {
       case '200':
       case 200:
         // if (apiResData.length == 0) {
-        // uni.showToast({
-        // title: "已经是全部数据了~",
-        // icon: "none"
-        // })
+        //     
         // }
         return apiResData;
         break;
       // 默认错误
       default:
         // clearTimeout(time);
-        uni.hideToast();
-        uni.hideLoading();
+        _hideUniapp();
         var apiResMsg = apiResData.msg || '';
         if (apiResMsg == 'Unknown') {
           apiResMsg = '';
@@ -301,14 +313,8 @@ class RequestClass {
           }
           return _this.setResponse(apiResData);
         } else if (uniRes[1].statusCode == 502) {
-          uni.hideNavigationBarLoading();
-          uni.hideToast();
-          uni.hideLoading();
         } else {
-          uni.hideNavigationBarLoading();
-          uni.hideToast();
-          uni.hideLoading();
-
+          _hideUniapp();
           if (type == 'POST') {
             uni.showModal({
               content: '加载错误！请稍后重试',
@@ -325,17 +331,17 @@ class RequestClass {
         }
       })
       .catch(function (uniRes) {
+        _hideUniapp();
         console.log('--catch--', uniRes);
-        uni.hideToast();
-        uni.hideLoading();
+        // MessageTip.info('网络繁忙，请稍后再试');
         // uni.showModal({
-        // content: '请求超时！请检查网络',
-        // showCancel: false,
-        // success: function(res) {
-        // if (res.confirm) {
-        // console.log('用户点击确定')
-        // }
-        // }
+        //   content: '请求超时！请检查网络',
+        //   showCancel: false,
+        //   success: function (res) {
+        //     if (res.confirm) {
+        //       console.log('用户点击确定');
+        //     }
+        //   }
         // });
       });
   }
@@ -394,6 +400,15 @@ class RequestClass {
     let argumentsArr = arguments;
     return this.unifyApi('url', 'DELETE', argumentsArr);
   }
+  /* 文件上传通用 */
+  flagUpload() {
+    let argumentsArr = arguments;
+    return this.unifyApi('flag', 'UPLOAD', argumentsArr);
+  }
+  urlUpload() {
+    let argumentsArr = arguments;
+    return this.unifyApi('url', 'UPLOAD', argumentsArr);
+  }
   /* 图片上传通用 */
   flagUpImg() {
     let argumentsArr = arguments;

package/plugins/storage.js

@@ -1,9 +1,6 @@
 /**
  * 缓存数据优化
- * var cache = require('utils/cache.js');
- * import cache from '../cache'
- * 使用方法 【
- *
+ * 使用方法
  */
 
 function get_data1(key, def) {

package/plugins/utils.js

@@ -0,0 +1,13 @@
+function uniEleOffset(selector) {
+  // 获取高度
+  return new Promise((resolve) =>
+    uni
+      .createSelectorQuery()
+      .in(this)
+      .select(selector)
+      .boundingClientRect((data) => resolve(data))
+      .exec()
+  );
+}
+
+export { uniEleOffset };