Merge pull request #380 from John-Hong/release-3.0.0

fix(SCRM-5417): 缴费说明展示流程调整

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -777,6 +777,9 @@ export default {
     },
     // 
     setDescription() {
+      if ( this?.orderDetail?.parkInfo?.ruleDescription.length > 0 ) {
+        return this?.orderDetail?.parkInfo?.ruleDescription;
+      }
       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/>');  

src/pages/parkingFee/parkingFee.vue

@@ -667,7 +667,7 @@ export default {
           padding-left: 2px;
           font-size: 27px;
           width: 95%;
-          color: #666;
+          // color: #666;
           line-height: 45px;
           p {
             margin: 0;

src/pages/parkingFee/parkingFeeDetail.vue

@@ -70,14 +70,13 @@
         </div>
       </div>
 
-      <div class="description-box">
+      <div class="description-box ql-snow">
         <div class="title_box">
           <span class="title">缴费说明</span>
         </div>
-<!--        <div class="sub_title_box">-->
-<!--          <span class="title">计费基础规则：</span>-->
-<!--        </div>-->
-        <div class="info" v-html="setDescription()"></div>
+        <div class="ql-editor">
+          <div v-html="setDescription()"></div>
+        </div>
       </div>
 <!--      <div style="height: 50px;"></div>-->
       <!-- 开启底部安全区适配 -->

src/pages/parkingFeeV2/mixins/parkingFeeDetail.js

@@ -884,6 +884,9 @@ export default {
     },
     // 
     setDescription() {
+      if ( this?.orderDetail?.parkInfo?.ruleDescription.length > 0 ) {
+        return this?.orderDetail?.parkInfo?.ruleDescription;
+      }
       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/>');  

src/pages/parkingFeeV2/parkingFee.vue

@@ -660,7 +660,7 @@ export default {
           padding-left: 2px;
           font-size: 27px;
           width: 95%;
-          color: #666;
+          // color: #666;
           line-height: 45px;
           p {
             margin: 0;

src/pages/parkingFeeV2/parkingFeeDetail.vue

@@ -70,14 +70,13 @@
         </div>
       </div>
 
-      <div class="description-box">
+      <div class="description-box ql-snow">
         <div class="title_box">
           <span class="title">缴费说明</span>
         </div>
-<!--        <div class="sub_title_box">-->
-<!--          <span class="title">计费基础规则：</span>-->
-<!--        </div>-->
-        <div class="info" v-html="setDescription()"></div>
+        <div class="ql-editor">
+          <div v-html="setDescription()"></div>
+        </div>
       </div>
 <!--      <div style="height: 50px;"></div>-->
       <!-- 开启底部安全区适配 -->