Skip to content

I
integral-mall
Commit ac20ff52 by damodmg
Options

解决门店控件问题

parent 33a72ec3
Showing with 55 additions and 14 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.4a17988d23d4b77e142786a769878820.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.8be859c6e96b08abcceb.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.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
dist/static/js/app.1b6ca504fd6fbb2ffebb.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.8be859c6e96b08abcceb.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main.js
......@@ -15,6 +15,8 @@ import './assets/theme/index.css';
import '../static/fonts/iconfont.js';
Vue.use(ElementUI);
Vue.use(VueAxios, axios);
// import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage';
// Vue.use(vueGicStoreLinkage);
Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
Vue.config.productionTip = false;
......
src/views/goods/coupon/info.vue
......@@ -285,6 +285,18 @@ export default {
this.couponForm.memberGrade = [];
}
this.sendChildData.storeType = res.data.result.showStore;
if (this.sendChildData.storeType === 1) {
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
// };
// });
}
this.getSelectGroupData(this.sendChildData);
//限兑
if (res.data.result.limitTimes === -1) {
this.couponForm.limitTimesStatus = false;
......@@ -372,9 +384,14 @@ export default {
},
//门店分类回执方法
getSelectGroupData(val) {
this.sendChildData.storeType = val.storeType || 0;
this.sendChildData.storeGroupIds = val.storeGroupIds || '';
this.sendChildData.storeIds = val.storeIds || [];
// this.sendChildData.storeType = val.storeType || 0;
// this.sendChildData.storeGroupIds = val.storeGroupIds || '';
// this.sendChildData.storeIds = val.storeIds || [];
this.sendChildData = {
storeType: val.storeType || 0,
storeGroupIds: val.storeGroupIds || '',
storeIds: val.storeIds || []
};
},
// 显示卡券弹窗
showCard() {
......
src/views/goods/gift/info.vue
......@@ -544,6 +544,19 @@ export default {
}
this.giftForm.timeRangeList = timeRangeList;
}
this.sendChildData.storeType = res.data.result.showStore;
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;
}
this.getSelectGroupData(this.sendChildData);
//显示状态
this.giftForm.proShowStatus = res.data.result.proShowStatus;
//上架时间
......@@ -591,8 +604,8 @@ export default {
if (res.data.result.skuJsonList) {
for (let item of JSON.parse(res.data.result.skuJsonList[0].giftPropValues)) {
this.skuHeaderList.push({
propName: item.standardName,
propId: item.standardId
proName: item.proName,
proId: item.proId
});
}
}
......@@ -780,9 +793,14 @@ export default {
},
//门店分类回执方法
getSelectGroupData(val) {
this.sendChildData.storeType = val.storeType || 0;
this.sendChildData.storeGroupIds = val.storeGroupIds || '';
this.sendChildData.storeIds = val.storeIds || [];
// this.sendChildData.storeType = val.storeType || 0;
// this.sendChildData.storeGroupIds = val.storeGroupIds || '';
// this.sendChildData.storeIds = val.storeIds || [];
this.sendChildData = {
storeType: val.storeType || 0,
storeGroupIds: val.storeGroupIds || '',
storeIds: val.storeIds || []
};
},
// 图片上传
// 上传图片前
......@@ -902,8 +920,8 @@ export default {
this.skuHeaderList = [];
for (let item of this.giftProStandardJson) {
this.skuHeaderList.push({
propName: item.standardName,
propId: item.standardId
proName: item.standardName,
proId: item.standardId
});
}
if (this.giftProStandardJson.length <= 0) {
......@@ -914,6 +932,7 @@ export default {
},
getSkuList(val) {
this.skuList = val;
// return;
this.handleSku();
if (this.giftProStandardJson.length > 0) {
if (this.skuList.length > 0) {
......@@ -946,12 +965,15 @@ export default {
// console.log(333, outArr);
outArr1 = outArr.splice(outArr.length - 6, 6);
for (let k in outArr) {
outArr[k].proName = skuArr[0][k].proName;
outArr[k].proId = skuArr[0][k].proId;
outArr[k].proName = this.skuHeaderList[k].proName;
outArr[k].proId = this.skuHeaderList[k].proId;
// outArr[k].proName = skuArr[0][k].proName;
// outArr[k].proId = skuArr[0][k].proId;
}
skuSta.push(outArr);
skuPrice.push(outArr1);
}
// console.log()
}
// return false;
this.submitSkuJson = [];
......
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