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

Compare commits

base: Food:267ee5dbcd8d83db6bf25a1bc460c69be124533f
Branches Tags
Food:master
..
compare: Food:9e36a0bd1cb8a0852cceb6bc8c859bc820a639db
Branches Tags
Food:master

No commits in common. "267ee5dbcd8d83db6bf25a1bc460c69be124533f" and "9e36a0bd1cb8a0852cceb6bc8c859bc820a639db" have entirely different histories.
267ee5dbcd ... 9e36a0bd1c

4 changed files with 11 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
src/components/SearchOrder.vue
View File

@ -1,7 +1,7 @@
<template>
<el-input placeholder="请输入搜索内容" v-model="value[1]">
<el-select v-model="value[0]" slot="prepend" placeholder="条件选择" class="w-120px">
<el-option label="订单号" value="orderSn" selection></el-option>
<el-option label="订单号" value="orderId" selection></el-option>
<el-option label="收获人" value="name"></el-option>
<el-option label="客户电话" value="tel"></el-option>
<el-option label="客户留言" value="remark"></el-option>

5
src/components/SelectionShopId.vue
View File

@ -6,7 +6,8 @@
<span class="rspan">所有商铺</span>
</el-option>
<el-option v-for="item in shopList" :key="item.id" :label="item.name" :value="item.shop_id">
<el-avatar v-if="item.logo != ''" class="vm" shape="square" :size="25" :src="item.logo[0]">
<el-avatar v-if="item.logo != ''" class="vm" shape="square" :size="25"
:src="item.logo[0]">
</el-avatar>
<el-avatar v-else :size="25" class="vm" icon="iconfont icon-tuxiang"></el-avatar>
<span class="rspan">{{ item.name }}</span>
@ -27,7 +28,7 @@ export default {
data () {
return {
form: {
shop_id: this.$store.state.user.shop_id
shop_id: ''
}
}
},

4
src/store/modules/app.js
View File

@ -66,13 +66,13 @@ const getters = {
// 获取订单页面搜索条件
getOrderSerch (state) {
const defaultValues = {
shop_id: localStorage.getItem('shop_id'), // 搜索条件 商铺id
shop_id: '', // 搜索条件 商铺id
start_time: Math.floor(new Date(new Date().setHours(0, 0, 0, 0)).getTime() / 1000), // 搜索条件 起始时间 默认为今天凌晨0点
end_time: Math.floor(new Date(new Date().setHours(23, 59, 59, 999)).getTime() / 1000), // 搜索条件 结束时间 默认为今天23点59分59秒
main_status: [], // 搜索条件 主状态
shipment_status: [], // 搜索条件 执行状态
refund_status: [], // 搜索条件 退款状态
search: ['orderSn', '']// 搜索条件 搜索
search: ['orderId', '']// 搜索条件 搜索
}
// 深层合并 state.orderSerch 和默认值 取值得时候对象里面如果有得属性 会被保留 没有得会用defaultValues的属性进行填充
// 缓存中没有 从本地拿 本地也没有 给一个默认空对象

9
src/views/layout/components/main/order/index.vue
View File

@ -74,7 +74,7 @@ export default {
return {
pageSize: 50, // 每页显示记录条数
currentPage: 1, // 当前页
shop_id: this.$store.state.user.shop_id // 搜索条件 商铺id
shop_id: '' // 搜索条件 商铺id
}
},
components: {
@ -110,14 +110,15 @@ export default {
}
},
watch: {
shop_id (val) {
this.$store.commit('app/setOrderSerch', { shop_id: val })
},
// shop_id (val) {
// this.$store.commit('app/setOrderSerch', { shop_id: val })
// },
orderSerch (val) {
this.getOrderList(val)
}
},
created () {
},
filters: {
countSelIdArr,