Commit dcb560a6 by crushh

update: dist

parent 58b28a1a
...@@ -91,14 +91,14 @@ Vue.axios.interceptors.response.use( ...@@ -91,14 +91,14 @@ Vue.axios.interceptors.response.use(
return data; return data;
}, },
err => { err => {
// if (err.response.status == 502) { if (err.response.status == 502) {
// window.location.href = gicHost + '/gic-web/#/login?ishb=1'; window.location.href = gicHost + '/gic-web/#/login?ishb=1';
// Message.error({ message: '服务异常⊙﹏⊙∥' }); Message.error({ message: '服务异常⊙﹏⊙∥' });
// } }
// if (err.response.status != 403) { if (err.response.status != 403) {
// window.location.href = gicHost + '/gic-web/#/login?ishb=1'; window.location.href = gicHost + '/gic-web/#/login?ishb=1';
// Message.error({ message: '登录失效!' }); Message.error({ message: '登录失效!' });
// } }
return Promise.resolve(err); return Promise.resolve(err);
} }
); );
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</div> </div>
<dm-sub-title type="line">欢迎语设置</dm-sub-title> <dm-sub-title type="line">欢迎语设置</dm-sub-title>
<div class="section"> <div class="section">
<welcomeItem @getWelcomeId="getWelcomeId" :welcomeIdP="form.welcomeId" ref="welcomeItem" :welcomeType="link"></welcomeItem> <welcomeItem :welcomeId.sync="form.welcomeId" :welcomeType.sync="welcomeType" ref="welcomeItem" welcomeName="link"></welcomeItem>
</div> </div>
<dm-sub-title type="line">落地页配置</dm-sub-title> <dm-sub-title type="line">落地页配置</dm-sub-title>
<div class="section flex" style="margin-bottom: 40px;"> <div class="section flex" style="margin-bottom: 40px;">
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 20 pageSize: 20
}, },
link: 'link', welcomeType: 1,
landingLoading: false, landingLoading: false,
loading: false, loading: false,
landingData: [], landingData: [],
...@@ -178,10 +178,10 @@ export default { ...@@ -178,10 +178,10 @@ export default {
storeData: [], storeData: [],
form: { form: {
linkType: 1, linkType: 1,
memberLabelName: '', // memberLabelName: '',
memberLabelId: '', // memberLabelId: '',
// memberLabelName: '测试标签值名称重复- 温州青童时代店', memberLabelName: '测试标签值名称重复- 温州青童时代店',
// memberLabelId: 'edd3901afd1e418d93fdc3b50bb24784', memberLabelId: 'edd3901afd1e418d93fdc3b50bb24784',
storeList: [], storeList: [],
name: '', name: '',
pageId: '', pageId: '',
...@@ -275,10 +275,12 @@ export default { ...@@ -275,10 +275,12 @@ export default {
link.storeRuleJson = JSON.parse(link.storeRuleJson); link.storeRuleJson = JSON.parse(link.storeRuleJson);
link.storeList = link.storeList ? link.storeList : []; link.storeList = link.storeList ? link.storeList : [];
this.form = link; this.form = link;
if (!this.form.welcomeId) {
this.welcomeType = 2;
}
this.landingForm = page; this.landingForm = page;
this.getStoreList(); this.getStoreList();
} }
console.log(result);
}) })
.finally(_ => { .finally(_ => {
this.loading = false; this.loading = false;
...@@ -300,9 +302,7 @@ export default { ...@@ -300,9 +302,7 @@ export default {
this.form.storeList = val; this.form.storeList = val;
this.$refs.form.validateField('storeList'); this.$refs.form.validateField('storeList');
}, },
getWelcomeId(e) {
this.form.welcomeId = e;
},
getList() { getList() {
this.landingLoading = true; this.landingLoading = true;
guidePageList(this.landingPage) guidePageList(this.landingPage)
...@@ -360,6 +360,9 @@ export default { ...@@ -360,6 +360,9 @@ export default {
data.storeRuleJson = JSON.stringify(data.storeRuleJson); data.storeRuleJson = JSON.stringify(data.storeRuleJson);
data.customRuleJson = JSON.stringify(data.customRuleJson); data.customRuleJson = JSON.stringify(data.customRuleJson);
data.wxEnterpriseId = this.wxEnterpriseId; data.wxEnterpriseId = this.wxEnterpriseId;
if (this.welcomeType == 2) {
data.welcomeId = '';
}
delete data.memberLabelStatus; delete data.memberLabelStatus;
this.$refs.form.validate(val => { this.$refs.form.validate(val => {
if (!val) { if (!val) {
......
...@@ -92,11 +92,11 @@ const tableHead = [ ...@@ -92,11 +92,11 @@ const tableHead = [
}, },
{ {
label: '今日点击人次', label: '今日点击人次',
prop: 'clickNum', prop: 'clickTimes',
width: '130', width: '130',
sortable: 'custom', sortable: 'custom',
formatter: function(row) { formatter: function(row) {
return `<span>${row.clickNum ? row.clickNum : '- -'}</span>`; return `<span>${row.clickTimes ? row.clickTimes : '- -'}</span>`;
} }
}, },
{ {
......
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