Skip to content

I
integral-mall
Commit ea9764e1 by crushh
Options

udpate: 完成

parent ddd12ceb
Showing with 76 additions and 50 deletions
src/components/selectGoodsType.vue
<template> <template>
<el-dialog title="新增礼品" :visible.sync="addModalData.dialogVisible" width="450px" @close="cancel"> <el-dialog
title="新增礼品"
:visible.sync="addModalData.dialogVisible"
width="450px"
@close="cancel"
>
<div class="dialog-body"> <div class="dialog-body">
<div class="type-item" @click="goAdd('1')"> <div class="type-item" @click="goAdd('1')">
<img class="real-img" src="../../static/img/real.png" alt="" /> <img class="real-img" src="../../static/img/real.png" alt="">
<p class="type-name">实物礼品</p> <p class="type-name">
实物礼品
</p>
</div> </div>
<div class="type-item" @click="goAdd('0')"> <div class="type-item" @click="goAdd('0')">
<img class="virtual-img" src="../../static/img/virtual.png" alt="" /> <img class="virtual-img" src="../../static/img/virtual.png" alt="">
<p class="type-name">虚拟礼品<span>（无需物流）</span></p> <p class="type-name">
虚拟礼品<span>（无需物流）</span>
</p>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">
取 消
</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
...@@ -20,22 +31,22 @@ ...@@ -20,22 +31,22 @@
export default { export default {
props: { props: {
addModalData: { addModalData: {
type: Object type: Object,
} },
}, },
data() { data () {
return { return {
dialogVisible: true dialogVisible: true,
}; };
}, },
methods: { methods: {
goAdd(type) { goAdd (type) {
this.$router.push({ name: 'giftAdd', query: { type: type, giftId: '-1', proReferId: '-1', canEdit: true } }); this.$router.push({ name: 'giftAdd', query: { type: type, giftId: '-1', proReferId: '-1', canEdit: true } });
}, },
cancel() { cancel () {
this.addModalData.dialogVisible = false; this.addModalData.dialogVisible = false;
} },
} },
}; };
</script> </script>
<style scoped> <style scoped>
......
src/router/index.js
...@@ -36,126 +36,126 @@ const router = new Router({ ...@@ -36,126 +36,126 @@ const router = new Router({
name: 'gift', name: 'gift',
component: gift, component: gift,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/giftAdd', path: '/giftAdd',
name: 'giftAdd', name: 'giftAdd',
component: giftInfo component: giftInfo,
}, },
{ {
path: '/giftInfo', path: '/giftInfo',
name: 'giftInfo', name: 'giftInfo',
component: giftInfo component: giftInfo,
}, },
{ {
path: '/coupon', path: '/coupon',
name: 'coupon', name: 'coupon',
component: coupon, component: coupon,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/couponAdd', path: '/couponAdd',
name: 'couponAdd', name: 'couponAdd',
component: couponInfo component: couponInfo,
}, },
{ {
path: '/couponInfo', path: '/couponInfo',
name: 'couponInfo', name: 'couponInfo',
component: couponInfo component: couponInfo,
}, },
{ {
path: '/soldStatistics', path: '/soldStatistics',
name: 'soldStatistics', name: 'soldStatistics',
component: soldStatistics component: soldStatistics,
}, },
{ {
path: '/flashSale', path: '/flashSale',
name: 'flashSale', name: 'flashSale',
component: flashSale, component: flashSale,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/flashSaleAdd', path: '/flashSaleAdd',
name: 'flashSaleAdd', name: 'flashSaleAdd',
component: flashSaleInfo component: flashSaleInfo,
}, },
{ {
path: '/flashSaleInfo', path: '/flashSaleInfo',
name: 'flashSaleInfo', name: 'flashSaleInfo',
component: flashSaleInfo component: flashSaleInfo,
}, },
{ {
path: '/giftExchange', path: '/giftExchange',
name: 'giftExchange', name: 'giftExchange',
component: giftExchange, component: giftExchange,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/orderDetail', path: '/orderDetail',
name: 'orderDetail', name: 'orderDetail',
component: orderDetail component: orderDetail,
}, },
{ {
path: '/couponExchange', path: '/couponExchange',
name: 'couponExchange', name: 'couponExchange',
component: couponExchange, component: couponExchange,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/refundList', path: '/refundList',
name: 'refundList', name: 'refundList',
component: refundList, component: refundList,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/deliverSet', path: '/deliverSet',
name: 'deliverSet', name: 'deliverSet',
component: deliverSet, component: deliverSet,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/addDeliver', path: '/addDeliver',
name: 'addDeliver', name: 'addDeliver',
component: editDeliver component: editDeliver,
}, },
{ {
path: '/editDeliver', path: '/editDeliver',
name: 'editDeliver', name: 'editDeliver',
component: editDeliver component: editDeliver,
}, },
{ {
path: '/recordList', path: '/recordList',
name: 'recordList', name: 'recordList',
component: recordList, component: recordList,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
}, },
{ {
path: '/convenSet', path: '/convenSet',
name: 'convenSet', name: 'convenSet',
component: convenSet, component: convenSet,
meta: { meta: {
useMenuLimit: true useMenuLimit: true,
} },
} },
] ],
} },
] ],
}); });
// router.beforeEach((to, from, next) => { // router.beforeEach((to, from, next) => {
......
src/views/goods/coupon/coupon.vue
...@@ -59,9 +59,24 @@ ...@@ -59,9 +59,24 @@
clearable clearable
@change="handleData" @change="handleData"
> >
<el-option v-if="$getButtonLimit($buttonCode.couponNew)" :limit-code="$buttonCode.couponNew" label="批量上架" :value="0" /> <el-option
<el-option v-if="$getButtonLimit($buttonCode.couponRemove)" :limit-code="$buttonCode.couponRemove" label="批量下架" :value="1" /> v-if="$getButtonLimit($buttonCode.couponNew)"
<el-option v-if="$getButtonLimit($buttonCode.couponDelete)" :limit-code="$buttonCode.couponDelete" label="批量删除" :value="2" /> :limit-code="$buttonCode.couponNew"
label="批量上架"
:value="0"
/>
<el-option
v-if="$getButtonLimit($buttonCode.couponRemove)"
:limit-code="$buttonCode.couponRemove"
label="批量下架"
:value="1"
/>
<el-option
v-if="$getButtonLimit($buttonCode.couponDelete)"
:limit-code="$buttonCode.couponDelete"
label="批量删除"
:value="2"
/>
</el-select> </el-select>
</div> </div>
<el-button <el-button
......
src/views/goods/gift/gift.vue
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
> >
<span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span> <span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;"> <el-dropdown-menu slot="dropdown" style="width:110px;">
<el-dropdown-item command="1" v-if="$getButtonLimit($buttonCode.couponConversion)"> <el-dropdown-item command="1" v-if="$getButtonLimit($buttonCode.giftConversion)" :limit-code="$buttonCode.giftConversion">
查看订单 查看订单
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item command="2" v-if="scope.row.changeType === '5' && scope.row.canEdit && $getButtonLimit($buttonCode.giftCouponCode)" :limit-code="$buttonCode.giftCouponCode"> <el-dropdown-item command="2" v-if="scope.row.changeType === '5' && scope.row.canEdit && $getButtonLimit($buttonCode.giftCouponCode)" :limit-code="$buttonCode.giftCouponCode">
......
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