Эх сурвалжийг харах

Merge pull request #129 from tron/lock/release-2.9.0/heji_rollout

feat(KIP-10270):停车开票bug修复
John-Hong 2 жил өмнө
parent
commit
5801ec8e34

+ 2 - 1
src/pages/parkingFee/mixins/parkingReceipt/parkingReceipt.js

@@ -317,11 +317,12 @@ export default {
       }
     },
     showFailureReason(reson) {
+      console.log('12345')
       this.$dialog({
         title: '开票失败原因',
         message: reson,
         confirmButtonText: '关闭',
-        confirmButtonColor: this.$theme[this.theme].primaryColor,
+        confirmButtonColor: 'var(--k-color-primary-01)',
       }).then(() => {
         // on confirm
         console.log('confirm');

+ 1 - 1
src/pages/parkingFee/parkingReceipt/parkingApplication.vue

@@ -91,7 +91,7 @@
           <div class="part-item" style="padding-top:30px;padding-bottom: 15px;">
             <span class="part-item-key" style="min-width: 120px; white-space: nowrap">电子邮箱</span>
             <div class="part-item-value">
-              <input class="van-field__control" style="white-space: nowrap" type="text" @blur="mailboxChange" placeholder="请输入电子邮箱" v-model="condition.email" />
+              <input class="van-field__control" style="white-space: nowrap; width:520px;" type="text" @blur="mailboxChange" placeholder="请输入电子邮箱" v-model="condition.email" />
             </div>
           </div>
           <div class="part-item default-email part-item-bg" @click="changeDefaultEMail">

+ 4 - 3
src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -19,8 +19,8 @@
               <div class="orderNum"  v-if="tabIndex == 1">{{ item.orderNo }}</div>
               <div class="orderNum"  v-else>
                 <span>税号: {{ item.taxNo }}</span> 
-                <!-- 失败重试  -->
-                <div class="failureReason" v-if="item.status === 'FAILED'"  >
+                <!-- 失败重试    -->
+                <div class="failureReason" v-if="item.status === 'FAILED'">
                   <span @click.stop="showFailureReason(item.errorMessage)"><van-icon name="info" /> 失败原因</span>
                 </div>
                 <div class="right">
@@ -113,7 +113,7 @@
                   <div class="van-hairline--bottom"></div>
                   <div class="choice_card_index orderno-box2 orderDetail-box">
                     <div class="orderFee2" >{{ item.totalPaidAmount || item.invoiceTotalAmount | currency }}</div>
-                    <div class="orderDetail">查看详情</div>
+                    <div class="orderDetail" v-if="item.status === 'COMPLETE'">查看详情</div>
                     <!-- v-if="/FAILED|3/.test(item.status)"  -->
                     <div v-if="/FAILED|3/.test(item.status)" class="try-again" @click="tryGoToInvoicing(item)">重新开票</div>
                     <!-- <van-icon name="arrow" /> -->
@@ -357,6 +357,7 @@ export default {
         border-radius: 2px;
         position:absolute;
         right: 168px;
+        z-index: 9999;
       }
       .my-invoiced-list {
         align-items: flex-end;