Skip to content

I
integral-mall
Commit a27a376f by damodmg
Options

更新老的门店组件2.0.08

parent 82d8fe6b
Showing with 45 additions and 15 deletions
dist/index.html
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {}); gio('init','8be12240a3749eab', {});
//custom page code begin here //custom page code begin here
//custom page code end here //custom page code end here
gio('send');</script><link href=./static/css/app.5ec343bc5a81fa51dbe8836c6e9f6dae.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.05.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 type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.c258a1eb4f4adca7b2bf.js></script></body></html> gio('send');</script><link href=./static/css/app.9ff2fb74ae1e3b8a69d331604ca1c587.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 type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.b5efec5e94d4f6160f89.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/app.b5efec5e94d4f6160f89.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.c258a1eb4f4adca7b2bf.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
...@@ -29,7 +29,7 @@ ...@@ -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/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/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/footer.2.0.02.js"></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.05.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/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/member-info.1.0.01.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.06.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.06.js"></script>
......
package.json
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
"friendly-errors-webpack-plugin": "^1.6.1", "friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"node-sass": "^4.12.0",
"onchange": "^5.2.0", "onchange": "^5.2.0",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0", "ora": "^1.2.0",
...@@ -65,6 +66,7 @@ ...@@ -65,6 +66,7 @@
"postcss-url": "^7.2.1", "postcss-url": "^7.2.1",
"prettier": "^1.16.4", "prettier": "^1.16.4",
"rimraf": "^2.6.0", "rimraf": "^2.6.0",
"sass-loader": "^8.0.0",
"semver": "^5.3.0", "semver": "^5.3.0",
"shelljs": "^0.7.6", "shelljs": "^0.7.6",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",
......
src/components/selectGoodsType.vue
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
}, },
methods: { methods: {
goAdd(type) { goAdd(type) {
this.$router.push({ name: 'giftInfo', query: { type: type, giftId: '-1', proReferId: '-1' } }); this.$router.push({ name: 'giftInfo', query: { type: type, giftId: '-1', proReferId: '-1', canEdit: true } });
}, },
cancel() { cancel() {
this.addModalData.dialogVisible = false; this.addModalData.dialogVisible = false;
......
src/views/goods/coupon/coupon.vue
...@@ -401,7 +401,7 @@ export default { ...@@ -401,7 +401,7 @@ export default {
}, },
// 新增礼品 // 新增礼品
addCoupon() { addCoupon() {
this.$router.push({ name: 'couponInfo', query: { giftId: '-1', coupCardId: '-1' } }); this.$router.push({ name: 'couponInfo', query: { giftId: '-1', coupCardId: '-1', canEdit: true } });
}, },
// 编辑 // 编辑
goAdd(item) { goAdd(item) {
......
src/views/goods/coupon/info.vue
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</div> </div>
</el-form-item> --> </el-form-item> -->
<el-form-item label="展现门店" required style="position:relative"> <el-form-item label="展现门店" required style="position:relative">
<vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage> <vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span> <span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span>
</el-form-item> </el-form-item>
...@@ -268,10 +268,11 @@ export default { ...@@ -268,10 +268,11 @@ export default {
memberGradeList: [], //会员等级 memberGradeList: [], //会员等级
// 门店控件 // 门店控件
sendChildData: { sendChildData: {
storeType: 0, storeType: 1,
storeGroupIds: '', storeGroupIds: '',
storeIds: [] storeIds: []
}, },
openFlag: false,
monthOptions: Array.from(Array(31), (v, k) => (k + 1).toString()), monthOptions: Array.from(Array(31), (v, k) => (k + 1).toString()),
weekOptions: ['1', '2', '3', '4', '5', '6', '7'], weekOptions: ['1', '2', '3', '4', '5', '6', '7'],
couponRules: { couponRules: {
...@@ -307,6 +308,7 @@ export default { ...@@ -307,6 +308,7 @@ export default {
}; };
}, },
created() { created() {
this.getOpenStatus();
window.onbeforeunload = function(e) { window.onbeforeunload = function(e) {
// var storage = window.localStorage; // var storage = window.localStorage;
// storage.clear('couponListObj'); // storage.clear('couponListObj');
...@@ -332,6 +334,18 @@ export default { ...@@ -332,6 +334,18 @@ export default {
refashData() { refashData() {
this.refash = !this.refash; this.refash = !this.refash;
}, },
getOpenStatus() {
request.post('/api-integral-mall/is-show-self ').then(res => {
if (res.data.errorCode === 0) {
this.openFlag = res.data.result.openFlag;
if (this.openFlag) {
this.sendChildData.storeType = 1;
}
} else {
this.$message.error(res.data.message);
}
});
},
// 获取会员等级 // 获取会员等级
getMemberGradeList() { getMemberGradeList() {
request.post('/api-integral-mall/load-grade').then(res => { request.post('/api-integral-mall/load-grade').then(res => {
...@@ -400,7 +414,7 @@ export default { ...@@ -400,7 +414,7 @@ export default {
} else { } else {
this.uploadStatus = true; this.uploadStatus = true;
} }
this.sendChildData.storeType = res.data.result.showStore || 0; this.sendChildData.storeType = Number(res.data.result.showStore);
if (this.sendChildData.storeType === 1) { if (this.sendChildData.storeType === 1) {
this.sendChildData.storeGroupIds = res.data.result.storeGroupIds || ''; this.sendChildData.storeGroupIds = res.data.result.storeGroupIds || '';
} else if (this.sendChildData.storeType === 2) { } else if (this.sendChildData.storeType === 2) {
...@@ -516,7 +530,7 @@ export default { ...@@ -516,7 +530,7 @@ export default {
// this.sendChildData.storeGroupIds = val.storeGroupIds || ''; // this.sendChildData.storeGroupIds = val.storeGroupIds || '';
// this.sendChildData.storeIds = val.storeIds || []; // this.sendChildData.storeIds = val.storeIds || [];
this.sendChildData = { this.sendChildData = {
storeType: val.storeType || 0, storeType: val.storeType || 1,
storeGroupIds: val.storeGroupIds || '', storeGroupIds: val.storeGroupIds || '',
storeIds: val.storeIds || [] storeIds: val.storeIds || []
}; };
......
src/views/goods/gift/info.vue
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</div> </div>
</el-form-item> --> </el-form-item> -->
<el-form-item label="展现门店" required style="position:relative"> <el-form-item label="展现门店" required style="position:relative">
<vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage> <vue-gic-store-linkage :disabled="isInfo" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span> <span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店，系统不会默认选中此新增门店，请重新确认选择并保存礼品</span>
</el-form-item> </el-form-item>
<el-form-item label="限兑"> <el-form-item label="限兑">
...@@ -395,10 +395,12 @@ export default { ...@@ -395,10 +395,12 @@ export default {
weekOptions: ['1', '2', '3', '4', '5', '6', '7'], weekOptions: ['1', '2', '3', '4', '5', '6', '7'],
// 门店控件 // 门店控件
sendChildData: { sendChildData: {
storeType: 0, storeType: 1,
storeGroupIds: '', storeGroupIds: '',
storeIds: [] storeIds: []
}, },
// sendChildData: {}, // 向子元素传递的对象
openFlag: true,
stockDisabled: false, //spu库存是否可输入 stockDisabled: false, //spu库存是否可输入
refash: false, refash: false,
giftProStandardJson: [], //规格列表 giftProStandardJson: [], //规格列表
...@@ -446,6 +448,7 @@ export default { ...@@ -446,6 +448,7 @@ export default {
}; };
}, },
created() { created() {
this.getOpenStatus();
window.onbeforeunload = function(e) { window.onbeforeunload = function(e) {
// var storage = window.localStorage; // var storage = window.localStorage;
// storage.clear('giftListObj'); // storage.clear('giftListObj');
...@@ -483,9 +486,7 @@ export default { ...@@ -483,9 +486,7 @@ export default {
this.mallProId === '-1'; this.mallProId === '-1';
} }
} }
// if (this.giftForm.changeType === 5) {
// this.refundTypeStatus = true;
// }
let val = { let val = {
storeType: 0, storeType: 0,
storeGroupIds: '', storeGroupIds: '',
...@@ -499,6 +500,19 @@ export default { ...@@ -499,6 +500,19 @@ export default {
}); });
}, },
methods: { methods: {
getOpenStatus() {
request.post('/api-integral-mall/is-show-self ').then(res => {
if (res.data.errorCode === 0) {
this.openFlag = res.data.result.openFlag;
if (this.openFlag) {
this.sendChildData.storeType = 1;
}
} else {
this.$message.error(res.data.message);
}
});
},
// 获取卡券详情 // 获取卡券详情
getCardInfo() { getCardInfo() {
let params = { let params = {
...@@ -688,7 +702,7 @@ export default { ...@@ -688,7 +702,7 @@ export default {
} }
this.giftForm.timeRangeList = timeRangeList; this.giftForm.timeRangeList = timeRangeList;
} }
this.sendChildData.storeType = res.data.result.showStore; this.sendChildData.storeType = Number(res.data.result.showStore);
if (this.sendChildData.storeType === 1) { if (this.sendChildData.storeType === 1) {
this.sendChildData.storeGroupIds = res.data.result.storeGroupIds; this.sendChildData.storeGroupIds = res.data.result.storeGroupIds;
......
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