Merge branch 'release-2.6.0' into John/release-2.7.0/KIP-9392

# Conflicts:
#	package.json

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

@@ -35,11 +35,11 @@
       <div class="part" v-else>
         <div class="part-item">
           <span class="part-item-key">抬头类型</span>
-          <div class="part-item-value">个人/非企业单位</div>
+          <div class="part-item-value">{{ header.invoiceTitle.invoiceTitleType === 'COMPANY' ? '单位' : '个人/非企业单位'}}</div>
         </div>
         <div class="part-item">
           <span class="part-item-key">抬头名称</span>
-          <span class="part-item-value">{{ header.invoiceTitleName }}</span>
+          <span class="part-item-value">{{ header.invoiceTitle.titleName }}</span>
         </div>
       </div>
     </div>

src/pages/parkingFee/mixins/parkingFeeCoupon.js

@@ -200,7 +200,7 @@ export default {
           couponList = couponList.map((elm, i) => {
             elm.disabled = false; // 默认可选
             const elmName = `coupon${i}`;
-            if (elm.name === name) {
+            if (elm.superposition === superposition) {
               if (limitCountPerOrder) { // 是否存在上限
                 if (this.checkedCouponList.length >= limitCountPerOrder) {
                   elm.disabled = this.checkedCouponList.indexOf(elmName) < 0

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -453,6 +453,9 @@ export default {
     },
     // 积分修改框
     showPointsMathPopup() {
+      if(this.integralDesc === '暂无可用积分'){
+        return
+      }
       this.popup = true;
     },
     cancelPointsMathPopup() {

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

@@ -12,39 +12,23 @@ export default {
       arrowIcon: arrowIcon,
       downloadBtnIcon: downloadBtnIcon,
       order: {
-        id: 1219562352,
-        invoiceOrderNo: "INVyedUsFwdkelQbxeTeQOvaScfqIOOmaa",
-        pdfUrl: "https://232.pdf",
-        invoiceType: "增值税普通发票",
-        invoiceNumber: "UMaAIKKIkknjWEXJUfPxxQHeWKEJ",
-        invoiceCode: "43253254324",
-        invoiceTotalAmount: 0.72,
-        email: "LlN@qq.com",
-        remark: "gNfZBdyFGRajVfJNonEnOinZj",
-        invoiceTitleId: 1188957731,
-        invoiceTime: "20220228",
+        id: 0 ,
+        invoiceOrderNo: "",
+        pdfUrl: "",
+        invoiceType: "",
+        invoiceNumber: "",
+        invoiceCode: "",
+        invoiceTotalAmount: 0,
+        email: "",
+        remark: "",
+        invoiceTitleId: 0,
+        invoiceTime: "",
         invoiceTitle: {
-            id: 1018954901,
-            titleName: "QvBQYuxiXXVytGCxzVllpgTJKhRQq",
-            companyAddress: "上海浦东"
+            id: 0,
+            titleName: "",
+            companyAddress: ""
         },
         invoiceItem: [
-            {
-                "id": 1295249578,
-                "invoiceItemNo": "SY32342432043250-辽A8889",
-                "invoiceAmount": 0.99,
-                "parkName": "沈阳家里停车场",
-                "enterTime": "2026-02-13 16:23:01",
-                "parkTotalTime": 39088943
-            },
-            {
-                "id": 12952495798,
-                "invoiceItemNo": "SY32342432043250-辽A8889",
-                "invoiceAmount": 0.99,
-                "parkName": "沈阳家里停车场",
-                "enterTime": "2026-02-13 16:23:01",
-                "parkTotalTime": 39088943
-            }
         ]
     },
       webviewStyles: {

src/store/order.js

@@ -298,6 +298,7 @@ const actions = {
       maxOneDayDiscountFee, // 每日最大优惠金额(深圳车场)
       remainConsumeTime, // 当前订单剩余可使用的优惠
     } = parkingRule;
+    if ( !points ) return commit('setIntegralDesc', '暂无可用积分'); // 积分优惠处的描述
     const [
       {
         pointsPerHour,