cxc/yshopb2c-qd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改订单状态，增加筛选条件

Browse Source
This commit is contained in:
xuwenbo
2021-02-22 17:53:40 +08:00
parent 139373b00c
commit 4603a28c5f
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/components/good/index.vue
View File

@ -99,7 +99,7 @@ export default {
beforeInit() {
this.url = 'api/yxStoreProduct'
const sort = 'id,desc'
this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 }
this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 ,isIntegral:0}
const query = this.query
const type = query.type
const value = query.value

2
src/views/components/goods/index.vue
View File

@ -181,7 +181,7 @@ export default {
beforeInit() {
this.url = 'api/yxStoreProduct'
const sort = 'id,desc'
this.params = {page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0}
this.params = {page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0,isIntegral:0}
const query = this.query
const type = query.type
const value = query.value

6
src/views/shop/goods/index.vue
View File

@ -48,6 +48,12 @@
<el-table-column prop="price" label="商品价格" />
<el-table-column prop="sales" label="销量" />
<el-table-column prop="stock" label="库存" />
<el-table-column label="商品类型" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.isIntegral === 1" style="cursor: pointer" :type="'warning'">积分商品</el-tag>
<el-tag v-else style="cursor: pointer" :type=" 'info' ">普通商品</el-tag>
</template>
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div @click="onSale(scope.row.id,scope.row.isShow)">

8
src/views/shop/order/detail.vue
View File

@ -66,7 +66,7 @@
<el-col :span="4" class="table-cell-title">物流单号</el-col>
<el-col :span="4" class="table-cell-title">自动确认收货时间</el-col>
<el-col :span="4" class="table-cell-title">订单可得积分</el-col>
<el-col :span="4" class="table-cell-title">填空待补充。。</el-col>
<el-col :span="4" class="table-cell-title">消费积分。</el-col>
<el-col :span="4" class="table-cell-title">活动信息</el-col>
</el-row>
<el-row>
@ -74,7 +74,7 @@
<el-col :span="4" class="table-cell">{{order.deliverySn | formatNull}}</el-col>
<el-col :span="4" class="table-cell">7天</el-col>
<el-col :span="4" class="table-cell">{{order.gainIntegral}}</el-col>
<el-col :span="4" class="table-cell">{{order.growth}}</el-col>
<el-col :span="4" class="table-cell">{{order.payIntegral}}</el-col>
<el-col :span="4" class="table-cell">
<el-popover
placement="top-start"
@ -574,6 +574,7 @@ import eRemark from './remark'
shippingType: data.shippingType,
isChannel: data.isChannel,
isRemind: data.isRemind,
payIntegral: data.payIntegral,
isSystemDel: data.isSystemDel
}
_this.dialog = true
@ -633,6 +634,7 @@ import eRemark from './remark'
shippingType: data.shippingType,
isChannel: data.isChannel,
isRemind: data.isRemind,
payIntegral: data.payIntegral,
isSystemDel: data.isSystemDel
}
_this.dialog = true
@ -691,6 +693,7 @@ import eRemark from './remark'
shippingType: data.shippingType,
isChannel: data.isChannel,
isRemind: data.isRemind,
payIntegral: data.payIntegral,
isSystemDel: data.isSystemDel
}
_this.dialog = true
@ -749,6 +752,7 @@ import eRemark from './remark'
shippingType: data.shippingType,
isChannel: data.isChannel,
isRemind: data.isRemind,
payIntegral: data.payIntegral,
isSystemDel: data.isSystemDel
}
_this.dialog = true

5
src/views/shop/order/index.vue
View File

@ -118,6 +118,7 @@
</template>
</el-table-column>
<el-table-column prop="payPrice" label="实际支付" />
<el-table-column prop="payIntegral" label="消费积分" />
<el-table-column prop="payTypeName" label="支付状态" />
<el-table-column prop="statusName" label="订单状态">
<template slot-scope="scope">
@ -283,7 +284,9 @@
{ value: '1', label: '普通订单' },
{ value: '2', label: '拼团订单' },
{ value: '3', label: '秒杀订单' },
{ value: '4', label: '砍价订单' }
{ value: '4', label: '砍价订单' },
{ value: '5', label: '核销订单' },
{ value: '6', label: '积分订单' }
],
handleOptions: [
{value: '', label: '批量操作'},