@10yun/cv-mobile-ui 0.3.23 → 0.3.25

package/{lib → ui-cv}/cv-cell/cv-cell.vue

@@ -1,36 +1,36 @@
 <template>
   <view class="cv-cell">
     <view class="cv-cell-box">
-      <view class="cv-cell-main" :class=" sublabel && 'cv-cell-main-big' " @tap="jump">
+      <view class="cv-cell-main" :class="sublabel && 'cv-cell-main-big'" @tap="jump">
         <view class="cv-cell-main-left">
-          <view class="cv-cell-main-left-icon" v-if="image|| $slots.before">
+          <view class="cv-cell-main-left-icon" v-if="image || $slots.before">
             <image class="cv-cell-main-left-icon-image" :src="image" mode="aspectFit" v-if="image" />
             <slot name="before" v-else />
           </view>
-          <view class="cv-cell-main-left-text" :class="!image && !$slots.before?'cv-cell-main-left-text-noimage':''">
+          <view class="cv-cell-main-left-text" :class="!image && !$slots.before ? 'cv-cell-main-left-text-noimage' : ''">
             <view class="cv-cell-main-left-text-intact" v-if="!sublabel">
-              {{label}}
+              {{ label }}
             </view>
             <view class="cv-cell-main-left-text-double" v-else>
               <view class="cv-cell-main-left-text-label">
-                {{label}}
+                {{ label }}
               </view>
               <view class="cv-cell-main-left-text-sublabel">
-                {{sublabel}}
+                {{ sublabel }}
               </view>
             </view>
           </view>
         </view>
-        <view class="cv-cell-main-center" :class="url=='' && !$listeners.click?'cv-cell-main-center-nourl':''">
+        <view class="cv-cell-main-center" :class="url == '' && !$listeners.click ? 'cv-cell-main-center-nourl' : ''">
           <view class="cv-cell-main-center-intact" v-if="!subexplain">
-            {{explain}}
+            {{ explain }}
           </view>
           <view class="cv-cell-main-center-double" v-else>
             <view class="cv-cell-main-center-explain">
-              {{explain}}
+              {{ explain }}
             </view>
             <view class="cv-cell-main-center-subexplain">
-              {{subexplain}}
+              {{ subexplain }}
             </view>
           </view>
         </view>
@@ -40,7 +40,7 @@
         </view>
       </view>
       <view class="cv-cell-message" v-if="message">
-        {{message}}
+        {{ message }}
       </view>
     </view>
   </view>
@@ -48,9 +48,9 @@
 
 <script>
 export default {
-  name: "cvCell",
+  name: 'cvCell',
   options: {
-    addGlobalClass: true,
+    addGlobalClass: true
   },
   props: {
     url: {
@@ -87,7 +87,6 @@ export default {
       type: String,
       default: ''
     }
-
   },
   watch: {
     dataLists(newVal) {
@@ -95,9 +94,7 @@ export default {
     }
   },
   data() {
-    return {
-
-    };
+    return {};
   },
   created: function () {
     // console.log(this.$slots);
@@ -107,35 +104,34 @@ export default {
       if (typeof this.url == 'string' && this.url) {
         const url = this.url;
         switch (this.urlType) {
-          case 'redirectTo'://关闭当前页面，跳转到应用内的某个页面。
+          case 'redirectTo': //关闭当前页面，跳转到应用内的某个页面。
             uni.redirectTo({
               url: this.url
             });
             break;
-          case 'reLaunch'://关闭所有页面，打开到应用内的某个页面。
+          case 'reLaunch': //关闭所有页面，打开到应用内的某个页面。
             uni.reLaunch({
               url: this.url
             });
             break;
-          case 'switchTab'://跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。
+          case 'switchTab': //跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面。
             uni.switchTab({
               url: this.url
             });
             break;
-          default://默认【navigateTo】 保留当前页面，跳转到应用内的某个页面
+          default: //默认【navigateTo】 保留当前页面，跳转到应用内的某个页面
             uni.navigateTo({
               url: this.url
             });
         }
-
       } else {
-        this.$emit('click')
+        this.$emit('click');
       }
     }
   }
 };
-</script> 
-<style >
+</script>
+<style>
 /* #ifndef MP-WEIXIN */
 .cv-cell:last-child .cv-cell-main {
   border-bottom: none;

package/{lib → ui-cv}/cv-checkbox/cv-checkbox.vue

@@ -1,12 +1,19 @@
 <template>
-  <cv-form-item :label="label" :must="must" :message="message" :messageDisplay="messageDisplay" :labelWidth="localLabelWidth" :layout="localLayout">
+  <cv-form-item
+    :label="label"
+    :must="must"
+    :message="message"
+    :messageDisplay="messageDisplay"
+    :labelWidth="localLabelWidth"
+    :layout="localLayout"
+  >
     <view class="cv-checkbox">
       <checkbox-group @change="checkboxChange">
         <label class="cv-checkbox-item" v-for="item in items" :value="value" :key="item.value">
           <view>
-            <checkbox :value="item.value" :checked="item.checked" style="transform:scale(0.7)" />
+            <checkbox :value="item.value" :checked="item.checked" style="transform: scale(0.7)" />
           </view>
-          <view>{{item.text}}</view>
+          <view>{{ item.text }}</view>
         </label>
       </checkbox-group>
     </view>
@@ -17,10 +24,8 @@
 import MixinsCheckbox from '../mixins/mixins-checkbox.js';
 export default {
   mixins: [MixinsCheckbox],
-  name: "cvCheckbox",
-  inject: {
-
-  },
+  name: 'cvCheckbox',
+  inject: {},
   props: {
     //默认输入框内容
     value: {
@@ -29,9 +34,7 @@ export default {
     }
   },
   data() {
-    return {
-
-    };
+    return {};
   },
 
   created: function () {
@@ -46,7 +49,6 @@ export default {
       let original = [];
       if (this.dataUrl) {
         //网络请求
-
       } else {
         original = this.dataLists;
       }
@@ -65,30 +67,29 @@ export default {
         let text = data[dataText];
         let value = data[dataValue];
         if (value) {
-          value = value.toString()
+          value = value.toString();
         }
         if (data[dataChecked] == true) {
-          checked = true
+          checked = true;
         }
         let localVal = this.localVal;
         //写入已选选项
         for (const ii in localVal) {
           if (this.dataType == 'text') {
             if (localVal[ii] == text) {
-              checked = true
+              checked = true;
             }
           } else {
             if (localVal[ii] == value) {
-              checked = true
+              checked = true;
             }
-
           }
         }
         items.push({
           value: value,
           text: text,
           checked: checked
-        })
+        });
       }
       return items;
     },
@@ -96,21 +97,20 @@ export default {
       var items = this.items,
         values = e.detail.value;
       for (var i = 0, lenI = items.length; i < lenI; ++i) {
-        const item = items[i]
+        const item = items[i];
         if (values.includes(item.value)) {
           this.$set(item, 'checked', true);
         } else {
-          this.$set(item, 'checked', false)
+          this.$set(item, 'checked', false);
         }
       }
       let localVal = [];
       for (let i in items) {
         if (items[i].checked) {
           if (this.dataType == 'text') {
-            localVal.push(items[i].text)
+            localVal.push(items[i].text);
           } else {
-            localVal.push(items[i].value)
-
+            localVal.push(items[i].value);
           }
         }
       }

package/{lib → ui-cv}/cv-checkbox-tag/cv-checkbox-tag.vue

@@ -1,13 +1,25 @@
 <template>
-  <cv-form-item :label="label" :must="must" :message="message" :messageDisplay="messageDisplay" :labelWidth="localLabelWidth" :layout="localLayout">
+  <cv-form-item
+    :label="label"
+    :must="must"
+    :message="message"
+    :messageDisplay="messageDisplay"
+    :labelWidth="localLabelWidth"
+    :layout="localLayout"
+  >
     <view class="cv-checkbox-tag">
       <checkbox-group @change="checkboxChange">
-        <label class="cv-checkbox-tag-item cv-checkbox-tag-item-tag" v-for="item in items" :value="value" :key="item.value"
-          :class="item.checked?'checkbox-checked':''">
+        <label
+          class="cv-checkbox-tag-item cv-checkbox-tag-item-tag"
+          v-for="item in items"
+          :value="value"
+          :key="item.value"
+          :class="item.checked ? 'checkbox-checked' : ''"
+        >
           <view class="">
-            <checkbox :value="item.value" :checked="item.checked" style="transform:scale(0.7)" />
+            <checkbox :value="item.value" :checked="item.checked" style="transform: scale(0.7)" />
           </view>
-          <view>{{item.text}}</view>
+          <view>{{ item.text }}</view>
         </label>
       </checkbox-group>
     </view>
@@ -18,10 +30,8 @@
 import MixinsCheckbox from '../mixins/mixins-checkbox.js';
 export default {
   mixins: [MixinsCheckbox],
-  name: "cvCheckboxTag",
-  inject: {
-
-  },
+  name: 'cvCheckboxTag',
+  inject: {},
   props: {
     //默认输入框内容
     value: {
@@ -30,9 +40,7 @@ export default {
     }
   },
   data() {
-    return {
-
-    };
+    return {};
   },
   created: function () {
     this.localVal = this.value;
@@ -46,7 +54,6 @@ export default {
       let original = [];
       if (this.dataUrl) {
         //网络请求
-
       } else {
         original = this.dataLists;
       }
@@ -66,10 +73,10 @@ export default {
         let text = data[dataText];
         let value = data[dataValue];
         if (typeof value == 'number') {
-          value = value.toString()
+          value = value.toString();
         }
         if (data[dataChecked] == true) {
-          checked = true
+          checked = true;
         }
         let localVal = this.localVal;
         let tempLocalVal = localVal.split(',');
@@ -77,20 +84,19 @@ export default {
         for (const ii in localVal) {
           if (this.dataType == 'text') {
             if (tempLocalVal[ii] == text) {
-              checked = true
+              checked = true;
             }
           } else {
             if (tempLocalVal[ii] == value) {
-              checked = true
+              checked = true;
             }
-
           }
         }
         items.push({
           value: value,
           text: text,
           checked: checked
-        })
+        });
       }
       return items;
     },
@@ -98,21 +104,20 @@ export default {
       var items = this.items,
         values = e.detail.value;
       for (var i = 0, lenI = items.length; i < lenI; ++i) {
-        const item = items[i]
+        const item = items[i];
         if (values.includes(item.value)) {
           this.$set(item, 'checked', true);
         } else {
-          this.$set(item, 'checked', false)
+          this.$set(item, 'checked', false);
         }
       }
       let localVal = [];
       for (let i in items) {
         if (items[i].checked) {
           if (this.dataType == 'text') {
-            localVal.push(items[i].text)
+            localVal.push(items[i].text);
           } else {
-            localVal.push(items[i].value)
-
+            localVal.push(items[i].value);
           }
         }
       }
@@ -122,7 +127,7 @@ export default {
         this.messageDisplay = false;
       }
       this.localVal = localVal;
-      this.$emit('input', localVal.join(","));
+      this.$emit('input', localVal.join(','));
     }
   }
 };

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

@@ -1,13 +1,33 @@
 <template>
-  <cv-form-item :tip="tip" :label="label" :message="message" :messageDisplay="messageDisplay" :labelWidth="localLabelWidth" :layout="localLayout">
+  <cv-form-item
+    :tip="tip"
+    :label="label"
+    :message="message"
+    :messageDisplay="messageDisplay"
+    :labelWidth="localLabelWidth"
+    :layout="localLayout"
+  >
     <view class="cv-code-area">
       <view class="cv-code-input-area">
-        <input class="cv-code-input-item" placeholder-class="cv-code-input-item-placeholder" v-model="localVal" type="number" :maxlength="maxlength"
-          :placeholder="diyPlaceholder" @input="updateInput" />
+        <input
+          class="cv-code-input-item"
+          placeholder-class="cv-code-input-item-placeholder"
+          v-model="localVal"
+          type="number"
+          :maxlength="maxlength"
+          :placeholder="diyPlaceholder"
+          @input="updateInput"
+        />
       </view>
       <view class="cv-code-button-area">
-        <button class="cv-code-button-item " :class="btnDisabled?'cv-code-button-wait':''" :disabled="btnDisabled"
-          @tap="getSmsCode">{{btnText}}</button>
+        <button
+          class="cv-code-button-item"
+          :class="btnDisabled ? 'cv-code-button-wait' : ''"
+          :disabled="btnDisabled"
+          @tap="getSmsCode"
+        >
+          {{ btnText }}
+        </button>
       </view>
     </view>
   </cv-form-item>
@@ -16,18 +36,18 @@
 import MixinsCommon from '../mixins/mixins-common.js';
 export default {
   mixins: [MixinsCommon],
-  name: "cvCodeSms",
+  name: 'cvCodeSms',
   inject: {
     cvFormGroup: {
       default() {
-        return null
+        return null;
       }
     }
   },
   props: {
     label: {
       type: String,
-      default: "短信验证"
+      default: '短信验证'
     },
     maxlength: {
       type: [Number, String],
@@ -35,27 +55,27 @@ export default {
     },
     value: {
       type: [Number, String],
-      default: ""
+      default: ''
     },
     message: {
       type: String,
-      default: ""
+      default: ''
     },
     messageDisplay: {
       type: Boolean,
       default: false
     },
     mobile: {
-      type: String,
-      default: ""
+      type: [Number, String],
+      default: ''
     },
     mobileParam: {
       type: String,
-      default: "mobile"
+      default: 'mobile'
     },
     codeUrl: {
       type: String,
-      default: ""
+      default: ''
     },
     codeSign: {
       type: Boolean,
@@ -65,60 +85,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,
+      // 按钮定时器对象
+      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) {
@@ -127,46 +158,53 @@ export default {
             cto_sms_type: 'alterMobile',
             sendCode: '发送验证码',
             [this.mobileParam]: this.localMobile
-          }).then((successRes) => {
-            let apiData = successRes;
-            if (apiData.status == 200) {
-              this.showToast2('发送成功！');
-              setTimeout(() => {
-                if (this.codeSign) {
-                  let sign = (apiData.data && apiData.data.sign) || '';
-                  this.diyPlaceholder = "识别码：" + sign
-                }
-                this.smsCodeWaitTime();
-              }, 500);
-            }
-          });
+          })
+            .then((successRes) => {
+              let apiData = successRes;
+              if (apiData.status == 200) {
+                this.showDiyMsg('发送成功！');
+                setTimeout(() => {
+                  if (this.codeSign) {
+                    let sign = (apiData.data && apiData.data.sign) || '';
+                    this.diyPlaceholder = '识别码：' + sign;
+                  }
+                  this.smsCodeWaitTime();
+                }, 500);
+              } else {
+                this.showDiyMsg('短信获取失败，请检查网络');
+                this.btnDisabled = false;
+                this.btnText = '获取验证码';
+              }
+            })
+            .catch((errorRes) => {
+              this.btnDisabled = false;
+              this.btnText = '获取验证码';
+            });
         } else {
-          console.warn('url请求未完善，请使用：codeApiFunc')
+          console.warn('url请求未完善，请使用：codeApiFunc');
           this.btnDisabled = false;
           this.btnText = '重新获取验证码';
         }
-
       }
     },
-
     smsCodeWaitTime() {
       this.nextTime = Date.parse(new Date()) / 1000 + parseInt(this.waitTime);
       this.btnIntervalObj = setInterval(() => {
-        let currTime = this.nextTime - (Date.parse(new Date()) / 1000);
+        let currTime = this.nextTime - Date.parse(new Date()) / 1000;
         if (currTime <= 0) {
           clearInterval(this.btnIntervalObj);
-          this.btnText = '重新获取验证码'
+          this.btnText = '重新获取验证码';
           this.btnIntervalObj = 0;
           this.btnDisabled = false;
         } else {
           this.btnDisabled = true;
-          this.btnText = currTime.toString() + 's'// '秒后重试';
+          this.btnText = currTime.toString() + 's'; // '秒后重试';
         }
       }, 100);
     },
     updateInput(e) {
       this.$emit('input', this.localVal);
-    },
+    }
   }
 };
 </script>
@@ -200,4 +238,4 @@ export default {
   background-color: #007aff;
   color: #ffffff;
 }
-</style>
+</style>