Skip to content

I
integral-mall
Commit dbd7daf2 by damodmg
Options

更新新功能

parent 9132bb9f
Showing with 48 additions and 10 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.bf3abb7722f7ec0dd66a4ed6885d1937.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.5f64f095829ef3aa7a26.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.1295daaf5476042f8bd77439aaf798ad.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.9ea5ff88e3613a620e30.js></script></body></html>
\ No newline at end of file
dist/static/js/app.5f64f095829ef3aa7a26.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.9ea5ff88e3613a620e30.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/coupon/info.vue
......@@ -110,8 +110,14 @@
<div class="section-content">
<h3>兑换设置</h3>
<span style="display:none">{{ refash }}</span>
<el-form-item label="适用会员" prop="memberGrade">
<el-select v-model="couponForm.memberGrade" multiple placeholder="请选择" size="small" class="w-350">
<el-form-item label="适用会员" prop="gradeType">
<el-radio-group v-model="couponForm.gradeType" @change="handleChange">
<el-radio :label="1">品牌卡</el-radio>
<el-radio :label="2" v-if="cliqueStatus">集团卡</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="memberGrade">
<el-select v-model="couponForm.memberGrade" multiple placeholder="请选择" size="small" class="w-600">
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option>
</el-select>
</el-form-item>
......@@ -147,6 +153,8 @@
<el-radio v-model="couponForm.exchangeDateType" :label="2">固定日期</el-radio>
<el-radio v-model="couponForm.exchangeDateType" :label="3">每月</el-radio>
<el-radio v-model="couponForm.exchangeDateType" :label="4">每周</el-radio>
<el-radio v-model="couponForm.exchangeDateType" :label="6">生日当日</el-radio>
<el-radio v-model="couponForm.exchangeDateType" :label="5">生日当月</el-radio>
</template>
</el-form-item>
<!-- 兑换日期 -->
......@@ -260,6 +268,7 @@ export default {
cashCost: '',
virtualStock: '',
memberLabelType: 1,
gradeType: 1,
memberGrade: [], //适用会员
limitTimesStatus: false, //限兑
limitTimes: '', //限兑次数
......@@ -289,6 +298,7 @@ export default {
storeGroupIds: '',
storeIds: []
},
cliqueStatus: true, //是否有集团卡
openFlag: false,
monthOptions: Array.from(Array(31), (v, k) => (k + 1).toString()),
weekOptions: ['1', '2', '3', '4', '5', '6', '7'],
......@@ -296,6 +306,7 @@ export default {
integralCost: [{ required: true, message: '请输入积分费用', trigger: 'blur' }],
cashCost: [{ required: true, message: '请输入现金费用', trigger: 'blur' }],
virtualStock: [{ required: true, message: '请输入库存', trigger: 'blur' }, { validator: stockValidator, trigger: 'blur' }],
gradeType: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],
exchangeDateDayArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
......@@ -381,10 +392,12 @@ export default {
getMemberGradeList() {
request.post('/api-integral-mall/load-grade').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result) {
this.memberGradeList = res.data.result;
} else {
this.memberGradeList = [];
this.cliqueStatus = res.data.result.cliqueGrade ? true : false;
if (this.couponForm.gradeType === 1) {
//品牌卡
this.memberGradeList = res.data.result.enterpriseGrade || [];
} else if (this.couponForm.gradeType === 2) {
this.memberGradeList = res.data.result.cliqueGrade || [];
}
} else {
this.$message.error(res.data.message);
......@@ -428,6 +441,7 @@ export default {
// this.useId = res.data.result.integralMallProId;
this.hasSearchData = res.data.result.searchParams;
//适用会员
this.couponForm.gradeType = res.data.result.gradeType;
if (res.data.result.memberGrade) {
this.couponForm.memberGrade = res.data.result.memberGrade.split(',');
} else {
......@@ -863,6 +877,7 @@ export default {
costValue: this.costValue, //礼品成本
cashCost: this.couponForm.cashCost, //现金
virtualStock: this.couponForm.virtualStock, //库存
gradeType: this.couponForm.gradeType,
memberGrade: this.couponForm.memberGrade.join(','), //适用会员
showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店
storeIds: '', //展现门店id
......
src/views/goods/gift/info.vue
......@@ -112,7 +112,13 @@
</div>
<div class="section-content">
<h3>兑换设置</h3>
<el-form-item label="适用会员" prop="memberGrade">
<el-form-item label="适用会员" prop="gradeType">
<el-radio-group v-model="giftForm.gradeType" @change="handleChange">
<el-radio :label="1">品牌卡</el-radio>
<el-radio :label="2" v-if="cliqueStatus">集团卡</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item prop="memberGrade">
<el-select v-model="giftForm.memberGrade" multiple placeholder="请选择" size="small" class="w-600">
<el-option v-for="item in memberGradeList" :key="item.gradeId" :label="item.gradeName" :value="item.gradeId"> </el-option>
</el-select>
......@@ -145,6 +151,8 @@
<el-radio v-model="giftForm.exchangeDateType" :label="2">固定日期</el-radio>
<el-radio v-model="giftForm.exchangeDateType" :label="3">每月</el-radio>
<el-radio v-model="giftForm.exchangeDateType" :label="4">每周</el-radio>
<el-radio v-model="giftForm.exchangeDateType" :label="6">生日当日</el-radio>
<el-radio v-model="giftForm.exchangeDateType" :label="5">生日当月</el-radio>
</template>
</el-form-item>
<!-- 兑换日期 -->
......@@ -339,6 +347,7 @@ export default {
proName: '',
proCategoryId: '', //分类id
images: [],
gradeType: 1,
memberGrade: [], //适用会员
limitTimesStatus: false,
limitTimes: '', //限制兑换的次数
......@@ -366,11 +375,13 @@ export default {
limitTimes: 0,
limitTimesNum: 0,
validateTime,
cliqueStatus: true, //是否有集团卡
memberGradeList: [], //会员等级列表
submitLoading: false, //按钮加载中
giftRules: {
proName: [{ validator: proNameValidator, trigger: 'blur' }],
costValue: [{ required: true, message: '请输入礼品成本', trigger: 'blur' }],
gradeType: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
memberGrade: [{ required: true, message: '请选择适用会员', trigger: 'change' }],
proCategoryId: [{ required: true, message: '请选择礼品分类', trigger: 'blur' }],
exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],
......@@ -678,6 +689,7 @@ export default {
// }
// this.useId = res.data.result.integralMallProId;
this.hasSearchData = res.data.result.searchParams;
this.giftForm.gradeType = res.data.result.gradeType;
if (res.data.result.memberGrade) {
this.giftForm.memberGrade = res.data.result.memberGrade.split(','); //适用会员
} else {
......@@ -1004,12 +1016,22 @@ export default {
createCategory() {
this.addCateModal.dialogVisible = true;
},
handleChange() {
this.giftForm.memberGrade = [];
this.getMemberGradeList();
},
// 获取会员等级
getMemberGradeList() {
request.post('/api-integral-mall/load-grade').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result) {
this.memberGradeList = res.data.result;
this.cliqueStatus = res.data.result.cliqueGrade ? true : false;
if (this.giftForm.gradeType === 1) {
//品牌卡
this.memberGradeList = res.data.result.enterpriseGrade || [];
} else if (this.giftForm.gradeType === 2) {
this.memberGradeList = res.data.result.cliqueGrade || [];
}
} else {
this.memberGradeList = [];
}
......@@ -1476,6 +1498,7 @@ export default {
cardType: this.giftForm.changeType === 1 ? this.giftForm.cardType : '', //卡券类型
proCategoryId: this.giftForm.proCategoryId, //礼品分类
detailDescription: this.giftForm.detailDescription, //图文详情
gradeType: this.giftForm.gradeType,
memberGrade: this.giftForm.memberGrade.join(','), //适用会员
showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店
storeIds: '', //展现门店id
......
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