Skip to content

W
welfare
Commit ef1bf296 by 萱草
Options

Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev 

# Conflicts:
#	dist/css/app.4c9122d8.css
#	dist/css/app.7ccdafef.css
#	dist/css/app.c07cb367.css
#	dist/css/chunk-09efd3db.439cdc24.css
#	dist/css/chunk-0fe9d25e.2ef8205b.css
#	dist/css/chunk-1757828d.d5c62f81.css
#	dist/css/chunk-2503fb08.7a5b166e.css
#	dist/css/chunk-3bbbdd12.ac1aabf0.css
#	dist/css/chunk-3deefcb9.439cdc24.css
#	dist/css/chunk-459815f5.2cde6ef6.css
#	dist/css/chunk-6ba52ef4.2cde6ef6.css
#	dist/css/chunk-6d4a4dcb.fec0806b.css
#	dist/css/chunk-748ca371.d5c62f81.css
#	dist/css/chunk-9632093e.00b42928.css
#	dist/css/chunk-eef171d2.2cde6ef6.css
#	dist/css/chunk-f2396f90.f63e5908.css
#	dist/css/chunk-f2802392.b3408b2b.css
#	dist/css/chunk-fa0c526e.d5c62f81.css
#	dist/index.html
#	dist/js/chunk-09efd3db.8201ec18.js
#	dist/js/chunk-0d4ebdfa.14b3849f.js
#	dist/js/chunk-0d4ebdfa.245cd2c9.js
#	dist/js/chunk-0d4ebdfa.76549112.js
#	dist/js/chunk-1757828d.9058af81.js
#	dist/js/chunk-34bff564.9e368703.js
#	dist/js/chunk-34bff564.a5054948.js
#	dist/js/chunk-34bff564.ceb5bcd9.js
#	dist/js/chunk-350bdb36.93230245.js
#	dist/js/chunk-3deefcb9.b5829a10.js
#	dist/js/chunk-6287d3af.1650b788.js
#	dist/js/chunk-6287d3af.533beb60.js
#	dist/js/chunk-6287d3af.f3bbc57c.js
#	dist/js/chunk-748ca371.cedf1a30.js
#	dist/js/chunk-7690a1e6.cdb5d495.js
#	dist/js/chunk-bb542da4.a1092816.js
#	dist/js/chunk-f2396f90.541172f5.js
#	dist/js/chunk-fa0c526e.dfba9c8b.js
#	dist/js/chunk-vendors.e1d4da3a.js
parents 88d80c3d f08462e7
Showing with 46 additions and 349 deletions
dist/css/card-package.e0764067.css → dist/css/card-package.ffe8323d.css
.ml40[data-v-20cf549a]{margin-left:40px}.filter-block[data-v-20cf549a]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-20cf549a]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-20cf549a]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-20cf549a]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-20cf549a]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-51536a1e]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-51536a1e]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-89174452]{margin-left:40px}.filter-block[data-v-89174452]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-89174452]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-89174452]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-89174452]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-89174452]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-51536a1e]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-51536a1e]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/card-package~gic-card.90c324df.css → dist/css/card-package~gic-card.223f94e1.css
.prepend-select[data-v-5ee4b509] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-5ee4b509] .el-input__inner{border-radius:0 2px 2px 0}.welfare-item{width:100%;background:#fff}.welfare-item .head{border-bottom:1px solid #e4e7ed;font-size:13px;background:#f7f8fa;color:#303133;height:40px;line-height:40px;padding:0 20px 0;border-bottom:1px solid #dcdfe6;color:#606266}.welfare-item .head span{margin-right:30px}.welfare-item .head span.btn{margin-right:5px;font-weight:400;color:#303133;line-height:40px;float:right;cursor:pointer}.welfare-item .content{height:83px;overflow:hidden;padding:0;padding:10px 16px;border-bottom:1px solid #e4e7ed;margin-bottom:20px}.welfare-item .content,.welfare-item .content .f1{display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content .f1{-webkit-box-flex:6;-ms-flex:6;flex:6;border-right:1px solid #e4e7ed}.welfare-item .content .f1>*{-webkit-box-flex:1;-ms-flex:1;flex:1}.welfare-item .content .f1>p{margin-left:10px;padding-top:4px;font-size:14px;font-weight:400;color:#606266;line-height:20px}.welfare-item .content .f1>p span{margin-top:6px;display:block;font-size:18px;font-weight:500;line-height:21px;color:#303133}.welfare-item .content .f1 div.detail{-webkit-box-flex:2;-ms-flex:2;flex:2;position:relative;padding-left:70px}.welfare-item .content .f1 div.detail img{position:absolute;top:0;left:0;width:60px;height:60px;border-radius:4px}.welfare-item .content .f1 div.detail p:first-child{padding-top:8px;font-weight:400;color:#303133;line-height:22px;margin-bottom:6px}.welfare-item .content .f1 div.detail p:first-child+p{font-size:12px;color:#303133;line-height:17px}.welfare-item .content .f2{-webkit-box-flex:4;-ms-flex:4;flex:4;padding:0 20px 0}.welfare-item .content .f2 /deep/ .el-col{color:#606266;line-height:20px}.welfare-item .content .f2 /deep/ .el-col span{color:#303133}
\ No newline at end of file
.prepend-select[data-v-a5a3177c] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-a5a3177c] .el-input__inner{border-radius:0 2px 2px 0}.welfare-item{width:100%;background:#fff}.welfare-item .head{border-bottom:1px solid #e4e7ed;font-size:13px;background:#f7f8fa;color:#303133;height:40px;line-height:40px;padding:0 20px 0;border-bottom:1px solid #dcdfe6;color:#606266}.welfare-item .head span{margin-right:30px}.welfare-item .head span.btn{margin-right:5px;font-weight:400;color:#303133;line-height:40px;float:right;cursor:pointer}.welfare-item .content{height:83px;overflow:hidden;padding:0;padding:10px 16px;border-bottom:1px solid #e4e7ed;margin-bottom:20px}.welfare-item .content,.welfare-item .content .f1{display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content .f1{-webkit-box-flex:6;-ms-flex:6;flex:6;border-right:1px solid #e4e7ed}.welfare-item .content .f1>*{-webkit-box-flex:1;-ms-flex:1;flex:1}.welfare-item .content .f1>p{margin-left:10px;padding-top:4px;font-size:14px;font-weight:400;color:#606266;line-height:20px}.welfare-item .content .f1>p span{margin-top:6px;display:block;font-size:18px;font-weight:500;line-height:21px;color:#303133}.welfare-item .content .f1 div.detail{-webkit-box-flex:2;-ms-flex:2;flex:2;position:relative;padding-left:70px}.welfare-item .content .f1 div.detail img{position:absolute;top:0;left:0;width:60px;height:60px;border-radius:4px}.welfare-item .content .f1 div.detail p:first-child{padding-top:8px;font-weight:400;color:#303133;line-height:22px;margin-bottom:6px}.welfare-item .content .f1 div.detail p:first-child+p{font-size:12px;color:#303133;line-height:17px}.welfare-item .content .f2{-webkit-box-flex:4;-ms-flex:4;flex:4;padding:0 20px 0}.welfare-item .content .f2 /deep/ .el-col{color:#606266;line-height:20px}.welfare-item .content .f2 /deep/ .el-col span{color:#303133}
\ No newline at end of file
dist/css/chunk-9632093e.00b42928.css deleted 100644 → 0
.enter[data-v-8987bf3a]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-top:80px}.enter>div.b1[data-v-8987bf3a]:after{background:url(../img/01.c155f11a.png)}.enter>div.b1[data-v-8987bf3a]:after,.enter>div.b2[data-v-8987bf3a]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b2[data-v-8987bf3a]:after{background:url(../img/02.438fcb96.png)}.enter>div.b3[data-v-8987bf3a]:after{background:url(../img/03.6fab4498.png)}.enter>div.b3[data-v-8987bf3a]:after,.enter>div.b4[data-v-8987bf3a]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b4[data-v-8987bf3a]:after{background:url(../img/04.08b8aa0f.png)}.enter>div[data-v-8987bf3a]{width:280px;position:relative;height:360px;border-radius:12px;margin-right:28px}.enter>div[data-v-8987bf3a]:last-child{margin-right:0}.enter>div.b1[data-v-8987bf3a]{color:#eb584f;background:-webkit-gradient(linear,left top,left bottom,from(#fae5e5),to(#f7cecd));background:linear-gradient(180deg,#fae5e5,#f7cecd)}.enter>div.b1 span.title[data-v-8987bf3a]{background:#eb584f}.enter>div.b2[data-v-8987bf3a]{color:#f1bd49;background:-webkit-gradient(linear,left top,left bottom,from(#f8f7e4),to(#f7f1cb));background:linear-gradient(180deg,#f8f7e4,#f7f1cb)}.enter>div.b2 span.title[data-v-8987bf3a]{background:#f1bd49}.enter>div.b3[data-v-8987bf3a]{color:#597ef7;background:-webkit-gradient(linear,left top,left bottom,from(#f1f1f9),to(#d9e1fa));background:linear-gradient(180deg,#f1f1f9,#d9e1fa)}.enter>div.b3 span.title[data-v-8987bf3a]{background:#597ef7}.enter>div.b4[data-v-8987bf3a]{color:#df7d45;background:-webkit-gradient(linear,left top,left bottom,from(#f5e8df),to(#f2d8c8));background:linear-gradient(180deg,#f5e8df,#f2d8c8)}.enter>div.b4 span.title[data-v-8987bf3a]{background:#df7d45}.enter>div p.desc[data-v-8987bf3a]{font-size:14px;font-weight:400;line-height:20px;margin:20px;color:inherit}.enter>div .target[data-v-8987bf3a]{position:absolute;cursor:pointer;color:inherit;width:40px;height:40px;top:70px;left:22px}.enter>div .target i[data-v-8987bf3a]{color:inherit;font-size:32px}.enter>div span.title[data-v-8987bf3a]{padding-left:20px;width:140px;display:inline-block;line-height:40px;color:#fff;border-radius:12px 0 12px 0;font-size:20px;font-weight:500}
\ No newline at end of file
dist/css/chunk-f803170c.9190ad7d.css 0 → 100644
.enter[data-v-7ed25fb2]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-line-pack:center;align-content:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-top:80px}.enter>div.b1[data-v-7ed25fb2]:after{background:url(../img/01.c155f11a.png)}.enter>div.b1[data-v-7ed25fb2]:after,.enter>div.b2[data-v-7ed25fb2]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b2[data-v-7ed25fb2]:after{background:url(../img/02.438fcb96.png)}.enter>div.b3[data-v-7ed25fb2]:after{background:url(../img/03.6fab4498.png)}.enter>div.b3[data-v-7ed25fb2]:after,.enter>div.b4[data-v-7ed25fb2]:after{content:"";display:block;width:231px;height:211px;position:absolute;right:0;bottom:0}.enter>div.b4[data-v-7ed25fb2]:after{background:url(../img/04.08b8aa0f.png)}.enter .block[data-v-7ed25fb2]:hover{margin-top:-20px}.enter>div[data-v-7ed25fb2]{-webkit-transition:all .2s;transition:all .2s;width:280px;cursor:pointer;position:relative;height:360px;border-radius:12px;margin-right:28px}.enter>div[data-v-7ed25fb2]:last-child{margin-right:0}.enter>div.b1[data-v-7ed25fb2]{color:#eb584f;background:-webkit-gradient(linear,left top,left bottom,from(#fae5e5),to(#f7cecd));background:linear-gradient(180deg,#fae5e5,#f7cecd)}.enter>div.b1 span.title[data-v-7ed25fb2]{background:#eb584f}.enter>div.b2[data-v-7ed25fb2]{color:#f1bd49;background:-webkit-gradient(linear,left top,left bottom,from(#f8f7e4),to(#f7f1cb));background:linear-gradient(180deg,#f8f7e4,#f7f1cb)}.enter>div.b2 span.title[data-v-7ed25fb2]{background:#f1bd49}.enter>div.b3[data-v-7ed25fb2]{color:#597ef7;background:-webkit-gradient(linear,left top,left bottom,from(#f1f1f9),to(#d9e1fa));background:linear-gradient(180deg,#f1f1f9,#d9e1fa)}.enter>div.b3 span.title[data-v-7ed25fb2]{background:#597ef7}.enter>div.b4[data-v-7ed25fb2]{color:#df7d45;background:-webkit-gradient(linear,left top,left bottom,from(#f5e8df),to(#f2d8c8));background:linear-gradient(180deg,#f5e8df,#f2d8c8)}.enter>div.b4 span.title[data-v-7ed25fb2]{background:#df7d45}.enter>div p.desc[data-v-7ed25fb2]{font-size:14px;font-weight:400;line-height:20px;margin:20px;color:inherit}.enter>div .target[data-v-7ed25fb2]{position:absolute;cursor:pointer;color:inherit;width:40px;height:40px;top:70px;left:22px}.enter>div .target i[data-v-7ed25fb2]{color:inherit;font-size:32px}.enter>div span.title[data-v-7ed25fb2]{padding-left:20px;width:140px;display:inline-block;line-height:40px;color:#fff;border-radius:12px 0 12px 0;font-size:20px;font-weight:500}
\ No newline at end of file
dist/css/gic-card.6e187d6e.css 0 → 100644
[data-v-31ef4600] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-31ef4600] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-31ef4600]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-31ef4600]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-31ef4600]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-31ef4600]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-31ef4600]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-31ef4600]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-31ef4600]{margin-left:40px}.filter-block[data-v-31ef4600]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-31ef4600]{margin-left:10px;margin-right:10px;line-height:20px}.dm-switch[data-v-457d5c5a] .el-switch__label{color:#606266}.dm-switch[data-v-457d5c5a] .el-switch__label.is-active{color:#303133}.w260[data-v-b43f3084]{width:260px}.result[data-v-34452bfd]{text-align:center}.result p[data-v-34452bfd]:first-child{color:#303133;font-size:14px;line-height:24px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:24px}.result i[data-v-34452bfd]{font-size:24px;margin-right:8px}.send-preview[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease;opacity:0;visibility:hidden;z-index:1000;position:fixed;width:100%;height:100%;overflow-y:hidden;left:0;top:0}.send-preview.visible[data-v-0ab93ec9]{visibility:visible;opacity:1}.send-preview div.block[data-v-0ab93ec9]{margin:0 auto;z-index:3;position:relative;top:0;height:100%;width:100%}.send-preview div.block img[data-v-0ab93ec9]{width:100%}.send-preview ul[data-v-0ab93ec9]{position:absolute;bottom:10px}.send-preview .content[data-v-0ab93ec9]{height:100%;width:100%;position:absolute;left:0;top:0}.send-preview .content .avatar[data-v-0ab93ec9]{position:absolute;right:75.5px;top:119px}.send-preview .content .avatar[data-v-0ab93ec9] i{font-size:18px;line-height:35px}.send-preview .content .blk[data-v-0ab93ec9]{position:absolute;padding:22px 15px 13px 15px;right:129.5px;top:119px;width:224px;background:#fff;-webkit-box-shadow:0 2px 8px 0 rgba(0,0,0,.1);box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:10px}.send-preview .content .blk .card[data-v-0ab93ec9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.send-preview .content .blk .card i[data-v-0ab93ec9]{position:relative;top:2px}.send-preview .content .blk pre[data-v-0ab93ec9]{margin:15px auto;line-height:18px}.send-preview .bg[data-v-0ab93ec9]{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:block;background:rgba(0,0,0,.5)}.send-preview .btn[data-v-0ab93ec9]{position:absolute;height:80px;width:368px;top:773px;left:63px;background:#fff;overflow:hidden;border-radius:0 0 50px 50px}.send-preview .btn li[data-v-0ab93ec9]{float:left;width:50%;line-height:80px;color:#606266;text-align:center;font-size:18px}.send-preview .btn li.active[data-v-0ab93ec9]{color:#2f54eb}.page[data-v-0ab93ec9]{width:308px;position:absolute;top:98px;left:50%;margin-left:-154px}.page .title[data-v-0ab93ec9]{color:#335782;font-size:16px;margin:16px 0;text-align:center}.page .page-card[data-v-0ab93ec9]{background:#fff;padding:20px;height:650px;border-radius:4px}.page .give-rule[data-v-0ab93ec9]{margin-top:70px}.page .give-rule dd[data-v-0ab93ec9]{text-align:center;color:#2c3038;font-size:18px;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #e6e6e6}.page .give-rule dt[data-v-0ab93ec9]{font-size:14px;line-height:24px}.page .card-content[data-v-0ab93ec9]{-webkit-box-shadow:0 2px 8px 0 rgba(136,148,156,.15);box-shadow:0 2px 8px 0 rgba(136,148,156,.15);overflow:hidden;position:relative;height:70px;padding-left:91px;background:#fff}.page .card-content img.exchange[data-v-0ab93ec9]{width:50px}.page .card-content .dl[data-v-0ab93ec9]{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:91px;color:#fff;height:100%;text-align:center;position:absolute;left:0;top:0;background:#3970b5}.page .card-content .dl[data-v-0ab93ec9]:after{content:"";width:6px;height:100%;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAKCAYAAAB8OZQwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEYyRkY1NkUxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEYyRkY1NkYxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0RjJGRjU2QzFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0RjJGRjU2RDFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ph7O54QAAABGSURBVHjaYvrx48cvID4JxFH///9nAGEGIOc/Ep4KEmQEcRhQQTQTAybIxyZoiE2QAZvgeWyCE9EFp7Gzsy9jwOZ4gAADABluO3AWsN5PAAAAAElFTkSuQmCC) repeat-y;position:absolute;left:-3px;top:0}.page .card-content .dl p[data-v-0ab93ec9]{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:28px;font-weight:700;line-height:100px;height:100px;text-align:center}.page .card-content .dl p span[data-v-0ab93ec9]{margin-right:2px;font-size:18px}.page .card-d[data-v-0ab93ec9]{padding:10px 10px 5px 10px;position:relative;height:100%}.page .card-d-title[data-v-0ab93ec9]{height:18px;font-size:13px;font-weight:500;color:#2c3038;line-height:18px;margin-bottom:11px;position:relative;margin-top:2px;padding-left:48px}.page .card-d-title span[data-v-0ab93ec9]{position:absolute;left:-20px;bottom:-7px;width:84px;padding:2px 0 2px;border-radius:1px;text-align:center;color:#fff;line-height:28px;font-weight:400;font-size:20px;display:inline-block;-webkit-transform:scale(.5);transform:scale(.5)}.page .card-d-time[data-v-0ab93ec9]{height:15px;font-size:12px;font-weight:400;color:#2c3038;line-height:15px}.page .card-d-option[data-v-0ab93ec9]{width:calc(200% - 48px);position:absolute;bottom:0;left:-40%;font-size:22px;font-weight:400;color:#2c3038;line-height:32px;-webkit-transform:scale(.5);transform:scale(.5);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.page .card-d-option img[data-v-0ab93ec9]{width:24px;height:24px}.page .card-d-option .right[data-v-0ab93ec9]{margin-left:auto}.slide-fade-enter-active[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease}.slide-fade-leave-active[data-v-0ab93ec9]{-webkit-transition:all .8s cubic-bezier(1,.5,.8,1);transition:all .8s cubic-bezier(1,.5,.8,1)}.slide-fade-enter[data-v-0ab93ec9],.slide-fade-leave-to[data-v-0ab93ec9]{-webkit-transform:translateX(10px);transform:translateX(10px);opacity:0}.mt8[data-v-5dfc879c]{margin-top:8px}.cardForm[data-v-5dfc879c]{padding:30px 20px}.cardForm .w165[data-v-5dfc879c]{width:165px!important}.cardForm .w265[data-v-5dfc879c]{width:265px!important}.cardForm .tips[data-v-5dfc879c]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-5dfc879c]{margin:20px auto 48px}.cardForm[data-v-5dfc879c] .el-form .el-input-number .el-input,.cardForm[data-v-5dfc879c] .el-form .el-select .el-input{width:100%}.cardForm[data-v-5dfc879c] .el-form .w260,.w260[data-v-5dfc879c] input,.w260[data-v-5dfc879c] textarea{width:260px}.cardEffectiveMode1[data-v-5dfc879c]{position:relative}.cardEffectiveMode1-time[data-v-5dfc879c]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-5dfc879c]{top:47px}.content[data-v-5dfc879c]{margin-bottom:30px}.info .row[data-v-f71e8c96] .el-form-item{margin-bottom:12px}.w500[data-v-f71e8c96] input,.w500[data-v-f71e8c96] textarea{width:500px}.card-info[data-v-f71e8c96]{padding:24px 20px;position:relative}.card-info .title[data-v-f71e8c96]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-f71e8c96] .btn-area{display:none}.card-info[data-v-f71e8c96] .el-form-item__content{color:#303133}.card-info[data-v-f71e8c96] .el-form .el-input-number .el-input,.card-info[data-v-f71e8c96] .el-form .el-select .el-input{width:100%}.card-info[data-v-f71e8c96] .el-form .dm-input,.card-info[data-v-f71e8c96] .el-form .el-input,.card-info[data-v-f71e8c96] .el-form .el-input-number,.card-info[data-v-f71e8c96] .el-form .el-select,.card-info[data-v-f71e8c96] .el-form .el-textarea{width:352px}.cardSelect[data-v-1324332a] .el-button{width:350px!important}.cardSelect[data-v-1324332a] .reveal .card img.flag{display:none}[data-v-1324332a] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-1324332a] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/css/gic-card.9e1f235c.css deleted 100644 → 0
.ct[data-v-1a4621fb]{padding-left:20px;padding-right:20px;position:relative}.ct i[data-v-1a4621fb]{position:absolute;left:0;top:3px}.ct p[data-v-1a4621fb]{font-size:13px;font-weight:400;color:#606266;line-height:22px}.ct .tips[data-v-1a4621fb]{font-size:13px;line-height:1;color:#606266;margin-left:90px;margin-top:8px}.ct .tips[data-v-1a4621fb]:before{content:"*";color:#ff943e;margin-right:3px}[data-v-544d1af3] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-544d1af3] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-544d1af3]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-544d1af3]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-544d1af3]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-544d1af3]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-544d1af3]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-544d1af3]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-544d1af3]{margin-left:40px}.filter-block[data-v-544d1af3]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-544d1af3]{margin-left:10px;margin-right:10px;line-height:20px}.dm-switch[data-v-457d5c5a] .el-switch__label{color:#606266}.dm-switch[data-v-457d5c5a] .el-switch__label.is-active{color:#303133}.w260[data-v-b43f3084]{width:260px}.result[data-v-34452bfd]{text-align:center}.result p[data-v-34452bfd]:first-child{color:#303133;font-size:14px;line-height:24px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:24px}.result i[data-v-34452bfd]{font-size:24px;margin-right:8px}.send-preview[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease;opacity:0;visibility:hidden;z-index:1000;position:fixed;width:100%;height:100%;overflow-y:hidden;left:0;top:0}.send-preview.visible[data-v-0ab93ec9]{visibility:visible;opacity:1}.send-preview div.block[data-v-0ab93ec9]{margin:0 auto;z-index:3;position:relative;top:0;height:100%;width:100%}.send-preview div.block img[data-v-0ab93ec9]{width:100%}.send-preview ul[data-v-0ab93ec9]{position:absolute;bottom:10px}.send-preview .content[data-v-0ab93ec9]{height:100%;width:100%;position:absolute;left:0;top:0}.send-preview .content .avatar[data-v-0ab93ec9]{position:absolute;right:75.5px;top:119px}.send-preview .content .avatar[data-v-0ab93ec9] i{font-size:18px;line-height:35px}.send-preview .content .blk[data-v-0ab93ec9]{position:absolute;padding:22px 15px 13px 15px;right:129.5px;top:119px;width:224px;background:#fff;-webkit-box-shadow:0 2px 8px 0 rgba(0,0,0,.1);box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:10px}.send-preview .content .blk .card[data-v-0ab93ec9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.send-preview .content .blk .card i[data-v-0ab93ec9]{position:relative;top:2px}.send-preview .content .blk pre[data-v-0ab93ec9]{margin:15px auto;line-height:18px}.send-preview .bg[data-v-0ab93ec9]{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:block;background:rgba(0,0,0,.5)}.send-preview .btn[data-v-0ab93ec9]{position:absolute;height:80px;width:368px;top:773px;left:63px;background:#fff;overflow:hidden;border-radius:0 0 50px 50px}.send-preview .btn li[data-v-0ab93ec9]{float:left;width:50%;line-height:80px;color:#606266;text-align:center;font-size:18px}.send-preview .btn li.active[data-v-0ab93ec9]{color:#2f54eb}.page[data-v-0ab93ec9]{width:308px;position:absolute;top:98px;left:50%;margin-left:-154px}.page .title[data-v-0ab93ec9]{color:#335782;font-size:16px;margin:16px 0;text-align:center}.page .page-card[data-v-0ab93ec9]{background:#fff;padding:20px;height:650px;border-radius:4px}.page .give-rule[data-v-0ab93ec9]{margin-top:70px}.page .give-rule dd[data-v-0ab93ec9]{text-align:center;color:#2c3038;font-size:18px;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #e6e6e6}.page .give-rule dt[data-v-0ab93ec9]{font-size:14px;line-height:24px}.page .card-content[data-v-0ab93ec9]{-webkit-box-shadow:0 2px 8px 0 rgba(136,148,156,.15);box-shadow:0 2px 8px 0 rgba(136,148,156,.15);overflow:hidden;position:relative;height:70px;padding-left:91px;background:#fff}.page .card-content img.exchange[data-v-0ab93ec9]{width:50px}.page .card-content .dl[data-v-0ab93ec9]{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:91px;color:#fff;height:100%;text-align:center;position:absolute;left:0;top:0;background:#3970b5}.page .card-content .dl[data-v-0ab93ec9]:after{content:"";width:6px;height:100%;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAKCAYAAAB8OZQwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEYyRkY1NkUxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEYyRkY1NkYxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0RjJGRjU2QzFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0RjJGRjU2RDFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ph7O54QAAABGSURBVHjaYvrx48cvID4JxFH///9nAGEGIOc/Ep4KEmQEcRhQQTQTAybIxyZoiE2QAZvgeWyCE9EFp7Gzsy9jwOZ4gAADABluO3AWsN5PAAAAAElFTkSuQmCC) repeat-y;position:absolute;left:-3px;top:0}.page .card-content .dl p[data-v-0ab93ec9]{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:28px;font-weight:700;line-height:100px;height:100px;text-align:center}.page .card-content .dl p span[data-v-0ab93ec9]{margin-right:2px;font-size:18px}.page .card-d[data-v-0ab93ec9]{padding:10px 10px 5px 10px;position:relative;height:100%}.page .card-d-title[data-v-0ab93ec9]{height:18px;font-size:13px;font-weight:500;color:#2c3038;line-height:18px;margin-bottom:11px;position:relative;margin-top:2px;padding-left:48px}.page .card-d-title span[data-v-0ab93ec9]{position:absolute;left:-20px;bottom:-7px;width:84px;padding:2px 0 2px;border-radius:1px;text-align:center;color:#fff;line-height:28px;font-weight:400;font-size:20px;display:inline-block;-webkit-transform:scale(.5);transform:scale(.5)}.page .card-d-time[data-v-0ab93ec9]{height:15px;font-size:12px;font-weight:400;color:#2c3038;line-height:15px}.page .card-d-option[data-v-0ab93ec9]{width:calc(200% - 48px);position:absolute;bottom:0;left:-40%;font-size:22px;font-weight:400;color:#2c3038;line-height:32px;-webkit-transform:scale(.5);transform:scale(.5);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.page .card-d-option img[data-v-0ab93ec9]{width:24px;height:24px}.page .card-d-option .right[data-v-0ab93ec9]{margin-left:auto}.slide-fade-enter-active[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease}.slide-fade-leave-active[data-v-0ab93ec9]{-webkit-transition:all .8s cubic-bezier(1,.5,.8,1);transition:all .8s cubic-bezier(1,.5,.8,1)}.slide-fade-enter[data-v-0ab93ec9],.slide-fade-leave-to[data-v-0ab93ec9]{-webkit-transform:translateX(10px);transform:translateX(10px);opacity:0}.mt8[data-v-5dfc879c]{margin-top:8px}.cardForm[data-v-5dfc879c]{padding:30px 20px}.cardForm .w165[data-v-5dfc879c]{width:165px!important}.cardForm .w265[data-v-5dfc879c]{width:265px!important}.cardForm .tips[data-v-5dfc879c]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-5dfc879c]{margin:20px auto 48px}.cardForm[data-v-5dfc879c] .el-form .el-input-number .el-input,.cardForm[data-v-5dfc879c] .el-form .el-select .el-input{width:100%}.cardForm[data-v-5dfc879c] .el-form .w260,.w260[data-v-5dfc879c] input,.w260[data-v-5dfc879c] textarea{width:260px}.cardEffectiveMode1[data-v-5dfc879c]{position:relative}.cardEffectiveMode1-time[data-v-5dfc879c]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-5dfc879c]{top:47px}.content[data-v-5dfc879c]{margin-bottom:30px}.info .row[data-v-f71e8c96] .el-form-item{margin-bottom:12px}.w500[data-v-f71e8c96] input,.w500[data-v-f71e8c96] textarea{width:500px}.card-info[data-v-f71e8c96]{padding:24px 20px;position:relative}.card-info .title[data-v-f71e8c96]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-f71e8c96] .btn-area{display:none}.card-info[data-v-f71e8c96] .el-form-item__content{color:#303133}.card-info[data-v-f71e8c96] .el-form .el-input-number .el-input,.card-info[data-v-f71e8c96] .el-form .el-select .el-input{width:100%}.card-info[data-v-f71e8c96] .el-form .dm-input,.card-info[data-v-f71e8c96] .el-form .el-input,.card-info[data-v-f71e8c96] .el-form .el-input-number,.card-info[data-v-f71e8c96] .el-form .el-select,.card-info[data-v-f71e8c96] .el-form .el-textarea{width:352px}.cardSelect[data-v-1324332a] .el-button{width:350px!important}.cardSelect[data-v-1324332a] .reveal .card img.flag{display:none}[data-v-1324332a] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-1324332a] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/js/chunk-9632093e.765758aa.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-9632093e"],{"0687":function(t,a,e){},"1e4b":function(t,a,e){"use strict";e.r(a);var c=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",[e("div",{staticClass:"enter"},t._l(t.wfTypes,(function(a,c){return e("div",{key:c,class:"b"+(c+1)},[e("span",{staticClass:"title"},[t._v(t._s(a.title))]),e("router-link",{staticClass:"target",attrs:{to:a.target}},[e("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},n=[],i=e("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(e("ccb6"),e("2877")),u=Object(s["a"])(l,c,n,!1,null,"8987bf3a",null);a["default"]=u.exports},ccb6:function(t,a,e){"use strict";e("0687")},f9e4:function(t,a,e){"use strict";e.d(a,"b",(function(){return c})),e.d(a,"a",(function(){return n}));e("6c7b"),Array(31).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})),Array(28).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,a){return{label:"".concat(a+1,"月"),value:"".concat(a+1)}}));var c=[{title:"实物礼品",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file
dist/js/chunk-f803170c.62835622.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f803170c"],{"1e4b":function(t,a,e){"use strict";e.r(a);var c=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",[e("div",{staticClass:"enter"},t._l(t.wfTypes,(function(a,c){return e("div",{key:c,class:"block b"+(c+1)},[e("span",{staticClass:"title"},[t._v(t._s(a.title))]),e("router-link",{staticClass:"target",attrs:{to:a.target}},[e("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},n=[],i=e("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(e("5a29"),e("2877")),u=Object(s["a"])(l,c,n,!1,null,"7ed25fb2",null);a["default"]=u.exports},"5a29":function(t,a,e){"use strict";e("931f")},"931f":function(t,a,e){},f9e4:function(t,a,e){"use strict";e.d(a,"b",(function(){return c})),e.d(a,"a",(function(){return n}));e("6c7b"),Array(31).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})),Array(28).fill().map((function(t,a){return{label:"".concat(a+1,"号"),value:"".concat(a+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,a){return{label:"".concat(a+1,"月"),value:"".concat(a+1)}}));var c=[{title:"实物礼品",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file
dist/js/gic-card.5934b5b9.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.ae80f46a.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/layout/layout.vue
......@@ -34,7 +34,7 @@
</div>
<span slot="footer">
<div class="text-center pb20">
<el-button @click="toAppCenter"> 返回应用中心</el-button>
<el-button @click="$router.push('/index');">返回首页</el-button>
</div>
</span>
</el-dialog>
......@@ -66,9 +66,6 @@ export default {
this.init();
},
methods: {
toAppCenter() {
window.location.href = '/app-center/applyIndex';
},
// 处理提交创建子应用的回调
handleSubApp({ type, areaId, reason }) {
this.addSubResVisible = true;
......
src/components/libs/adjust-stock.vue
......@@ -77,10 +77,11 @@ export default {
if (!valid) {
return;
}
if(this.ruleForm.type == 2 && this.totalCount < this.ruleForm.stock) {
this.$tips({ message: '调整目标值大于当前库存值', type: 'error' });
return;
}
// 后端会控制的，减少值大于库存值直接减到0 success
// if(this.ruleForm.type == 2 && this.totalCount < this.ruleForm.stock) {
// this.$tips({ message: '调整目标值大于当前库存值', type: 'error' });
// return;
// }
const params = {
optType: this.ruleForm.type, // 1: 增加; 2: 减少
count: this.ruleForm.stock // 增加或者减少数量
......
src/components/libs/switch-page.vue
<template>
<div class="switch-page">
<el-popover v-if="!(project == '' || project == 'index')" placement="left-end" width="143" trigger="hover" popper-class="sw-page-pop">
<div>
<ul class="toggle">
......@@ -10,10 +11,22 @@
</li>
</ul>
</div>
<div class="switch-page" slot="reference">
<div class="s-icon mb10" slot="reference">
<img src="../../assets/images/svg/more.svg" width="30" height="30" />
</div>
</el-popover>
<el-popover v-if="!(project == '' || project == 'index')" placement="left-end" width="143" trigger="hover" popper-class="sw-page-pop">
<div>
?????
</div>
<div class="s-icon" slot="reference">
<img src="../../assets/images/svg/more.svg" width="30" height="30" />
</div>
</el-popover>
<!-- <div class="s-icon">
<img src="../../assets/images/svg/more.svg" width="30" height="30" />
</div> -->
</div>
</template>
<script>
......@@ -33,14 +46,18 @@ export default {
right: 40px;
bottom: 90px;
width: 50px;
height: 110px;
z-index: 900;
.s-icon {
padding-top: 9px;
width: 50px;
height: 50px;
background: #F7F8FA;
border-radius: 4px;
border: 1px solid #DCDFE6;
cursor: pointer;
text-align: center;
padding-top: 9px;
z-index: 900;
}
}
.toggle {
li {
......
src/views/card/card-package/list.vue
......@@ -14,9 +14,10 @@
<div v-show="isOpen" class="filter-block">
<div class="mb20">
<label class="mr8">福利成本：</label>
<el-input-number :controls="false" class="prefix-amount w140" @change="refresh" v-model="listParams.costPriceBegin" controls-position="right" :precision="2" :max="listParams.costPriceBegin" :min="0" placeholder="请输入" />
<!-- listParams.costPriceBegin -->
<el-input-number :controls="false" class="prefix-amount w140" @change="refresh" v-model="listParams.costPriceBegin" controls-position="right" :precision="2" :max="listParams.costPriceEnd" :min="0" placeholder="请输入" />
<span>至</span>
<el-input-number :controls="false" class="prefix-amount w140" @change="refresh" v-model="listParams.costPriceEnd" controls-position="right" :precision="2" :min="1" :max="100000" placeholder="请输入" />
<el-input-number :controls="false" class="prefix-amount w140" @change="refresh" v-model="listParams.costPriceEnd" controls-position="right" :precision="2" :min="listParams.costPriceBegin" :max="100000" placeholder="请输入" />
<label class="mr8 ml40 w100 inline-block">更新时间：</label>
<el-select v-model="listParams.sortOrder" @change="refresh" placeholder="默认筛选">
<el-option label="由近及远" value="desc"></el-option>
......
src/views/card/card-package/module/sync-stock.vue deleted 100644 → 0
<template>
<el-dialog :title="`${type === 1 ? '同步' : '返还'}卡券`" :visible.sync="visible" width="500px" @close="close">
<div class="ct" v-loading="loading">
<!-- 同步 -->
<i class="el-icon-info blue"></i>
<p class="inline-block" v-if="type === 1">卡券同步至福利中心后，可提供其它应用使用卡券的能力；同步后可在福利中心或同步记录页面返还以同步库存。<el-button type="text" v-if="showLink && synFlag" @click="toSyncList">查看同步记录</el-button></p>
<p class="inline-block" v-if="type === 2">使用返还功能将福利中心卡券库存返还至卡券</p>
<div class="gray01 fz14 mt25">
{{ type === 1 ? '当前剩余库存' : '福利中心可返还库存' }}
<span class="fz16 ml8">{{ stock }}</span>
</div>
<div class="mt20">
{{ type === 1 ? '同步库存' : '返还库存' }}：
<el-input-number class="ml15 w300" controls-position="right" :precision="0" :min="0" :max="stock" v-model="count" />
<p class="tips">{{ type === 1 ? '同步最大库存不能超过当前剩余库存' : '福利中心已被占用的库存无法返还' }}</p>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="close">取消</el-button>
<el-button type="primary" :disabled="loading && count" @click="submit">确认</el-button>
</span>
</el-dialog>
</template>
<script>
// 卡券同步
import api from '@/api/card-package';
const { syncStock, getWelfareStock, getCouponStockInfo, returnStock } = api;
export default {
name: 'SyncStock',
props: {
visible: {
type: Boolean,
default: false
},
showLink: {
type: Boolean,
default: true
},
type: {
// 类型：1同步 2返还
type: Number,
default: 1
},
couponId: {
type: String,
},
},
data() {
return {
loading: false,
synFlag: false, // 是否同步过 没通不过不显示link
stock: 0, // 可操作库存
count: '', // 返还/同步的数量
};
},
methods: {
close() {
this.count = 0;
this.synFlag = false;
this.stock = 0;
this.$emit('update:visible', false);
},
submit() {
const { type, couponId, count } = this;
if (type === 1) {
// 同步库存
this.loading = true;
syncStock({ couponId, count }).then(res => {
this.loading = false;
this.$tips({ message: '同步成功', type: 'success' });
this.$emit('update:visible', false);
this.$emit('syncSuccess');
}).finally(() => {
this.loading = false;
});
} else {
// 返还
returnStock({ couponId, count }).then(res => {
this.loading = false;
this.$tips({ message: '返还成功', type: 'success' });
this.$emit('update:visible', false);
this.$emit('syncSuccess');
}).finally(() => {
this.loading = false;
});
}
},
getCouponStockInfo() {
this.loading = true;
getCouponStockInfo({ couponId: this.couponId }).then(res => {
this.loading = false;
this.synFlag = res.result.synFlag || false;
this.stock = res.result.remainedStock || 0;
}).finally(() => {
this.loading = false;
});
},
// 获取福利剩余库存
getWelfareStock() {
this.loading = true;
getWelfareStock({ couponId: this.couponId }).then(res => {
this.loading = false;
this.stock = res.result || 0;
}).finally(() => {
this.loading = false;
});
},
toSyncList() {
this.visible = false;
this.$router.push(`/gic-card/sync-stock/list?couponId=${this.couponId}`);
}
},
watch: {
visible(val) {
if(val) {
if(this.type === 1) {
this.getCouponStockInfo();
} else {
this.getWelfareStock();
}
}
}
},
};
</script>
<style lang="scss" scoped>
.ct {
padding-left: 20px;
padding-right: 20px;
position: relative;
i {
position: absolute;
left: 0px;
top: 3px;
}
p {
font-size:13px;
font-weight:400;
color:$gray02;
line-height:22px;
}
.tips {
&::before {
content: '*';
color: #FF943E;
margin-right: 3px;
}
font-size: 13px;
line-height: 1;
color: $gray02;
margin-left: 90px;
margin-top: 8px;
}
}
</style>
\ No newline at end of file
src/views/card/gic-card/card-list.vue
......@@ -49,7 +49,7 @@
<label class="mr8">可占库存：</label>
<el-input-number class="w140" @change="refresh" v-model="listParams.remainedStockBegin" controls-position="right" :precision="0" :min="1" :max="10000" placeholder="请输入" />
<span>至</span>
<el-input-number class="w140 mrAuto" @change="refresh" v-model="listParams.remainedStockEnd" controls-position="right" :precision="0" :min="listParams.remainedStockBegin" :max="100000" placeholder="请输入" />
<el-input-number class="w140 mrAuto" @change="refresh" v-model="listParams.remainedStockEnd" controls-position="right" :precision="0" :min="listParams.remainedStockEnd" :max="100000" placeholder="请输入" />
<label class="mr8 ml40 w100 inline-block">更新时间范围：</label>
<el-date-picker v-model="dateTime" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh" />
</div>
......@@ -139,7 +139,6 @@
<dm-pagination class="fr mb0" v-if="tableList.length" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</div>
<adjust-stock ref="adjust" title="调整可占用库存" :show.sync="adjustStock" :total-count="currentCard.remainedStock" @handleSubmit="adjustStockBack" /><!-- 调整库存 -->
<sync-stock :visible.sync="syncStock.visible" :coupon-id="syncStock.couponId" :type="1" @syncSuccess="getTableList" /><!-- 同步库存 -->
<import-code :coupon-id="codeDialog.couponId" ref="importCode" :visible.sync="codeDialog.visible" @success="getTableList" @close="(len) => { if(len) { getTableList(); } }" /><!-- 导入券码 -->
</div>
</template>
......@@ -152,7 +151,6 @@ import { mixBeforeRouteLeave } from '@/mixins/mixRoute';
import { formatDateTimeByType } from '@/utils/index';
import { showConfirm } from '@/utils/common';
import adjustStock from '@/components/libs/adjust-stock';
import syncStock from './module/sync-stock';
import api from '@/api/gic-card';
const { cardList, deleteCard, updateCardStock, disableCard } = api;
......@@ -160,7 +158,6 @@ export default {
name: 'CardList',
components: {
adjustStock,
syncStock,
importCode
},
mixins: [ page, formate, mixBeforeRouteLeave, getMainHeight ],
......@@ -192,10 +189,6 @@ export default {
total: 0,
tableList: [],
adjustStock: false,
syncStock: { // 同步dialog
visible: false,
couponId: '',
},
codeDialog: { // 导入券码dialog
visible: false,
couponId: '',
......
src/views/card/gic-card/module/sync-stock.vue deleted 100644 → 0
<template>
<el-dialog :title="`${type === 1 ? '同步' : '返还'}卡券`" :visible.sync="visible" width="500px" @close="close">
<div class="ct" v-loading="loading">
<!-- 同步 -->
<i class="el-icon-info blue"></i>
<p class="inline-block" v-if="type === 1">卡券同步至福利中心后，可提供其它应用使用卡券的能力；同步后可在福利中心或同步记录页面返还以同步库存。<el-button type="text" v-if="showLink && synFlag" @click="toSyncList">查看同步记录</el-button></p>
<p class="inline-block" v-if="type === 2">使用返还功能将福利中心卡券库存返还至卡券</p>
<div class="gray01 fz14 mt25">
{{ type === 1 ? '当前剩余库存' : '福利中心可返还库存' }}
<span class="fz16 ml8">{{ stock }}</span>
</div>
<div class="mt20">
{{ type === 1 ? '同步库存' : '返还库存' }}：
<el-input-number class="ml15 w300" controls-position="right" :precision="0" :min="0" :max="stock" v-model="count" />
<p class="tips">{{ type === 1 ? '同步最大库存不能超过当前剩余库存' : '福利中心已被占用的库存无法返还' }}</p>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="close">取消</el-button>
<el-button type="primary" :disabled="loading && count" @click="submit">确认</el-button>
</span>
</el-dialog>
</template>
<script>
// 卡券同步
import api from '@/api/gic-card';
const { syncStock, getWelfareStock, getCouponStockInfo, returnStock } = api;
export default {
name: 'SyncStock',
props: {
visible: {
type: Boolean,
default: false
},
showLink: {
type: Boolean,
default: true
},
type: {
// 类型：1同步 2返还
type: Number,
default: 1
},
couponId: {
type: String,
},
},
data() {
return {
loading: false,
synFlag: false, // 是否同步过 没通不过不显示link
stock: 0, // 可操作库存
count: '', // 返还/同步的数量
};
},
methods: {
close() {
this.count = 0;
this.synFlag = false;
this.stock = 0;
this.$emit('update:visible', false);
},
submit() {
const { type, couponId, count } = this;
if (type === 1) {
// 同步库存
this.loading = true;
syncStock({ couponId, count }).then(res => {
this.loading = false;
this.$tips({ message: '同步成功', type: 'success' });
this.$emit('update:visible', false);
this.$emit('syncSuccess');
}).finally(() => {
this.loading = false;
});
} else {
// 返还
returnStock({ couponId, count }).then(res => {
this.loading = false;
this.$tips({ message: '返还成功', type: 'success' });
this.$emit('update:visible', false);
this.$emit('syncSuccess');
}).finally(() => {
this.loading = false;
});
}
},
getCouponStockInfo() {
this.loading = true;
getCouponStockInfo({ couponId: this.couponId }).then(res => {
this.loading = false;
this.synFlag = res.result.synFlag || false;
this.stock = res.result.remainedStock || 0;
}).finally(() => {
this.loading = false;
});
},
// 获取福利剩余库存
getWelfareStock() {
this.loading = true;
getWelfareStock({ couponId: this.couponId }).then(res => {
this.loading = false;
this.stock = res.result || 0;
}).finally(() => {
this.loading = false;
});
},
toSyncList() {
this.visible = false;
this.$router.push(`/gic-card/sync-stock/list?couponId=${this.couponId}`);
}
},
watch: {
visible(val) {
if(val) {
if(this.type === 1) {
this.getCouponStockInfo();
} else {
this.getWelfareStock();
}
}
}
},
};
</script>
<style lang="scss" scoped>
.ct {
padding-left: 20px;
padding-right: 20px;
position: relative;
i {
position: absolute;
left: 0px;
top: 3px;
}
p {
font-size:13px;
font-weight:400;
color:$gray02;
line-height:22px;
}
.tips {
&::before {
content: '*';
color: #FF943E;
margin-right: 3px;
}
font-size: 13px;
line-height: 1;
color: $gray02;
margin-left: 90px;
margin-top: 8px;
}
}
</style>
\ No newline at end of file
src/views/index.vue
<template>
<div>
<div class="enter">
<div v-for="(item, idx) in wfTypes" :key="idx" :class="`b${idx + 1}`">
<div v-for="(item, idx) in wfTypes" :key="idx" :class="`block b${idx + 1}`">
<span class="title">{{ item.title }}</span>
<router-link :to="item.target" class="target"><i class="icon-right-circle iconfont-welfare4"></i></router-link>
</div>
......@@ -46,9 +46,13 @@ export default {
background: url('../assets/images/0#{$i}.png');
}
}
.block:hover {
margin-top: -20px;
}
> div {
transition: all 0.2s;
width: 280px;
cursor: pointer;
position: relative;
height: 360px;
border-radius: 12px;
......
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