From 47e6f94688c12336055c6c07c0201d22e79654af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 6 Jul 2023 10:46:08 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project/signUp.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue
index 2ac0abd6..bd2f429f 100644
--- a/src/views/project/signUp.vue
+++ b/src/views/project/signUp.vue
@@ -360,7 +360,7 @@ export default {
},
onRead (file) {
this.$toast.loading({
- message: "正在提交...",
+ message: "正在提交签名",
forbidClick: true,
duration: 0,
});
@@ -410,6 +410,11 @@ export default {
// })
// return;
// }
+ this.$toast.loading({
+ message: "正在提交报名",
+ forbidClick: true,
+ duration: 0,
+ });
values.signPic = this.signFileUrlUp;
submmitSignup(values).then(response =>{
if(response.code==200){
From ae615c7a5b9d5efd427d0dfb69341b5a1882b7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 6 Jul 2023 11:36:45 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project/projectDetail.vue | 8 ++++----
src/views/sunVillage_info/list_signature_pdf.vue | 11 +++++++++++
src/views/user/signature/signatureList.vue | 7 +++++++
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 96d06775..b6eb1c26 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -206,9 +206,9 @@
-
+
-
+
@@ -216,7 +216,7 @@
出价
- {{price}}元
+ {{price}}元
@@ -224,7 +224,7 @@
-
+
diff --git a/src/views/sunVillage_info/list_signature_pdf.vue b/src/views/sunVillage_info/list_signature_pdf.vue
index a5c5718e..ca71f427 100644
--- a/src/views/sunVillage_info/list_signature_pdf.vue
+++ b/src/views/sunVillage_info/list_signature_pdf.vue
@@ -34,11 +34,22 @@
}
const id = this.$route.query.id;
const baseURL = process.env.VUE_APP_BASE_API;
+ this.$toast.loading({
+ message: "正在加载文件",
+ forbidClick: true,
+ duration: 20000,
+ });
previewContractFile(id).then(response => {
this.url = baseURL + response.msg;
let loadingTask = pdf.createLoadingTask(this.url)
+ this.$toast.loading({
+ message: "正在加载文件",
+ forbidClick: true,
+ duration: 20000,
+ });
loadingTask.promise.then(pdf => {
this.numPages = pdf.numPages
+ this.$toast.clear();
})
});
},
diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue
index 4c51fadb..011a224e 100644
--- a/src/views/user/signature/signatureList.vue
+++ b/src/views/user/signature/signatureList.vue
@@ -388,6 +388,13 @@
align-items: center;
margin-top: 5PX;
justify-content: space-between;
+ p:first-child{
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+ word-break: break-all;
+ overflow: hidden;
+ }
.icon_time{
width: 25px;
height: 25px;
From 002db23f23c43d977e178de3925fd5d3d06135fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 6 Jul 2023 11:45:26 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project/projectDetail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index b6eb1c26..7603fae0 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -400,7 +400,7 @@ export default {
getBiddingList(that.id).then(response =>{
that.biddinglistInformation = response.rows
that.biddinglistInformationLength = response.total
- if (that.detail.biddingType != '自由竞价'){
+ if (that.detail.biddingType == '阶梯竞价'){
if (response.rows.length>0&&that.detail.ladderPrice){
if (that.price == 0){return;}
if (that.detail.biddingDirect == 2 ||that.detail.biddingDirect == '反向竞价') {
From 006e6a3679b43275ba0e136ae666643fccb1a17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 6 Jul 2023 11:59:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project/projectDetail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 7603fae0..924c3d48 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -555,7 +555,7 @@ export default {
this.timeConfig = response.data[8].configValue;
response.data.map(item =>{
if(item.configKey=="cqjy.website.bidInfo"){
- this.webConfig += item.configValue
+ this.webConfig = item.configValue
}
})
});
From f4d4c453dd87f8a7a0fb5051b899ae2eecde96a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 7 Jul 2023 08:38:50 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project/projectDetail.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 924c3d48..dbb150f5 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -318,7 +318,7 @@ export default {
}
},
created() {
-
+ clearInterval(this.timer);
this.reload();
},
methods: {
@@ -562,6 +562,7 @@ export default {
},
offerFirst(){
+ clearInterval(this.timer);
let newMoney;
projectNewBidMoney(this.id).then(response =>{
if (response.data&&response.code==200){
@@ -686,6 +687,7 @@ export default {
biddingSubmit(data).then(response =>{
let _this = this
if(response){
+ clearInterval(this.timer);
this.$toast({
icon: 'success', // 找到自己需要的图标
message: '出价成功',