Merge branch 'feature' into 'dev'

fiex defect | 590 | APP与web端海运拼柜的订单v值活动详情中积分说明单位错误

See merge request !24

src/views/jiedao/profile/detailsActivity.vue

@@ -20,14 +20,14 @@
         }}
       </div>
       <div
-        class="share-label"
         v-if="detailInfo.type == 4"
+        class="share-label"
         v-html="
           locale === 'zh_CN'
             ? detailInfo.extraShare.activityDescZh
             : detailInfo.extraShare.activityDescEn
         "
-      ></div>
+      />
       <div class="activity-cell">
         <div class="cell-label">{{ $t("integral.illustrate") }}</div>
         <div class="cell-content">
@@ -44,9 +44,9 @@
             }}</span>
             <div v-if="detailInfo.type == 1">
               <div
-                class="rule"
                 v-for="ruleItem in detailInfo.extraOrderV.orderVRule"
                 :key="ruleItem.low"
+                class="rule"
               >
                 {{
                   $t("integral.orderRuleLabel", {
@@ -54,7 +54,7 @@
                     high: ruleItem.high,
                     score: ruleItem.score,
                     unit:
-                      detailInfo.extraOrderVtransportType == 1 ? "m³" : "kg",
+                      detailInfo.extraOrderV.transportType == 1 ? "m³" : "kg",
                   })
                 }}
               </div>
@@ -62,7 +62,7 @@
           </div>
         </div>
       </div>
-      <div class="activity-cell" v-if="detailInfo.type != 2">
+      <div v-if="detailInfo.type != 2" class="activity-cell">
         <div class="cell-label">{{ $t("integral.maxIntegral") }}</div>
         <div class="cell-content">
           <img class="cell-image" src="@/assets/integral/score_b.png" />