Skip to content

I
integral-mall
Commit f320e7ab by damodmg
Options

更新门店组件

parent ac20ff52
Showing with 35 additions and 20 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.e6c9d22556f9e2442d187ec674b32414.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.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.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.1b6ca504fd6fbb2ffebb.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.4a3cfb4187c6f303e65820676470e7a0.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.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.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.50c1d49b9411017df3a5.js></script></body></html>
\ No newline at end of file
dist/static/js/app.1b6ca504fd6fbb2ffebb.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.50c1d49b9411017df3a5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -17,9 +17,9 @@
<script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
<!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.18.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.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.00.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.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.03.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js"></script>
......
src/views/goods/coupon/info.vue
......@@ -231,6 +231,12 @@ export default {
};
},
created() {
let val = {
storeType: 0,
storeGroupIds: '',
storeIds: []
};
this.getSelectGroupData(val);
this.mallProId = this.$route.query.giftId;
this.coupCardId = this.$route.query.coupCardId;
......@@ -238,7 +244,7 @@ export default {
this.getInfo();
}
this.getMemberGradeList(); //会员等级列表
this.getMemberGradeList(); //会员等级列表\
},
methods: {
refashData() {
......@@ -285,16 +291,17 @@ export default {
this.couponForm.memberGrade = [];
}
this.sendChildData.storeType = res.data.result.showStore;
this.sendChildData.storeType = res.data.result.showStore || 0;
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) {
this.sendChildData.storeIds = res.data.result.storeInfo;
// this.sendChildData.storeIds = res.data.result.storeIds.split(',').map(v => {
// return {
// storeIds: v
// };
// });
let list = [];
if (res.data.result.storeInfo) {
res.data.result.storeInfo.map(v => {
list.push(v);
});
}
this.sendChildData.storeIds = list;
}
this.getSelectGroupData(this.sendChildData);
//限兑
......
src/views/goods/gift/info.vue
......@@ -377,6 +377,13 @@ export default {
this.getInfo();
this.editChangeTypeStatus = true;
}
let val = {
storeType: 0,
storeGroupIds: '',
storeIds: []
};
this.getSelectGroupData(val);
},
mounted: function() {
this.$nextTick(function() {
......@@ -549,12 +556,13 @@ export default {
if (this.sendChildData.storeType === 1) {
this.sendChildData.storeGroupIds = res.data.result.storeGroupIds;
} else if (this.sendChildData.storeType === 2) {
// this.sendChildData.storeIds = res.data.result.storeIds.split(',').map(v => {
// return {
// storeIds: v
// };
// });
this.sendChildData.storeIds = res.data.result.storeInfo;
let list = [];
if (res.data.result.storeInfo) {
res.data.result.storeInfo.map(v => {
list.push(v);
});
}
this.sendChildData.storeIds = list;
}
this.getSelectGroupData(this.sendChildData);
//显示状态
......
src/views/order/deliverInfo.vue
......@@ -122,6 +122,7 @@ export default {
return item.logisticsCompanyId === value;
}).logisticsCompanyCode;
this.logisticsCompanyCode = code;
if (code === 'QITA') {
this.otherLogistics = true;
} else {
......
src/views/order/giftExchange.vue
......@@ -421,7 +421,6 @@ export default {
this.deliverInfodModal.logisticsCompanyId = res.data.result.changeLog.logisticsCompanyId; //快递公司
this.deliverInfodModal.logisticsCompanyCode = res.data.result.changeLog.logisticsCompanyCode; //快递code
this.deliverInfodModal.courierNumber = res.data.result.changeLog.courierNumber; //快递单号
this.deliverInfodModal.otherLogisticsCompanyName = '';
this.deliverInfodModal.otherLogisticsCompanyName = ''; //快递单号
if (res.data.result.traces) {
this.deliverInfodModal.traces = res.data.result.traces; //物流信息
......
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