Skip to content

M
marketing
Commit 5f5df24a by zhangmeng
Options

add:迭代5上线

parent a2122800
Showing with 47 additions and 11 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.f61937149cff0e4d1a8617107f5f1958.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b95f77e8a57f632ca3ef.js></script><script type=text/javascript src=/marketing/static/js/app.b00f9e2459e8a8a519ba.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.c46490fb7d4f1bde76dbb1f6686c15c0.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.07.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b95f77e8a57f632ca3ef.js></script><script type=text/javascript src=/marketing/static/js/app.b4ffef98a6e43cf8a37b.js></script></body></html>
\ No newline at end of file
index.html
......@@ -19,7 +19,7 @@
<script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
<!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.06.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.07.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store.2.0.01.js"></script>
......@@ -27,7 +27,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.08.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.15.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js"></script>
</body>
</html>
src/assets/style/base/reset.scss
......@@ -410,6 +410,9 @@ a:hover {
.vertical-bottom{
vertical-align: bottom;
}
.vertical-baseline {
vertical-align: baseline;
}
.cursor-pointer{
cursor: pointer;
......
src/router/modules/card.js
......@@ -74,7 +74,7 @@ export default {
}
},
{
path: 'groupsend/:id/:name',
path: 'addgroupsend/:id',
name: '卡券投放',
component: cardGroupSend,
meta: {
......
src/views/card/form.js
......@@ -89,7 +89,10 @@ export default {
isAdd: this.$route.meta.type === 'add',
storeMode: 0,
// 兑换商品货号是否展示
products_exchange_number_show: false
products_exchange_number_show: false,
goodsDiscountCheck: true,
discountAmountCheck: true
};
},
watch: {
......@@ -103,6 +106,31 @@ export default {
'form.proNoList'(val) {
this.products_exchange_number_show = !!val.length;
this.form.products_exchange_number = val.length ? 1 : 0;
},
discountAmountCheck(val) {
if (val) {
this.form.discount_amount_upper_limit = 0;
} else if (this.form.discount_amount_upper_limit <= 0) {
this.form.discount_amount_upper_limit = 1;
}
},
goodsDiscountCheck(val) {
if (val) {
this.form.goods_discounts_number_upper_limit = 0;
} else if (this.form.goods_discounts_number_upper_limit <= 0) {
this.form.goods_discounts_number_upper_limit = 1;
}
},
'form.discount_amount_upper_limit'(val) {
if (val <= 0) {
this.discountAmountCheck = true;
}
},
'form.goods_discounts_number_upper_limit'(val) {
if (val <= 0) {
this.goodsDiscountCheck = true;
}
}
},
components: {
......
src/views/card/form.vue
......@@ -36,11 +36,11 @@
<el-form-item prop="cardDenomination" label="减免金额" v-if="form.cardType === 0"> <el-input-number controls-position="right" :disabled="isEdit || isInfo" v-model="form.cardDenomination" class="200" :precison="0" :min="0"></el-input-number> 元 <span class="fz12 gray">请输入大于0的整数</span> </el-form-item>
<!-- 折扣券 -->
<el-form-item prop="cardDenomination" label="折扣额度" v-if="form.cardType === 1"> <el-input-number controls-position="right" :disabled="isEdit || isInfo" v-model="form.cardDenomination" class="200" :precision="1" :step="0.1" :max="9.9" :min="0"></el-input-number> 折 <span class="fz12 gray">请填写1-9.9之间的数字</span> </el-form-item>
<el-form-item prop="cardDenomination" label="折扣额度" v-if="form.cardType === 1"> <el-input-number controls-position="right" :disabled="isEdit || isInfo" v-model="form.cardDenomination" class="200" :precision="1" :step="0.1" :max="9.9" :min="0"></el-input-number> 折 <span class="fz12 gray">请填写1-9.9之间的数字</span></el-form-item>
<el-form-item prop="cardDenomination" label="优惠金额封顶" v-if="form.cardType === 1"> <el-input-number controls-position="right" :disabled="isEdit || isInfo" v-model="form.discount_amount_upper_limit" class="200" :precision="2" :step="1" :min="0"></el-input-number> 元</el-form-item>
<el-form-item label="优惠金额封顶" v-if="form.cardType === 1"> <el-input-number controls-position="right" :disabled="isEdit || isInfo || discountAmountCheck" v-model="form.discount_amount_upper_limit" class="200" :precision="2" :step="1" :min="0"></el-input-number> 元 &nbsp;<el-checkbox v-model="discountAmountCheck">不封顶</el-checkbox><span class="pl10 fz12 gray vertical-baseline">*该条件目前仅线上可用</span> </el-form-item>
<el-form-item prop="cardDenomination" label="最大商品优惠数" v-if="form.cardType === 1"> <el-input-number controls-position="right" :disabled="isEdit || isInfo" v-model="form.goods_discounts_number_upper_limit" class="200" :precision="0" :step="1" :min="0"></el-input-number> 件</el-form-item>
<el-form-item label="最大商品优惠数" v-if="form.cardType === 1"> <el-input-number controls-position="right" :disabled="isEdit || isInfo || goodsDiscountCheck" v-model="form.goods_discounts_number_upper_limit" class="200" :precision="0" :step="1" :min="0"></el-input-number> 件 &nbsp;<el-checkbox v-model="goodsDiscountCheck">无上限</el-checkbox><span class="pl10 fz12 gray vertical-baseline">*该条件目前仅线上可用</span> </el-form-item>
<!-- 兑换券无 -->
<el-form-item prop="" label="使用条件">
......
src/views/card/group-send.vue
......@@ -183,7 +183,7 @@ export default {
putOnName: '',
sceneSettingName: '',
cardId: this.$route.params.id,
cardName: this.$route.params.name,
cardName: this.$route.query.name,
noticeType: 1,
templateNoticeFlag: 0,
// 判断模板消息能否使用
......
src/views/card/partials/card-item.vue
......@@ -94,7 +94,12 @@ export default {
handler(val) {
switch (val) {
case 1:
this.$router.push('/card/groupsend/' + this.item.coupCardId + '/' + this.item.cardName);
this.$router.push({
path: '/card/addgroupsend/' + this.item.coupCardId,
query: {
name: this.item.cardName
}
});
break;
case 2:
this.$router.push('/card/analysis/' + this.item.coupCardId);
......
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