Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppMeetingNotice/AppMeetingNotice.vue

@@ -67,7 +67,7 @@
         params: null,
       }
     },
-    onLoad() {
+    created() {
       this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter", "meetStatus");
     },
     computed: {

src/apps/AppMeetingNotice/components/addMeeting.vue

@@ -72,7 +72,7 @@
         <div @click="add(1)">发布会议</div>
       </div>
     </div>
-    <u-datetime-picker mode="datetime" :show="show" :value="value" @confirm="confirm"></u-datetime-picker>
+    <u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
     <AiBack ref="aiBack" v-if="!userSelect"/>
     <AiSelectEnterprise :visible.sync="userSelect" :value="form.attendees" v-if="userSelect"
                         @change="change"></AiSelectEnterprise>
@@ -188,29 +188,19 @@
         })
       },
       confirm(e) {
-        const date = new Date(e.value);
-        const year = date.getFullYear();
-        const month = date.getMonth() + 1;
-        const day = date.getDate();
-        const hours = date.getHours();
-        const minutes = date.getMinutes();
-        const seconds = date.getSeconds();
-        const weekday = date.getDay();
-
-        if (new Date().getTime() / 1000 > e.value) return this.$u.toast("选择时间不能小于当前时间")
+        if (new Date().getTime() / 1000 > e.timestamp) return this.$u.toast("选择时间不能小于当前时间")
         if (this.index == 0) {
-          this.form.startTime = {year,month,day,timestamp:e.vaule}
-          this.form.startTime.time = hours + ":" + minutes
-          this.form.startTime.weekday = '一二三四五六日'.charAt(weekday)
+          this.form.startTime = {...e}
+          this.form.startTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
+          this.form.startTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
         } else {
-          if (this.form.startTime.timestamp >= e.value) {
+          if (this.form.startTime.timestamp >= e.timestamp) {
             return this.$u.toast("结束时间不能小于开始时间");
           }
-          this.form.endTime = {year,month,day,timestamp:e.vaule}
-          this.form.endTime.time = hours + ":" + minutes
-          this.form.endTime.weekday = '一二三四五六日'.charAt(weekday)
+          this.form.endTime = {...e}
+          this.form.endTime.time = e.hour + ":" + (e.minute.length > 1 ? e.minute : ("0" + e.minute))
+          this.form.endTime.weekday = '日一二三四五六'.charAt(new Date(e.timestamp * 1000).getDay())
         }
-        this.show = false;
       },
 
       add(status) {

src/apps/AppMeetingNotice/components/belongToMe.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="belong-to-me">
     <ai-top-fixed>
-      <u-tabs :list="tabs" :is-scroll="false" :current="index" bar-width="88" :height="96" @click="change"></u-tabs>
+      <u-tabs :list="tabs" :is-scroll="false" :current="index" bar-width="88" :height="96" @change="change"></u-tabs>
     </ai-top-fixed>
     <div class="body">
       <template v-if="list.length">
@@ -97,7 +97,7 @@
         this.$parent.comp = "detail"
       },
       change(e) {
-        this.index = e.index
+        this.index = e
         this.current = 1
         this.getList()
       },

src/apps/AppNotification/AppNotification.vue

@@ -2,7 +2,7 @@
   <div class="notification">
     <template v-if="showList">
       <AiTopFixed>
-        <u-tabs :list="tabs" :is-scroll="false" height="96" bar-width="192" @click="change"></u-tabs>
+        <u-tabs :list="tabs" :is-scroll="false" height="96" :current="index" bar-width="192" @change="change"></u-tabs>
       </AiTopFixed>
       <div class="body" v-if="dataList.length">
         <div class="card" v-for="(item,idx) in dataList" :key="idx" @click="handeClick(item)">
@@ -45,11 +45,11 @@
       <AiEmpty v-else/>
       <u-loadmore :status="status" v-if="dataList.length"/>
       <AiAdd @add="add"/>
-      <u-popup :show="show" mode="bottom" closeOnClickOverlay>
+      <u-popup v-model="show" mode="bottom">
         <div class="popup-wrap">
           <u-row justify="between">
             <div class="colum" v-for="(item,index) in optList" :key="index" @click="handleOpt(item)">
-              <u-icon :name="item.icon" size="50" :custom-style="{backgroundColor:'#fff',borderRadius:'8px'}"></u-icon>
+              <u-icon :name="item.icon" size="100" :custom-style="{backgroundColor:'#fff',borderRadius:'8px'}"></u-icon>
               <u-gap height="16"></u-gap>
               {{item.name}}
             </div>
@@ -57,9 +57,9 @@
           <div class="btn" @click="show=false">关闭</div>
         </div>
       </u-popup>
-      <u-modal :show="modal" :content="'是否确定' + content + '该公告？'" title="" show-confirm-button
+      <u-modal v-model="modal" :content="'是否确定' + content + '该公告？'" title="" show-confirm-button
                show-cancel-button confirm-text="确定" cancel-text="取消"
-               @confirm="confirm" :closeOnClickOverlay="true" @cancel="modal=false"></u-modal>
+               @confirm="confirm" @cancel="modal=false"></u-modal>
     </template>
     <component :is="comp" v-else :params="params"></component>
   </div>
@@ -223,7 +223,7 @@
         this.showList = false;
       },
       change(val) {
-        this.index = val.index;
+        this.index = val;
         this.current = 1;
         this.getList()
       },

src/apps/AppNotification/components/add.vue

@@ -61,7 +61,7 @@
       </div>
     </div>
     <AiBack ref="aiBack" v-if="!userSelect"/>
-    <u-datetime-picker :show="show" mode="datetime" :value="Number(new Date())" @confirm="confirm"></u-datetime-picker>
+    <u-picker v-model="show" mode="time" :params="options" @confirm="confirm"></u-picker>
     <AiSelectEnterprise :visible.sync="userSelect" :value="form.persons" v-if="userSelect" @change="change"></AiSelectEnterprise>
   </div>
 </template>
@@ -92,6 +92,15 @@
         },
         userSelect: false,
         flag: null,
+        options: {
+          year: true,
+          month: true,
+          day: true,
+          hour: true,
+          minute: true,
+          second: true,
+          timestamp: true,
+        },
       }
     },
     watch:{
@@ -112,17 +121,10 @@
     },
     methods: {
       confirm(e){
-        const date = new Date(e.value);
-        if(e.value< (Date.now())|0){
+        if(e.timestamp< (Date.now()/1000)|0){
           return this.$u.toast("发送时间不能小于当前时间");
         }
-        const year = date.getFullYear();
-        const month = date.getMonth() + 1;
-        const day = date.getDate();
-        const hours = date.getHours();
-        const minutes = date.getMinutes();
-        this.form.releaseTime = `${year}-${month}-${day} ${hours}:${minutes}:00`;
-        this.show = false;
+        this.form.releaseTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
       },
       fileList(e){
         this.form.files = e

src/apps/AppNotification/components/read.vue

@@ -5,7 +5,7 @@
     </AiTopFixed>
     <div class="body">
       <div class="item" v-for="(item,index) in (current==0 ? list.read : list.unRead)" :key="index">
-        <u-avatar :src="item.avatar" mode="square" size="38"></u-avatar>
+        <u-avatar :src="item.avatar" mode="square" size="76"></u-avatar>
         <span class="name">{{item.name}}</span>
       </div>
     </div>