no message

src/components/certificateDialog.vue

@@ -2,56 +2,30 @@
   <u-popup mode="center" round="10" :show="isShow" :closeOnClickOverlay="false">
     <view class="dialog">
       <view class="close">
-        <u-icon
-          name="close"
-          color="#9E9E9E"
-          size="24"
-          @tap="closeDialog"
-        ></u-icon>
+        <u-icon name="close" color="#9E9E9E" size="24" @tap="closeDialog"></u-icon>
       </view>
       <view class="top">
-        <image
-          src="@/static/images/dialog/insurance-icon2.png"
-          mode="widthFix"
-        ></image>
+        <image src="@/static/images/dialog/insurance-icon2.png" mode="widthFix"></image>
       </view>
 
       <block v-if="type === 1">
         <view class="title">证件过期提示</view>
-        <view class="text" v-if="day > 0"
-          >您的{{ name
-          }}{{ day }}天后即将过期，请及时上传最新证件，以免影响接单！</view
-        >
-        <view class="text" v-else
-          >您的{{ name }}已过期{{
-            Math.abs(day)
-          }}天，请及时上传最新证件，以免影响接单！</view
-        >
+        <view class="text" v-if="day > 0">您的{{ name }}{{ day }}天后即将过期，请及时上传最新证件，以免影响接单！</view>
+        <view class="text" v-else>您的{{ name }}已过期{{ Math.abs(day) }}天，请及时上传最新证件，以免影响接单！</view>
       </block>
 
       <block v-if="type === 2">
         <view class="title">证件复审提示</view>
         <view class="text" v-if="day > 0"
-          >您的{{ name
-          }}{{
-            day
-          }}天后即将过复审日期，请及时上传最新证件，以免影响接单！</view
+          >您的{{ name }}{{ day }}天后即将过复审日期，请及时上传最新证件，以免影响接单！</view
         >
         <view class="text" v-else
-          >您的{{ name }}复审日期已过期{{
-            Math.abs(day)
-          }}天，请及时上传最新证件，以免影响接单！</view
+          >您的{{ name }}复审日期已过期{{ Math.abs(day) }}天，请及时上传最新证件，以免影响接单！</view
         >
       </block>
 
       <view class="btn">
-        <u-button
-          text="去上传"
-          shape="circle"
-          type="primary"
-          @click="clickButton()"
-        >
-        </u-button>
+        <u-button text="去上传" shape="circle" type="primary" @click="clickButton()"> </u-button>
       </view>
     </view>
   </u-popup>
@@ -62,39 +36,39 @@ export default {
   props: {
     isShow: {
       type: Boolean,
-      default: false,
+      default: false
     },
     type: {
       type: Number,
-      default: 0, // 1=证件快过期提示 2=复审快过期提示
-    },
+      default: 0 // 1=证件快过期提示 2=复审快过期提示
+    }
   },
 
   data() {
     return {
       name: '',
-      day: '',
-    };
+      day: ''
+    }
   },
 
   onLoad() {},
 
   methods: {
     initData() {
-      const userInfo = this.$store.state.userInfo;
-      this.name = userInfo.certExpireName;
-      this.day = userInfo.certExpireDay;
+      const userInfo = this.$store.state.userInfo
+      this.name = userInfo.certExpireName
+      this.day = userInfo.certExpireDay
     },
 
     closeDialog() {
-      this.$emit('close');
+      this.$emit('close')
     },
 
     clickButton() {
-      this.$emit('handle');
-    },
-  },
-};
+      this.$emit('handle')
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/components/insuranceDialog.vue

@@ -2,40 +2,17 @@
   <u-popup mode="center" round="10" :show="isShow" :closeOnClickOverlay="false">
     <view class="dialog">
       <view class="close" v-if="type === 3">
-        <u-icon
-          name="close"
-          color="#9E9E9E"
-          size="24"
-          @tap="closeDialog"
-        ></u-icon>
+        <u-icon name="close" color="#9E9E9E" size="24" @tap="closeDialog"></u-icon>
       </view>
       <view class="top">
-        <image
-          src="@/static/images/dialog/insurance-icon1.png"
-          mode="widthFix"
-          v-if="type === 3"
-        ></image>
-        <image
-          src="@/static/images/dialog/insurance-icon2.png"
-          mode="widthFix"
-          v-if="type === 2"
-        ></image>
+        <image src="@/static/images/dialog/insurance-icon1.png" mode="widthFix" v-if="type === 3"></image>
+        <image src="@/static/images/dialog/insurance-icon2.png" mode="widthFix" v-if="type === 2"></image>
       </view>
       <view class="title">保险购买提示</view>
-      <view class="text" v-if="type === 3"
-        >距离保险期还有{{ day }}天，请及时续保，以免影响接单!</view
-      >
-      <view class="text" v-if="type === 2"
-        >保险已过期，为了您的安全保障，请及时续保，以免影响接单!</view
-      >
+      <view class="text" v-if="type === 3">距离保险期还有{{ day }}天，请及时续保，以免影响接单!</view>
+      <view class="text" v-if="type === 2">保险已过期，为了您的安全保障，请及时续保，以免影响接单!</view>
       <view class="btn">
-        <u-button
-          text="去续保"
-          shape="circle"
-          type="primary"
-          @click="clickButton()"
-        >
-        </u-button>
+        <u-button text="去续保" shape="circle" type="primary" @click="clickButton()"> </u-button>
       </view>
     </view>
   </u-popup>
@@ -46,37 +23,37 @@ export default {
   props: {
     isShow: {
       type: Boolean,
-      default: false,
+      default: false
     },
     type: {
       type: Number,
-      default: 0, // 2=保险过期提示 3=保险快到期提示
-    },
+      default: 0 // 2=保险过期提示 3=保险快到期提示
+    }
   },
 
   data() {
     return {
-      day: 0,
-    };
+      day: 0
+    }
   },
 
   onLoad() {},
 
   methods: {
     initData() {
-      const userInfo = this.$store.state.userInfo;
-      this.day = userInfo.limitInsureDay;
+      const userInfo = this.$store.state.userInfo
+      this.day = userInfo.limitInsureDay
     },
 
     closeDialog() {
-      this.$emit('close');
+      this.$emit('close')
     },
 
     clickButton() {
-      this.$emit('handle');
-    },
-  },
-};
+      this.$emit('handle')
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/components/protocolDialog.vue

@@ -2,31 +2,17 @@
   <u-popup mode="center" round="10" :show="isShow" :closeOnClickOverlay="false">
     <view class="dialog">
       <view class="close">
-        <u-icon
-          name="close-circle"
-          color="#ffffff"
-          size="40"
-          @tap="closeDialog"
-        ></u-icon>
+        <u-icon name="close-circle" color="#ffffff" size="40" @tap="closeDialog"></u-icon>
       </view>
       <view class="top">
-        <image
-          src="@/static/images/dialog/protocol-bg.png"
-          class="bg"
-          mode="widthFix"
-        ></image>
+        <image src="@/static/images/dialog/protocol-bg.png" class="bg" mode="widthFix"></image>
         <view class="title">电子协议签约提示</view>
       </view>
       <view class="box">
         <view class="icon">
-          <image
-            src="@/static/images/dialog/protocol-icon1.png"
-            mode="widthFix"
-          ></image>
+          <image src="@/static/images/dialog/protocol-icon1.png" mode="widthFix"></image>
         </view>
-        <view class="text"
-          >您的电子协议已过期，逾期不签约将影响登录使用，是否现在去签约？</view
-        >
+        <view class="text">您的电子协议已过期，逾期不签约将影响登录使用，是否现在去签约？</view>
         <view class="link">请先阅读《服务人员承揽协议》</view>
       </view>
       <view class="btn">
@@ -47,26 +33,26 @@ export default {
   props: {
     isShow: {
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
   },
 
   data() {
-    return {};
+    return {}
   },
 
   onLoad() {},
 
   methods: {
     closeDialog() {
-      this.$emit('close');
+      this.$emit('close')
     },
 
     clickButton() {
-      this.$emit('handle');
-    },
-  },
-};
+      this.$emit('handle')
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/packageMine/pages/workerEnter.vue

@@ -424,6 +424,12 @@ export default {
         ) {
           this.$tips('高空证信息需要完整！')
           return false
+        } else if (
+          Date(this.reexamineTime).getTime() < Date(this.altitudeDocumentStateTime).getTime() ||
+          Date(this.reexamineTime).getTime() > Date(this.altitudeDocumentEndTime).getTime()
+        ) {
+          this.$tips('复审日期必须包含在有效期内！')
+          return false
         }
       } else {
         this.altitudeDocumentNumber = ''
@@ -461,12 +467,12 @@ export default {
         name: this.name,
         bankAccount: this.bankAccount,
         idCard: this.idcard,
-        idCardStartTime: this.idCardStateTime,
-        idCardEndTime: this.idCardEndTime,
+        idCardStartTime: this.idCardStateTime + ' 00:00:00',
+        idCardEndTime: this.idCardEndTime + ' 23:59:59',
         number: this.altitudeDocumentNumber,
-        hightExamineTime: this.reexamineTime,
-        startTime: this.altitudeDocumentStateTime,
-        endTime: this.altitudeDocumentEndTime,
+        hightExamineTime: this.reexamineTime + ' 23:59:59',
+        startTime: this.altitudeDocumentStateTime + ' 00:00:00',
+        endTime: this.altitudeDocumentEndTime + ' 23:59:59',
         type: 'WORKER',
         websitId: this.websitId,
         isBuy: this.isBuy,
@@ -529,8 +535,8 @@ export default {
           company: this.insurancePolicyName,
           policyName: this.insuranceName,
           policyOrder: this.insuranceNumber,
-          startTime: this.insuranceStateTime,
-          endTime: this.insuranceEndTime,
+          startTime: this.insuranceStateTime + ' 00:00:00',
+          endTime: this.insuranceEndTime + ' 23:59:59',
           policyType: 'AC',
           policyPrice: 0,
           policyUrl: this.imageList.map(item => item.urls).join(',')

src/pages/index/index.vue

@@ -383,7 +383,15 @@
 
 <script>
 import { getNoticeNum, getOrderNum, selectionChange, mini_env } from '@/common/utils/util.js'
+import insuranceDialog from '@/components/insuranceDialog'
+import protocolDialog from '@/components/protocolDialog'
+import certificateDialog from '@/components/certificateDialog'
 export default {
+  components: {
+    insuranceDialog,
+    protocolDialog,
+    certificateDialog
+  },
   data() {
     return {
       isShowProtocolDialog: false, // 是否显示电子协议过期提示弹窗