sunlupeng 2 سال پیش
والد
کامیت
b7b68c80e3
2فایلهای تغییر یافته به همراه14 افزوده شده و 10 حذف شده
  1. 4 4
      src/views/HomeView/GoodsDetail.vue
  2. 10 6
      src/views/HomeView/MyCenter.vue

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

@@ -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) && data.deliveryType != 3">
+      <div class="footer" v-if="(data.orderType == 3 || data.orderType == 4) && 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"
@@ -145,14 +145,14 @@
             券码:<span style="font-weight: 600;color: #ff834e;">{{ data.trackingNumber }}</span><br>
           </p>
           <p class="info-content" v-if="data.deliveryType == 0">
-            线下领取物品请到各地公司进行领取<br>
+            办公室领取的物品请到各地公司进行领取<br>
             <!-- 领取联系人<br>
             上海办公室:茅玮婷<br>
             北京办公室:刘琳<br>
             洛阳办公室:吴燕敏<br> -->
           </p>
         </div>
-        <div class="right" v-if="data.orderType == 1">
+        <div class="right" v-if="data.orderType == 3">
           <!-- <div class="remark-line">
             <span>备注:</span>
             <el-input v-model="comment" class="remark" placeholder="请输入备注,例如兑换商品出现的问题等" type="textarea"></el-input>
@@ -164,7 +164,7 @@
         </div>
       </div>
       <div v-if="data.deliveryType == 3">
-        <div class="right" style="text-align: right;" v-if="data.orderType == 1">
+        <div class="right" style="text-align: right;" v-if="data.orderType == 3">
           <div class="btn-line">
             <el-button @click="handleClickConfirm(0)" type="primary" round>确认收货</el-button>
           </div>

+ 10 - 6
src/views/HomeView/MyCenter.vue

@@ -71,11 +71,11 @@
                                                     </svg>
                                                 </button>
                                                 <div class="status">
-                                                    <span v-if="item.orderType==0">已兑换</span>
-                                                    <span v-if="item.orderType==1">待确认</span>
+                                                    <span v-if="item.orderType==0">待审核</span>
+                                                    <span v-if="item.orderType==1">待发货</span>
                                                     <span v-if="item.orderType==2">作废</span>
-                                                    <span v-if="item.orderType==3">已确认</span>
-                                                    <span v-if="item.orderType==4">反馈确认中</span>
+                                                    <span v-if="item.orderType==3">待收货</span>
+                                                    <span v-if="item.orderType==4">已收货</span>
                                                 </div>
                                             </div>
                                         </div>
@@ -158,12 +158,16 @@ export default {
                     name: '待审核',
                 },
                 {
-                    value: '1,4',
+                    value: '1',
                     name: '待发货',
                 },
                 {
                     value: '3',
-                    name: '已确认收货',
+                    name: '待收货',
+                },
+                {
+                    value: '4',
+                    name: '已收货',
                 },
                 {
                     value: '2',