Food/food
3
0
Fork 0
Code Issues 60 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Food:2a425a826d5f0f4d368ab8b89a3211f0dc9b4bc6
Branches Tags
Food:master
...
compare: Food:d90fe9982dd2fc2a81ab4d939278808ca3f37b6e
Branches Tags
Food:master

2 Commits
2a425a826d ... d90fe9982d

Author SHA1 Message Date
tk
d90fe9982d 【类 型】：fix 跳转函数 路径参数写重复了 
【原  因】：传参 和 函数内都加上了"/planes/index"
【过  程】：
【影  响】：
 2024-08-07 13:01:06 +08:00
tk
89a7c96312 【类 型】：fix 1.待付款订单模块 各tabs的时间格式化 2.已发货tab的取消 送达两个按钮改为 跳转到对应飞机页面 
【原  因】：显示太长ui不能自适应 观看太罗嗦
【过  程】：去掉年 和秒
【影  响】：
 2024-08-07 12:57:10 +08:00
2 changed files with 26 additions and 14 deletions
Show Stats Expand all files Collapse all files

36
src/components/QuestTabs.vue
View File

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

2
src/views/layout/components/headbar.vue
View File

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