Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuemobr7res into dev

src/components/app-mob-datetime-picker/app-mob-datetime-picker.less

@@ -2,7 +2,8 @@
   width: 100%;
   text-align: right;
   ion-datetime{
-    padding-right: 36px;
+    // padding-right: 36px;
+    --padding-end: 0;
   }
   ion-icon{
     position: absolute;
@@ -10,4 +11,10 @@
     top: 42px;
     z-index:2;
   }
+
+
+}
+.picker-col {
+  padding-inline-start: 5px;
+  padding-inline-end: 0px;
 }
\ No newline at end of file

src/components/app-mob-datetime-picker/app-mob-datetime-picker.vue

@@ -2,7 +2,9 @@
     <div class="app-mobile-datetime-picker">
         <ion-icon v-if="curValue"  name="close-circle-outline" @click="clear"></ion-icon>
         <ion-datetime 
-            display-format="YYYY-MM-DD HH:mm:ss" 
+            :max="max"
+            :min="min"
+            display-format="YYYY-MM-DD hh:mm" 
             :value="value" 
             :placeholder="placeholder" 
             :disabled="disabled"
@@ -49,6 +51,21 @@ export default class AppDateTimePicker extends Vue {
      */
     public curValue:any = this.value;
 
+    /**
+     * 当前日期
+     * @type {*}
+     * @memberof MOBILEENTITY3Canlen
+     */
+    protected currentDate:any = new Date().getFullYear();
+
+
+    /**
+     * 当前选中值
+     * @memberof AppDateTimePicker
+     */
+    public min:any = this.currentDate - 100;
+    public max:any = this.currentDate + 100;
+
     /**
      * 是否禁用
      *
@@ -84,6 +101,10 @@ export default class AppDateTimePicker extends Vue {
         this.curValue = null;
         this.$emit('change','')
     }        
+
+    created(){
+        console.log(this.currentDate);
+    }
 }
 </script>
 <style lang="less">