@@ -1322,24 +1322,24 @@ export default {
},
timeShowXXX2(val){
const now = Date.now();
- const diff = now - val;
-
- const seconds = Math.floor(diff / 1000);
- const minutes = Math.floor(seconds / 60);
- const hours = Math.floor(minutes / 60);
- const days = Math.floor(hours / 24);
-
- if (days < 2) {
- if (hours > 0) {
- return `${hours}小时前`;
- } else if (minutes > 0) {
- return `${minutes}分钟前`;
- } else {
- return `${seconds}秒前`;
- }
- } else {
- return `${days}天前`;
- }
+ const diff = now - val;
+
+ const seconds = Math.floor(diff / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ if (days < 2) {
+ if (hours > 0) {
+ return `${hours}小时前`;
+ } else if (minutes > 0) {
+ return `${minutes}分钟前`;
+ } else {
+ return `${seconds}秒前`;
+ }
+ } else {
+ return `${days}天前`;
+ }
},
async getJobListYicai(newdata) {
// this.isspinning = true;
@@ -1600,13 +1600,13 @@ export default {
this.formvalue.pageNum = 1
if (e.target.dataset.type != undefined) {
this.formvalue.pageNum = 1;
- if (e.target.dataset.type != 0) {
+ // if (e.target.dataset.type != 0) {
+ // this.formvalue.signType = this.signType = e.target.dataset.type;
+ // this.getJobListYicai();
+ // } else {
this.formvalue.signType = this.signType = e.target.dataset.type;
- this.getJobListYicai();
- } else {
- this.formvalue.signType = this.signType = "";
this.getJobList();
- }
+ //}
}
},
async getJobSpecialList() {
diff --git a/src/style/index.css b/src/style/index.css
index 68fd2fb..f1d582d 100644
--- a/src/style/index.css
+++ b/src/style/index.css
@@ -1,4 +1,4 @@
-@import "//at.alicdn.com/t/c/font_3135652_nd5ivglbv4.css";
+@import "//at.alicdn.com/t/c/font_3135652_q5zxetpyxmk.css";
@font-face {
font-family: "DingTalk";
/* 这里的字体名称是自定义的 */
diff --git a/src/style/index.less b/src/style/index.less
index 02e1900..20e9017 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,4 @@
-@import "//at.alicdn.com/t/c/font_3135652_nd5ivglbv4.css";
+@import "//at.alicdn.com/t/c/font_3135652_q5zxetpyxmk.css";
@font-face {
font-family: "DingTalk"; /* 这里的字体名称是自定义的 */
src: url("../assets/fonts/DingTalk\ Sans.ttf"); /* 服务器上ttf文件的路径,记得配置域名权限 */
diff --git a/src/views/main.vue b/src/views/main.vue
index d4a5b45..e0a6001 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -968,6 +968,7 @@ export default {
top: 0;
width: 100vw;
z-index: 999999;
+ box-shadow: 3px 3px 6px 0px rgba(77, 87, 94, 0.1);
}
.fellowtownsman {