feat： 微服务接入改造15%(历史订单详情)

src/api/mockData/ordersInfo.json

@@ -7,10 +7,15 @@
   "enterTime": "2022-11-29 04:04:06",
   "exitTime": "2022-11-27 18:14:13",
   "serviceMin": 275,
+  "parkDuration": "10",
   "totalFee": 69400,
+  "payFee": 69400,
   "actualPayFee": 2000,
   "paymentMethod": null,
   "paymentTime": null,
+  "payStatus": 1,
+  "isInvoice": 2,
+  "paykind": "微信",
   "invoiceStatusText": "未开票",
   "discountInfo": {
     "id": 797,

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

@@ -5,15 +5,9 @@
 
       <div class="parking-info">
         <div class="parking-price">
-          <div class="price">{{ (detail.payfee / 100) | currency }}</div>
+          <div class="price">{{ (detail.payFee / 100) | currency }}</div>
           <div class="price-text">
-            {{
-              detail.refundStatus === 1
-                ? '已退款'
-                : detail.payStatus === 1
-                ? '支付成功'
-                : '支付失败'
-            }}
+            {{ ['支付成功', '支付失败', '已退款'][detail.payStatus] }}
           </div>
         </div>
         <div class="parking-part parking-detail">
@@ -24,25 +18,25 @@
 
           <div class="parking-info-item">
             <span class="info-key">支付时间</span>
-            <span class="info-value">{{ detail.createDate || '' }}</span>
+            <span class="info-value">{{ detail.createTime || '' }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">车牌号</span>
-            <span class="info-value">{{ detail.carno | formatCarno }}</span>
+            <span class="info-value">{{ detail.vehicleNo | formatCarno }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">停车场</span>
-            <span class="info-value">{{ detail.parkname }}</span>
+            <span class="info-value">{{ detail.parkName }}</span>
           </div>
         </div>
         <div class="parking-part parking-detail">
           <div class="parking-info-item">
             <span class="info-key">订单号</span>
-            <span class="info-value">{{ detail.orderno }}</span>
+            <span class="info-value">{{ detail.orderNo }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">入场时间</span>
-            <span class="info-value">{{ detail.entertime }}</span>
+            <span class="info-value">{{ detail.enterTime }}</span>
           </div>
           <!-- <div class="parking-info-item">
             <span class="info-key">离场时间</span>
@@ -50,7 +44,7 @@
           </div> -->
           <div class="parking-info-item">
             <span class="info-key">停车时长</span>
-            <span class="info-value">{{ parkingTime }}</span>
+            <span class="info-value">{{ detail.parkDuration }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">开票状态</span>
@@ -70,52 +64,52 @@
           <div class="parking-info-item">
             <span class="info-key">会员等级减免</span>
             <span class="info-value">{{
-              (detail.memberGradeFee / 100) | currency
+              (detail.discountInfo.memberLevelDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">消费减免</span>
             <span class="info-value">{{
-              (detail.consumeFee / 100) | currency
+              (detail.discountInfo.consumeDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">新会员积分减免</span>
             <span class="info-value">{{
-              (detail.newMemeberBonusFee / 100) | currency
+              (detail.discountInfo.newMemberPointsDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">积分减免</span>
             <span class="info-value">{{
-              (detail.bonusfee / 100) | currency
+              (detail.discountInfo.pointsDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">会员卡券</span>
             <span class="info-value">{{
-              (detail.couponfee / 100) | currency
+              (detail.discountInfo.couponDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item" v-if="detail.paperCouponCode">
             <span class="info-key">纸质优惠券</span>
             <span class="info-value">{{
-              (detail.paperCouponFee / 100) | currency
+              (detail.discountInfo.paperCouponDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">使用优惠总计</span>
             <span class="info-value">{{
-              ((detail.usetotalfee || 0) / 100) | currency
+              ((detail.discountInfo.usingTotalDiscount || 0) / 100) | currency
             }}</span>
           </div>
           <div
             class="parking-info-item"
-            v-if="detail.usetotalfee > detail.totalfee"
+            v-if="detail.discountInfo.usingTotalDiscount > detail.discountInfo.actualUsedDiscount"
           >
             <span class="info-key">实际优惠总计</span>
             <span class="info-value">{{
-              (detail.totalfee / 100) | currency
+              (detail.discountInfo.actualUsedDiscount / 100) | currency
             }}</span>
           </div>
         </div>
@@ -123,13 +117,13 @@
           <div class="parking-info-item">
             <span class="info-key">应缴</span>
             <span class="info-value">{{
-              (detail.servicefee / 100) | currency
+              (detail.totalFee / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">实缴</span>
             <span class="info-value red">{{
-              (detail.payfee / 100) | currency
+              (detail.actualPayFee / 100) | currency
             }}</span>
           </div>
         </div>

src/pages/parkingFee/components/officeBlue/parkingFeeDetailSuccess.vue

@@ -7,15 +7,9 @@
     <div class="detail-box">
       <div class="parking-info mgb-40">
         <div class="parking-price">
-          <div class="price">{{ (detail.payfee / 100) | currency }}</div>
+          <div class="price">{{ (detail.payFee / 100) | currency }}</div>
           <div class="price-text">
-            {{
-              detail.refundStatus === 1
-                ? '已退款'
-                : detail.payStatus === 1
-                ? '支付成功'
-                : '支付失败'
-            }}
+            {{ ['支付成功', '支付失败', '已退款'][detail.payStatus] }}
           </div>
         </div>
         <div class="parking-part">
@@ -25,23 +19,23 @@
           </div>
           <div class="parking-info-item">
             <span class="info-key">支付时间</span>
-            <span class="info-value">{{ detail.createDate || '' }}</span>
+            <span class="info-value">{{ detail.createTime || '' }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">车牌号</span>
-            <span class="info-value">{{ detail.carno | formatCarno }}</span>
+            <span class="info-value">{{ detail.vehicleNo | formatCarno }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">停车场</span>
-            <span class="info-value">{{ detail.parkname }}</span>
+            <span class="info-value">{{ detail.parkName }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">订单号</span>
-            <span class="info-value">{{ detail.orderno }}</span>
+            <span class="info-value">{{ detail.orderNo }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">入场时间</span>
-            <span class="info-value">{{ detail.entertime }}</span>
+            <span class="info-value">{{ detail.enterTime }}</span>
           </div>
           <!-- <uni-view class="parking-info-item">
             <span class="info-key">离场时间</span>
@@ -49,7 +43,7 @@
           </uni-view> -->
           <div class="parking-info-item">
             <span class="info-key">停车时长</span>
-            <span class="info-value">{{ parkingTime }}</span>
+            <span class="info-value">{{ detail.parkDuration }}</span>
           </div>
           <div class="parking-info-item pb0">
             <span class="info-key">开票状态</span>
@@ -69,47 +63,47 @@
           <div class="parking-info-item">
             <span class="info-key">会员等级减免</span>
             <span class="info-value fw">{{
-              (detail.memberGradeFee / 100) | currency
+              (detail.discountInfo.memberLevelDiscount  / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">消费减免</span>
             <span class="info-value fw">{{
-              (detail.consumeFee / 100) | currency
+              (detail.discountInfo.consumeDiscount / 100) | currency
             }}</span>
           </div>
 
           <div class="parking-info-item">
             <span class="info-key">积分减免</span>
             <span class="info-value fw">{{
-              (detail.bonusfee / 100) | currency
+              (detail.discountInfo.pointsDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">会员卡券</span>
             <span class="info-value fw">{{
-              (detail.couponfee / 100) | currency
+              (detail.discountInfo.couponDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item" v-if="detail.paperCouponCode">
             <span class="info-key">纸质优惠券</span>
             <span class="info-value fw">{{
-              (detail.paperCouponFee / 100) | currency
+              (detail.discountInfo.paperCouponDiscount / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item pb0">
             <span class="info-key">使用优惠总计</span>
             <span class="info-value fw">{{
-              ((detail.usetotalfee || 0) / 100) | currency
+              ((detail.discountInfo.usingTotalDiscount || 0) / 100) | currency
             }}</span>
           </div>
           <div
             class="parking-info-item"
-            v-if="detail.usetotalfee > detail.totalfee"
+            v-if="detail.discountInfo.usingTotalDiscount > detail.discountInfo.actualUsedDiscount"
           >
             <span class="info-key">实际优惠总计</span>
             <span class="info-value fw">{{
-              (detail.totalfee / 100) | currency
+              (detail.discountInfo.actualUsedDiscount / 100) | currency
             }}</span>
           </div>
         </div>
@@ -118,13 +112,13 @@
           <div class="parking-info-item">
             <span class="info-key">应缴</span>
             <span class="info-value fw">{{
-              (detail.servicefee / 100) | currency
+              (detail.totalFee / 100) | currency
             }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">实缴</span>
             <span class="info-value fw">{{
-              (detail.payfee / 100) | currency
+              (detail.actualPayFee / 100) | currency
             }}</span>
           </div>
         </div>

src/pages/parkingFee/mixins/parkingFeeDetailSuccess.js

@@ -55,6 +55,18 @@ export default {
         title: '加载中',
       });*/
       this.detail = ordersInfoMockData;
+      const isInvoice = this.detail.isInvoice;
+      if (isInvoice == 0) {
+        this.isInvoiceName = '未开票';
+      } else if (isInvoice == 1) {
+        this.isInvoiceName = '已申请开票';
+      } else if (isInvoice == 2) {
+        this.isInvoiceName = '开票中';
+      } else if (isInvoice == 3) {
+        this.isInvoiceName = '开票完成';
+      } else if (isInvoice == 4) {
+        this.isInvoiceName = '开票失败';
+      }
       return
       this.$md(params);
       uni.request({

src/store/index.js

@@ -35,7 +35,7 @@ const store = new Vuex.Store({
     member: {},
     userInfo: {},
     mobile: '',
-    custTypeId: 0, // 0 默认版本，1 上海静安 2 上海浦东 3 KIP:默认版本
+    custTypeId: 3, // 0 默认版本，1 上海静安 2 上海浦东 3 KIP:默认版本
     paramsScene: {},
     parkFee: {},
     marketList: [],