Skip to content

M
memberTag-web
Commit e4fb9011 by caoyanzhi
Options

Merge branch 'feature/微盟权限控制' into 'master' 

Feature/微盟权限控制

See merge request !25
parents 1d188db6 8d3b07c0
Showing with 20 additions and 13 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.811d677c0b9b2fbf9d3bce246c0884f8.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.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-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.078649c7dae9158c058a.js></script><script type=text/javascript src=./static/js/vendor.ef3a75f3bbf430dacbb6.js></script><script type=text/javascript src=./static/js/app.75184f1dbb4afaf5e201.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.6bf7b7e7e4b04f59de60495b428578cf.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.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-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.8f5830b7ca0dc7b89384.js></script><script type=text/javascript src=./static/js/vendor.ef3a75f3bbf430dacbb6.js></script><script type=text/javascript src=./static/js/app.75184f1dbb4afaf5e201.js></script></body></html>
\ No newline at end of file
dist/static/js/0.91cbee6dd36df6c020b8.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.a7a7f4ae74e5efc3cdac.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.d90ced7ebedb6550da74.js → dist/static/js/2.0edcb35a883d4e946a66.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.078649c7dae9158c058a.js → dist/static/js/manifest.8f5830b7ca0dc7b89384.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={35:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"a7a7f4ae74e5efc3cdac",1:"8c70f0cb13618f18a13c",2:"d90ced7ebedb6550da74",3:"42bd10d121e1926b261c",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"0a0b05053c05de09cbe1",7:"a3de6e99972868700eeb",8:"52f385701244b6096300",9:"e611ead9d5f383177972",10:"4d21b3886413df436f13",11:"1f03e3ab23d0dc69df7a",12:"2c8b2a5bf5a744e3db15",13:"cf60e659a31b615c5ce4",14:"e1a80e4a4532c4e8be53",15:"dfc5a96030093c1ed00b",16:"0d04608b2f40775007aa",17:"793285aebe33c6cfc9d0",18:"b56c9a4ae3fb5c2ff116",19:"4ed3c0524c55a7705ec5",20:"ff4bd7e2a636521cba02",21:"8a6af65d31e07f05f60b",22:"a30b9dbfe469da4a5830",23:"cc37b778686574aec82d",24:"996db5330fea43229fdf",25:"30f87ad2f1079650b1bc",26:"a2c10f5bafd0a7aeddd8",27:"c12eb8f712389d519826",28:"902a4f428b0383037593",29:"82810bb45021ba93543e",30:"a24f03c1e1e1adb42779",31:"4368b6f52dbc4175ffdc",32:"4810ffec77506f40440c"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={35:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"91cbee6dd36df6c020b8",1:"8c70f0cb13618f18a13c",2:"0edcb35a883d4e946a66",3:"a78a90bb29ef9a706b06",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"0a0b05053c05de09cbe1",7:"a3de6e99972868700eeb",8:"52f385701244b6096300",9:"e611ead9d5f383177972",10:"4d21b3886413df436f13",11:"1f03e3ab23d0dc69df7a",12:"2c8b2a5bf5a744e3db15",13:"cf60e659a31b615c5ce4",14:"e1a80e4a4532c4e8be53",15:"dfc5a96030093c1ed00b",16:"0d04608b2f40775007aa",17:"793285aebe33c6cfc9d0",18:"b56c9a4ae3fb5c2ff116",19:"4ed3c0524c55a7705ec5",20:"ff4bd7e2a636521cba02",21:"8a6af65d31e07f05f60b",22:"a30b9dbfe469da4a5830",23:"cc37b778686574aec82d",24:"996db5330fea43229fdf",25:"30f87ad2f1079650b1bc",26:"a2c10f5bafd0a7aeddd8",27:"c12eb8f712389d519826",28:"902a4f428b0383037593",29:"82810bb45021ba93543e",30:"a24f03c1e1e1adb42779",31:"4368b6f52dbc4175ffdc",32:"4810ffec77506f40440c"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/view/manualTag/manual-tag-value-edit.vue
......@@ -45,7 +45,7 @@
</template>
<!-- 删除的初始状态 -->
<template v-else>
<el-popover placement="top" width="300" trigger="click" v-model="scope.row.showDelPopOver">
<el-popover placement="top" width="300" trigger="click" v-model="scope.row.showDelPopOver" v-if="!scope.row.isWeimob">
<p>选择删除后，请去批处理一键清除所有标签值。</p>
<div style="text-align: right; margin: 5px 0 0 0;">
<el-button type="text" size="mini" @click.native="scope.row.showDelPopOver = false">取消</el-button>
......@@ -58,7 +58,7 @@
</template>
</template>
</el-table-column>
<div class="add-tag" slot="append">
<div class="add-tag" slot="append" v-if="isShowAdd">
<div class="add-tag-btn" @click="addTagValPop.isShow = true">
<i class="iconfont icon-icon02"></i>
添加标签值
......@@ -195,7 +195,8 @@ export default {
animationPos: {
x: 1000,
y: 500
}
},
isShowAdd: true,
};
},
computed: {
......@@ -351,6 +352,7 @@ export default {
}
});
this.tagValTableData = result;
if (result.some(v => v.isWeimob)) this.isShowAdd = false;
this.handleRefreshTag();
return;
}
......
src/view/platformTag/member-tag.vue
......@@ -21,12 +21,12 @@
<p class="tag-name">
<!--{{ tagName }}-->
{{showSearchResult ? `【${tagName}】搜索结果` : tagName}}
<el-button type="primary" class="add-newtag" @click="editHandTag()" v-show="handTag == 1">新增标签</el-button>
<el-button type="primary" class="add-newtag" @click="editHandTag()" v-show="handTag == 1 && !weimId.includes(groupId || params.id)">新增标签</el-button>
<a href="http://demogic.udesk.cn/hc/articles/221271?api_name=&preview=true&preview_as_role=admin&theme_id=18093" target="_blank" class="help-doc">查看帮助文档</a>
</p>
<p class="tips" v-if="tagName == '金字塔会员分层' && !memberTagGradeEnsure">暂未开通金字塔分层功能，无法使用该标签，可以联系达摩项目经理进行开通！</p>
<tag-container @deleteHandTag="deleteHandTag" :data="memberTagList" :handTag="handTag" :groupId="groupId" :refersh="refershList" @addTag="selectedTag" @editHandTag="editHandTag" ref="tagContainer" />
<tag-container @deleteHandTag="deleteHandTag" :data="memberTagList" :handTag="handTag" :groupId="groupId" :refersh="refershList" @addTag="selectedTag" @editHandTag="editHandTag" ref="tagContainer" :isWeim="weimId.includes(groupId || params.id)" />
<div class="page-box" v-if="total > 0">
<dm-pagination
......@@ -302,6 +302,7 @@ export default {
tagTwoLevelGroupId: ''
},
memberTagGradeEnsure: true, // 是否开启会员分层
weimId: [ '3d11ac15963b4c0790762e6147ea9315', '5bdac971673b4f40a9af981e3c9215bf' ]
};
},
......
src/view/platformTag/second-tag.vue
......@@ -2,12 +2,15 @@
<div class="second">
<span class="name" :class="{ 'manual-name': tagName === '手工标签', 'light-active': tagList.name === tagRealName }" @click="handleSecondtag(tagList)">
<span>{{ tagList.name }}</span>
<el-tooltip content="请去微盟后台创建标签，且仅同步微盟多选项标签" v-if="tagList.id === '3d11ac15963b4c0790762e6147ea9315'">
<i class="el-icon-info"></i>
</el-tooltip>
</span>
<i class="arrow-line iconfont icon-next-" v-if="tagName !== '手工标签'"></i>
<el-popover placement="bottom" width="30" trigger="click">
<li class="more" @click="addNewType">新增子分类</li>
<li class="more" @click="handleEditType">编辑子分类</li>
<i slot="reference" class="el-icon-more icon-tag" v-if="tagName === '手工标签'"></i>
<i slot="reference" class="el-icon-more icon-tag" v-if="tagName === '手工标签' && tagList.id !== '3d11ac15963b4c0790762e6147ea9315'"></i>
</el-popover>
<div class="third-list" :class="{ 'manual-tag': tagName === '手工标签' }">
<!-- <i class="iconfont icon-next-" v-if="tagName === '手工标签'"></i> -->
......
src/view/platformTag/tag-container.vue
......@@ -25,9 +25,9 @@
<el-table-column label="操作" v-if="handTag" min-width="200">
<template slot-scope="scope">
<!-- <span v-if="scope.row.tagType == 1"> -->
<el-button type="text" @click="editHandTag(scope.row)">编辑</el-button>
<el-button type="text" v-if="!isWeim" @click="editHandTag(scope.row)">编辑</el-button>
<el-button type="text" @click="editHandTagValue(scope.row)">标签值设置</el-button>
<el-button type="text" @click="deleteHandTag(scope.row)">删除</el-button>
<el-button type="text" v-if="!isWeim" @click="deleteHandTag(scope.row)">删除</el-button>
<!-- </span> -->
</template>
</el-table-column>
......@@ -58,7 +58,8 @@ export default {
default: false
},
groupId: String,
refersh: Object
refersh: Object,
isWeim: Boolean
},
data() {
......
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