Parcourir la source

fix:修改授权弹窗倒计时

lazy il y a 2 mois
Parent
commit
47130aaf95

+ 5 - 6
src/views/cyAccountManage/memberAccountManage/components/Authorization.vue

@@ -11,7 +11,7 @@
             <div><span>倒计时:</span></div>
             <div>
               <count-down
-                :current-time="countDownNow"
+                :current-time="countDownStart"
                 :start-time="countDownStart"
                 :end-time="countDownEnd"
                 :tip-text="'距离开始文字1'"
@@ -58,8 +58,8 @@ export default {
     return {
       timeReduce: 48 * 60 * 60 * 1000,
       countDownNow: new Date().getTime(),
-      countDownStart: '',
-      countDownEnd: '',
+      countDownStart: 0,
+      countDownEnd: 0,
       activeName: '',
       defaultAcitveTime: 48,
       qrcodeUrl: '',
@@ -73,7 +73,7 @@ export default {
         if (val && Object.keys(val).length) {
           this.hideCuntdown = true
           this.payTime = this.calcTimes(val.effectTime)
-          this.countDownEnd = new Date(this.payTime).getTime() || ''
+          this.countDownEnd = new Date(this.payTime).getTime() || 0
           this.countDownStart = new Date().getTime()
 
           this.activeName = val.name
@@ -105,7 +105,7 @@ export default {
 
       if (status && this.activeInfo && this.activeInfo.effectTime) {
         this.payTime = this.calcTimes(this.activeInfo.effectTime)
-        this.countDownEnd = new Date(this.payTime).getTime()
+        this.countDownEnd = new Date(this.payTime).getTime() || 0
         this.countDownStart = new Date().getTime()
       }
     },
@@ -169,7 +169,6 @@ export default {
       margin-top: 30px;
       cursor: pointer;
       .count-down {
-        margin-top: 5px;
         // height: 20px;
         display: flex;
         align-items: center;

+ 7 - 0
src/views/cyAccountManage/memberAccountManage/updateBind.vue

@@ -37,6 +37,13 @@
       :operate-id="operateId"
       :basic-info-id="basicInfoId"
     />
+    <div class="submit-btn">
+      <el-button
+        @click="() => {
+          $router.go(-1)
+        }"
+      >取消</el-button>
+    </div>
   </div>
 </template>
 <script>