MONSTER-ygh 11 mesi fa
parent
commit
69636ad773

+ 1 - 0
package.json

@@ -51,6 +51,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.30.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "scp2": "^0.5.0",

+ 6 - 4
src/views/tourism/marketingActivities/formBox/couponManagementForm.vue

@@ -261,6 +261,7 @@ import {
 import selectMembershipLevel from '../model/selectMembershipLevel.vue'
 import selectMemberInformation from '../model/selectMemberInformation.vue'
 import selectTicketOrders from "../model/selectTicketOrders.vue"
+import moment from'moment';
 export default {
   name: "addAndEdit",
   components: {selectMembershipLevel,selectMemberInformation,selectTicketOrders},
@@ -314,6 +315,7 @@ export default {
     };
   },
   methods: {
+    moment,
     async initData(title , model,row){
       this.title = title
       this.activeName = 'first'
@@ -596,8 +598,8 @@ export default {
       return {
         disabledDate: (time) => {
           if(useType == 1 && datas && datas.length>0) {
-            let now = new Date(datas[1])
-            return time.getTime() >= (now-86400000);
+            let now = new Date(moment(datas[1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'))
+            return time.getTime() > now.getTime();
           }else {
             return false
           }
@@ -609,8 +611,8 @@ export default {
       return {
         disabledDate: (time) => {
           if(datas && datas.length>0) {
-            let now = new Date(datas[0])
-            return time.getTime() <= (now-86400000);
+            let now = new Date(moment(datas[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'))
+            return time.getTime() < now.getTime()
           }else {
             return false
           }

+ 1 - 1
src/views/tourism/popularCheck/detailsBox/contentManagementDetails.vue

@@ -86,7 +86,7 @@
               <span style="display: block;min-width: 250px;">{{ form.content }}</span>
             </el-form-item>
             <el-form-item label="星级评分:">
-              <div style="height: 100%;display: flex;align-items: center;">
+              <div style="height: 36px;display: flex;align-items: center;">
                 <el-rate v-model="form.score" disabled></el-rate>
               </div>
             </el-form-item>