faiz
/
settledIn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

活动类型

This commit is contained in:
faiz 2024-11-20 16:25:18 +08:00
parent f558b80a61
commit 1e18ee32b1
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -4,8 +4,8 @@ ENV = 'development'
# http://mer.crmeb.net/admin # http://mer.crmeb.net/admin
# base api # base api
# www.shop.xyz # www.shop.xyz
VUE_APP_BASE_API = 'http://zkx.tropjoin.com' # VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
# VUE_APP_BASE_API = 'http://test.tropjoin.com' VUE_APP_BASE_API = 'http://test.tropjoin.com'
# VUE_APP_BASE_API = 'https://api.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com'
# socket 连接地址 # socket 连接地址

26
src/views/order/list/index.vue
View File

@ -108,10 +108,10 @@
@change="getList(1), getCardList()" @change="getList(1), getCardList()"
> >
<el-option <el-option
v-for="item in activity" v-for="(item, key) in activity"
:key="item.type" :key="key"
:label="item.name" :label="item"
:value="item.type" :value="key"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -386,9 +386,7 @@
</el-table-column> </el-table-column>
<el-table-column label="活动类型" min-width="100"> <el-table-column label="活动类型" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{ scope.row.activity_type_name }}</span>
scope.row.activity_type_name ? scope.row.activity_type_name : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品信息" min-width="330"> <el-table-column label="商品信息" min-width="330">
@ -584,18 +582,7 @@ export default {
data: [], data: [],
total: 0, total: 0,
}, },
activity: [ activity: {},
{ name: "普通订单", type: 0 },
// {name: "秒杀订单",type: 1},
{ name: "预售订单", type: 2 },
// 51 特惠 52惠美 53双十一活动 54 全折扣
{ name: "特惠", type: 51 },
{ name: "惠美", type: 52 },
{ name: "双十一活动", type: 53 },
{ name: "全折扣", type: 54 },
// {name: "助力订单",type: 3},
// {name: "拼团订单",type: 4}
],
listLoading: true, listLoading: true,
tableFrom: { tableFrom: {
order_sn: this.$route.query.order_sn ? this.$route.query.order_sn : "", order_sn: this.$route.query.order_sn ? this.$route.query.order_sn : "",
@ -928,6 +915,7 @@ export default {
orderListApi(this.tableFrom) orderListApi(this.tableFrom)
.then((res) => { .then((res) => {
this.tableData.data = res.data.list; this.tableData.data = res.data.list;
this.activity = res.data.activity_types;
this.tableData.total = res.data.count; this.tableData.total = res.data.count;
// this.cardLists = res.data.stat; // this.cardLists = res.data.stat;
this.listLoading = false; this.listLoading = false;