Skip to content

I
integral-mall
Commit ffc16e11 by damodmg
Options

门店组件更新17

parent 406f380a
Showing with 64 additions and 20 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.ce6a7e3a23fad80aabb4e434126d023c.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.30.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.10.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.6d3ef3a2db522b1c552e.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.96ec0e0f509c52078f8bfe6bede1092b.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.30.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.17.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.ad18e2f83f1e47004eaa.js></script></body></html>
\ No newline at end of file
dist/static/js/app.6d3ef3a2db522b1c552e.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.ad18e2f83f1e47004eaa.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -29,7 +29,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.30.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.02.js"></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.10.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.17.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/member-info.1.0.01.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.06.js"></script>
......
src/router/index.js
......@@ -15,8 +15,8 @@ import orderDetail from '../views/order/orderDetail';
Vue.use(VueClipboard);
const router = new Router({
mode: 'history',
base: '/integral-mall',
// mode: 'history',
// base: '/integral-mall',
routes: [
{
path: '/',
......
src/views/goods/coupon/info.vue
......@@ -113,7 +113,7 @@
</div>
</el-form-item> -->
<el-form-item label="展现门店" required style="position:relative">
<vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" @getDisGroupList="getDisGroupList" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span>
</el-form-item>
......@@ -292,7 +292,8 @@ export default {
costValueStatus: true,
couponCardStock: '', //优惠券库存
couponStatus: false, //卡券状态
canEdit: true
canEdit: true,
groupIdDisableList: []
// 人群筛选器
// // 可传参数
// // projectName: 'integral-mall', // 当前项目名
......@@ -324,9 +325,10 @@ export default {
this.canEdit = Boolean(this.$route.query.canEdit);
this.coupCardId = this.$route.query.coupCardId;
if (this.mallProId !== '-1') {
this.getInfo();
}
// if (this.mallProId !== '-1') {
// // this.getInfo();
// this.getDisGroupList();
// }
this.getMemberGradeList(); //会员等级列表\
},
......@@ -346,6 +348,12 @@ export default {
}
});
},
getDisGroupList(arr) {
this.groupIdDisableList = arr;
if (this.mallProId !== '-1') {
this.getInfo();
}
},
// 获取会员等级
getMemberGradeList() {
request.post('/api-integral-mall/load-grade').then(res => {
......@@ -416,7 +424,17 @@ export default {
}
this.sendChildData.storeType = Number(res.data.result.showStore);
if (this.sendChildData.storeType === 1) {
this.sendChildData.storeGroupIds = res.data.result.storeGroupIds || '';
let arr = res.data.result.storeGroupIds.split(',');
for (let i = 0; i < arr.length; i++) {
if (this.groupIdDisableList.indexOf(arr[i]) !== -1) {
//存在
// console.log('不可删除的');
arr.splice(i, 1);
i--;
}
}
this.sendChildData.storeGroupIds = arr.join(',');
// this.sendChildData.storeGroupIds = res.data.result.storeGroupIds || '';
} else if (this.sendChildData.storeType === 2) {
let list = [];
if (res.data.result.storeInfo) {
......
src/views/goods/gift/info.vue
......@@ -127,7 +127,7 @@
</div>
</el-form-item> -->
<el-form-item label="展现门店" required style="position:relative">
<vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<vue-gic-store-linkage :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span>
</el-form-item>
<el-form-item label="限兑">
......@@ -431,8 +431,8 @@ export default {
integralMallProId: ''
},
textStock: 0, //文本券码库存数
canEdit: true
canEdit: true,
groupIdDisableList: []
// // 人群筛选器
// // 可传参数
// // projectName: 'integral-mall', // 当前项目名
......@@ -447,7 +447,7 @@ export default {
// responseParams: [] //回显的数据
};
},
created() {
mounted() {
this.getOpenStatus();
window.onbeforeunload = function(e) {
// var storage = window.localStorage;
......@@ -477,7 +477,12 @@ export default {
this.refundTypeStatus = this.giftForm.changeType === 5 ? true : false;
}
if (this.mallProId !== '-1') {
this.getInfo();
// setTimeout(() => {
// this.groupIdDisableList = this.$refs.selectTree.getDisGroupList;
// }, 1000);
// this.getDisGroupList();
// this.getInfo();
// this.getDisGroupList();
this.editChangeTypeStatus = true;
} else {
if (this.giftType === 0) {
......@@ -493,12 +498,16 @@ export default {
storeIds: []
};
this.getSelectGroupData(val);
},
mounted: function() {
this.$nextTick(function() {
window.addEventListener('scroll', this.onScroll, true);
});
},
// mounted: function() {
// this.$nextTick(function() {
// window.addEventListener('scroll', this.onScroll, true);
// });
// // this.getGroupList();
// },
methods: {
getOpenStatus() {
request.post('/api-integral-mall/is-show-self ').then(res => {
......@@ -513,6 +522,14 @@ export default {
}
});
},
getDisGroupList(arr) {
this.groupIdDisableList = arr;
if (this.mallProId !== '-1') {
this.getInfo();
}
},
// 获取卡券详情
getCardInfo() {
let params = {
......@@ -703,9 +720,17 @@ export default {
this.giftForm.timeRangeList = timeRangeList;
}
this.sendChildData.storeType = Number(res.data.result.showStore);
// console.log('获取子组件的值', this.groupIdDisableList);
if (this.sendChildData.storeType === 1) {
this.sendChildData.storeGroupIds = res.data.result.storeGroupIds;
let arr = res.data.result.storeGroupIds.split(',');
for (let i = 0; i < arr.length; i++) {
if (this.groupIdDisableList.indexOf(arr[i]) !== -1) {
//存在
arr.splice(i, 1);
i--;
}
}
this.sendChildData.storeGroupIds = arr.join(',');
} else if (this.sendChildData.storeType === 2) {
let list = [];
if (res.data.result.storeInfo) {
......@@ -844,6 +869,7 @@ export default {
getSpuStock(val) {
this.giftForm.virtualStock = val;
},
// 礼品字数限制
goodsLimit(value) {
this.$nextTick(() => {
......
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