Commit 09eb0adf authored by mengwenhao's avatar mengwenhao

feature:商品图片上传格式修改

parent 06e8b187
This diff is collapsed.
...@@ -166,18 +166,19 @@ ...@@ -166,18 +166,19 @@
> >
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-if="scope.row.audit_status == 2 || scope.row.online_status == 1 || scope.row.online_status == 2"
type="text" type="text"
@click="goDetail(`EDIT`,scope.row.goods_spu_id)" @click="goDetail(`EDIT`, scope.row.goods_spu_id)"
>编辑</el-button> >编辑</el-button>
<el-button <el-button
v-if="scope.row.audit_status == 0" v-if="scope.row.audit_status == 0"
type="text" type="text"
@click="goDetail(`AUDIT`,scope.row.goods_spu_id)" @click="goDetail(`AUDIT`, scope.row.goods_spu_id)"
>审核</el-button> >审核</el-button>
<!-- v-if="scope.row.audit_status == 1 && scope.row.online_status == 2 || scope.row.audit_status == 1 && scope.row.online_status == 0" -->
<el-popconfirm <el-popconfirm
v-if="scope.row.online_status == 2 || scope.row.audit_status != 0 && scope.row.online_status == 0"
title="您确定要上架该商品吗?" title="您确定要上架该商品吗?"
cancelButtonType="default" cancelButtonType="default"
@confirm="changeGoodsState('GROUNDING', scope.row.goods_spu_id)" @confirm="changeGoodsState('GROUNDING', scope.row.goods_spu_id)"
...@@ -187,8 +188,8 @@ ...@@ -187,8 +188,8 @@
</template> </template>
</el-popconfirm> </el-popconfirm>
<!-- v-if="scope.row.online_status == 1" -->
<el-popconfirm <el-popconfirm
v-if="scope.row.online_status == 1"
title="您确定要下架该商品吗?" title="您确定要下架该商品吗?"
cancelButtonType="default" cancelButtonType="default"
@confirm=" @confirm="
...@@ -215,7 +216,6 @@ ...@@ -215,7 +216,6 @@
</el-pagination> </el-pagination>
</el-card> </el-card>
</layout> </layout>
</template> </template>
<style lang="less" src="./index.less" scope></style> <style lang="less" src="./index.less" scope></style>
...@@ -227,7 +227,7 @@ import { ...@@ -227,7 +227,7 @@ import {
putOnline, putOnline,
putOffline putOffline
} from "@/service/Goods/goods"; } from "@/service/Goods/goods";
import Layout from '../layout/index.vue' import Layout from "../layout/index.vue";
export default { export default {
name: "GoodsList", name: "GoodsList",
...@@ -348,7 +348,7 @@ export default { ...@@ -348,7 +348,7 @@ export default {
}, },
// 重置表单 // 重置表单
resetList () { resetList () {
this.searchProps = { (this.searchProps = {
page: 1, // 页码 page: 1, // 页码
page_size: 20, // 页数大小 page_size: 20, // 页数大小
goods_spu_id: "", // 后台商品id goods_spu_id: "", // 后台商品id
...@@ -359,7 +359,7 @@ export default { ...@@ -359,7 +359,7 @@ export default {
life_account_name: "", life_account_name: "",
audit_status: "", // 商品状态 audit_status: "", // 商品状态
online_status: "" // 上架状态 online_status: "" // 上架状态
}, }),
this.getCommodityList(); this.getCommodityList();
}, },
// 上架/下架操作 // 上架/下架操作
......
...@@ -15,10 +15,10 @@ const headerConfig = [ ...@@ -15,10 +15,10 @@ const headerConfig = [
name: "分销", name: "分销",
path: "/goods/retail" path: "/goods/retail"
}, },
{ // {
name: "秒杀", // name: "秒杀",
path: "/death" // path: "/death"
} // }
] ]
} }
]; ];
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
text-color="#fff" text-color="#fff"
:default-active="activeMenu" :default-active="activeMenu"
active-text-color="#ffd04b" active-text-color="#ffd04b"
unique-opened
> >
<el-submenu <el-submenu
v-for="item in headerConfig" v-for="item in headerConfig"
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
<el-menu-item <el-menu-item
v-for="meItem in item.menuItem" v-for="meItem in item.menuItem"
:index="meItem.path" :index="meItem.path"
:key="meItem.name" :key="meItem.path"
> >
{{ meItem.name }} {{ meItem.name }}
</el-menu-item> </el-menu-item>
...@@ -45,29 +46,19 @@ export default { ...@@ -45,29 +46,19 @@ export default {
User User
}, },
data () { data () {
return { headerConfig }; return {
headerConfig
};
}, },
computed: { computed: {
activeMenu () { activeMenu () {
return this.$route.path; return this.$route.path;
} }
}, },
beforeMount () { beforeMount () { },
console.log(headerConfig);
console.log("当前激活", this.activeMenu);
},
methods: {} methods: {}
}; };
</script> </script>
<style lang="less"> <style lang="less">
.menu-router {
display: inline-block;
line-height: 60px;
width: 100%;
}
.header-menu .user-menu {
float: right !important;
margin-right: 20px;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment