Merge branch 'dev4.5.2' of http://172.16.10.252:8080/qmx/jy into dev4.5.2

src/jfw/modules/app/src/web/templates/frontRouter/portraitRecord/sess/index.html

@@ -27,7 +27,7 @@
               <van-button round type="primary" v-else @click="setBook">订阅设置</van-button>
             </div>
           </div>
-          <div class="p-date">
+          <div class="p1-date">
             <div class="d-box flex">
               使用记录
               <van-field v-model="dValue" @click="usedHised" placeholder="选择年月" right-icon="play" readonly/>
@@ -44,6 +44,7 @@
               type="year-month"
               title="选择日期"
               :formatter="formatter11"
+              :max-date="maxTime"
               @confirm="confirmed"
               @cancel="canceled"
             />
@@ -53,7 +54,7 @@
               v-model="listInfo.loading"
               :finished="listInfo.finished"
               finished-text=""
-              @onLoad="onLoad"
+              @load="onLoad"
             >
                 <div class="ent-search-item" v-for="(item, i) in list" :key="item._id" @click="detailed(item._id)">
                     <div class="ent-info-top">

src/web/staticres/common-module/portraitRecord/css/index.css

@@ -62,37 +62,36 @@
     font-size: .32rem;
     color: #F7F9FA;
 }
-.p-date {
-    height: .88rem;
+.p1-date {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0 16px;
+    padding: 12px 16px;
 }
-.p-date div {
+.p1-date div {
     font-size: .26rem;
     color: #9b9ca3;
 }
-.p-date .word-tips span {
+.p1-date .word-tips span {
     color: #2ABED1;
 }
-.p-date .d-box .van-cell {
+.p1-date .d-box .van-cell {
     padding: 0 12px;
     width: 2rem;
     height: .48rem;
     border-radius: 53px;
     margin-left: 8px;
 }
-.p-date .d-box .van-cell .van-field__control {
+.p1-date .d-box .van-cell .van-field__control {
     height: .48rem;
     font-size: .24rem;
     color: #171826;
 }
-.p-date .d-box .van-cell .van-field__right-icon {
+.p1-date .d-box .van-cell .van-field__right-icon {
     padding: 0;
     padding-right: 8px;
 }
-.p-date .d-box .van-cell .van-icon-play::before {
+.p1-date .d-box .van-cell .van-icon-play::before {
     -webkit-transform: rotate(90deg);
     transform:rotate(90deg);
 }
@@ -124,7 +123,7 @@
     background-size: contain;
 }
 .c-list .ent-search-item {
-    margin-top: 8px;
+    margin-bottom: 8px;
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;

src/web/staticres/common-module/portraitRecord/js/index-wx.js

@@ -48,6 +48,7 @@ var vm = new Vue({
       dValue: '',
       pShow: false,
       curDate: '',
+      maxTime: '',
       points: [],
       years: '',
       months: '',
@@ -70,6 +71,7 @@ var vm = new Vue({
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
       this.curDate = new Date()
+      this.maxTime = new Date(this.years, this.months - 1)
       this.subPoint()
       this.onLoad()
   },
@@ -110,9 +112,7 @@ var vm = new Vue({
         if (this.listInfo.pageNum === 1) {
           if (r.data.total || r.data.total === 0) {
             this.listInfo.total = r.data.total
-            this.showUpTip = false
           } else {
-            this.showUpTip = true
             this.listInfo.finished = true
           }
         }

src/web/staticres/common-module/portraitRecord/js/index.js

@@ -48,6 +48,7 @@ var vm = new Vue({
       dValue: '',
       pShow: false,
       curDate: '',
+      maxTime: '',
       points: [],
       years: '',
       months: '',
@@ -70,6 +71,7 @@ var vm = new Vue({
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
       this.curDate = new Date()
+      this.maxTime = new Date(this.years, this.months - 1)
       this.subPoint()
       this.onLoad()
   },
@@ -110,9 +112,7 @@ var vm = new Vue({
         if (this.listInfo.pageNum === 1) {
           if (r.data.total || r.data.total === 0) {
             this.listInfo.total = r.data.total
-            this.showUpTip = false
           } else {
-            this.showUpTip = true
             this.listInfo.finished = true
           }
         }

src/web/templates/frontRouter/wx/portraitRecord/sess/index.html

@@ -41,7 +41,7 @@
               <van-button round type="primary" v-else @click="setBook">订阅设置</van-button>
             </div>
           </div>
-          <div class="p-date">
+          <div class="p1-date">
             <div class="d-box flex">
               使用记录
               <van-field v-model="dValue" @click="usedHised" placeholder="显示图标" right-icon="play" readonly/>
@@ -57,6 +57,7 @@
               type="year-month"
               title="选择日期"
               :formatter="formatter11"
+              :max-date="maxTime"
               @confirm="confirmed"
               @cancel="canceled"
             />
@@ -66,7 +67,7 @@
               v-model="listInfo.loading"
               :finished="listInfo.finished"
               finished-text=""
-              @onLoad="onLoad"
+              @load="onLoad"
             >
                 <div class="ent-search-item" v-for="(item, i) in list" :key="item._id" @click="detailed(item._id)">
                     <div class="ent-info-top">