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

package/plugins/uni-upgrade2.js

@@ -1,68 +1,63 @@
-
 uni.request({
-  url: "http://2132",  //请求更新地址
+  url: 'http://2132', //请求更新地址
   data: '',
   success(res) {
     if (!!res.data) {
       uni.showModal({
         title: '版本更新' + res.data.versionCode,
         content: res.data.description,
-        confirmText: "更新",
+        confirmText: '更新',
         showCancel: !res.forceUpdate,
         success: function (e) {
           if (e.confirm) {
             if (plus.os.name.toLowerCase() == 'ios') {
               // 跳转到下载页面
-              plus.runtime.openURL(res.data.upgradeUrl)
+              plus.runtime.openURL(res.data.upgradeUrl);
             } else {
-              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) {
+              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
-                    });
-                  }
-                });
+                    }
+                  );
+                } 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
-                ) {
+                var showLoading = plus.nativeUI.showWaiting('正在下载'); //创建一个showWaiting对象
+                dtask.addEventListener('statechanged', function (task, status) {
                   // 给下载任务设置一个监听 并根据状态  做操作
                   switch (task.state) {
                     case 1:
-                      showLoading.setTitle("正在下载");
+                      showLoading.setTitle('正在下载');
                       break;
                     case 2:
-                      showLoading.setTitle("已连接到服务器");
+                      showLoading.setTitle('已连接到服务器');
                       break;
                     case 3:
-                      prg = parseInt(
-                        (parseFloat(task.downloadedSize) /
-                          parseFloat(task.totalSize)) *
-                        100
-                      );
-                      showLoading.setTitle("  正在下载" + prg + "%  ");
+                      prg = parseInt((parseFloat(task.downloadedSize) / parseFloat(task.totalSize)) * 100);
+                      showLoading.setTitle('  正在下载' + prg + '%  ');
                       break;
                     case 4:
                       plus.nativeUI.closeWaiting();
@@ -79,7 +74,6 @@ uni.request({
                 });
               }
             }
-
           } else {
             //取消
           }
@@ -92,5 +86,5 @@ uni.request({
         showCancel: false
       });
     }
-  },
-})
+  }
+});

package/plugins/uni-upgrade3.js

@@ -13,73 +13,91 @@ let xx = {
   //检查更新
   checkUpdate: function () {
     var that = this;
-    this.$http.post(this.GLOBAL.host + '/version/checkUpdate', {
-      version: that.wgtVer
-    }).then(function (res) {
-      if (res.data.code == 0) {
-        if (res.data.result == 1) {//跟后台传过来的版本号比对，如果版本号不一致
-          if (navigator.userAgent.match(/(iPhone|iPod|iPad);?/i)) { //如果是苹果手机
-            plus.nativeUI.confirm("检测到有新版本，是否更新", function (e) {
-              if (e.index == 0) { //如果选择更新
-                window.location.href = "itms-services://?action=download-manifest&url=https://ios.17rua.top/static/ios/x5.plist";
-                //不经过苹果商店下载（不懂得看我的另一篇文章）
-                plus.nativeUI.showWaiting("正在下载...");
-              }
-            }, "", ["立即更新", "以后再说"]);
-            return;
+    this.$http
+      .post(this.GLOBAL.host + '/version/checkUpdate', {
+        version: that.wgtVer
+      })
+      .then(function (res) {
+        if (res.data.code == 0) {
+          if (res.data.result == 1) {
+            //跟后台传过来的版本号比对，如果版本号不一致
+            if (navigator.userAgent.match(/(iPhone|iPod|iPad);?/i)) {
+              //如果是苹果手机
+              plus.nativeUI.confirm(
+                '检测到有新版本，是否更新',
+                function (e) {
+                  if (e.index == 0) {
+                    //如果选择更新
+                    window.location.href =
+                      'itms-services://?action=download-manifest&url=https://ios.17rua.top/static/ios/x5.plist';
+                    //不经过苹果商店下载（不懂得看我的另一篇文章）
+                    plus.nativeUI.showWaiting('正在下载...');
+                  }
+                },
+                '',
+                ['立即更新', '以后再说']
+              );
+              return;
+            } else {
+              plus.nativeUI.confirm(
+                '检测到有新版本，是否更新',
+                function (e) {
+                  if (e.index == 0) {
+                    that.downWgt(res.data.url); //下载文件
+                  } else {
+                    plus.runtime.quit(); //安卓控制不更新退出应用
+                  }
+                },
+                '',
+                ['立即更新', '以后再说']
+              );
+            }
+            sessionStorage.setItem('kbj_banben', true); //检验过一次版本就加入缓存，不在检测
           } else {
-            plus.nativeUI.confirm("检测到有新版本，是否更新", function (e) {
-              if (e.index == 0) {
-                that.downWgt(res.data.url);//下载文件
-              } else {
-                plus.runtime.quit();//安卓控制不更新退出应用
-              }
-            }, "", ["立即更新", "以后再说"]);
+            sessionStorage.setItem('kbj_banben', true);
+            return;
           }
-          sessionStorage.setItem('kbj_banben', true);//检验过一次版本就加入缓存，不在检测
         } else {
-          sessionStorage.setItem('kbj_banben', true);
-          return;
+          alert('获取数据失败');
         }
-      } else {
-        alert("获取数据失败")
-      }
-    }).catch(function (error) {
-      alert("请检查网络连接")
-    });
+      })
+      .catch(function (error) {
+        alert('请检查网络连接');
+      });
   },
   //下载资源包
   downWgt: function (wgtUrl) {
     var that = this;
-    var task = plus.downloader.createDownload(wgtUrl, {}, function (download, status) { //安装到手机的目录
+    var task = plus.downloader.createDownload(wgtUrl, {}, function (download, status) {
+      //安装到手机的目录
       if (status == 200) {
-        plus.runtime.install(download.filename);  // 安装下载的apk文件
+        plus.runtime.install(download.filename); // 安装下载的apk文件
       } else {
-        mui.toast("下载更新失败！");
+        mui.toast('下载更新失败！');
         plus.nativeUI.closeWaiting();
       }
     });
     //监听下载
-    task.addEventListener("statechanged", function (download, status) {
+    task.addEventListener('statechanged', function (download, status) {
       switch (download.state) {
         case 2:
-          plus.nativeUI.showWaiting("正在下载...");
+          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);
+          if (parseInt((download.downloadedSize / that.totalSize) * 100) != that.baifen) {
+            that.baifen = parseInt((download.downloadedSize / that.totalSize) * 100);
           }
           break;
         case 4:
-          mui.toast("下载完成");
+          mui.toast('下载完成');
           plus.nativeUI.closeWaiting();
           break;
       }
     });
     task.start();
-  },
-};
+  }
+};

package/{lib → ui-cv}/cv-code-sms/cv-code-sms.vue

@@ -46,7 +46,7 @@ export default {
       default: false
     },
     mobile: {
-      type: String,
+      type: [Number, String],
       default: ""
     },
     mobileParam: {
@@ -65,60 +65,71 @@ export default {
       type: Function,
       default: null
     },
+    // 短信发送间隔
     waitTime: {
-      type: String,
-      default: "60"
+      type: [Number, String],
+      default: 60
+    }
+  },
+  watch: {
+    mobile(newVal) {
+      this.localMobile = newVal;
+    },
+    value(newVal) {
+      this.localVal = newVal;
     }
   },
   data() {
     return {
+      // 验证码
+      localVal: this.value,
+      localMobile: '',
       nextTime: 0,
-      localVal: '',
-      localSmsMobile: '',
       diyPlaceholder: '短信验证码',
+      // 按钮禁用
       btnDisabled: false,
+      // 按钮文本
       btnText: '获取验证码',
+      // 按钮定时器对象
       btnIntervalObj: null,
     };
   },
-  watch: {
-    mobile(newVal) {
-      this.localMobile = newVal;
-    }
-  },
   created() {
     this.localMobile = this.mobile;
   },
   methods: {
-    showToast2(msg) {
+    showDiyMsg(msg) {
       uni.showToast({
         title: msg,
         duration: 1200,
         icon: 'none'
       });
     },
-    // ******获取短信验证码************************************* */
+    /******获取短信验证码************************************* */
     getSmsCode() {
-      if (!this.localMobile || this.localMobile.length != 11) {
-        this.showToast2('手机号不正确');
+      if (!this.localMobile) {
+        this.showDiyMsg('手机号不正确');
         return;
       }
       let mobileReg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
       if (!mobileReg.test(this.localMobile)) {
-        this.showToast2('手机号格式正确');
+        this.showDiyMsg('手机号格式不正确');
         return;
       }
 
       if (!this.codeUrl && !this.codeApiFunc) {
-        this.showToast2('短信接口地址不能为空');
+        this.showDiyMsg('短信接口地址不能为空');
         return;
       }
+
+      // 禁用按钮
       this.btnDisabled = true;
       /* 请求接口 */
       if (this.btnIntervalObj) {
         // console.log('请勿重复提交验证码发送请求');
         return;
       }
+
       if (this.btnDisabled) {
         this.btnText = '请稍后...';
         if (this.codeApiFunc) {
@@ -130,7 +141,7 @@ export default {
           }).then((successRes) => {
             let apiData = successRes;
             if (apiData.status == 200) {
-              this.showToast2('发送成功！');
+              this.showDiyMsg('发送成功！');
               setTimeout(() => {
                 if (this.codeSign) {
                   let sign = (apiData.data && apiData.data.sign) || '';
@@ -138,17 +149,22 @@ export default {
                 }
                 this.smsCodeWaitTime();
               }, 500);
+            } else {
+              this.showDiyMsg('短信获取失败，请检查网络');
+              this.btnDisabled = false;
+              this.btnText = '获取验证码';
             }
+          }).catch((errorRes) => {
+            this.btnDisabled = false;
+            this.btnText = '获取验证码';
           });
         } else {
           console.warn('url请求未完善，请使用：codeApiFunc')
           this.btnDisabled = false;
           this.btnText = '重新获取验证码';
         }
-
       }
     },
-
     smsCodeWaitTime() {
       this.nextTime = Date.parse(new Date()) / 1000 + parseInt(this.waitTime);
       this.btnIntervalObj = setInterval(() => {