Commit 45e1d4bd by crushh

udpate: dist

parent 9d2f2513
...@@ -85,5 +85,12 @@ module.exports = { ...@@ -85,5 +85,12 @@ module.exports = {
'^/haoban-app-aggregation-web/': '' '^/haoban-app-aggregation-web/': ''
} }
}, },
'/dmHbApi': {
target: 'https://haoban.gicdev.com',
changeOrigin: true,
pathRewrite: {
'^/dmHbApi': ''
}
},
} }
} }
...@@ -18,6 +18,7 @@ Vue.axios.defaults.withCredentials = true; // cookie访问 ...@@ -18,6 +18,7 @@ Vue.axios.defaults.withCredentials = true; // cookie访问
Vue.axios.defaults.headers.common['platform'] = 'haoban'; Vue.axios.defaults.headers.common['platform'] = 'haoban';
Vue.axios.defaults.timeout = 500000; Vue.axios.defaults.timeout = 500000;
let local = window.location.origin; let local = window.location.origin;
const userInfos = JSON.parse(sessionStorage.getItem('userInfos') || '{}'); const userInfos = JSON.parse(sessionStorage.getItem('userInfos') || '{}');
let gicHost = typeof userInfos.gicHost == 'string' ? userInfos.gicHost.replace(/\/$/, '') : ''; let gicHost = typeof userInfos.gicHost == 'string' ? userInfos.gicHost.replace(/\/$/, '') : '';
......
...@@ -17,11 +17,13 @@ ...@@ -17,11 +17,13 @@
<el-form-item label="链接描述" prop="remark"> <el-form-item label="链接描述" prop="remark">
<el-input placeholder="请输入链接描述" type="textarea" class="w-340" :maxlength="100" :autosize="{ minRow: 3, maxRow: 5 }" show-word-limit v-model="form.remark"></el-input> <el-input placeholder="请输入链接描述" type="textarea" class="w-340" :maxlength="100" :autosize="{ minRow: 3, maxRow: 5 }" show-word-limit v-model="form.remark"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="链接标签" required prop="memberLabelId"> <el-form-item label="链接标签" required prop="memberLabelId" class="memberTag-form-item">
<el-button plain v-if="!form.memberLabelId" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button> <el-button plain v-if="!form.memberLabelId" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
<el-tag v-else closable @close="handleTagCloseTag">{{ form.memberLabelName }}</el-tag> <el-tooltip :disabled="!isEdit || form.memberLabelStatus != 0" content="已删除" placement="top" v-else>
<el-tag closable @close="handleTagCloseTag" :type="isEdit && form.memberLabelStatus == 0 ? 'warning' : ''">{{ form.memberLabelName }}</el-tag>
</el-tooltip>
</el-form-item> </el-form-item>
<dm-memberTag-group :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group> <dm-memberTag-group isHb :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
</div> </div>
<dm-sub-title type="line">分配规则</dm-sub-title> <dm-sub-title type="line">分配规则</dm-sub-title>
<p class="tips-info"> <p class="tips-info">
...@@ -225,8 +227,6 @@ export default { ...@@ -225,8 +227,6 @@ export default {
}, },
mounted() { mounted() {
this.getList(); this.getList();
console.log('mounted');
console.log(this.form);
document.addEventListener('visibilitychange', () => { document.addEventListener('visibilitychange', () => {
if (document.visibilityState == 'visible') { if (document.visibilityState == 'visible') {
this.landingPage = { this.landingPage = {
...@@ -280,6 +280,7 @@ export default { ...@@ -280,6 +280,7 @@ export default {
const { tagItemId, tagItemName } = data; const { tagItemId, tagItemName } = data;
this.form.memberLabelName = tagItemName; this.form.memberLabelName = tagItemName;
this.form.memberLabelId = tagItemId; this.form.memberLabelId = tagItemId;
this.form.memberLabelStatus = 1;
}, },
handleTagCloseTag() { handleTagCloseTag() {
this.form.memberLabelName = ''; this.form.memberLabelName = '';
...@@ -327,6 +328,25 @@ export default { ...@@ -327,6 +328,25 @@ export default {
this.$message.error('请选择落地页模板'); this.$message.error('请选择落地页模板');
return; return;
} }
if (this.isEdit && this.form.memberLabelStatus == 0) {
this.$confirm('关联的标签在GIC中已被删除,无法统计和查看添加好友客户数据,为确保后续客户数据统计,请重新关联标签', '关联的标签已被删除,请重新关联标签', {
confirmButtonText: '选择标签',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
this.form.memberLabelId = '';
this.form.memberLabelName = '';
this.$refs.form.validateField('memberLabelId');
this.$nextTick(_ => {
const isError = document.getElementsByClassName('memberTag-form-item');
isError[0].scrollIntoView({
block: 'center',
behavior: 'smooth'
});
});
});
return;
}
const data = JSON.parse(JSON.stringify(this.form)); const data = JSON.parse(JSON.stringify(this.form));
data.storeRuleJson = JSON.stringify(data.storeRuleJson); data.storeRuleJson = JSON.stringify(data.storeRuleJson);
data.customRuleJson = JSON.stringify(data.customRuleJson); data.customRuleJson = JSON.stringify(data.customRuleJson);
......
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