@10yun/cv-mobile-ui 0.5.21 → 0.5.23

package/package.json

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

package/plugins/jumps.js

@@ -36,9 +36,10 @@ class JumpsClass {
     this.page_my = options.page_my || '';
     this.page_home = options.page_home || '';
     this.page_login = options.page_login;
+    this.page_xieyi = options.page_xieyi;
     this.storeHandle = options.storeHandle;
   }
-  jumpsPage(url, urlPm, time) {
+  jumpsPage = (url, urlPm, time) => {
     url = url || '';
     let jumpUrl = doJumpUrl(url);
     if (jumpUrl == '') {
@@ -64,8 +65,9 @@ class JumpsClass {
         }
       });
     }, time);
-  }
-  jumpsAuth(jumpUrl, urlPm, time) {
+  };
+
+  jumpsAuth = (jumpUrl, urlPm, time) => {
     jumpUrl = jumpUrl || '';
     if (jumpUrl == '') {
       uni.showToast({
@@ -82,8 +84,8 @@ class JumpsClass {
         this.jumpsPage(jumpUrl, urlPm, time);
       }
     }
-  }
-  jumpsLogin() {
+  };
+  jumpsLogin = () => {
     uni.showModal({
       content: '您还未登录，请前往登录',
       showCancel: false,
@@ -95,24 +97,67 @@ class JumpsClass {
         }
       }
     });
-  }
+  };
   // 跳转到用户页
-  jumpsMy(time) {
+  jumpsMy = (time) => {
     this.jumpsPage(this.page_my, time);
-  }
+  };
   // 跳转到主页
-  jumpsHome(time) {
+  jumpsHome = (time) => {
     this.jumpsPage(this.page_home, time);
-  }
+  };
+  /**
+   * 跳转协议
+   * @param {*} name
+   */
+  jumpsXieyi = (name) => {
+    this.jumpsPage(this.page_xieyi, {
+      // 'no': 'XY003',
+      title: name
+    });
+  };
   // 上一个页面
-  jumpsPre() {
+  jumpsPre = () => {
     let pages = getCurrentPages();
     let prePage = pages[pages.length - 2];
     // #ifdef H5
     return prePage;
     // #endif
     return prePage.$vm;
-  }
+  };
+  /**
+   * 返回页面
+   * @param {*} name
+   */
+  jumpsBack = (jumpUrl, time) => {
+    time = time || 1000;
+    let pages = getCurrentPages(); //页面栈
+    let prePage = pages[pages.length - 2]; //上一页
+    prePage.$vm.reFresh = Math.random(); //触发上一页监听器
+    setTimeout(() => {
+      uni.navigateBack(); //返回上一页
+    }, time);
+  };
 }
+export const useBindPlugin = (bindInstance, options) => {
+  const jumpsObj = new JumpsClass(options);
+
+  bindInstance.cv__jumpPage = jumpsObj.jumpsPage;
+  bindInstance.cv__jumpAuth = jumpsObj.jumpsAuth;
+  bindInstance.cv__jumpHome = jumpsObj.jumpsHome;
+  bindInstance.cv__jumpMy = jumpsObj.jumpsMy;
+  bindInstance.cv__jumpLogin = jumpsObj.jumpsLogin;
+  bindInstance.cv__jumpXieyi = jumpsObj.jumpsXieyi;
+  bindInstance.cv__jumpPre = jumpsObj.jumpsPre;
+  bindInstance.cv__jumpBack = jumpsObj.jumpsBack;
 
+  uni.cv__jumpPage = jumpsObj.jumpsPage;
+  uni.cv__jumpAuth = jumpsObj.jumpsAuth;
+  uni.cv__jumpHome = jumpsObj.jumpsHome;
+  uni.cv__jumpMy = jumpsObj.jumpsMy;
+  uni.cv__jumpLogin = jumpsObj.jumpsLogin;
+  uni.cv__jumpXieyi = jumpsObj.jumpsXieyi;
+  uni.cv__jumpPre = jumpsObj.jumpsPre;
+  uni.cv__jumpBack = jumpsObj.jumpsBack;
+};
 export default JumpsClass;

package/plugins/lbs.js

@@ -132,9 +132,10 @@ class LbsClass {
    *
    * @return {Object}
    */
-  getLocation(ip = '') {
+  getLocation = (ip = '') => {
+    const _self = this;
     return new Promise((resolve, reject) => {
-      if (!this._KEY_) {
+      if (!_self._KEY_) {
         reject('请先设置Key');
         console.error('请先设置Key');
         return false;
@@ -143,9 +144,9 @@ class LbsClass {
       if (ip) {
         formData.ip = ip;
       }
-      formData.key = this._KEY_;
+      formData.key = _self._KEY_;
 
-      if (this._TYPE_ == 'qq') {
+      if (_self._TYPE_ == 'qq') {
         formData.output = 'json';
         uni.request({
           url: '/tx_apis_map' + '/ws/location/v1/ip/',
@@ -173,7 +174,7 @@ class LbsClass {
             reject(error);
           }
         });
-      } else if (this._TYPE_ == 'amap') {
+      } else if (_self._TYPE_ == 'amap') {
         formData.output = 'JSON';
         /* 高德地图 */
         uni.request({
@@ -222,13 +223,13 @@ class LbsClass {
         });
       }
     });
-  }
+  };
   /**
    * 获取全部行政区划数据。该请求为GET请求。
    *
    * @return {Object}
    */
-  getDistrict(keyword = '') {
+  getDistrict = (keyword = '') => {
     return new Promise((resolve, reject) => {
       if (!this._KEY_) {
         reject('请先设置Key');
@@ -286,6 +287,14 @@ class LbsClass {
         });
       }
     });
-  }
+  };
+}
+
+export function useBindPlugin(bindInstance, options) {
+  const LbsObj = new LbsClass(options);
+
+  bindInstance.cv__lbsGetLocation = LbsObj.getLocation;
+
+  uni.cv__lbsGetLocation = LbsObj.getLocation;
 }
 export default LbsClass;

package/ui-cv/components/cv-icons/icons.js

@@ -1,5 +1,7 @@
 /* 基础图标库 */
-const iconsFiles = import.meta.globEager('./iconfont/*-icons.js');
+// const iconsFiles = import.meta.globEager('./iconfont/*-icons.js');
+const iconsFiles = import.meta.glob('./modules/*.js', { eager: true });
+
 const modules = {};
 for (const key in iconsFiles) {
   modules[key.replace(/(\.\/iconfont\/|\.js)/g, '')] = iconsFiles[key].default;