Commit fc2a7f24 by huaying

fix: 客户分组,域名修改

parent 47d535b7
......@@ -21,7 +21,7 @@
(function() {
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()
</script>
......
......@@ -141,7 +141,7 @@ export default {
if (res.errorCode == 0) {
console.log(res.result)
const { result} = res.result;
this.groupList = result.filter(el => el.classifyName != '未分类').map(item => ({
this.groupList = result.filter(el => el.classifyName != '未分类' && el.classifyName != null).map(item => ({
...item,
edit: false
}));
......
......@@ -197,7 +197,7 @@ export default {
methods: {
// 导出标签值
importTagValue() {
// window.open(`http://gicdev.demogic.com/gic-member-tag-web/memberTag/exportMemberTag?requestProject=member-tag&tagId=${this.$route.query.tagId}&tagName=${this.$route.query.tagName}`);
// window.open(`http://www.gicdev.com/gic-member-tag-web/memberTag/exportMemberTag?requestProject=member-tag&tagId=${this.$route.query.tagId}&tagName=${this.$route.query.tagName}`);
// return
const paras = {
tagId: this.$route.query.tagId,
......
......@@ -23,7 +23,7 @@
</ul>
<p v-if="searchTip" class="searchTip">没有找到和“{{ listsParams.classifyName }}”相关的内容</p>
<div v-if="$getButtonLimit($buttonCode.memberTagAddCateGory) && activeType == 1" class="add-category">
<el-button @click="editDialog.visible = true" :limit-code="$buttonCode.memberTagAddCateGory" type="primary" class="ghost-btn add-group" v-if="lists.length > 1">新增分类</el-button>
<el-button @click="editDialog.visible = true" :limit-code="$buttonCode.memberTagAddCateGory" type="primary" class="ghost-btn add-group" v-if="addType">新增分类</el-button>
</div>
<!--编辑分类-->
<el-dialog :title="editDialog.list.memberTagGroupClassifyId ? '编辑分类' : '新增分类'" :visible.sync="editDialog.visible" width="600px" top="30vh" :close-on-click-modal="false" @close="closeEditGroup">
......@@ -66,8 +66,8 @@ export default {
classifyName: '',
list: {}
},
memberGroupLoading: false
memberGroupLoading: false,
addType: true
};
},
......@@ -215,9 +215,13 @@ export default {
const { result, totalPage } = res.result || {};
if (this.listsParams.classifyName == '') {
this.searchTip = false;
this.addType = true;
} else if (this.listsParams.classifyName != '') {
this.addType = false;
if (result.length <= 0) {
this.searchTip = true;
}else {
this.searchTip = false;
}
}
if (pageNum == 1) {
......@@ -251,7 +255,7 @@ export default {
} else if (newVal == 3) {
this.$emit('second-list', 'allLevel');
}
}
},
}
};
</script>
......
......@@ -660,6 +660,7 @@ export default {
// 获取一个标签分类下面的标签数据
getTagsGroupList() {
const tagType = this.activeTag == 'system' ? 0 : this.activeTag == 'manual' ? 1 : 2;
console.log(this.searchData, 'this.searchData');
const params = {
requestProject: 'gic-member-tag-web',
search: this.searchData || null, // 模糊查询的标签名
......
......@@ -1072,6 +1072,7 @@ export default {
return false;
} else {
this.operateNumber = val;
console.log(val, 'val');
this.batchVisiable = true;
}
},
......
......@@ -605,6 +605,7 @@ export default {
},
async loadMemberTagList(opt) {
console.log(opt.searchName, 'opt.searchName');
const tagType = this.activeTag == 'active' ? '2' : this.activeTag == 'manual' ? '1' : '0';
try {
const params = {
......
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