@10yun/cv-mobile-ui 0.4.12 → 0.5.2

package/extend/permission.js

@@ -1,10 +1,10 @@
 /// null = 未请求，1 = 已允许，0 = 拒绝|受限, 2 = 系统未开启
 
-var isIOS
+var isIOS;
 
 function album() {
   var result = 0;
-  var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+  var PHPhotoLibrary = plus.ios.import('PHPhotoLibrary');
   var authStatus = PHPhotoLibrary.authorizationStatus();
   if (authStatus === 0) {
     result = null;
@@ -19,7 +19,7 @@ function album() {
 
 function camera() {
   var result = 0;
-  var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+  var AVCaptureDevice = plus.ios.import('AVCaptureDevice');
   var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
   if (authStatus === 0) {
     result = null;
@@ -34,7 +34,7 @@ function camera() {
 
 function location() {
   var result = 0;
-  var cllocationManger = plus.ios.import("CLLocationManager");
+  var cllocationManger = plus.ios.import('CLLocationManager');
   var enable = cllocationManger.locationServicesEnabled();
   var status = cllocationManger.authorizationStatus();
   if (!enable) {
@@ -52,28 +52,28 @@ function location() {
 
 function push() {
   var result = 0;
-  var UIApplication = plus.ios.import("UIApplication");
+  var UIApplication = plus.ios.import('UIApplication');
   var app = UIApplication.sharedApplication();
   var enabledTypes = 0;
   if (app.currentUserNotificationSettings) {
     var settings = app.currentUserNotificationSettings();
-    enabledTypes = settings.plusGetAttribute("types");
+    enabledTypes = settings.plusGetAttribute('types');
     if (enabledTypes == 0) {
       result = 0;
-      console.log("推送权限没有开启");
+      console.log('推送权限没有开启');
     } else {
       result = 1;
-      console.log("已经开启推送功能!")
+      console.log('已经开启推送功能!');
     }
     plus.ios.deleteObject(settings);
   } else {
     enabledTypes = app.enabledRemoteNotificationTypes();
     if (enabledTypes == 0) {
       result = 3;
-      console.log("推送权限没有开启!");
+      console.log('推送权限没有开启!');
     } else {
       result = 4;
-      console.log("已经开启推送功能!")
+      console.log('已经开启推送功能!');
     }
   }
   plus.ios.deleteObject(app);
@@ -83,7 +83,7 @@ function push() {
 
 function contact() {
   var result = 0;
-  var CNContactStore = plus.ios.import("CNContactStore");
+  var CNContactStore = plus.ios.import('CNContactStore');
   var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
   if (cnAuthStatus === 0) {
     result = null;
@@ -98,10 +98,10 @@ function contact() {
 
 function record() {
   var result = null;
-  var avaudiosession = plus.ios.import("AVAudioSession");
+  var avaudiosession = plus.ios.import('AVAudioSession');
   var avaudio = avaudiosession.sharedInstance();
   var status = avaudio.recordPermission();
-  console.log("permissionStatus:" + status);
+  console.log('permissionStatus:' + status);
   if (status === 1970168948) {
     result = null;
   } else if (status === 1735552628) {
@@ -115,13 +115,13 @@ function record() {
 
 function calendar() {
   var result = null;
-  var EKEventStore = plus.ios.import("EKEventStore");
+  var EKEventStore = plus.ios.import('EKEventStore');
   var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
   if (ekAuthStatus == 3) {
     result = 1;
-    console.log("日历权限已经开启");
+    console.log('日历权限已经开启');
   } else {
-    console.log("日历权限没有开启");
+    console.log('日历权限没有开启');
   }
   plus.ios.deleteObject(EKEventStore);
   return result;
@@ -129,44 +129,43 @@ function calendar() {
 
 function memo() {
   var result = null;
-  var EKEventStore = plus.ios.import("EKEventStore");
+  var EKEventStore = plus.ios.import('EKEventStore');
   var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
   if (ekAuthStatus == 3) {
     result = 1;
-    console.log("备忘录权限已经开启");
+    console.log('备忘录权限已经开启');
   } else {
-    console.log("备忘录权限没有开启");
+    console.log('备忘录权限没有开启');
   }
   plus.ios.deleteObject(EKEventStore);
   return result;
 }
 
-
 function requestIOS(permissionID) {
   return new Promise((resolve, reject) => {
     switch (permissionID) {
-      case "push":
+      case 'push':
         resolve(push());
         break;
-      case "location":
+      case 'location':
         resolve(location());
         break;
-      case "record":
+      case 'record':
         resolve(record());
         break;
-      case "camera":
+      case 'camera':
         resolve(camera());
         break;
-      case "album":
+      case 'album':
         resolve(album());
         break;
-      case "contact":
+      case 'contact':
         resolve(contact());
         break;
-      case "calendar":
+      case 'calendar':
         resolve(calendar());
         break;
-      case "memo":
+      case 'memo':
         resolve(memo());
         break;
       default:
@@ -185,22 +184,22 @@ function requestAndroid(permissionID) {
         for (var i = 0; i < resultObj.granted.length; i++) {
           var grantedPermission = resultObj.granted[i];
           console.log('已获取的权限：' + grantedPermission);
-          result = 1
+          result = 1;
         }
         for (var i = 0; i < resultObj.deniedPresent.length; i++) {
           var deniedPresentPermission = resultObj.deniedPresent[i];
           console.log('拒绝本次申请的权限：' + deniedPresentPermission);
-          result = 0
+          result = 0;
         }
         for (var i = 0; i < resultObj.deniedAlways.length; i++) {
           var deniedAlwaysPermission = resultObj.deniedAlways[i];
           console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
-          result = -1
+          result = -1;
         }
         resolve(result);
       },
       function (error) {
-        console.log('result error: ' + error.message)
+        console.log('result error: ' + error.message);
         resolve({
           code: error.code,
           message: error.message
@@ -212,32 +211,32 @@ function requestAndroid(permissionID) {
 
 function gotoAppPermissionSetting() {
   if (permission.isIOS) {
-    var UIApplication = plus.ios.import("UIApplication");
+    var UIApplication = plus.ios.import('UIApplication');
     var application2 = UIApplication.sharedApplication();
-    var NSURL2 = plus.ios.import("NSURL");
-    var setting2 = NSURL2.URLWithString("app-settings:");
+    var NSURL2 = plus.ios.import('NSURL');
+    var setting2 = NSURL2.URLWithString('app-settings:');
     application2.openURL(setting2);
     plus.ios.deleteObject(setting2);
     plus.ios.deleteObject(NSURL2);
     plus.ios.deleteObject(application2);
   } else {
-    var Intent = plus.android.importClass("android.content.Intent");
-    var Settings = plus.android.importClass("android.provider.Settings");
-    var Uri = plus.android.importClass("android.net.Uri");
+    var Intent = plus.android.importClass('android.content.Intent');
+    var Settings = plus.android.importClass('android.provider.Settings');
+    var Uri = plus.android.importClass('android.net.Uri');
     var mainActivity = plus.android.runtimeMainActivity();
     var intent = new Intent();
     intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-    var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+    var uri = Uri.fromParts('package', mainActivity.getPackageName(), null);
     intent.setData(uri);
     mainActivity.startActivity(intent);
   }
 }
 
 function gotoiOSPermissionSetting() {
-  var UIApplication = plus.ios.import("UIApplication");
+  var UIApplication = plus.ios.import('UIApplication');
   var application2 = UIApplication.sharedApplication();
-  var NSURL2 = plus.ios.import("NSURL");
-  var setting2 = NSURL2.URLWithString("App-prefs:root=General");
+  var NSURL2 = plus.ios.import('NSURL');
+  var setting2 = NSURL2.URLWithString('App-prefs:root=General');
   application2.openURL(setting2);
 
   plus.ios.deleteObject(setting2);
@@ -247,12 +246,12 @@ function gotoiOSPermissionSetting() {
 
 const permission = {
   get isIOS() {
-    return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios')
+    return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios');
   },
   requestIOS: requestIOS,
   requestAndroid: requestAndroid,
   gotoAppSetting: gotoAppPermissionSetting,
   gotoiOSSetting: gotoiOSPermissionSetting
-}
+};
 
-module.exports = permission
+module.exports = permission;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.4.12",
+  "version": "0.5.2",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "",
   "license": "Apache-2.0",
-  "homepage": "https://cvjs.cn/cv-mobile-ui",
+  "homepage": "https://cvjs.cn/cv-mobile-ui/",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
@@ -15,7 +15,7 @@
   "dependencies": {},
   "devDependencies": {},
   "browserslist": [
-    "Android >= 4",
-    "ios >= 8"
+    "Android >= 7",
+    "ios >= 9"
   ]
 }

package/plugins/MessageTip.js

@@ -13,7 +13,7 @@ const MessageTip = function (options) {
 
     let setting = {
       title: options.message || '提示',
-      duration: options.duration || 1500,
+      duration: options.duration || 800,
       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 || 800,
+    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 };