Skip to content

W
welfare
Commit fe67fa44 by crushh
Options

update: dist

parent 0396ee96
Showing with 50 additions and 34 deletions
dist/index.html
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link href=//at.alicdn.com/t/font_1434755_up9fc92yhi.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_1s8bd0r1t2ri.css><title>福利中心</title><link href=/welfare/css/card-package.57482441.css rel=prefetch><link href=/welfare/css/card-package~gic-card.06e52b24.css rel=prefetch><link href=/welfare/css/chunk-001d874e.04a03d4f.css rel=prefetch><link href=/welfare/css/chunk-0a638264.90df7b8c.css rel=prefetch><link href=/welfare/css/chunk-0beca480.ad69aaca.css rel=prefetch><link href=/welfare/css/chunk-247c4cc7.ad01b3e2.css rel=prefetch><link href=/welfare/css/chunk-256597ba.fa1d3569.css rel=prefetch><link href=/welfare/css/chunk-447f9844.f11404c0.css rel=prefetch><link href=/welfare/css/chunk-538ce912.ee4b8a2b.css rel=prefetch><link href=/welfare/css/chunk-593e752c.8f300845.css rel=prefetch><link href=/welfare/css/chunk-5e077bbb.282cdb77.css rel=prefetch><link href=/welfare/css/chunk-62df7e69.5ce8e788.css rel=prefetch><link href=/welfare/css/chunk-7b01ce79.3d1e4d18.css rel=prefetch><link href=/welfare/css/chunk-a7320cc8.a794f702.css rel=prefetch><link href=/welfare/css/gic-card.a334944e.css rel=prefetch><link href=/welfare/js/card-package.5c1b04a3.js rel=prefetch><link href=/welfare/js/card-package~gic-card.230ca294.js rel=prefetch><link href=/welfare/js/chunk-001d874e.bbba81ed.js rel=prefetch><link href=/welfare/js/chunk-0a638264.d33df169.js rel=prefetch><link href=/welfare/js/chunk-0beca480.864f045d.js rel=prefetch><link href=/welfare/js/chunk-0d4ebdfa.f5bf7d6b.js rel=prefetch><link href=/welfare/js/chunk-247c4cc7.edcc0a30.js rel=prefetch><link href=/welfare/js/chunk-256597ba.fc4a8c72.js rel=prefetch><link href=/welfare/js/chunk-447f9844.c225e632.js rel=prefetch><link href=/welfare/js/chunk-538ce912.96b3bf7a.js rel=prefetch><link href=/welfare/js/chunk-593e752c.158a8b1d.js rel=prefetch><link href=/welfare/js/chunk-5e077bbb.f1e21240.js rel=prefetch><link href=/welfare/js/chunk-6287d3af.e57b691b.js rel=prefetch><link href=/welfare/js/chunk-62df7e69.70f8bd46.js rel=prefetch><link href=/welfare/js/chunk-7b01ce79.cd7f51ee.js rel=prefetch><link href=/welfare/js/chunk-a7320cc8.1270dd20.js rel=prefetch><link href=/welfare/js/chunk-db6a8f34.1a1f05a1.js rel=prefetch><link href=/welfare/js/gic-card.a8524890.js rel=prefetch><link href=/welfare/css/app.e51f9e2a.css rel=preload as=style><link href=/welfare/js/app.4abe440a.js rel=preload as=script><link href=/welfare/js/chunk-vendors.34f063f2.js rel=preload as=script><link href=/welfare/css/app.e51f9e2a.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function() {
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link href=//at.alicdn.com/t/font_1434755_up9fc92yhi.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_1s8bd0r1t2ri.css><title>福利中心</title><link href=/welfare/css/card-package.57482441.css rel=prefetch><link href=/welfare/css/card-package~gic-card.06e52b24.css rel=prefetch><link href=/welfare/css/chunk-001d874e.04a03d4f.css rel=prefetch><link href=/welfare/css/chunk-0a638264.90df7b8c.css rel=prefetch><link href=/welfare/css/chunk-0beca480.ad69aaca.css rel=prefetch><link href=/welfare/css/chunk-247c4cc7.ad01b3e2.css rel=prefetch><link href=/welfare/css/chunk-256597ba.fa1d3569.css rel=prefetch><link href=/welfare/css/chunk-447f9844.f11404c0.css rel=prefetch><link href=/welfare/css/chunk-538ce912.ee4b8a2b.css rel=prefetch><link href=/welfare/css/chunk-593e752c.8f300845.css rel=prefetch><link href=/welfare/css/chunk-5e077bbb.282cdb77.css rel=prefetch><link href=/welfare/css/chunk-62df7e69.5ce8e788.css rel=prefetch><link href=/welfare/css/chunk-7b01ce79.3d1e4d18.css rel=prefetch><link href=/welfare/css/chunk-a7320cc8.a794f702.css rel=prefetch><link href=/welfare/css/gic-card.6a54fb3c.css rel=prefetch><link href=/welfare/js/card-package.5c1b04a3.js rel=prefetch><link href=/welfare/js/card-package~gic-card.230ca294.js rel=prefetch><link href=/welfare/js/chunk-001d874e.bbba81ed.js rel=prefetch><link href=/welfare/js/chunk-0a638264.d33df169.js rel=prefetch><link href=/welfare/js/chunk-0beca480.864f045d.js rel=prefetch><link href=/welfare/js/chunk-0d4ebdfa.f5bf7d6b.js rel=prefetch><link href=/welfare/js/chunk-247c4cc7.edcc0a30.js rel=prefetch><link href=/welfare/js/chunk-256597ba.fc4a8c72.js rel=prefetch><link href=/welfare/js/chunk-447f9844.c225e632.js rel=prefetch><link href=/welfare/js/chunk-538ce912.96b3bf7a.js rel=prefetch><link href=/welfare/js/chunk-593e752c.158a8b1d.js rel=prefetch><link href=/welfare/js/chunk-5e077bbb.f1e21240.js rel=prefetch><link href=/welfare/js/chunk-6287d3af.e57b691b.js rel=prefetch><link href=/welfare/js/chunk-62df7e69.70f8bd46.js rel=prefetch><link href=/welfare/js/chunk-7b01ce79.cd7f51ee.js rel=prefetch><link href=/welfare/js/chunk-a7320cc8.1270dd20.js rel=prefetch><link href=/welfare/js/chunk-db6a8f34.1a1f05a1.js rel=prefetch><link href=/welfare/js/gic-card.dd240c4b.js rel=prefetch><link href=/welfare/css/app.d18c9714.css rel=preload as=style><link href=/welfare/js/app.847f3dc8.js rel=preload as=script><link href=/welfare/js/chunk-vendors.34f063f2.js rel=preload as=script><link href=/welfare/css/app.d18c9714.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function() {
var host = window.location.host;
document.write('<script src="//'+ (host == 'ideal.demogic.com' ? host : 'four.gicdev.com') + '/component-library/static/import-component.js?timestrap='+ new Date().getTime() +'"><\/script>')
})()</script><script src=/welfare/js/chunk-vendors.34f063f2.js></script><script src=/welfare/js/app.4abe440a.js></script></body></html>
\ No newline at end of file
})()</script><script src=/welfare/js/chunk-vendors.34f063f2.js></script><script src=/welfare/js/app.847f3dc8.js></script></body></html>
\ No newline at end of file
dist/js/gic-card.a8524890.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.dd240c4b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/styles/general.scss
......@@ -31,8 +31,6 @@ a:hover {
.container {
position: relative;
max-width: 1200px;
margin: 30px auto;
padding: 20px;
}
.p2 {
padding: 2px !important;
......@@ -733,3 +731,8 @@ a:hover {
.lose-floor-width {
width: calc(100% - 120px);
}
.newGoodsSelector{
.container{
margin: 0;
}
}
\ No newline at end of file
src/views/card/gic-card/card-form.js
......@@ -405,6 +405,10 @@ export default {
}
},
methods: {
onSaveSearchId(id){
console.log(id);
this.ruleForm1.goodsSearchId = id;
},
getRelationId() {
getRelationId().then(res => {
this.couponId = res.result;
......@@ -486,18 +490,18 @@ export default {
}
if (target === 2) {
// 去往第二步 验证ruleForm1
const { cardEffectiveMode, expireTimeCount, effectTimeMode, dateTime, customCodeFlag, cardType, operAuth, operAuthType } = this.ruleForm1;
const { cardEffectiveMode, expireTimeCount, effectTimeMode, dateTime, customCodeFlag, operAuth, operAuthType } = this.ruleForm1;
if(isEmpty(cardEffectiveMode)) {
reject({ message: '请选择有效期类型' });
}
if (cardType == 2) {
// 兑换券判断卡券优惠内容
if(!this.goodsSearchId) {
reject({ message: '请保存卡券优惠内容' });
} else if (this.goodsSearchIdWaiting) {
reject({ message: '卡券优惠内容处于编辑状态请保存' });
}
}
// if (cardType == 2) {
// // 兑换券判断卡券优惠内容
// if(!this.ruleForm1.goodsSearchId) {
// reject({ message: '请保存卡券优惠内容' });
// } else if (this.goodsSearchIdWaiting) {
// reject({ message: '卡券优惠内容处于编辑状态请保存' });
// }
// }
// 验证有效期
if (cardEffectiveMode) {
if (isEmpty(effectTimeMode)) { reject({ message: '有效期填写不完整' }); }
......@@ -556,13 +560,13 @@ export default {
// reject({ message: '请保存线下门店线下适用商品' })
// }
// 判断线下适用商品
if (this.ruleForm1.cardType !== 2) {
if (!xxsy.goodsFilterId) {
reject({ message: '请保存线下门店线下适用商品' });
} else if (this.xxsyGoodsWaiting) {
reject({ message: '线下适用商品处于编辑状态，请保存' });
}
}
// if (this.ruleForm1.cardType !== 2) {
// if (!xxsy.goodsFilterId) {
// reject({ message: '请保存线下门店线下适用商品' });
// } else if (this.xxsyGoodsWaiting) {
// reject({ message: '线下适用商品处于编辑状态，请保存' });
// }
// }
}
// 判断GIC微商城适用
if (gicmall.switch) {
......@@ -726,7 +730,7 @@ export default {
}
// if(!this.$refs.accg.validate()) return;
// this.$refs.accg.save();
let params = { ...this.ruleForm1, ...this.ruleForm2, goodsSearchId: this.goodsSearchId };
let params = { ...this.ruleForm1, ...this.ruleForm };
try {
params.couponId = this.couponId; // 主键在一进来页面的时候就已经确定
params.memberCardId = this.currentAreaId;
......@@ -922,8 +926,8 @@ export default {
});
},
// **********商品选择器*************
confirm(keyName, res) { // 点击确认返回数据
this[keyName].goodsFilterId = res.goodsSelectorId;
confirm(keyName, id) { // 点击确认返回数据
this[keyName].goodsFilterId = id;
},
// 保存兑换券的商品选择器id
saveExchangeGoodsSearchId() {
......
src/views/card/gic-card/card-form.vue
......@@ -53,7 +53,8 @@
</el-form-item>
<!-- 兑换券 !!! 比微信卡券多的内容 -->
<el-form-item label="卡券优惠内容" v-if="ruleForm1.cardType === 2">
<vue-gic-goods-selector-new real-save :waiting-save.sync="goodsSearchIdWaiting" @submit="(res) => { goodsSearchId = res.goodsSelectorId }" force-show-save />
<!-- <vue-gic-goods-selector-new real-save :waiting-save.sync="goodsSearchIdWaiting" @submit="(res) => { goodsSearchId = res.goodsSelectorId }" force-show-save /> -->
<dm-new-goods-selector :selector-id="ruleForm1.goodsSearchId" @save="onSaveSearchId" />
</el-form-item>
<!-- 抵金券、兑换券 -->
<el-form-item prop="costPrice" label="成本费用" v-if="ruleForm1.cardType !== 1">
......@@ -292,7 +293,8 @@
<!-- <dm-new-goods-selector :selector-id="xxsy.storeFilterId" @save="(id) => { xxsy.storeFilterId = id; }" /> -->
</el-form-item>
<el-form-item v-if="ruleForm1.cardType !== 2" label="线下适用商品" class="is-required">
<vue-gic-goods-selector-new real-save :waiting-save.sync="xxsyGoodsWaiting" @submit="(val) => { confirm('xxsy', val) }" force-show-save />
<!-- <vue-gic-goods-selector-new real-save :waiting-save.sync="xxsyGoodsWaiting" @submit="(val) => { confirm('xxsy', val) }" force-show-save /> -->
<dm-new-goods-selector :selector-id="xxsy.goodsFilterId" @save="(val) => { confirm('xxsy', val) }" />
</el-form-item>
<!-- <el-form-item label="GIC微商城适用">
<el-switch v-model="gicmall.switch" :active-value="1" :inactive-value="0" />
......@@ -349,6 +351,7 @@ export default cardFormAdd;
</script>
<style lang="scss" scoped>
.mt8 {
margin-top: 8px;
}
......
src/views/card/gic-card/card-info.js
......@@ -23,7 +23,9 @@ export default {
loading: false,
couponId: this.$route.query.id,
subapp: {}, // 子应用信息
info: {}, // 卡券信息
info: {
goodsSearchId: ''
}, // 卡券信息
ruleForm: {
color: '', // 卡券颜色
useExplain: '', // 使用说明
......
src/views/card/gic-card/card-info.vue
......@@ -32,7 +32,8 @@
</span>
</el-form-item> -->
<el-form-item label="兑换券优惠内容" v-if="info.cardType === 2">
<vue-gic-goods-selector-new ref="selector4" :read-only="true" :id="info.goodsSearchId" />
<!-- <vue-gic-goods-selector-new ref="selector4" :read-only="true" :id="info.goodsSearchId" /> -->
<dm-new-goods-selector :selector-id="info.goodsSearchId" :read-only="true" />
</el-form-item>
<el-form-item label="减免金额" v-if="info.cardType === 0">{{ info.denomination }} 元</el-form-item>
<el-form-item label="优惠折扣" v-if="info.cardType === 1">{{ info.denomination }} 折</el-form-item>
......@@ -132,14 +133,15 @@
</div>
</el-form-item>
<el-form-item label="线下适用商品" v-if="info.cardType !== 2">
<vue-gic-goods-selector-new v-if="xxsy.goodsFilterId" ref="selector1" :read-only="true" :id="xxsy.goodsFilterId" />
<span v-else>未配置</span>
<!-- <vue-gic-goods-selector-new v-if="xxsy.goodsFilterId" ref="selector1" :read-only="true" :id="xxsy.goodsFilterId" /> -->
<!-- <span v-else>未配置</span> -->
<dm-new-goods-selector :selector-id="xxsy.goodsFilterId" :read-only="true" />
</el-form-item>
</template>
<!-- GIC微商城适用 -->
<el-form-item label="GIC微商城适用">
<!-- <el-form-item label="GIC微商城适用">
<el-switch v-model="gicmall.switch" disabled />
</el-form-item>
</el-form-item> -->
<template v-if="gicmall.switch">
<el-form-item label="消费金额门槛">
{{ gicmall.feeLimit }} 元
......@@ -149,8 +151,9 @@
<el-form-item label="最大商品优惠数" v-if="info.cardType === 1">{{ gicmall.maxDiscountGoodsCount }} 件</el-form-item>
<el-form-item label="适用微商城店铺">{{ gicmall.shopFilter.join('， ') }}</el-form-item>
<el-form-item label="适用商品" v-if="info.cardType !== 2">
<vue-gic-goods-selector-new ref="selector2" :read-only="true" v-if="gicmall.goodsFilterId" :id="gicmall.goodsFilterId" />
<span v-else>未配置</span>
<!-- <vue-gic-goods-selector-new ref="selector2" :read-only="true" v-if="gicmall.goodsFilterId" :id="gicmall.goodsFilterId" />
<span v-else>未配置</span> -->
<dm-new-goods-selector :selector-id="gicmall.goodsSearchId" :read-only="true" />
</el-form-item>
</template>
......
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