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

fix: 开票功能异常修复

John-Hong 2 жил өмнө
parent
commit
ee17b9f68e

+ 1 - 1
src/App.vue

@@ -58,7 +58,7 @@ export default {
   methods: {
     initEnv() {
       const href = window.location.href;
-      if (/dev-/.test(href)) {
+      if (/dev-|8080/.test(href)) {
         window.env = 'dev'
         window.profileApi = 'profileApi'
         window.api = 'qaApi'

+ 6 - 4
src/components/uni-number-box/uni-number-box.vue

@@ -137,8 +137,8 @@ export default {
 
 .uni-numbox__value {
   background-color: #ffffff;
-  width: 40px;
-  height: 33PX;
+  width: 30PX;
+  height: 24PX;
   text-align: center;
   font-size: 32px;
   border-width: 1px;
@@ -156,11 +156,12 @@ export default {
   align-items: center;
   justify-content: center;
   width: 35px;
-  height: 35PX;
+  height: 26PX;
   /* line-height: $box-line-height;
 */
   /* text-align: center;
 */
+padding: 0 2px;
   font-size: 20px;
   color: #333;
   background-color: #f8f8f8;
@@ -180,7 +181,8 @@ export default {
   align-items: center;
   justify-content: center;
   width: 35px;
-  height: 35px;
+  height: 26PX;
+  padding: 0 2px;
   border-width: 1px;
   border-style: solid;
   border-color: #e5e5e5;

+ 0 - 4
src/pages/parkingFee/parkingFeeDetail.vue

@@ -964,10 +964,6 @@ export default {
         return Toast({
           message: '暂无可用优惠',
         });
-        // return uni.showToast({
-        //   title: '暂无可用优惠',
-        //   icon: 'none',
-        // });
       }
       this.$router.push({
         path: '/parkingFeeDiscounts',

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

@@ -518,7 +518,7 @@ export default {
             if (res.data.code === 0) {
               // 因为合并开票接口中无法判断是否是一个CO(一个发票id可以直接进发票详情)还是两个CO,所以统一返回到发票列表页面
               this.$router.replace({
-                path: '/pages/parkingFee/parkingReceipt/parkingReceipt',
+                path: '/parkingReceipt',
               });
               // this.$router.replace({
               //   path:

+ 13 - 7
src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -67,7 +67,11 @@
                     (ids.indexOf(item.id) > -1 || tabIndex == 2) && 'active',
                   ]"
                 >
-                  ¥{{ (item.payfee / 100).toFixed(2) }}
+                  ¥{{
+                    (
+                      item[tabIndex == 1 ? 'payfee' : 'invoiceAmount'] / 100
+                    ).toFixed(2)
+                  }}
                 </div>
               </div>
               <div class="line"></div>
@@ -107,15 +111,17 @@
                     开票时间:
                     {{ item.paperDrewDate ? item.paperDrewDate : '-' }}
                   </div>
-                  <div class="choice_card_index mb0">
-                    停车时长: {{ item.serviceMin | parkingTime }}
-                  </div>
+                  <!-- <div class="choice_card_index mb0">
+                    停车时长: <span>{{ item.serviceMin | parkingTime }}</span>  _{{
+                      item.serviceMin
+                    }}
+                  </div> -->
                 </div>
                 <div class="right">
                   <!-- 0:已提交申请(待开票) 1:开票中  2:开票完成 3:开票失败 -->
                   <div class="choice_card_status">
                     {{
-                      ['开票中', '开票完成', '开票失败'][
+                      ['已提交申请(待开票)', '开票中', '开票完成', '开票失败'][
                         item.status ? item.status : 1
                       ]
                     }}
@@ -160,7 +166,7 @@ import moment from 'moment';
 import arrowIcon from '../static/images/arrows.png';
 import noData from '@/static/images/parkingReceipt-noData.png';
 import { mapState } from 'vuex';
-import LoginDom from '@/components/Login/Login.vue'
+import LoginDom from '@/components/Login/Login.vue';
 // import authorize from '@/components/authorize/authorize.vue'
 import MemberCacheTool from '@/utils/member-cache-tool.js';
 import { REG_SOURCE } from '@/constants.js';
@@ -193,7 +199,7 @@ export default {
   },
   components: {
     // authorize,
-    LoginDom
+    LoginDom,
   },
   computed: {
     height() {