sunlupeng před 2 roky
rodič
revize
88d8e145b9

+ 5 - 5
src/views/HomeView/GoodsDetail.vue

@@ -25,7 +25,7 @@
                     <div v-html="data.comment"></div>
                 </div>
             </div>
-      <div v-if="data.deliveryTypeName == '快递'">
+      <div v-if="data.deliveryType == 1">
         <p class="label">收货地址</p>
           <div class="address">
             <div class="address-container">
@@ -122,7 +122,7 @@
         <el-table-column align="center" prop="orderStatus" label="状态"></el-table-column>
         <el-table-column align="center" prop="createTime" label="处理时间"></el-table-column>
       </el-table>
-      <div class="footer" v-if="data.orderType == 1 || data.orderType == 3">
+      <div class="footer" v-if="(data.orderType == 1 || data.orderType == 3) && data.deliveryType != 3">
         <div class="left-info">
           <span class="info-title">
             <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"
@@ -136,15 +136,15 @@
             </svg>
             领取详情
           </span>
-          <p class="info-content" v-if="data.deliveryTypeName == '快递'">
+          <p class="info-content" v-if="data.deliveryType == 1">
             快递类物品兑换后,将在这里显示兑换的物流单号,请保存好该信息自行查阅快递物流信息。<br>
             物流单号:<span style="font-weight: 600;color: #ff834e;">{{ data.trackingNumber }}</span><br>
           </p>
-          <p class="info-content" v-if="data.deliveryTypeName == '卷码兑换'">
+          <p class="info-content" v-if="data.deliveryType == 2">
             虚拟类物品兑换后,将在这里显示兑换的券码,请保存好该信息自行兑换。<br>
             券码:<span style="font-weight: 600;color: #ff834e;">{{ data.trackingNumber }}</span><br>
           </p>
-          <p class="info-content" v-if="data.deliveryTypeName == '办公室领取'">
+          <p class="info-content" v-if="data.deliveryType == 0">
             线下领取物品请到各地公司进行领取<br>
             领取联系人<br>
             上海办公室:茅玮婷<br>

+ 1 - 1
src/views/HomeView/RedeemView.vue

@@ -26,7 +26,7 @@
                     <div v-html="data.comment"></div>
                 </div>
             </div>
-            <div v-if="data.deliveryTypeName == '快递'">
+            <div v-if="data.deliveryType == 1">
                 <p class="label">收货地址</p>
                 <div class="address">
                     <div v-if="addressDetail">