@10yun/cv-mobile-ui 0.5.24 → 0.5.26

package/plugins/uni-upgrade.js

@@ -1,33 +1,11 @@
 import HttpObj from '@/plugins/http.js';
-uni.request({
-  url: 'https://uniapp.dcloud.io/update', // 检查更新的服务器地址
-  data: {
-    appid: (plus.runtime.appid || ''),
-    version: (plus.runtime.version || ''),
-    imei: (plus.device.imei || ''),
-  },
-  success: res => {
-    if (res.statusCode == 200 && res.data.isUpdate) {
-      let openUrl = plus.os.name === 'iOS' ? res.data.iOS : res.data.Android;
-      // 提醒用户更新
-      uni.showModal({
-        title: '更新提示',
-        content: res.data.note ? res.data.note : '是否选择更新',
-        success: showResult => {
-          if (showResult.confirm) {
-            plus.runtime.openURL(openUrl);
-          }
-        }
-      });
-    }
-  }
-});
-// APP检测更新 具体可以参考：https://ask.dcloud.net.cn/article/35667
-plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
-
+function checkVersion(plus,widgetInfo){
   uni.request({
     url: 'https://uniapp.dcloud.io/update', // 检查更新的服务器地址
     data: {
+      appid: (plus.runtime.appid || ''),
+      version: (plus.runtime.version || ''),
+      imei: (plus.device.imei || ''),
       appid: widgetInfo.appid, //当前应用的APPID
       version: widgetInfo.version, // 当前应用的版本  
       name: widgetInfo.name, // 当前应用的名称 
@@ -35,27 +13,135 @@ plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
       os: plus.os.name // OS环境 ios / android 
     },
     success: res => {
-    if (res.code == 200) {
-      uni.downloadFile({
-        url: res.data.wgtUrl,
-        success: (downloadResult) => {
-          if (downloadResult.statusCode === 200) {
-            plus.runtime.install(downloadResult.tempFilePath, {
-              force: false
-            }, (d) => {
-              console.log('install success...');
-              plus.runtime.restart();
-            }, (e) => {
-              console.error('install fail...');
-            })
+      if (res.code == 200) {
+        if(res.data.version_update ='no_need'){
+          uni.showModal({
+            title: '提示',
+            content: '已是最新版本',
+            showCancel: false
+          });
+        }else{
+          if(res.data.version_update ='yes_need'){
+            showVersion(res.data);
           }
         }
+      } 
+    }
+  });
+}
+function showVersion(apiData){
+  
+  
+  // 提醒用户更新
+  uni.showModal({
+    title: '更新提示',
+    title: '版本更新' + apiData.versionCode,
+    content: apiData.note ? apiData.note : '是否选择更新',
+    content: apiData.description,
+    confirmText: '更新',
+    showCancel: !res.forceUpdate,
+    success: showResult => {
+      if (showResult.confirm) {
+        downVersion(apiData);
+      } else {
+        //取消
+      }
+    }
+  });
+}
+function downVersion(){
+
+
+  if (plus.os.name.toLowerCase() == 'ios') {
+    // 跳转到下载页面
+    let upgradeUrl = apiData.url_ios;
+    plus.runtime.openURL(res.data.upgradeUrl);
+  } else {
+    // let upgradeUrl =  apiData.url_android;
+    // plus.runtime.openURL(upgradeUrl);
+    var dtask = plus.downloader.createDownload(res.data.upgradeUrl, {}, function (d, status) {
+      uni.showToast({
+        title: '下载完成',
+        mask: false,
+        duration: 1000
+      });
+      // 下载完成
+      if (status == 200) {
+        plus.runtime.install(
+          plus.io.convertLocalFileSystemURL(d.filename),
+          {},
+          (e) => e,
+          function (error) {
+            uni.showToast({
+              title: '安装失败-01',
+              mask: false,
+              duration: 1500
+            });
+          }
+        );
+      } else {
+        uni.showToast({
+          title: '更新失败-02',
+          mask: false,
+          duration: 1500
+        });
+      }
+    });
+    try {
+      dtask.start(); // 开启下载的任务
+      var prg = 0;
+      var showLoading = plus.nativeUI.showWaiting('正在下载'); //创建一个showWaiting对象
+      dtask.addEventListener('statechanged', function (task, status) {
+        // 给下载任务设置一个监听 并根据状态  做操作
+        switch (task.state) {
+          case 1:
+            showLoading.setTitle('正在下载');
+            break;
+          case 2:
+            showLoading.setTitle('已连接到服务器');
+            break;
+          case 3:
+            prg = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100);
+            showLoading.setTitle('  正在下载' + prg + '%  ');
+            break;
+          case 4:
+            plus.nativeUI.closeWaiting();
+            //下载完成
+            break;
+        }
+      });
+    } catch (err) {
+      plus.nativeUI.closeWaiting();
+      uni.showToast({
+        title: '更新失败-03',
+        mask: false,
+        duration: 1500
       });
     }
   }
-});
-
+} 
+function downloadVersion(){
+  uni.downloadFile({
+    url: res.data.wgtUrl,
+    success: (downloadResult) => {
+      if (downloadResult.statusCode === 200) {
+        plus.runtime.install(downloadResult.tempFilePath, {
+          force: false
+        }, (d) => {
+          console.log('install success...');
+          plus.runtime.restart();
+        }, (e) => {
+          console.error('install fail...');
+        })
+      }
+    }
+  });
+}
 
+// APP检测更新 具体可以参考：https://ask.dcloud.net.cn/article/35667
+plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
+  checkVersion(plus,widgetInfo); 
+});
 
 var UniUpgradeClass = function{
   // console.log('App Launch')
@@ -107,4 +193,102 @@ var UniUpgradeClass = function{
       })
     });
   }
-}
+}
+function showPlusVersion() {
+  // 跟后台传过来的版本号比对，如果版本号不一致
+  plus.nativeUI.confirm(
+    '检测到有新版本，是否更新',
+    function (e) {
+      /**
+       * 如果是苹果手机
+       */
+      if (navigator.userAgent.match(/(iPhone|iPod|iPad);?/i)) {
+        /**
+         * 如果选择更新
+         */
+        if (e.index == 0) {
+          window.location.href = 'itms-services://?action=download-manifest&url=https://ios.17rua.top/static/ios/x5.plist';
+          //不经过苹果商店下载（不懂得看我的另一篇文章）
+          plus.nativeUI.showWaiting('正在下载...');
+        }
+      } else {
+        if (e.index == 0) {
+          that.downWgt(res.data.url); //下载文件
+        } else {
+          plus.runtime.quit(); //安卓控制不更新退出应用
+        }
+      }
+    },
+    '',
+    ['立即更新', '以后再说']
+  );
+}
+
+function versionCheckUpdate() {
+  var that = this;
+  HttpObj.post('/version/checkUpdate', {
+    version: that.wgtVer
+  })
+    .then((res) => {
+      if (res.data.code == 0) {
+        showPlusVersion();
+        // 检验过一次版本就加入缓存，不在检测
+        sessionStorage.setItem('kbj_banben', true);
+      } else {
+        alert('获取数据失败');
+      }
+    })
+    .catch(function (error) {
+      alert('请检查网络连接');
+    });
+}
+let xx = {
+  //检测当前版本号
+  dqbanben: function () {
+    var that = this;
+    //在页面中初始化plus插件
+    mui.init();
+    mui.plusReady(function () {
+      // 获取本地应用资源版本号
+      that.wgtVer = plus.runtime.version;
+      that.checkUpdate();
+    });
+  },
+  //检查更新
+  checkUpdate: function () {},
+  //下载资源包
+  downWgt: function (wgtUrl) {
+    var that = this;
+    var task = plus.downloader.createDownload(wgtUrl, {}, function (download, status) {
+      //安装到手机的目录
+      if (status == 200) {
+        plus.runtime.install(download.filename); // 安装下载的apk文件
+      } else {
+        mui.toast('下载更新失败！');
+        plus.nativeUI.closeWaiting();
+      }
+    });
+    //监听下载
+    task.addEventListener('statechanged', function (download, status) {
+      switch (download.state) {
+        case 2:
+          plus.nativeUI.showWaiting('正在下载...');
+          break;
+        case 3:
+          //进度条百分比 totalSize为总量，baifen为当前下载的百分比
+          if (that.totalSize == 0) {
+            that.totalSize = parseInt(download.totalSize);
+          }
+          if (parseInt((download.downloadedSize / that.totalSize) * 100) != that.baifen) {
+            that.baifen = parseInt((download.downloadedSize / that.totalSize) * 100);
+          }
+          break;
+        case 4:
+          mui.toast('下载完成');
+          plus.nativeUI.closeWaiting();
+          break;
+      }
+    });
+    task.start();
+  }
+};

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

@@ -1,5 +1,4 @@
 /* 基础图标库 */
-// const iconsFiles = import.meta.globEager('./iconfont/*-icons.js');
 const iconsFiles = import.meta.glob('./iconfont/*-icons.js', { eager: true });
 console.log('---iconsFiles--', iconsFiles);
 const modules = {};

package/ui-cv/components/cv-lists-swiper/cv-lists-swipe2r.vue

@@ -84,7 +84,7 @@ export default {
       }
     }
 
-    // this.swiperChange(option.order_state);
+    // this.swiperChange(option.xxxx);
   },
   methods: {
     animationfinish({ detail: { current } }) {

package/plugins/jumps.js

@@ -1,163 +0,0 @@
-function doJumpUrl(jumpType) {
-  let jumpUrl = '';
-  if (typeof jumpType == 'string') {
-    jumpUrl = jumpType;
-  } else if (typeof jumpType === 'object') {
-    jumpUrl = jumpType.currentTarget.dataset.url;
-  }
-  jumpUrl = jumpUrl || '';
-  if (jumpUrl != '') {
-    // 是否/开头，如果不是，追加/开头
-    if (!jumpUrl.match(new RegExp('^/pages/.*$'))) {
-      jumpUrl = '/pages/' + jumpUrl;
-    }
-    jumpUrl = jumpUrl.replace(/\/\//g, '/');
-  }
-  // console.log(encodeURI(e.currentTarget.dataset.url));
-  return jumpUrl;
-}
-function doUrlParam(url, query = {}, isSequence = true) {
-  if (!query) return url;
-  let joiner = url.match(/\?/) ? '&' : '?';
-  let queryArr = [];
-  let queryStr = '';
-  if (Object.keys(query).length > 0) {
-    for (const key in query) {
-      queryArr.push(key + '=' + query[key]);
-    }
-    queryStr = queryArr.join('&');
-    return url + joiner + queryStr;
-  }
-  return url;
-}
-
-class JumpsClass {
-  constructor(options = {}) {
-    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) => {
-    url = url || '';
-    let jumpUrl = doJumpUrl(url);
-    if (jumpUrl == '') {
-      uni.showToast({
-        title: '即将上线,敬请期待！',
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    }
-    urlPm = urlPm || {};
-    jumpUrl = doUrlParam(jumpUrl, urlPm);
-    time = time || 1;
-    let timeFunc = setTimeout(() => {
-      // clearInterval(time);
-      uni.navigateTo({
-        url: jumpUrl,
-        fail: function () {
-          uni.switchTab({
-            url: jumpUrl,
-            fail: function () {}
-          });
-        }
-      });
-    }, time);
-  };
-
-  jumpsAuth = (jumpUrl, urlPm, time) => {
-    jumpUrl = jumpUrl || '';
-    if (jumpUrl == '') {
-      uni.showToast({
-        title: '即将上线,敬请期待！',
-        icon: 'none',
-        duration: 1500
-      });
-      return;
-    } else {
-      console.log('debug===是否登录,has_login：', this.storeHandle.state.storeUser.has_login);
-      if (!this.storeHandle.state.storeUser.has_login) {
-        this.jumpsLogin();
-      } else {
-        this.jumpsPage(jumpUrl, urlPm, time);
-      }
-    }
-  };
-  jumpsLogin = () => {
-    uni.showModal({
-      content: '您还未登录，请前往登录',
-      showCancel: false,
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({
-            url: this.page_login
-          });
-        }
-      }
-    });
-  };
-  // 跳转到用户页
-  jumpsMy = (time) => {
-    this.jumpsPage(this.page_my, time);
-  };
-  // 跳转到主页
-  jumpsHome = (time) => {
-    this.jumpsPage(this.page_home, time);
-  };
-  /**
-   * 跳转协议
-   * @param {*} name
-   */
-  jumpsXieyi = (name) => {
-    this.jumpsPage(this.page_xieyi, {
-      // 'no': 'XY003',
-      title: name
-    });
-  };
-  // 上一个页面
-  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;