Skip to content

I
integral-mall
Commit 2d7eed2e by damodmg
Options

更新

parent a77e8aa5
Showing with 16 additions and 12 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.f071e749698379d699b7320056cdda86.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.11.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.35.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.11.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.a24fd848c0eab01dea1f.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.218bad300401d9b86ec8c4483025b84d.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.11.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.35.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.11.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.3985c73114ec56dcbf93.js></script></body></html>
\ No newline at end of file
dist/static/js/app.3985c73114ec56dcbf93.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.a24fd848c0eab01dea1f.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/info.vue
......@@ -7,10 +7,10 @@
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>商品</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/gift' }">礼品</el-breadcrumb-item>
<el-breadcrumb-item>{{ mallProId === '-1' ? '新建' : '编辑' }}礼品</el-breadcrumb-item>
<el-breadcrumb-item>{{ giftId === '-1' ? '新建' : '编辑' }}礼品</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>{{ mallProId === '-1' ? '新建' : '编辑' }}礼品</span>
<span>{{ giftId === '-1' ? '新建' : '编辑' }}礼品</span>
</h3>
</div>
<div class="section">
......@@ -205,7 +205,7 @@
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;display: inline-block;vertical-align: middle;">公众号积分商城不支持此功能，小程序积分商城请升级至V3.1.1及以上版本</span>
</el-checkbox-group>
</el-form-item>
<el-form-item label="配送方式" required v-if="giftType !== 1" prop="changeType">
<el-form-item label="配送方式" v-if="giftType !== 1" prop="changeType">
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="3"
>在线发货
......@@ -226,10 +226,10 @@
</el-form-item>
<div class="section-content1" v-show="giftForm.changeType === 1">
<h3>选择卡券</h3>
<el-form-item label="选择卡券" required v-show="mallProId === '-1'" style="margin-bottom:66px;">
<el-form-item label="选择卡券" required v-show="giftId === '-1'" style="margin-bottom:66px;">
<el-button plain @click="showCard">添加卡券</el-button>
</el-form-item>
<el-form-item label="选择卡券" required v-show="mallProId !== '-1'"> </el-form-item>
<el-form-item label="选择卡券" required v-show="giftId !== '-1'"> </el-form-item>
<el-table :data="cardList" style="width: 900px;margin-left:170px;margin-top:-44px;" v-show="cardList.length > 0">
<el-table-column label="卡券名称" prop="cardName"> </el-table-column>
<el-table-column label="有效期" prop="limitDay">
......@@ -331,6 +331,7 @@ export default {
projectName: 'integral-mall',
giftType: '', //礼品类型
mallProId: '', //礼品id
giftId: '', //礼品Id
linkIndex: 0,
giftForm: {
proReferId: '', //礼品关联id
......@@ -375,7 +376,8 @@ export default {
exchangeDateDayArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
exchangeDateWeekArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
limitTimeBegin: [{ required: true, message: '请选择时间', trigger: 'change' }],
changeTypeList: [{ type: 'array', required: true, message: '请至少选择一个配送方式', trigger: 'change' }]
changeTypeList: [{ type: 'array', required: true, message: '请至少选择一个配送方式', trigger: 'change' }],
changeType: [{ required: true, message: '请选择一个配送方式', trigger: 'change' }]
},
refundTypeStatus: false,
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
......@@ -463,6 +465,7 @@ export default {
};
this.giftType = Number(this.$route.query.type); //列表上实物是1虚拟是0
this.canEdit = Boolean(this.$route.query.canEdit);
this.giftId = this.$route.query.giftId;
this.mallProId = this.$route.query.giftId;
if (this.$route.query.proReferId !== '-1') {
//编辑
......@@ -483,7 +486,7 @@ export default {
this.stockDisabled = this.giftForm.changeType === 5 ? true : false;
this.refundTypeStatus = this.giftForm.changeType === 5 ? true : false;
}
if (this.mallProId !== '-1') {
if (this.giftId !== '-1') {
// setTimeout(() => {
// this.groupIdDisableList = this.$refs.selectTree.getDisGroupList;
// }, 1000);
......@@ -533,7 +536,8 @@ export default {
getDisGroupList(arr) {
this.groupIdDisableList = arr;
if (this.mallProId !== '-1') {
// console.log(this.mallProId);
if (this.giftId !== '-1') {
this.getInfo();
}
},
......@@ -644,7 +648,7 @@ export default {
// 获取详情
getInfo() {
let params = {
integralMallProId: this.mallProId
integralMallProId: this.giftId
};
request.post('/api-integral-mall/get-integral-mall-pro', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
......@@ -1458,7 +1462,7 @@ export default {
this.$refs[form].validate(valid => {
if (valid) {
let params = {
integralMallProId: this.mallProId === '-1' ? '' : this.mallProId, //礼品id
integralMallProId: this.giftId === '-1' ? '' : this.mallProId, //礼品id
proType: this.giftForm.changeType === 1 ? 2 : 3, //发货方式是微信兑换券传2其他传3
giftType: this.giftType === 0 ? 0 : 1, //0、虚拟 1、实物
proName: this.giftForm.proName.trim(), //礼品名称
......
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