From 31c998251d69a749beea512515759f51b23360cb Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Fri, 18 Mar 2022 16:01:36 +0800 Subject: [PATCH] v 2.8 --- src/assets/fontfile/demo_index.html | 52 +- src/assets/fontfile/iconfont.css | 14 +- src/assets/fontfile/iconfont.js | 2 +- src/assets/fontfile/iconfont.json | 14 + src/assets/fontfile/iconfont.ttf | Bin 26940 -> 27468 bytes src/assets/fontfile/iconfont.woff | Bin 18076 -> 18384 bytes src/assets/fontfile/iconfont.woff2 | Bin 16440 -> 16708 bytes src/components/FirstJob/components/timepicker.vue | 41 +- src/components/FirstJob/detail.vue | 6 +- src/components/FirstJob/recordBill.vue | 141 +++-- .../userinfo/usercenter/components/mybill.vue | 619 +++++++++++++++------ src/style/index.less | 8 + src/style/index.wxss | 6 + 13 files changed, 668 insertions(+), 235 deletions(-) diff --git a/src/assets/fontfile/demo_index.html b/src/assets/fontfile/demo_index.html index 37d8d85..e567f47 100644 --- a/src/assets/fontfile/demo_index.html +++ b/src/assets/fontfile/demo_index.html @@ -54,6 +54,18 @@
@@ -222,7 +222,20 @@ - + + + -
上传证件
+
--> + +
+ +
上传证件
+
+
+ +
上传中
 - - - + - +
@@ -347,7 +377,7 @@ :footer="null" @cancel="previewVisible = false" > - example + example
@@ -356,6 +386,7 @@ import { nationlist } from "../../utils/datalist"; // import recordbill from "@/components/FirstJob/components/recordbill.vue"; import moment from "moment"; +import { isEmptyCheck } from "../../utils/commonUtil"; import timepicker from "./components/timepicker.vue"; import { recordBillApi } from "@/api/job"; import request from "@/utils/request"; @@ -378,7 +409,7 @@ export default { // facetimedate: "", previewVisible: false, previewImage: "", - isMaster: false, + isMaster: true, isShow: false, userinfo: {}, islist: false, @@ -479,6 +510,7 @@ export default { nationlist, firminfo: {}, moment, + loading: false, }; }, // 计算属性 @@ -504,6 +536,7 @@ export default { this.proxyinfo = JSON.parse(sessionStorage.getItem("LOGIN_DATA")); // sessionStorage.setItem("CURRENT_FIRM", JSON.stringify(userinfo)); console.log(this.firminfo); + // console.log(this.proxyinfo); // console.dir(document.querySelector(".ant-calendar-picker-input")); // let picker = document.querySelector(".ant-calendar-picker-input"); @@ -644,6 +677,7 @@ export default { // }, beforeUpload() { let that = this; + //resolve() return new Promise((resolve, reject) => { //resolve() @@ -689,6 +723,7 @@ export default { async customRequestFun(file) { console.dir(file.onSuccess); let _self = this; + this.loading = true; var formData = new FormData(); //注意formData里append添加的键的大小写 @@ -720,10 +755,25 @@ export default { }, }) .then(({ data }) => { + this.loading = false; + + console.log(data); if (data.status === 200) { // console.log(this.$message); - if (data.data.IDCard !== null && data.data.IDCard !== "") { - this.form.idCard = data.data.IDCard; + if (data.data.success) { + if (!isEmptyCheck(data.data.num)) { + this.form.idCard = data.data.num; + this.form.age = data.data.age; + if (data.data.sex === "男") { + this.form.sex = "1"; + } else { + this.form.sex = "2"; + } + console.log(this.form.sex); + this.form.nation = data.data.nationality + "族"; + this.form.userName = data.data.name; + this.form.address = data.data.address; + } } else { this.$message.error("身份证识别失败,请重新上传图片"); } @@ -736,6 +786,7 @@ export default { console.log(err); }); file.onProgress(); + $.ajax({ type: "post", url: "http://matripe-cms.oss-cn-beijing.aliyuncs.com", @@ -744,6 +795,9 @@ export default { processData: false, success: function (data) { file.onSuccess(); + + console.log(document.querySelector(".ant-upload-list-item-info")); + _self.uploadFileFlag = true; console.log(data); var img = @@ -751,6 +805,7 @@ export default { "/" + _self.dataObj.key.replace("${filename}", file.file.name); _self.form.idCardImageUrl = img; + console.log(_self.form.idCardImageUrl); }, fail: function (err) { console.log(err); @@ -758,6 +813,7 @@ export default { }); }, async handlePreview(file) { + console.log(file); if (!file.url && !file.preview) { file.preview = await this.getBase64(file.originFileObj); } @@ -904,21 +960,19 @@ export default { } .ant-upload { padding: 0; - } - .ant-upload-list-item-info { - margin-top: 0px; - a { - width: 98px; - height: 38px; - border-radius: 2px; - } - img { - display: block; - width: 98px; - height: 38px; - border-radius: 2px; + .uploading { + position: absolute; + width: 98px !important; + height: 38px !important; + top: 1px; + left: -49px; + background-color: #f5f5f5; } } + + // .ant-upload-list-item-uploading { + // display: none; + // } .ant-upload-select { background-color: #f5f5f5 !important; } @@ -927,11 +981,12 @@ export default { margin: 0 0 0 6px; } .ant-upload-list-item-uploading-text { - display: inline-block; + // display: none; text-align: center !important; - line-height: 0px !important; + line-height: 40px !important; width: 100px !important; height: 40px !important; + margin-top: 0; // overflow: hidden; } .ant-upload-list-item-actions { diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue index 987d722..2bacd2c 100644 --- a/src/components/userinfo/usercenter/components/mybill.vue +++ b/src/components/userinfo/usercenter/components/mybill.vue @@ -1,66 +1,130 @@