Skip to content

M
memberTag-web
Commit d3fcaef8 by member
Options

Merge remote-tracking branch 'origin/dev' into dev-dingdang

parents cd575950 414beb9b
Showing with 53 additions and 10 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.e0fd3b5b69750916f5631d67c2dc3f7e.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.07.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.251b8b30bc590d620a74.js></script><script type=text/javascript src=./static/js/vendor.c30398db3b176e06f763.js></script><script type=text/javascript src=./static/js/app.20125f3e56ef7f8392b6.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.54f00a42eb234699a3786d5f38835cbc.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.07.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.7b1619df7441d5b0c45e.js></script><script type=text/javascript src=./static/js/vendor.c30398db3b176e06f763.js></script><script type=text/javascript src=./static/js/app.778b7eda2e5d4aa559e4.js></script></body></html>
\ No newline at end of file
dist/static/css/app.54f00a42eb234699a3786d5f38835cbc.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.e0fd3b5b69750916f5631d67c2dc3f7e.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/index.less
......@@ -42,4 +42,18 @@
color: #c0c4cc;
}
.line-nowrap {
white-space: nowrap;
overflow: hidden;
padding: 0 6px;
line-height: 32px;
vertical-align: middle;
}
.line-nowrap .el-tag {
margin-right: 4px;
}
.el-tag-popover {
margin-right: 5px;
margin-bottom: 5px;
}
\ No newline at end of file
dist/static/js/0.25ee4ef54d07716dd0e8.js → dist/static/js/0.9496054413121501cc1a.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/21.dcbb43680b4433f7b378.js → dist/static/js/20.400c516f9be9a2bd1e0e.js
webpackJsonp([21],{UnNO:function(t,e){},iHP3:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("Dd8w"),s=a.n(n),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:s()({},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,n){return a("second-tag",{key:n,attrs:{list:e,"tag-name":t.list.name}})}),1)])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("UnNO")},"data-v-46ef8c6a",null);e.default=m.exports}});
\ No newline at end of file
webpackJsonp([20],{gVxR: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)])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("gVxR")},"data-v-4f49419c",null);e.default=m.exports}});
\ No newline at end of file
dist/static/js/manifest.251b8b30bc590d620a74.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,d){for(var f,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=r(r.s=d[i]);return b};var a={},n={33:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,r.nc&&d.setAttribute("nonce",r.nc),d.src=r.p+"static/js/"+e+"."+{0:"25ee4ef54d07716dd0e8",1:"eccd8c3c3d12ce4a6d73",2:"dd4fd4366dbfaac0e52c",3:"d8e5769297d323db2af0",4:"f21080634b532ec7e21b",5:"f23a89578a39c3272788",6:"156667a0d69e9b0f9b4c",7:"4ff29118928a011087de",8:"a7bfdf906c46bdc7024f",9:"ea583eedf0e8e01807bd",10:"2450ea09d03a6d56323f",11:"20b8edf23ced5c12d43b",12:"ff49b3face62ef7aef5f",13:"109c66b4d5044a2c65ce",14:"0550dbc2c960c90c548f",15:"d3bc927a69a035e8f788",16:"a75aeea0cbeabe55b8a6",17:"de3efb98ab1af91a17c7",18:"34b693a8bcc1f192dc0f",19:"308e228686726571bdcf",20:"2b65704e386d6c480e4e",21:"dcbb43680b4433f7b378",22:"7d4423d284c4a444cc08",23:"113ed2bdef919e3f8c31",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"f7bcd73f7165acb2f64d",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"85349d1f36348906697c",32:"a9aaa6e5d01423c1a780"}[e]+".js";var f=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return d.onerror=d.onload=o,t.appendChild(d),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.7b1619df7441d5b0c45e.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={33:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;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:"9496054413121501cc1a",1:"eccd8c3c3d12ce4a6d73",2:"dd4fd4366dbfaac0e52c",3:"d8e5769297d323db2af0",4:"f21080634b532ec7e21b",5:"ffdef0b14f778b23e999",6:"156667a0d69e9b0f9b4c",7:"4ff29118928a011087de",8:"a7bfdf906c46bdc7024f",9:"ea583eedf0e8e01807bd",10:"2450ea09d03a6d56323f",11:"21ecd153eedb9904e2a7",12:"ff49b3face62ef7aef5f",13:"109c66b4d5044a2c65ce",14:"0550dbc2c960c90c548f",15:"d3bc927a69a035e8f788",16:"a75aeea0cbeabe55b8a6",17:"de3efb98ab1af91a17c7",18:"34b693a8bcc1f192dc0f",19:"308e228686726571bdcf",20:"400c516f9be9a2bd1e0e",21:"6ddaf764c36ea996789e",22:"7d4423d284c4a444cc08",23:"113ed2bdef919e3f8c31",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"f7bcd73f7165acb2f64d",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"85349d1f36348906697c",32:"a9aaa6e5d01423c1a780"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/card/card.vue
......@@ -17,7 +17,8 @@
</div>
</div>
<div class="pic-list-box">
<el-table ref="multipleTable" :data="cardData" class="card-table" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
<!-- @selection-change="handleSelectionChange" -->
<el-table ref="multipleTable" :data="cardData" class="card-table" tooltip-effect="dark" style="width: 100%" @select="handleSelect" @select-all="handleSelectAll">
<el-table-column
type="selection"
width="55">
......@@ -139,11 +140,13 @@ export default {
data() {
return {
middleSelection: [], // 中间
multipleSelection: [], // 选中的卡券
repProjectName: 'gic-web', // 项目名
searchText: '',
cardData: [],
currentRow: null,
firstSelect: false,
radio: null,
dialogCard: false,
cardCurrentPage: 1,
......@@ -162,9 +165,34 @@ export default {
},
methods: {
// 切换的卡券
handleSelectionChange(val) {
this.multipleSelection = val;
this.$emit('select-card', this.multipleSelection);
handleSelect(select, row) {
// 如果select大于
console.log(row);
if (this.middleSelection.length == 0) {
this.middleSelection.push(row);
} else {
// 如果不存在就增加 如果存在就减去
let index = this.middleSelection.findIndex(el => el.coupCardId == row.coupCardId);
if (index == -1) {
this.middleSelection.push(row);
} else {
this.middleSelection.splice(index, 1);
}
}
this.$emit('select-card', this.middleSelection);
},
handleSelectAll(val) {
// 如果是全选 就判断里面的元素是否在middleSelection
if (val.length) {
val.forEach((el, index) => {
let inx = this.middleSelection.findIndex(item => item.coupCardId == el.coupCardId);
// 如果没有找到就
if (inx == -1) {
this.middleSelection.push(el);
}
});
}
this.$emit('select-card', this.middleSelection);
},
add() {
window.open('/marketing/#/card/add');
......
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