Merge pull request #125 from tron/lock/release-2.4.0/scrm-3300

Lock/release 2.4.0/scrm 3300

src/pages/parkingFee/components/base/parkingReceipt/parkingReceipt.vue

@@ -233,13 +233,21 @@
                 >
                   <div>开票失败</div>
                   <!-- <div>重新开票</div> -->
-                  <div type="default" plain="true" @click.stop="tryGoToInvoicing(item)" size="mini" style="margin-left: 10px;color: #E89E42;border: 1px solid #E89E42;border-radius: 10px;padding: 10px;">重新开票</div>
+                  <div class="bordClass" type="default" plain="true" @click.stop="tryGoToInvoicing(item)" size="mini" style="margin-left: 10px;color: #E89E42;border-radius: 10px;padding: 10px;">重新开票</div>
                   <!-- <img
                     class="arrow"
                     :src="arrowIcon"
                     mode="heightFix"
                     style="height: 40px"
-                  ></img> -->
+                  />
+                  <div
+                    class="choice_card_index choice_card_index3"
+                    v-if="tabIndex == 2 && item.status === 'FAILED'"
+                    style="padding-bottom: 20rpx;justify-content: flex-end;font-size: 20rpx;"
+                  @click.stop="showFailureReason(item.failureReason)"
+                  >
+                    <icon type="info" size="12" color="#d7d7d7" style="margin-right: 10rpx;"/>失败原因
+                  </div> -->
                 </div>
                 <div 
                 class="choice_card_status" 
@@ -255,11 +263,13 @@
               </div>
               <div
                 class="choice_card_index choice_card_index3"
-                v-if="tabIndex == 2 && item.status === 3"
+                v-if="tabIndex == 2 && item.status === 'FAILED'"
                 style="padding-bottom: 20px;justify-content: flex-end;font-size: 20px;"
-                @click.stop="showFailureReason(item.failureReason)"
+                @click.stop="showFailureReason(item)"
               >
-                <icon type="info" size="12" color="#d7d7d7" style="margin-right: 10px;"/>
+              <van-icon name="info"  size="12" color="#d7d7d7" style="margin-right: 10px;"/>
+                <!-- <van-icon name="info-o" > -->
+                <!-- <icon type="info" size="12" color="#d7d7d7" style="margin-right: 10px;"/> -->
                 失败原因
               </div>
             </div>
@@ -404,6 +414,9 @@ export default {
         .choice_card_status {
           display: flex;
           align-items: center;
+          .bordClass {
+            border: 1px solid #E89E42 !important;
+          }
         }
       }
 

src/pages/parkingFee/mixins/parkingReceipt/parkingApplication.js

@@ -29,6 +29,7 @@ export default {
         invoiceTitle: {}, // long|发票抬头id
         parkOrderList: [], // 被选中的缴费记录id
         email: '',
+        id: '',
         emailAsDefault: true
       },
       headerInfo: {},
@@ -177,7 +178,8 @@ export default {
         query: {
           ids:this.ids,
           invoiceDetailList: JSON.stringify(this.invoiceDetailList),
-          money: this.invoiceAmount
+          money: this.invoiceAmount,
+          invoiceId: this.pageOptions?.invoiceId
         }
       });
     },
@@ -398,6 +400,9 @@ export default {
       
       params.invoiceTitle.id = this.headerInfo.id
       params.totalAmount = Number(this.invoiceAmount)
+      if (this.pageOptions.invoiceId) {
+        params.id = this.pageOptions.invoiceId
+      }
       console.log('params.parkOrderList::', params)
   // params.openid = this.openid;
   // params.groupId = this.groupId;

src/pages/parkingFee/mixins/parkingReceipt/parkingChooseHeader.js

@@ -120,7 +120,8 @@ export default {
           header: JSON.stringify(item),
           ids: this.ids,
           invoiceDetailList: this.$store.state.tempParkingOrder,
-          money: this.$store.state.tempParkingMoney
+          money: this.$store.state.tempParkingMoney,
+          invoiceId: this.$route.query?.invoiceId
         }
       });
     },

src/pages/parkingFee/mixins/parkingReceipt/parkingReceipt.js

@@ -413,7 +413,7 @@ export default {
       console.log(458, item);
       this.$dialog({
         title: '开票失败原因',
-        message: item.failureReason,
+        message: '',
         confirmButtonText: '关闭',
         confirmButtonColor: '#064c8a',
       }).then(() => {