diff --git a/public/static/img/about/aboutBanner.jpg b/public/static/img/about/aboutBanner.jpg new file mode 100644 index 0000000..95a4e9a Binary files /dev/null and b/public/static/img/about/aboutBanner.jpg differ diff --git a/public/static/img/about/aboutBanner.png b/public/static/img/about/aboutBanner.png deleted file mode 100644 index 4aa9374..0000000 Binary files a/public/static/img/about/aboutBanner.png and /dev/null differ diff --git a/public/static/img/logo-light.png b/public/static/img/logo-light.png index e57d2d5..94fb044 100644 Binary files a/public/static/img/logo-light.png and b/public/static/img/logo-light.png differ diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue index ffb3798..b180cbc 100644 --- a/src/components/NavBar.vue +++ b/src/components/NavBar.vue @@ -98,14 +98,14 @@ ] }, { title: '联系我们', path: '/cnkhp.com/CU' }, - { - title: '客户登录', - jump: 'http://117.72.41.220:9097' - }, - { - title: '供应商登录', - jump: 'http://117.72.41.220:9097' - } + // { + // title: '客户登录', + // jump: 'http://117.72.41.220:9097' + // }, + // { + // title: '供应商登录', + // jump: 'http://117.72.41.220:9097' + // } ] }; }, @@ -149,7 +149,7 @@ display: flex; justify-content: space-between; align-items: center; - padding: 28rem 60rem; + padding: 28rem 70rem; box-sizing: border-box; transition: background-color 0.3s; height: 158rem; diff --git a/src/views/About/CompanyIntroduction/Index.vue b/src/views/About/CompanyIntroduction/Index.vue index 9c7804a..1d6452a 100644 --- a/src/views/About/CompanyIntroduction/Index.vue +++ b/src/views/About/CompanyIntroduction/Index.vue @@ -5,7 +5,7 @@ id="screen1" > diff --git a/src/views/Invest/BusinessPartner/Index.vue b/src/views/Invest/BusinessPartner/Index.vue index 77d0ea2..d7d473a 100644 --- a/src/views/Invest/BusinessPartner/Index.vue +++ b/src/views/Invest/BusinessPartner/Index.vue @@ -59,7 +59,7 @@ - + @@ -231,11 +231,31 @@ - - - 上传 - - +
+ + + 上传 + +
+ 请上传 + + + 的文件 +
+
+ + + +
  • + + {{ getFileName(file.name) }} + +
    + 删除 +
    +
  • +
    +
    @@ -455,8 +475,10 @@ number: 0, uploadList: [], // 上传文件服务器地址 - uploadFileUrl: process.env.VUE_APP_API_TARGET_URL + '/system/oss/upload', + uploadFileUrl: + process.env.VUE_APP_API_TARGET_URL + 'system/oss/addFilesUpload', fileList: [], + fileList1: [], loadingModal: undefined }; }, @@ -501,6 +523,9 @@ this.$refs['Partnerform'].validate(valid => { if (valid) { this.form1.fieldType = this.form1.fieldType.toString(); + this.form1.imageurl = this.fileList + .map(item => item.url) + .toString(); this.$request .post('/official/companymessage/add', this.form1) .then(res => { @@ -512,10 +537,11 @@ phoneNumber: '', email: '', fieldType: [], - otherNotes: '', advantageConcept: '', - cooperationIntention: '' + cooperationIntention: '', + imageurl: '' }; + this.fileList = []; } }); } @@ -532,6 +558,9 @@ this.form.productCertification = this.form.productCertification.toString(); this.form.qualitySystem = this.form.qualitySystem.toString(); this.form.relevantQualifications = this.form.relevantQualifications.toString(); + this.form.imageurl = this.fileList1 + .map(item => item.url) + .toString(); this.$request .post('/official/companymessage/add', this.form) .then(res => { @@ -554,8 +583,10 @@ qualitySystem: [], relevantQualifications: [], advantageConcept: '', - cooperationIntention: '' + cooperationIntention: '', + imageurl: '' }; + this.fileList1 = []; } }); } @@ -599,7 +630,7 @@ }, // 上传失败 handleUploadError(err) { - this.$message.error(`上传文件失败,请重试`); + this.$message.error(`上传文件失败,请重试`, err); this.loadingModal.close(); }, // 上传成功回调 @@ -621,8 +652,8 @@ }, // 删除文件 handleDelete(index) { - let ossId = this.fileList[index].ossId; - delOss(ossId); + // let ossId = this.fileList[index].ossId; + // delOss(ossId); this.fileList.splice(index, 1); }, // 上传结束处理 @@ -642,6 +673,76 @@ } else { return name; } + }, + // 上传前校检格式和大小 + handleBeforeUpload1(file) { + // 校检文件类型 + if (this.fileType) { + const fileName = file.name.split('.'); + const fileExt = fileName[fileName.length - 1]; + const isTypeOk = this.fileType.indexOf(fileExt) >= 0; + if (!isTypeOk) { + this.$message.error( + `文件格式不正确, 请上传${this.fileType.join('/')}格式文件!` + ); + return false; + } + } + // 校检文件大小 + if (this.fileSize) { + const isLt = file.size / 1024 / 1024 < this.fileSize; + if (!isLt) { + this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`); + return false; + } + } + this.loadingModal = this.$loading({ + lock: true, + text: '正在上传文件,请稍候...', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); + this.number++; + return true; + }, + // 文件个数超出 + handleExceed1() { + this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`); + }, + // 上传失败 + handleUploadError1(err) { + this.$message.error(`上传文件失败,请重试`, err); + this.loadingModal.close(); + }, + // 上传成功回调 + handleUploadSuccess1(res, file) { + if (res.code === 200) { + this.uploadList1.push({ + name: res.data.fileName, + url: res.data.url, + ossId: res.data.ossId + }); + this.uploadedSuccessfully1(); + } else { + this.number--; + this.loadingModal.close(); + this.$message.error(res.msg); + this.$refs.fileUpload1.handleRemove(file); + this.uploadedSuccessfully1(); + } + }, + // 删除文件 + handleDelete1(index) { + this.fileList1.splice(index, 1); + }, + // 上传结束处理 + uploadedSuccessfully1() { + if (this.number > 0 && this.uploadList1.length === this.number) { + this.fileList1 = this.fileList1.concat(this.uploadList1); + this.uploadList1 = []; + this.number = 0; + this.loadingModal.close(); + } } } }; diff --git a/src/views/Invest/Investor/Index.vue b/src/views/Invest/Investor/Index.vue index 4b8d4dd..a784268 100644 --- a/src/views/Invest/Investor/Index.vue +++ b/src/views/Invest/Investor/Index.vue @@ -2,48 +2,23 @@
    - +
    - - + +
      -
    • +
    • - +
      - +
      - +
      {{ item.captionName }}[详细]
      @@ -55,12 +30,7 @@
        -
      • +
      • {{ item.captionName }}
      @@ -69,19 +39,10 @@
        -
      • +
      • diff --git a/src/views/Invest/Investor/NewsDetail.vue b/src/views/Invest/Investor/NewsDetail.vue index ed10670..d4ea576 100644 --- a/src/views/Invest/Investor/NewsDetail.vue +++ b/src/views/Invest/Investor/NewsDetail.vue @@ -2,11 +2,7 @@
        - +
        @@ -17,10 +13,7 @@ {{ newsDetail.releaseTime.slice(0, 10) }} {{ newsDetail.groupName }}
        -
        +
        @@ -62,197 +55,208 @@