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

【类 型】：fix

Browse Source 
【主	题】：待执行订单任务栏 改调用接口
【描	述】：
	[原因]：只取 已付款 未送达订单
	[过程]：从getPaidOrderList接口拿数据 更新时也调用此接口
	[影响]：
【结	束】

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
This commit is contained in:
tk 2024-06-26 15:24:15 +08:00
parent 0c5a666b12
commit b62a8ecc9b
4 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/QuestTabs.vue
View File

@ -8,8 +8,11 @@
<div class="fb l w-30">
订单ID：{{ item.id }}
</div>
<div class="r fb w-70 fr p-r-15">
下单时间：{{ parseTime(item.addtime) }}
<div v-if="item.refund_status !== '申请中'" class="r fb w-70 fr p-r-15">
下单时间：{{ parseTime(item.order_time) }}
</div>
<div v-else class="r fb w-70 fr p-r-15">
申请时间：{{ parseTime(item.refundapply_time) }}
</div>
</div>
</template>
@ -192,6 +195,7 @@ export default {
watch: {
},
created () {
console.log(this.list)
}
}
</script>

18
src/store/index.js
View File

@ -19,7 +19,7 @@ const store = new Vuex.Store({
categoryList: [], // 分类列表(小程序)
spuList: [], // 商品spu列表
skuList: [], // 商品sku列表
orderList: [], // 订单列表
paidOrderList: [], // 已付款 订单列表
logList: [], // 操作日志列表
crosFrequency: null // 对频macadd
},
@ -73,10 +73,10 @@ const store = new Vuex.Store({
state.skuList = list
},
/**
* @description: 设置订单列表
* @description: 设置 已付款 订单列表
*/
setOrderList (state, list) {
state.orderList = list
setPaidOrderList (state, list) {
state.paidOrderList = list
},
/**
* @description: 向操作日志列表最后插入新的信息
@ -929,18 +929,18 @@ const store = new Vuex.Store({
* @description: 获取订单列表
* @return {*} 列表
*/
async fetchOrderList ({ commit }) {
const res = await api.get('getOrderList', 'Admin')
async fetchPaidOrderList ({ commit }) {
const res = await api.get('getPaidOrderList', 'Admin')
if (res.data.status === 1) {
const list = res.data.orderList
const list = res.data.paidOrderList
list.forEach((item, index) => { // 拿到订单列表数据 直接把订单列表数据反序列化
if (item.product_snapshot !== '') {
list[index].product_snapshot = JSON.parse(item.product_snapshot)
}
})
commit('setOrderList', list)
commit('setPaidOrderList', list)
} else {
commit('setOrderList', [])
commit('setPaidOrderList', [])
}
return res
},

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

@ -32,7 +32,7 @@
<el-button :type="pendingCount + processingCount + shippedCount + requestedCount !== 0 ? 'primary' : ''"
@click="drawer = true" size="small" :icon="orderIcon" circle></el-button>
</el-badge>
<el-drawer :visible.sync="drawer" size="40%" :append-to-body="true" :modal-append-to-body="false">
<el-drawer :visible.sync="drawer" size="60%" :append-to-body="true" :modal-append-to-body="false">
<template slot="title">
<div>
<i class="l f-s-18 iconfont icon-jinjidingdan m-r-5 l-h-18"></i>
@ -130,16 +130,16 @@ export default {
return this.$store.state.settings.photoPath + this.$store.state.user.photo
},
/**
* @description: 获取订单列表
* @description: 获取 所有已付款订单列表
*/
orderList () {
return this.$store.state.orderList.filter(item => item.shop_id === this.shop_id)
paidOrderList () {
return this.$store.state.paidOrderList.filter(item => item.shop_id === this.shop_id)
},
/**
* @description: 过滤 未接单 并且没有申请退款的 订单
*/
pendingList () {
return this.orderList.filter(item => item.main_status === '已付款' && item.shipment_status === '未接单' && item.refund_status !== '申请中')
return this.paidOrderList.filter(item => item.main_status === '已付款' && item.shipment_status === '未接单' && item.refund_status !== '申请中')
},
/**
* @description: 未接单 总数
@ -151,7 +151,7 @@ export default {
* @description: 过滤 已接单 并且没有申请退款的 订单
*/
processingList () {
return this.orderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已接单' && item.refund_status !== '申请中')
return this.paidOrderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已接单' && item.refund_status !== '申请中')
},
/**
* @description: 已接单 总数
@ -163,7 +163,7 @@ export default {
* @description: 过滤 已发货 并且没有申请退款的 订单
*/
shippedList () {
return this.orderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已发货' && item.refund_status !== '申请中')
return this.paidOrderList.filter(item => item.main_status === '已付款' && item.shipment_status === '已发货' && item.refund_status !== '申请中')
},
/**
* @description: 已发货 总数
@ -175,7 +175,7 @@ export default {
* @description: 过滤 退款申请中 订单
*/
requestedList () {
return this.orderList.filter(item => item.refund_status === '申请中')
return this.paidOrderList.filter(item => item.refund_status === '申请中')
},
/**
* @description: 退款申请中 总数

4
src/views/layout/index.vue
View File

@ -67,7 +67,7 @@ export default {
this.$store.dispatch('fetchCategoryList')// 获取分类列表（小程序）
this.$store.dispatch('fetchSpuList')// 获取商品spu列表
this.$store.dispatch('fetchSkuList')// 获取商品sku列表
this.$store.dispatch('fetchOrderList')// 获取订单列表
this.$store.dispatch('fetchPaidOrderList')// 获取订单列表
},
watch: {
/**
@ -117,7 +117,7 @@ export default {
mqtt.doSubscribe(`refreshQuestList/${this.shop_id}`, (res) => {
if (res.topic.indexOf(`refreshQuestList/${this.shop_id}`) > -1) {
this.$store.dispatch('fetchSiteList')// 刷新站点列表
this.$store.dispatch('fetchOrderList')// 刷新订单列表 ps:待发货及待收货 并且不是退款成功状态
this.$store.dispatch('fetchPaidOrderList')// 刷新订单列表 ps:待发货及待收货 并且不是退款成功状态
}
})
}