Skip to content

M
memberTag-web
Commit 032ee8bd by 无尘
Options

add: 增加会员分组编辑

parent b26074c7
Showing with 49 additions and 52 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.f94a38ee1ac5907e99a21810c4429320.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.7384ed5a2fd472add55a.js></script><script type=text/javascript src=./static/js/vendor.fe4f9863882480bf679b.js></script><script type=text/javascript src=./static/js/app.2f0c4f14231ba7aaf367.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.140047d57de1019167314b5081c01380.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.7e58408493ad6b35f196.js></script><script type=text/javascript src=./static/js/vendor.fe4f9863882480bf679b.js></script><script type=text/javascript src=./static/js/app.2f0c4f14231ba7aaf367.js></script></body></html>
\ No newline at end of file
dist/static/js/6.342634942187a3c3799a.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.f020ff35c2dda64162e8.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.280b021c372fb562547d.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.603cf6c29315d330cfdf.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.740be8826411a62bfb4f.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.e2873a5fb82c24af80cc.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.7384ed5a2fd472add55a.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,f){for(var o,d,i,u=0,b=[];u<n.length;u++)d=n[u],r[d]&&b.push(r[d][0]),r[d]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(c&&c(n,a,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=t(t.s=f[u]);return i};var n={},r={26:0};function t(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,t){c=r[e]=[n,t]});c[2]=n;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"34aff793966d1eae3db3",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"f020ff35c2dda64162e8",7:"280b021c372fb562547d",8:"e2873a5fb82c24af80cc",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"180d4fb52739083bd4f8",14:"e3674474da8a18925ba8",15:"6bff0bcecd6f1ce1319d",16:"f4036a24000959bd38c8",17:"022c9fbbc20807dfcca3",18:"7a971724ceedf92fdfcc",19:"4f681127cc3b6c7e3765",20:"f003cb91f977e661e07a",21:"cc4b11f9d593442a0878",22:"1d6faaea5525916db56d",25:"9ceafa4ee79176c87d81"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=d,a.appendChild(f),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.7384ed5a2fd472add55a.js.map
\ No newline at end of file
dist/static/js/manifest.7e58408493ad6b35f196.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,f){for(var o,d,i,u=0,b=[];u<r.length;u++)d=r[u],c[d]&&b.push(c[d][0]),c[d]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(n&&n(r,a,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=t(t.s=f[u]);return i};var r={},c={26:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"34aff793966d1eae3db3",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"342634942187a3c3799a",7:"603cf6c29315d330cfdf",8:"740be8826411a62bfb4f",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"180d4fb52739083bd4f8",14:"e3674474da8a18925ba8",15:"6bff0bcecd6f1ce1319d",16:"f4036a24000959bd38c8",17:"022c9fbbc20807dfcca3",18:"7a971724ceedf92fdfcc",19:"4f681127cc3b6c7e3765",20:"f003cb91f977e661e07a",21:"cc4b11f9d593442a0878",22:"1d6faaea5525916db56d",25:"9ceafa4ee79176c87d81"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return f.onerror=f.onload=d,a.appendChild(f),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.7e58408493ad6b35f196.js.map
\ No newline at end of file
src/components/tagCategorySmall.vue
......@@ -7,7 +7,7 @@
<div class="common-wrap__cateTags">
<div class="common-wrap__temp flex">
<div class="common-wrap__currentTag inline-block">
<a class="common-wrap__currentTag__name" @click.stop="toRequestData">全部</a>
<a class="common-wrap__currentTag__name" @click.stop="toRequestData(0)">全部</a>
<i class="el-icon-arrow-right m-l-8 m-r-8"></i>
<template v-for="(item,index) in currentTagDatas">
<a class="common-wrap__currentTag__name" @click.stop="toRequestData(item.tagLevelGroupId)">{{item.levelName}}</a>
......@@ -21,7 +21,7 @@
</a>
</template>
</div>
<div class="common-wrap__moreTag p-l-20">
<div class="common-wrap__moreTag p-l-20" v-if="childTagDatas.length > 3">
<el-popover
placement="bottom-end"
trigger="click"
......@@ -90,6 +90,7 @@
toRequestData(id) {
var that = this
console.log(id)
that.getCateData(id)
},
/**
......@@ -109,6 +110,7 @@
// showMsg.showmsg('成功','success')
that.currentTagDatas = resData.result.currentNode; // 当前分类数据
that.childTagDatas = resData.result.dataList; // 子类数据
that.$emit('changeId',id)
return;
}
......@@ -132,6 +134,7 @@
mounted() {
var that = this
console.log(that.tagLibName)
that.getCateData(0)
},
components: {
......
src/components/tagShortDetail.vue
......@@ -524,8 +524,7 @@
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancelDialog">取 消</el-button>
<!-- <el-button plain @click="toTagDetail">标签详情</el-button> -->
<router-link :to="{path:'/myTagDetail',query:{tagId: tagShortId}}" class="el-button el-button--default el-button--large is-plain">详情</router-link>
<router-link v-if="fromFlag !=='memberGroup'" :to="{path:'/myTagDetail',query:{tagId: tagShortId}}" class="el-button el-button--default el-button--large is-plain">详情</router-link>
<el-button type="primary" @click="confirmDialog">确 定</el-button>
</div>
</el-dialog>
......@@ -543,7 +542,8 @@
name: "tagShortDetail",
props: {
showTagDetail: Boolean,
tagShortId: String
tagShortId: String,
fromFlag: String // memberGroup: 会员分组-我的标签列表用; mytag: 我的标签列表用
},
data() {
return {
......@@ -1266,7 +1266,7 @@
// tagValue.val[0].data.compute = ele.postCompute;
if (ele.fixedRecentRadio == 2) {
tagValue.time[0].type = 'lastday';
tagValue.time[0].value = ele.fixedRecentTimeRecent;
tagValue.time[0].value = String(ele.fixedRecentTimeRecent);
that.postTemplateData.selectedVal.push(`最近 ${ele.fixedRecentTimeRecent} 天`);
}
......@@ -1275,14 +1275,14 @@
if (ele.templateCode === 'tag005') {
if (ele.timeRecent === '') { returnFlag = false }
tagValue.time[0].type = ele.timeType;
tagValue.time[0].value = ele.timeRecent;
tagValue.time[0].value = String(ele.timeRecent);
that.postTemplateData.selectedVal.push( `最近 ${ele.timeRecent} 天`);
}
// 之后 天
if (ele.templateCode === 'tag006') {
if (ele.timeAfter === '') { returnFlag = false }
tagValue.time[0].type = ele.timeType;
tagValue.time[0].value = ele.timeAfter;
tagValue.time[0].value = String(ele.timeAfter);
that.postTemplateData.selectedVal.push( `之后 ${ele.timeAfter} 天`);
}
// 下拉搜索添加值
......@@ -1348,8 +1348,8 @@
that.postTemplateData.template = that.templateData
tagParams = that.postTemplateData;
that.addToTemp(tagValue,tagParams);
that.addToTemp(tagValue,tagParams);
},
/**
......@@ -1370,6 +1370,20 @@
if (resData.errorCode == 1) {
showMsg.showmsg('添加成功','success');
that.closeTagShortDialog()
// 如果来源是 会员标签编辑的时候
if (that.fromFlag == 'memberGroup') {
let sendObj = {
tagId: that.tagShortId,
tagValue: JSON.stringify(tagValue),
tagParams: JSON.stringify(tagParams),
tagName: that.tagData.tagName,
isActive: that.tagData.isActive
}
// that.closeTagShortDialog()
that.$emit('returnTagData',sendObj)
// return false;
}
// 更新暂存架
that.$emit('updateTemp');
return;
......
src/components/tagTemporary.vue
......@@ -74,13 +74,13 @@
// {
// tagId: 1,
// tagName: "123",
// tagValue: '描述描述，最多200字，一行显示50字，默认显示一行',
// newTagVal: '描述描述，最多200字，一行显示50字，默认显示一行',
// isActive: 1
// },
// {
// tagId: 1,
// tagName: "123",
// tagValue: '描述描述，最多200字，一行显示50字，默认显示一行',
// newTagVal: '描述描述，最多200字，一行显示50字，默认显示一行',
// isActive: 1
// },
......@@ -168,7 +168,15 @@
*/
toMemberGroupEdit() {
const that = this
that.changeRoute('/memberGroupEdit')
if (!!that.selectTag.length) {
sessionStorage.setItem('selectTempTag',JSON.stringify(that.selectTag))
that.changeRoute('/memberGroupEdit')
}else {
that.$message.error({
duration: 1000,
message: '请选择标签'
})
}
},
/**
......@@ -196,7 +204,7 @@
ele.newTagVal = ''
}
})
console.log(dataVal)
// console.log(dataVal)
that.tagListData = dataVal
return;
}
......
src/view/myTag/myTagDetail.vue
......@@ -1202,7 +1202,7 @@ import qs from 'qs';
// tagValue.val[0].data.compute = ele.postCompute;
if (ele.fixedRecentRadio == 2) {
tagValue.time[0].type = 'lastday';
tagValue.time[0].value = ele.fixedRecentTimeRecent;
tagValue.time[0].value = String(ele.fixedRecentTimeRecent);
that.postTemplateData.selectedVal.push(`最近 ${ele.fixedRecentTimeRecent} 天`);
}
......@@ -1211,14 +1211,14 @@ import qs from 'qs';
if (ele.templateCode === 'tag005') {
if (ele.timeRecent === '') { returnFlag = false }
tagValue.time[0].type = ele.timeType;
tagValue.time[0].value = ele.timeRecent;
tagValue.time[0].value = String(ele.timeRecent);
that.postTemplateData.selectedVal.push( `最近 ${ele.timeRecent} 天`);
}
// 之后 天
if (ele.templateCode === 'tag006') {
if (ele.timeAfter === '') { returnFlag = false }
tagValue.time[0].type = ele.timeType;
tagValue.time[0].value = ele.timeAfter;
tagValue.time[0].value = String(ele.timeAfter);
that.postTemplateData.selectedVal.push( `之后 ${ele.timeAfter} 天`);
}
// 下拉搜索添加值
......
src/view/myTag/myTagList.vue
......@@ -90,7 +90,7 @@
</div>
<vue-gic-footer></vue-gic-footer>
<!-- 标签详情缩写版 -->
<tagShortDetail :tagShortId.sync="tagShortDetailId" :showTagDetail="showTagDetail" @hideTag="handleHideTag" @updateTemp="updateTemp"></tagShortDetail>
<tagShortDetail :fromFlag="fromFlag" :tagShortId.sync="tagShortDetailId" :showTagDetail="showTagDetail" @hideTag="handleHideTag" @updateTemp="updateTemp"></tagShortDetail>
<!-- 暂存架 -->
<tag-temporary ref="tagTemp" @showShortDetail="showShortDetail"></tag-temporary>
</div>
......@@ -123,6 +123,7 @@
showTagDetail: false, // 标签详情缩小版显示/隐藏
tagShortDetailId: '', // 标签详情缩写版 id
fromFlag: 'myTag', // 参数--来源标志
tagLibName: 'myTag',// 面包屑分类需要的参数
tagSearch: '', // 搜索值绑定的参数
......@@ -237,7 +238,7 @@
/**
* 获取当前分类下下的标签
*/
getTagList(val) {
getTagList() {
const that = this
const para = {
tagName: that.tagSearch, // 搜索字段
......@@ -322,36 +323,7 @@
that.$refs.tagTemp.getTagList();
},
/**
* 获取标签列表
*/
getmyTagList() {
const that = this
const para = {
groupName: that.tagSearch, // 搜索字段
}
getRequest('/member-tag-group/findList.json',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
const resData = res.data
if (resData.errorCode == 1) {
return;
}
errMsg.errorMsg(resData)
})
.catch(function (error) {
console.log(error);
that.$message.error({
duration: 1000,
message: error.message
})
});
}
},
watch: {
$route: {
......
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