产权交易问题修改

src/views/biddingHall/index.vue

@@ -117,22 +117,11 @@
                 }[item.timeType]}">{{item.timeType}}</p>
           </div>
           <div class="list_li_time">
-              <van-count-down :time="item.deadline">
-                <template #default="timeData">
-                  <span style="color: #848484;font-size: 14PX;">距结束</span>
-                  <span :style="{'font-size':'14px',
-                color: {
-                  '未开始': '#007E72',
-                  '已结束': '#848484',
-                  '进行中': '#c21F3a',
-                }[item.timeType]}">
-                    <span style="font-size: 18PX;">{{timeData.days}}</span>天
-                    <span style="font-size: 18PX;">{{timeData.hours}}</span>时
-                    <span style="font-size: 18PX;">{{timeData.minutes}}</span>分
-                    <span style="font-size: 18PX;">{{timeData.seconds}}</span>秒
-                  </span>
-                </template>
-              </van-count-down>
+
+            <p>
+              <span style="color: #848484">竞价结束日期：{{item.biddingStopTime.substr(0,10)}}</span>
+            </p>
+
               <p>
                 <span style="color: #848484">当前价</span>
                 <span :style="{'font-size':'14px',
@@ -307,9 +296,9 @@ export default {
               time = endDate-nowDate>0?endDate-nowDate:0
             }
             console.log(time)
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime})
           }else{
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime})
           }
         })
         if(this.infoList.length >= response.total){

src/views/login.vue

@@ -14,10 +14,10 @@
     </div>
     <div class="login-main">
       <ul class="head_nav clear">
-        <li @click="isSmsLogin = false" :class="{ active: !isSmsLogin }">
+        <li @click="getCode(),isSmsLogin = false" :class="{ active: !isSmsLogin }">
           账号登录
         </li>
-        <li @click="isSmsLogin = true" :class="{ active: isSmsLogin }">
+        <li @click="getCodePhone(),isSmsLogin = true" :class="{ active: isSmsLogin }">
           验证码登录
         </li>
       </ul>
@@ -173,7 +173,7 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then((res) => {
-        this.uuid = res.uuid;
+        this.formData.uuid = res.uuid;
         this.codeUrl = "data:image/gif;base64," + res.img;
       });
     },
@@ -204,12 +204,12 @@ export default {
           });
           return false;
         }
-        getSmsCode(this.formData.mobile,this.mobileCode,this.formData.uuid).then((res) => {
+        getSmsCode(this.formData.mobile,this.mobileCode,this.uuidPhone).then((res) => {
           if (res.code === 200) {
              this.$dialog.alert({
               message: '验证码已发送',
             });
-            this.formData.uuid = res.uuid;
+            this.uuidPhone = res.uuid;
             this.computeTime = 60;
             this.timer = setInterval(() => {
               this.computeTime--;
@@ -281,7 +281,7 @@ export default {
           return false;
         }
         this.formData.code = this.code;
-        this.formData.uuid = this.uuid;
+        // this.formData.uuid = this.uuid;
         this.$store
           .dispatch("Login", this.formData)
           .then(() => {

src/views/project/projectDetail.vue

@@ -267,7 +267,9 @@ export default {
       current: 0,
       show: false,
       id:this.$route.query.id,
-      detail: {},
+      detail: {
+        biddingType:'自由竞价'
+      },
       webConfig:"",
       biddinglistInformation:[],
       rollout_type:[],
@@ -284,7 +286,7 @@ export default {
       userId:"",
       timeConfig:'',
       biddinglistInformationLength:0,
-      biddingTimeType:2,
+      biddingTimeType:1,
       isFirst:'',
       timer:null,
       getSignupData:'',
@@ -526,8 +528,8 @@ export default {
         // this.time = biddingStartTime-nowDate
         $('#timeData').html(this.TimeInterval(biddingStartTime-nowDate));
         // this.timeData = this.TimeInterval(biddingStartTime-nowDate);
+        this.isSignup=true;
         if(this.getSignupData=="1"){
-          this.isSignup=true;
           this.btnMsg="立即竞价"
           // this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1
         }else{
@@ -590,6 +592,7 @@ export default {
             this.isSignup = true
             this.showBtn = false
             this.biddingTimeType = 2;
+            $('#timeData').html('');
             return;
           }
         });