Skip to content

M
memberTag-web
Commit 18eb1673 by member
Options

修改bug

parent 0b6d86f2
Showing with 70 additions and 39 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.cac808079c112c76aa4c8ec3b5d36a95.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/header.2.0.18.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.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.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/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.e6665fb9fb8b7b56b141.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.bc3e3db18b5851ff9c2e.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.0a25d66a0338e270dc5da1b541120c63.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/header.2.0.18.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.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.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/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.f83329ede00bf1dbf3c4.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.183b608c36b1f53cda18.js></script></body></html>
\ No newline at end of file
dist/static/css/app.0a25d66a0338e270dc5da1b541120c63.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.cac808079c112c76aa4c8ec3b5d36a95.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/public.css
......@@ -467,6 +467,9 @@ input:focus {
.w-427 {
width: 427px;
}
.w-400 {
width: 400px;
}
.w-485 {
width: 485px;
}
......
dist/static/js/0.30b79f894c7c9cb4f662.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/0.f4a0522e3e2bf5dc6bbb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/19.22e47b0b352a44a7bc53.js deleted 100644 → 0
webpackJsonp([19],{GSV8:function(t,e){},iHP3:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),n=a.n(s),i=a("lRwf"),l=a.n(i),c=a("zL8q"),o=a("CUHN"),d=a("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var r={name:"tag-type",components:{SecondTag:o.default},props:{tagList:Object},data:function(){return{list:{},typeName:"",editData:[],expends:"收起"}},computed:n()({},Object(d.mapState)(["tagRealName"])),methods:{handleChangeExpends:function(){this.expends="收起"===this.expends?"展开":"收起"},handleFirstTag:function(){this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},p={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"list"},[a("span",{staticClass:"expends-txt",on:{click:t.handleChangeExpends}},[t._v(t._s(t.expends)+" ")]),t._v(" "),a("div",{staticClass:"first-tag"},[a("div",[a("i",{staticClass:"iconfont menu-icon",class:[t.list.icon,{"icon-tag-light":t.list.name===t.tagRealName}]}),t._v(" "),a("span",{staticClass:"tag-name",class:{"icon-tag-light":t.list.name===t.tagRealName},on:{click:t.handleFirstTag}},[t._v(t._s(t.list.name))])]),t._v(" "),a("el-collapseTransition",[a("div",{directives:[{name:"show",rawName:"v-show",value:"收起"===t.expends,expression:"expends === '收起'"}],staticClass:"second-tag"},t._l(t.list.children,function(e,s){return a("second-tag",{key:s,attrs:{list:e,"tag-name":t.list.name}})}))])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("GSV8")},"data-v-76274c1c",null);e.default=m.exports}});
\ No newline at end of file
dist/static/js/2.01784f338bb843f827f5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.c7377d533d02bd75965b.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/22.f24920a6257c85f352de.js 0 → 100644
webpackJsonp([22],{GXzu:function(t,e){},iHP3:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),n=a.n(s),i=a("lRwf"),l=a.n(i),c=a("zL8q"),o=a("CUHN"),d=a("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var r={name:"tag-type",components:{SecondTag:o.default},props:{tagList:Object},data:function(){return{list:{},typeName:"",editData:[],expends:"收起"}},computed:n()({},Object(d.mapState)(["tagRealName"])),methods:{handleChangeExpends:function(){this.expends="收起"===this.expends?"展开":"收起"},handleFirstTag:function(){localStorage.setItem("jumpTag",""),this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},p={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"list"},[a("span",{staticClass:"expends-txt",on:{click:t.handleChangeExpends}},[t._v(t._s(t.expends)+" ")]),t._v(" "),a("div",{staticClass:"first-tag"},[a("div",[a("i",{staticClass:"iconfont menu-icon",class:[t.list.icon,{"icon-tag-light":t.list.name===t.tagRealName}]}),t._v(" "),a("span",{staticClass:"tag-name",class:{"icon-tag-light":t.list.name===t.tagRealName},on:{click:t.handleFirstTag}},[t._v(t._s(t.list.name))])]),t._v(" "),a("el-collapseTransition",[a("div",{directives:[{name:"show",rawName:"v-show",value:"收起"===t.expends,expression:"expends === '收起'"}],staticClass:"second-tag"},t._l(t.list.children,function(e,s){return a("second-tag",{key:s,attrs:{list:e,"tag-name":t.list.name}})}))])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("GXzu")},"data-v-4c518050",null);e.default=m.exports}});
\ No newline at end of file
dist/static/js/manifest.e6665fb9fb8b7b56b141.js deleted 100644 → 0
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"30b79f894c7c9cb4f662",1:"1a66f3452cb905b67755",2:"c7377d533d02bd75965b",3:"1295058a35359bd311de",4:"8f38cbb49796452ed56b",5:"0e7da7a15cc23e620f69",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"f0730ab3ea2cc610aab4",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"45a78311835c4d786a28",16:"507fddf23cee64d7ade1",17:"3d781ba9b065c4046ffa",18:"9022ea0326694df97cda",19:"22e47b0b352a44a7bc53",20:"c73a34ffd96010c24641",21:"11aedf5a4196557df7ad",22:"61bb63c1296b6c9972a5",23:"24cd9b4a91da0814be19",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"3aca132c47a1220d1d2f",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"93394f129023c3e6e8fb",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.f83329ede00bf1dbf3c4.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[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(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={33:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;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:"f4a0522e3e2bf5dc6bbb",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"7b0fead7687002e5c6ba",4:"8f38cbb49796452ed56b",5:"ad2e2d6bb9d4247c0382",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"f0730ab3ea2cc610aab4",11:"74e7bd2cd2b7ccb74804",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"45a78311835c4d786a28",16:"507fddf23cee64d7ade1",17:"3d781ba9b065c4046ffa",18:"9022ea0326694df97cda",19:"b3eacaef0b9544a3c6fc",20:"0fef167461d750bfe493",21:"e39e3461a16359f1196b",22:"f24920a6257c85f352de",23:"24cd9b4a91da0814be19",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"3aca132c47a1220d1d2f",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"93394f129023c3e6e8fb",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/tag/tag-config-options.vue
......@@ -1322,6 +1322,7 @@ export default {
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
......@@ -1340,12 +1341,13 @@ export default {
case 'tag019':
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag017') {
if (this.templateData[i].templateCode === 'tag019') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
......@@ -1356,12 +1358,13 @@ export default {
case 'tag014':
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag017') {
if (this.templateData[i].templateCode === 'tag014') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
......@@ -1417,7 +1420,6 @@ export default {
* 重置条件添加的时候是空的
*/
resetOptions() {
console.log(1);
if (this.templateData.length) {
for (let tem of this.templateData) {
console.log(tem);
......
src/view/memberGroup/tags-group-list.vue
......@@ -18,7 +18,7 @@
@checkTagsGroup="checkTagsGroup"
@dragTag="dragTag"
/>
<el-button class="m-t-10 w-427 el-icon-plus color-blue add-group-btn" v-show="selectedTagsData.length < 3" @click="addTagsGroup">
<el-button class="m-t-10 w-400 el-icon-plus color-blue add-group-btn" v-show="selectedTagsData.length < 3" @click="addTagsGroup">
&nbsp;&nbsp;添加
</el-button>
</div>
......
src/view/memberGroup/tags-group.vue
<template>
<div class="w-427 border-box">
<div class="w-400 border-box">
<div :class="['tags-group', { 'tags-group--active': active }]" @click="checkTagsGroup">
<!--右上角的下拉菜单-->
<el-dropdown class="tags-group__dropdown" placement="bottom-end" v-if="showAddMenu || showDelMenu">
......
src/view/platformTag/member-tag.vue
......@@ -94,7 +94,7 @@
</div>
<div class="form-item" :class="{ 'margin-60': marginSixty }">
<label for="">分组描述</label>
<el-input type="textarea" v-model="tagConfig.textarea" :maxlength="200" class="w-427" placeholder="请输入内容"></el-input>
<el-input type="textarea" v-model="tagConfig.textarea" :maxlength="200" placeholder="请输入内容"></el-input>
<span class="textarea-txt">{{ tagConfig.textarea.length }}/200</span>
</div>
<div class="form-item" v-show="tagConfig.isRealTime == 0" :class="{ 'margin-60': marginSixty }">
......@@ -516,7 +516,10 @@ export default {
// 保存手工标签的数据 一 二 三 级
saveHandTagData(list) {
localStorage.setItem('middleHandtag', JSON.stringify(list));
}
},
// onLoadV() {
// localStorage.setItem('jumpThirdTag', '');
// }
},
beforeMount() {
......@@ -567,6 +570,8 @@ export default {
this.getTagList();
});
// window.onload = this.onLoadV();
// 处理二级标签
this.$on('handle-second-tag', list => {
this.middleWareVariable = {
......@@ -609,6 +614,14 @@ export default {
this.changeTagTitle(list.name);
});
this.defaultDate();
// if (localStorage.getItem('jumpThirdTag')) {
// console.log(1);
// let tagList = JSON.parse(localStorage.getItem('jumpThirdTag'));
// this.params.id = tagList.id;
// this.params.type = 1;
// this.tagName = tagList.name;
// this.loadMemberTagList(this.params);
// }
}
};
</script>
......@@ -798,8 +811,10 @@ export default {
}
.textarea-txt {
position: relative;
float: right;
top: -16px;
color: #909399;
left: -70px;
left: -24px;
font-size: 14px;
}
}
......
src/view/platformTag/second-tag.vue
......@@ -26,7 +26,7 @@
<el-table-column label="操作">
<template slot-scope="scope">
<el-button :disabled="scope.row.levelName == '未分类'" @click="handleEdit(scope.row, scope.$index)" type="text">{{ scope.row.editText }}</el-button>
<el-button :disabled="scope.row.levelName == '未分类'" type="text" @click="handleDelete(scope.row)">删除</el-button>
<el-button :disabled="scope.row.levelName == '未分类'" type="text" @click="handleDelete(scope.row, scope.$index)">取消</el-button>
</template>
</el-table-column>
</el-table>
......@@ -52,7 +52,8 @@
<script>
import Emitter from '@/mixins/emitter';
import { mapState } from 'vuex';
import { newHandTag, thirdHandTagList, deleteThirdTag, editThirdTag } from '@/request/api';
// deleteThirdTag
import { newHandTag, thirdHandTagList, editThirdTag } from '@/request/api';
export default {
mixins: [Emitter],
......@@ -133,8 +134,13 @@ export default {
},
handleEdit(list, i) {
if (!list.editName) {
list.editName = true;
list.editText = '确认';
this.editData = this.editData.map(el => ({
...el,
editName: false,
editText: '编辑'
}));
this.editData[i].editName = true;
this.editData[i].editText = '确认';
} else {
/** 提交修改的标签名
* 不能为空
......@@ -175,27 +181,29 @@ export default {
});
},
// 删除子分类
handleDelete(list) {
const param = {
tagLevelGroupId: list.tagLevelGroupId,
requestProject: 'gic-member-tag-web'
};
deleteThirdTag(param)
.then(res => {
if (res.errorCode == 1) {
this.$message({
message: '删除成功',
type: 'success',
duration: 1000
});
this.getThirdTag();
this.dispatch('member-tag', 'refersh-member-list');
// this.editVisiable = false;
}
})
.catch(err => {
console.log(err);
});
handleDelete(list, i) {
list.editName = false;
list.editText = '编辑';
// const param = {
// tagLevelGroupId: list.tagLevelGroupId,
// requestProject: 'gic-member-tag-web'
// };
// deleteThirdTag(param)
// .then(res => {
// if (res.errorCode == 1) {
// this.$message({
// message: '删除成功',
// type: 'success',
// duration: 1000
// });
// this.getThirdTag();
// this.dispatch('member-tag', 'refersh-member-list');
// // this.editVisiable = false;
// }
// })
// .catch(err => {
// console.log(err);
// });
},
/**
* 添加手工标签
......
static/css/public.css
......@@ -467,6 +467,9 @@ input:focus {
.w-427 {
width: 427px;
}
.w-400 {
width: 400px;
}
.w-485 {
width: 485px;
}
......
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