Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/project/projectDetail.vue

@@ -206,9 +206,9 @@
           </van-button>
         </van-col>
       </van-row>
-      <van-field v-if="showBtn&&detail.biddingType=='自由竞价'" v-model="price" type="number" input-align="center" placeholder="请输入出价金额" />
+      <van-field v-if="showBtn&&detail.biddingType!='阶梯竞价'" v-model="price" type="number" input-align="center" placeholder="请输入出价金额" />
       <van-row v-if="showBtn" type="flex" justify="space-around">
-        <van-col span="4" v-if="detail.ladderPrice&&detail.biddingType!='自由竞价'" style="text-align: center;line-height: 1rem">
+        <van-col span="4" v-if="detail.ladderPrice&&detail.biddingType=='阶梯竞价'" style="text-align: center;line-height: 1rem">
           <van-button color="#e2e2e2" icon="minus" size="small" @click="sub"></van-button>
         </van-col>
         <van-col span="16">
@@ -216,7 +216,7 @@
           <div style="display: flex;">
             <van-button round color="#C21F3A" block @click="offer">
               <p>出价</p>
-              <p v-if="detail.ladderPrice&&detail.biddingType!='自由竞价'">{{price}}元</p>
+              <p v-if="detail.ladderPrice&&detail.biddingType=='阶梯竞价'">{{price}}元</p>
             </van-button>
 
             <van-button v-if="isFirst == 'Y'" round color="#C21F3A" block @click="offerFirst" style="margin-left: 10px;">
@@ -224,7 +224,7 @@
             </van-button>
           </div>
         </van-col>
-        <van-col span="4" v-if="detail.ladderPrice&&detail.biddingType!='自由竞价'" style="text-align: center;line-height: 1rem">
+        <van-col span="4" v-if="detail.ladderPrice&&detail.biddingType=='阶梯竞价'" style="text-align: center;line-height: 1rem">
           <van-button color="#e2e2e2" icon="plus" size="small" @click="add"></van-button>
         </van-col>
       </van-row>
@@ -318,7 +318,7 @@ export default {
     }
   },
   created() {
-
+    clearInterval(this.timer);
     this.reload();
   },
   methods: {
@@ -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 == '反向竞价') {
@@ -555,13 +555,14 @@ 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
           }
         })
       });
     },
 
     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: '出价成功',

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){

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();
         })
       });
     },

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;