Преглед изворни кода

bugfix:处理活动关闭客户端访问点击无响应问题

leo пре 1 година
родитељ
комит
e8ac8d0632
1 измењених фајлова са 18 додато и 12 уклоњено
  1. 18 12
      pages/transferDuration/components/tansferDuration.vue

+ 18 - 12
pages/transferDuration/components/tansferDuration.vue

@@ -3,8 +3,9 @@
         <div>
             <div>减少时长的云机</div>
             <div>
-                <comoros :key="transferUserCardKey" :dayTime="countObj.transferMinDay" :transferPhoneList="transferPhoneList"
-                    v-model="params.transferUserCardId" :name.sync="transferUserCardName" @confirm="comorosConfirm"/>
+                <comoros :key="transferUserCardKey" :dayTime="countObj.transferMinDay"
+                    :transferPhoneList="transferPhoneList" v-model="params.transferUserCardId"
+                    :name.sync="transferUserCardName" @confirm="comorosConfirm" />
             </div>
         </div>
         <div class="transfer-item">
@@ -12,7 +13,7 @@
             <div>
                 <comoros :key="acceptUserCardKey" :disabledId="params.transferUserCardId"
                     :transferPhoneList="transferPhoneList" :buyVipType="buyVipType" v-model="params.acceptUserCardId"
-                    :name.sync="acceptUserCardName" :androidVersion ="androidVersion" distinguishBool />
+                    :name.sync="acceptUserCardName" :androidVersion="androidVersion" distinguishBool />
             </div>
         </div>
         <div class="transfer-item">
@@ -24,7 +25,9 @@
             </div>
         </div>
         <span style="font-size: 12px;font-weight: 400;color: #3B7FFF;line-height: 16px;margin-top: 5px;"
-            @click="params.transferTime && serviceCount()" :class="{ opacity: !params.transferTime }">{{ countLoading ? '正在计算中...' : '服务费计算'
+            @click="(params.transferTime && Object.keys(countObj).length) && serviceCount()"
+            :class="{ opacity: !params.transferTime || !Object.keys(countObj).length }">{{ countLoading ? '正在计算中...' :
+                '服务费计算'
             }}</span>
         <div class="transfer-tip">
             <div>
@@ -148,32 +151,34 @@ export default {
         // 确认框
         comorosConfirm(data) {
             this.buyVipType = data.buyVipType
-            this.buyVipType  === 'SVIP' && (this.androidVersion = data.androidVersion);
+            this.buyVipType === 'SVIP' && (this.androidVersion = data.androidVersion);
             this.acceptUserCardKey = +new Date()
             this.params.acceptUserCardId = ''
         },
 
         // 获取手续费比例
         getFeeRatio() {
-            this.$axios.$get('resources/v5/time/transfer/getFeeRatio', { headers: {  Authorization: this.token, versionName: '5.7.4' } }).then(res => {
+            this.$axios.$get('resources/v5/time/transfer/getFeeRatio', { headers: { Authorization: this.token, versionName: '5.7.4' } }).then(res => {
                 if (res.success) {
                     res.data.transferMinDay = res.data.transferMinDay * 24 * 60
                     this.countObj = res.data
                 }
+            }).catch(err => {
+                Toast.fail(err.message)
             })
         },
 
         // 确定提交
         async confirm() {
             // 获取服务器时间
-            let requestTime = await this.$axios.$get('pay/v1/order/getSystemTime', { headers: {  Authorization: this.token, versionName: '5.7.4' } })
+            let requestTime = await this.$axios.$get('pay/v1/order/getSystemTime', { headers: { Authorization: this.token, versionName: '5.7.4' } })
 
             requestTime = new Date(requestTime.data * 1000).$formatTime()
             const requestTimeSign = sha256("Register_SZX_2023:" + requestTime)
             this.$axios.$post('resources/v5/time/transfer/transferDurationOperation', {
                 ...this.params,
                 requestTime
-            }, { headers: {  Authorization: this.token, versionName: '5.7.4',  requestTimeSign } }).then(res => {
+            }, { headers: { Authorization: this.token, versionName: '5.7.4', requestTimeSign } }).then(res => {
                 if (res.success) {
                     this.init()
                     Toast.success(res.msg)
@@ -194,7 +199,6 @@ export default {
                 console.log(a, b)
                 return a.timeConsumingEnd - b.timeConsumingEnd
             })
-            console.log(arr)
             let commission = null
             for (const i of arr) {
                 if (this.params.transferTime <= i.timeConsumingEnd) {
@@ -210,6 +214,10 @@ export default {
         },
 
         changePopUpType(e) {
+            if (!Object.keys(this.countObj).length) {
+                Toast.fail('活动已结束')
+                return
+            }
             if (!e) {
                 this.serviceCount(false)
                 this.allocateLoading = true
@@ -231,7 +239,6 @@ export default {
                 if (m) {
                     m = m[1]
                 };
-                console.log(m)
                 this.html = m
 
             })
@@ -326,5 +333,4 @@ export default {
     ::v-deep ul {
         list-style-type: disc;
     }
-}
-</style>
+}</style>