Browse Source

fix:【DE】【C端】临时停车微服务。停车缴费页面的缴费说明文案,和S端设置的格式不一致

john 2 years ago
parent
commit
f4c679e758

+ 3 - 1
src/main.js

@@ -27,7 +27,8 @@ import {
   CountDown,
   CountDown,
   Switch,
   Switch,
   Skeleton,
   Skeleton,
-  Dialog
+  Dialog,
+  NumberKeyboard
 } from 'vant';
 } from 'vant';
 import router from './routes/index.js'; // 注册页面路由
 import router from './routes/index.js'; // 注册页面路由
 import wx from '@/utils/js_sdk/weixin'; // 接入微信JSDK
 import wx from '@/utils/js_sdk/weixin'; // 接入微信JSDK
@@ -62,6 +63,7 @@ Vue.use(Icon)
   .use(Skeleton)
   .use(Skeleton)
   .use(Switch)
   .use(Switch)
   .use(Dialog)
   .use(Dialog)
+  .use(NumberKeyboard)
 
 
   
   
 
 

+ 1 - 1
src/pages/parkingFee/components/base/parkingFeeDetail.vue

@@ -104,7 +104,7 @@
           <span class="btn">缴费说明</span>
           <span class="btn">缴费说明</span>
         </div>
         </div>
         <div class="info" :class="!isShowDescription ? 'is-show' : ''">
         <div class="info" :class="!isShowDescription ? 'is-show' : ''">
-          <span>{{ orderDetail.parkInfo.description }}</span>
+          <div v-html="setDescription()"></div>
         </div>
         </div>
         <div class="top-down" @click="togglePayinstruction" v-if="!isShowDescription && orderDetail.parkInfo.description.length > 60">︾</div>
         <div class="top-down" @click="togglePayinstruction" v-if="!isShowDescription && orderDetail.parkInfo.description.length > 60">︾</div>
         <div class="top-down" @click="togglePayinstruction" v-if="isShowDescription && orderDetail.parkInfo.description.length > 60">︽</div>
         <div class="top-down" @click="togglePayinstruction" v-if="isShowDescription && orderDetail.parkInfo.description.length > 60">︽</div>

+ 1 - 1
src/pages/parkingFee/components/purple/parkingFee.vue

@@ -128,7 +128,7 @@
             <div class="info" :class="!init_ch ? 'info_show' : ''">
             <div class="info" :class="!init_ch ? 'info_show' : ''">
               <!-- <p></p> -->
               <!-- <p></p> -->
               <!-- <p>{{ description }}</p> -->
               <!-- <p>{{ description }}</p> -->
-              <p v-html="description"></p>
+              <div v-html="description"></div>
             </div>
             </div>
           </div>
           </div>
           <div class="top_down" @click="top_display" v-if="!init_ch && description && description.length > 60"><van-icon name="arrow-down" /></div>
           <div class="top_down" @click="top_display" v-if="!init_ch && description && description.length > 60"><van-icon name="arrow-down" /></div>

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

@@ -211,7 +211,7 @@ export default {
         const res = await parkingLots(this.$store.state.lbsId); // TODO: 临时写死
         const res = await parkingLots(this.$store.state.lbsId); // TODO: 临时写死
         console.log(res);
         console.log(res);
         let reg = /[;;]/g;
         let reg = /[;;]/g;
-        this.description = res.description.replace(reg, '\r\n').replace(/\r\n/g, '<br/>');
+        this.description = res.description.replace(reg, '\r\n').replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>');
         this.supportUnlicensed = res.supportUnlicensed || false
         this.supportUnlicensed = res.supportUnlicensed || false
         const carList = uni.getStorageSync('carList');
         const carList = uni.getStorageSync('carList');
         if (carList) {
         if (carList) {

+ 8 - 0
src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -469,6 +469,14 @@ export default {
         message: message,
         message: message,
         icon: 'none',
         icon: 'none',
       });
       });
+    },
+    // 
+    setDescription() {
+      if ( this?.orderDetail?.parkInfo?.description.length > 0 ) {
+        let reg = /[;;]/g;
+        return this.orderDetail.parkInfo.description.replace(reg, '\r\n').replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>');  
+      } 
+       return ''
     }
     }
   },
   },
 };
 };

+ 1 - 1
vue.config.js

@@ -122,7 +122,7 @@ module.exports = {
         },
         },
       },
       },
       '/msApi': {
       '/msApi': {
-        // target: 'http://172.20.248.37:8080',
+        // target: 'http://172.21.201.149:8080',
         // target: 'http://172.21.202.133:8080',
         // target: 'http://172.21.202.133:8080',
         target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
         target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址,这里设置的地址会代替axios中设置的baseURL
         // target: 'http://172.21.203.140:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL   2023-2-9
         // target: 'http://172.21.203.140:8080', //代理地址,这里设置的地址会代替axios中设置的baseURL   2023-2-9