Skip to content

M
memberTag-web
Commit c72888cf by caoyanzhi
Options

Merge branch 'feature/3月会员标签' into feature/4月-会员通 

# Conflicts:
#	src/view/manualTag/manual-tag-value-edit-info.vue
parents ab5ff3df bdff25f5
Showing with 44 additions and 30 deletions
src/components/Trash.vue
......@@ -18,7 +18,7 @@
</ul>
<span slot="footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="doClean" :disabled="delTime > 0 || !trashList.length">{{ delTime > 0 ? getDelTime() : '删除' }}</el-button>
<el-button type="primary" @click="doClean" :disabled="!trashList.length">{{ delTime > 0 ? getDelTime() : '删除' }}</el-button>
</span>
</el-dialog>
</div>
......@@ -79,7 +79,7 @@ export default {
return `倒计时: ${h}h:${m}min:${s}s`;
},
doClean() {
if (this.delTime) return;
if (this.delTime > 0) return this.$message.error('当前有正在删除的标签/标签值，删除完成后才能再次操作删除任务');
cleanTrashList().then(res => {
const { errorCode, message } = res;
if (errorCode != 1) return this.$message.error(message);
......
src/components/card/card.vue
......@@ -46,7 +46,7 @@
<!-- <el-button @click="refresh">刷新列表</el-button> -->
</div>
</div>
<div style="font-size:12px;color:#909399;line-height:30px;">* 仅能选择卡券模板投放期限有效的卡券</div>
<div style="font-size:12px;color:#909399;line-height:30px;background:#f7faff">* 仅能选择卡券模板投放期限有效的卡券</div>
<div class="pic-list-box">
<!-- @selection-change="handleSelectionChange" -->
<el-table
......
src/components/tag/tag-config-options.vue
......@@ -256,7 +256,7 @@
<div v-if="parent.templateCode == 'tag011'">
<div :key="'tag11' + pindex">
<template v-if="loadSelector">
<dm-store-selector :options="parent.uuidOptions" :creatorId="creatorId" :uuid.sync="parent.uuid" ref="storeNew" :isAdd="!parent.uuid" scenes="auth" />
<dm-store-selector :options="parent.uuidOptions" :creatorId="creatorId" :uuid.sync="parent.uuid" ref="storeNew" :isAdd="!parent.uuid" />
</template>
<!-- <vue-gic-store-new :options="parent.uuidOptions" :creatorId="creatorId" :uuid.sync="parent.uuid" ref="storeNew" :isAdd="!parent.uuid"> </vue-gic-store-new> -->
</div>
......@@ -944,8 +944,8 @@
end-placeholder="结束时间"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
:picker-options="openCardPickerOptions"
>
<!-- openCardPickerOptions -->
</el-date-picker>
<template v-if="parent.radioType">
<div class="tag030flex">
......@@ -2467,7 +2467,7 @@ export default {
&.all-select-options__city {
.el-checkbox-group {
max-height: 300px;
max-height: 200px;
overflow-y: auto;
}
}
......
src/request/api.js
......@@ -375,4 +375,14 @@ export const changeTagSort = (params = {}) =>
}
})
// 是否展示系统标签
export const isShowSystemTag = (params = {}) =>
request({
url: '/tagLevel/isShowTag',
method: 'get',
params: {
requestProject: 'gic-member-tag-web',
...params
}
})
src/view/manualTag/manualTagEdit.vue
......@@ -67,7 +67,7 @@ const validateTagValue = (rule, value, cb) => {
const validateTagSort = (rule, value, cb) => {
const res = /^[0-9]+$/;
if (!res.test(value) || value > 100000 || value < 1) {
cb(new Error('仅支持输入1-1-100000之间的整数'))
cb(new Error('仅支持输入1-100000之间的整数'))
}
cb();
}
......
src/view/memberGroup/edit-tag.vue
<template>
<div>
<!-- 添加标签、编辑标签 -->
<el-dialog :title="title" :visible.sync="showEditTagPop" top="10vh" width="600px" :before-close="handleClose" custom-class="edit-tag" :close-on-click-modal="false" append-to-body>
<el-dialog :title="title" :visible.sync="showEditTagPop" top="10vh" width="900px" :before-close="handleClose" custom-class="edit-tag" :close-on-click-modal="false" append-to-body>
<div class="dialog-box">
<div class="tag-info">
<p class="tag-name">
......@@ -11,9 +11,9 @@
<p class="tag-desc">{{ tagDataAssgin.tagDescribe }}</p>
</div>
<p v-if="tagId" class="m-t-20 m-b-20 tag-config">
<dm-sub-title text="标签值设置"/>
<span class="inline-block"><dm-sub-title text="标签值设置"/></span>
<el-tooltip v-if="tagDataAssgin.columnKey==='haobanWechatRelatedTime'||(Object.keys(tagDataAssgin).length&&tagDataAssgin.tagValue&&JSON.parse(tagDataAssgin.tagValue).val[0].data.key==='haobanWechatRelatedTime')" popper-class="edit-tag-tooltip" placement="top" open-delay="100" effect="light"
><div slot="content"><span style="font-weight:600">固定时段：</span>在所选时间段内与关联了好办导购账号的企微员工成为好友的；<br/><span style="font-weight:600">相对时段：</span>在“标签统计时间”（每天凌晨计算统计一次）的前X天/月/年与某员工成为好友的。例：选择相对时段为“最近2天”，那么系统在5号凌晨进行统计时，统计的是在3号、4号与某员工成为企微好友的用户；系统在6号凌晨统计时，统计的是在4号、5号与某员工成为企微好友的客户；</div><i class="iconfont icon-tishi"></i></el-tooltip></p>
><div slot="content"><span style="font-weight:600">固定时段：</span>在所选时间段内与关联了好办导购账号的企微员工成为好友的；<br/><span style="font-weight:600">相对时段：</span>在“标签统计时间”（每天凌晨计算统计一次）的前X天/月/年与某员工成为好友的。例：选择相对时段为“最近2天”，那么系统在5号凌晨进行统计时，统计的是在3号、4号与某员工成为企微好友的用户；系统在6号凌晨统计时，统计的是在4号、5号与某员工成为企微好友的客户；</div><i class="iconfont icon-QuestionCircleOutlined"></i></el-tooltip></p>
<!-- 所有标签的配置项 -->
<div class="tag-config-options">
<tag-config-options v-if="isAddFlag" :creatorId="creatorId" :tagId="tagDataAssgin.tagId" :columnKey="tagDataAssgin.columnKey" ref="tagConfig" :templateDataList="templateObj" @returnTagData="returnTagData"></tag-config-options>
......@@ -101,7 +101,7 @@ export default {
<style lang="less" scoped>
.dialog-box {
.tag-info {
background: #f2f3f5;
background: #f7f8fa;
padding: 16px;
.tag-name {
display: flex;
......@@ -146,7 +146,7 @@ export default {
}
.tag-config-options {
max-height: 50vh;
// overflow-y: auto;
overflow-y: auto;
}
.tag-value {
margin-top: 10px;
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -123,7 +123,7 @@
</template>
<!-- 状态 -->
<template v-if="item.code == 'status'">
<template v-if="!Array.isArray(scope.row.memberSources) || scope.row.memberSources.filter(el => el.highlight != 0).length == 0">--</template>
<template v-if="!Array.isArray(scope.row.memberSources) || scope.row.memberSources.filter(el => el.highlight == 1 || el.highlight == 2).length == 0">--</template>
<template v-else>
<!-- 1100：公众号 1600：小程序 1700：企业微信 1303：微盟 1302：天猫会员通 -->
<span class="channel-box" v-for="channel in (scope.row.memberSources || []).filter(el => el.highlight == 1 || el.highlight == 2)" :key="channel.parentSourceCode">
......
src/view/platformTag/member-tag.vue
......@@ -4,9 +4,9 @@
<div class="member-box">
<div class="flex">
<el-tabs v-model="activeTag" @tab-click="handleClick">
<el-tab-pane label="系统标签" name="system"></el-tab-pane>
<el-tab-pane label="活动标签" name="active"></el-tab-pane>
<el-tab-pane label="系统标签" name="system" v-if="isShowSystem"></el-tab-pane>
<el-tab-pane label="手工标签" name="manual"></el-tab-pane>
<el-tab-pane label="活动标签" name="active"></el-tab-pane>
</el-tabs>
<a href="https://www.yuque.com/exnmlu/hpbb1c/cz27hs" target="_blank" class="help-doc">查看帮助文档</a>
</div>
......@@ -19,7 +19,7 @@
<div class="tag-all">
<p class="tag-name">
<span class="sub-title"><dm-sub-title :text="showSearchResult ? `【${tagName}】搜索结果` : tagName"/></span>
<span class="sub-title"></span>
<el-button
type="primary"
class="add-newtag"
......@@ -40,7 +40,7 @@
class="add-newtag"
placeholder="请输入标签名称"
prefix-icon="el-icon-search"
style="width: 260px"
style="width: 260px;float: left;margin-left: 0"
v-model="memberTag"
@keyup.native.enter="searchMemberList"
@clear="allTagList"
......@@ -208,7 +208,7 @@ import TagContainer from './tag-container';
import TagContainerSystem from './tag-container-system';
import TagContainerActive from './tag-container-active';
import ManualTagEdit from '../manualTag/manualTagEdit';
import { getMemberTag, getMemberTagList, addNewGroup, memberGroupList, groupCount, getMemberTagGradeEnsure, isAutomaticSync } from '@/request/api';
import { getMemberTag, getMemberTagList, addNewGroup, memberGroupList, groupCount, getMemberTagGradeEnsure, isAutomaticSync, isShowSystemTag } from '@/request/api';
import EditTag from '../memberGroup/edit-tag';
import Trash from '@/components/Trash.vue';
import { parseTime } from '@/utils';
......@@ -363,7 +363,8 @@ export default {
weimId: ['3d11ac15963b4c0790762e6147ea9315', '5bdac971673b4f40a9af981e3c9215bf'],
isSync: false, // 是否开启自动同步开关
activeTag: 'system',
manualOrderBy: -1
manualOrderBy: -1,
isShowSystem: true
};
},
computed: {
......@@ -757,6 +758,7 @@ export default {
},
// 点击活动标签、手工标签
handleClick() {
this.params.pageNum = 1;
this.memberTag = '';
const { activeTag, tagList, allTagList, handleFristTag } = this;
if (activeTag === 'system') {
......@@ -776,10 +778,16 @@ export default {
remoteSort(prop, order) {
this.manualOrderBy = order == 'descending' ? 0 : 1;
this.loadMemberTagList(this.params);
},
getShowSystem() {
return isShowSystemTag().then(res => {
this.isShowSystem = res.result;
if(!res.result) this.activeTag='manual';
})
}
},
beforeMount() {
async beforeMount() {
this._groupCount();
// 一二三级都需要一个变量来保存自己的信息 在切换页码和数量的时候也要传参数过去
this.middleWareVariable = {};
......@@ -824,6 +832,7 @@ export default {
this.loadMemberTagList(this.params);
this.$store.commit('modiftTagName', '我的用户');
}
this.getShowSystem()
},
mounted() {
this.$on('refersh-member-list', () => {
......@@ -939,6 +948,7 @@ export default {
padding-bottom: 40px;
overflow-y: auto;
.tag-name {
overflow: hidden;
line-height: 34px;
padding: 20px;
font-size: 16px;
......@@ -951,7 +961,6 @@ export default {
}
.add-newtag {
float: right;
margin-bottom: 10px;
margin-left: 15px;
}
}
......
src/view/platformTag/second-tag.vue
......@@ -14,7 +14,7 @@
</el-tooltip>
</span>
<i class="arrow-line iconfont icon-next-" v-if="!isOtherTag"></i>
<template v-if="tagName === '手工标签' && tagList.id !== '3d11ac15963b4c0790762e6147ea9315'">
<template v-if="(['手工标签', '活动标签'].includes(tagName))&& tagList.id !== '3d11ac15963b4c0790762e6147ea9315'">
<el-popover placement="bottom" width="30" trigger="click" v-if="getCode('add') || getCode('edit')">
<li class="more" @click="addNewType" :limit-code="getCode('add')" v-if="getCodeAuth('add')">新增子分类</li>
<li class="more" @click="handleEditType" :limit-code="getCode('edit')" v-if="getCodeAuth('edit')">编辑子分类</li>
......
src/view/platformTag/tag-container-active.vue
......@@ -179,6 +179,7 @@ export default {
cursor: pointer;
color: #303133;
transition: all .3s;
color: #2f54eb;
&:hover {
transform: scale(1.25);
}
......
src/view/platformTag/tag-container-system.vue
......@@ -124,6 +124,7 @@ export default {
cursor: pointer;
color: #303133;
transition: all 0.3s;
color: #2f54eb;
&:hover {
transform: scale(1.25);
}
......@@ -142,13 +143,5 @@ export default {
text-align: center;
line-height: 22px;
font-size: 12px;
&.keep-active {
background: #dee3fc;
color: #2f54eb;
}
&.no-active {
background: #feecda;
color: #fa8c16;
}
}
</style>
src/view/platformTag/tag-container.vue
......@@ -236,6 +236,7 @@ export default {
font-size: 16px;
cursor: pointer;
transition: all .3s;
color: #2f54eb;
&:hover {
transform: scale(1.25);
}
......
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