src/components/QuestTabs.vue

@@ -14,7 +14,8 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="medium" @click="dialogVisible = false">关闭</el-button>
-        <el-button size="medium" type="danger" @click="refund">确认退款</el-button>
+        <el-button size="medium" type="danger"
+          @click="refund">确认退款</el-button>
       </span>
     </el-dialog>
     <!-- 任务tab -->
@@ -27,16 +28,16 @@
                 订单ID：{{ item.id }}
               </div>
               <div v-if="type == '未接单'" class="r w-70 fr p-r-15">
-                付款时间：{{ parseTime(item.paid_time, '{m}-{d} {h}:{i}') }}
+                下单时间：{{ parseTime(item.order_time) }}
               </div>
               <div v-else-if="type == '已接单'" class="r w-70 fr p-r-15">
-                接单时间：{{ parseTime(item.received_time, '{m}-{d} {h}:{i}') }}
+                接单时间：{{ parseTime(item.received_time) }}
               </div>
               <div v-else-if="type == '已发货'" class="r w-70 fr p-r-15">
-                发货时间：{{ parseTime(item.shipped_time, '{m}-{d} {h}:{i}') }}
+                发货时间：{{ parseTime(item.shipped_time) }}
               </div>
               <div v-else-if="type == '退款申请中'" class="r w-70 fr p-r-15">
-                申请时间：{{ parseTime(item.refundapply_time, '{m}-{d} {h}:{i}') }}
+                申请时间：{{ parseTime(item.refundapply_time) }}
               </div>
             </div>
           </template>
@@ -109,11 +110,12 @@
                 </el-button>
               </el-button-group>
               <el-button-group v-else-if="type == '已发货'">
-                <template v-for="plane in planes">
-                  <el-button v-if="plane.id===item.by_plane_id" @click="handlerRouterPlane(`/planes/index/${plane.id}/${plane.name}`)" type="primary" icon="iconfont icon-wurenji">
-                    <font class="m-l-5">{{ plane.name }}</font>
-                  </el-button>
-                </template>
+                <el-button type="danger" icon="iconfont icon-cuowu">
+                  <font class="m-l-5">取消任务</font>
+                </el-button>
+                <el-button type="success" icon="iconfont icon-qiandai">
+                  <font class="m-l-5">已送达</font>
+                </el-button>
               </el-button-group>
             </el-descriptions-item>
           </el-descriptions>
@@ -158,25 +160,10 @@ export default {
     }
   },
   computed: {
-    planes () {
-      const planes = this.$store.state.airList
-      if (planes.length > 0) {
-        return planes
-      }
-      return []
-    }
   },
   methods: {
     parseTime, // 时间戳格式化
     questAss, // 修改订单
-    /**
-     * 跳转到执行飞机的控制页面
-     * @param path 飞机控制页面路由
-     */
-    handlerRouterPlane (path) {
-      this.$router.push(path)
-      this.$emit('close-drawer')
-    },
     /**
      * 封装退款函数 同步后续操作
      */
@@ -288,6 +275,7 @@ export default {
     }
   },
   created () {
+    console.log(this.list)
   }
 }
 </script>

src/views/layout/components/headbar.vue

@@ -112,7 +112,7 @@
             >
             </el-badge>
           </template>
-          <QuestTabs :list="shippedList" type = "已发货" @close-drawer="drawer = false"/>
+          <QuestTabs :list="shippedList" type = "已发货"/>
         </el-tab-pane>
         <el-tab-pane>
           <template slot="label">