Skip to content

W
welfare
Commit 69632a31 by chenxin
Options

fix: 去掉card-item build

parent f6e68bf4
Showing with 7 additions and 56 deletions
dist/css/gic-card.f8840ff8.css 0 → 100644
.upload[data-v-3fa9aee0]{display:inline-block;width:175px;line-height:15px!important}.file-list[data-v-3fa9aee0]{margin-left:95px}.file-list li[data-v-3fa9aee0]{height:37px;line-height:37px;background:#f2f3f7;border-radius:2px;margin-bottom:5px;padding-left:13px;padding-right:27px;margin-top:10px}.file-list li i[data-v-3fa9aee0]{margin-top:12px}.file-list li p[data-v-3fa9aee0]{display:inline-block;width:80%;margin-left:5px}.rule[data-v-3fa9aee0]{color:#909399;padding-top:22px;margin-top:36px;border-top:1px solid #e4e7ed;margin-bottom:11px}.rule+ul[data-v-3fa9aee0]{color:#909399}.rule+ul li[data-v-3fa9aee0]{font-size:12px;line-height:20px}.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-43be3626] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-43be3626] .el-table__row.hover-row .hover-btn{opacity:1}.dm-switch[data-v-457d5c5a] .el-switch__label{color:#606266}.dm-switch[data-v-457d5c5a] .el-switch__label.is-active{color:#303133}.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([object Module]) 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}.cardForm[data-v-12c87747]{padding:30px 20px}.cardForm .w165[data-v-12c87747]{width:165px!important}.cardForm .w265[data-v-12c87747]{width:265px!important}.cardForm .tips[data-v-12c87747]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-12c87747]{margin:20px auto 48px}.cardForm[data-v-12c87747] .el-form .el-input-number .el-input,.cardForm[data-v-12c87747] .el-form .el-select .el-input{width:100%}.cardForm[data-v-12c87747] .el-form .wInput352{width:352px}.w500[data-v-12c87747] input,.w500[data-v-12c87747] textarea{width:500px}.info .row[data-v-440cdf32] .el-form-item{margin-bottom:12px}.w500[data-v-440cdf32] input,.w500[data-v-440cdf32] textarea{width:500px}.card-info[data-v-440cdf32]{padding:24px 20px;position:relative}.card-info .title[data-v-440cdf32]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-440cdf32] .btn-area{display:none}.card-info[data-v-440cdf32] .el-form-item__content{color:#303133}.card-info[data-v-440cdf32] .el-form .el-input-number .el-input,.card-info[data-v-440cdf32] .el-form .el-select .el-input{width:100%}.card-info[data-v-440cdf32] .el-form .dm-input,.card-info[data-v-440cdf32] .el-form .el-input,.card-info[data-v-440cdf32] .el-form .el-input-number,.card-info[data-v-440cdf32] .el-form .el-select,.card-info[data-v-440cdf32] .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/gic-card.13ce86e7.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.d0a59e79.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
......@@ -88,10 +88,6 @@ export default {
// }
this.$store.commit('setCurrentSubApp', areaId);
},
// 设置默认子应用
// setDefaultApp({ areaId }) {
// this.$store.commit('setDefaultSubAppId', areaId);
// },
async init() {
const moduleCode = this.moduleCode;
......
src/views/card/gic-card/card-list.vue
......@@ -18,10 +18,6 @@
<el-option label="已过期" :value="2"></el-option>
<el-option label="已禁用" :value="3"></el-option>
</el-select>
<ul class="toggle-btn">
<li @click="active = 'card'" :class="{ active: active === 'card' }"><i class="iconfont-market4 icon-kapian"></i></li>
<li @click="active = 'list'" :class="{ active: active === 'list' }"><i class="iconfont-market4 icon-liebiao"></i></li>
</ul>
<dm-perm-button type="primary" @click="$router.push('/gic-card/add')" :disabled="$itemPerm($itemCode.gicCardFormAdd)">新建卡券</dm-perm-button>
</div>
<div style="height:20px;width:calc(100% + 40px);position:relative;left:-20px;" class="bg-color mb20"></div>
......@@ -37,20 +33,9 @@
<el-input-number class="hide-right w100" @change="refresh" v-model="listParams.remainedStockBegin" controls-position="right" :precision="0" :min="1" :max="10000" placeholder="请输入" />
<label class="ml5 mr5">-</label>
<el-input-number class="hide-right w100 mrAuto" @change="refresh" v-model="listParams.remainedStockEnd" controls-position="right" :precision="0" :min="listParams.remainedStockBegin" :max="100000" placeholder="请输入" />
<dm-perm-button type="danger" class="specter" v-show="active === 'list'" :disabled="!multipleSelection.length" @click="mutiDel">批量删除</dm-perm-button>
<dm-perm-button type="danger" class="specter" :disabled="!multipleSelection.length" @click="mutiDel">批量删除</dm-perm-button>
</div>
<!-- card -->
<div v-show="active === 'card'" class="card-content clearfix" :style="`max-height:${mainHeight(72 + 47)}px;overflow-y: auto;`">
<card-item @adjust-stock="preAdjustStock" @upload-code="uploadCode" :item="v" v-for="(v, i) in tableList" :key="i" @handler="handler"></card-item>
<div class="el-table__empty-block" v-if="!tableList.length">
<div class="empty-table">
<span class="el-table__empty-text">暂无数据</span>
</div>
</div>
</div>
<!-- list -->
<!-- TODO: minheight -->
<el-table v-show="active === 'list'" tooltip-effect="dark" :data="tableList" style="width:100%" :max-height="mainHeight(52 + 52)" @selection-change="handleSelectionChange">
<el-table tooltip-effect="dark" :data="tableList" style="width:100%" :max-height="mainHeight(52 + 52)" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="卡券信息" min-width="200" fixed="left">
<template slot-scope="scope">
......@@ -118,9 +103,6 @@
<li v-if="[2, 3, 4].includes(scope.row._status)" :class="{ disabled: $itemPerm($itemCode.gicCardGroupBtn) || scope.row.deleteFlag }">
<mk-button @click="handler(8, scope.row)" :option="{ perm: $itemPerm($itemCode.gicCardGroupBtn), deleteFlag: scope.row.deleteFlag, deleteRemark: scope.row.remark }" type="text">领取记录</mk-button>
</li>
<li>
<mk-button @click="handler(8, scope.row)" type="text">领取记录</mk-button>
</li>
</ul>
<el-button type="text" slot="reference">更多<i class="ml5 el-icon-arrow-down"></i></el-button>
</el-popover>
......@@ -144,7 +126,6 @@ import { cardType, cardStatus, mappingCardStatus } from '@/config/mapping/gic-ca
import { mixBeforeRouteLeave } from '@/mixins/mixRoute';
import { formatDateTimeByType } from '@/utils/index';
import { showConfirm } from '@/utils/common';
import cardItem from './module/card-item';
import adjustStock from '@/components/libs/adjust-stock';
import syncStock from './module/sync-stock';
import api from '@/api/gic-card';
......@@ -153,7 +134,6 @@ const { cardList, deleteCard, updateCardStock, disableCard } = api;
export default {
name: 'CardList',
components: {
cardItem,
adjustStock,
syncStock,
importCode,
......@@ -162,7 +142,6 @@ export default {
mixins: [ page, formate, mixBeforeRouteLeave, getMainHeight ],
data() {
return {
active: this.$route.query.active == 'list' ? 'list' : 'card', // card list
loading: false,
cacheRoute: [ '/gic-card/add', '/gic-card/edit', '/gic-card/copy' ],
dateTime: [ , ],
......@@ -406,29 +385,4 @@ export default {
opacity: 1;
}
}
.toggle-btn {
background: white;
overflow: hidden;
margin-right:10px;
border:1px solid rgba(196,198,207,1);
li {
border-right:1px solid rgba(196,198,207,1);
text-align: center;
float: left;
width:32px;
height:30px;
background: white;
border-radius:0px 1px 1px 0px;
color: $gray02;
line-height: 30px;
cursor: pointer;
&.active {
background:rgba(240,245,255,1);
color: $gray01;
}
&:last-child {
border-right: 0px;
}
}
}
</style>
\ No newline at end of file
src/views/card/gic-card/destory-list.vue
......@@ -127,7 +127,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: 'GIC卡券销毁列表' } ]);
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券销毁列表' } ]);
},
mounted() {
this.getTableList();
......
src/views/card/gic-card/module/card-item.vue
<template>
<!-- @mouseover="show = true" @mouseout="show = false" -->
<!-- 卡片样式 于2.22福利中心-卡券ui评审一致决定去掉 -->
<div class="card">
<div class="card-head" :style="`background: ${ item._status === 3 || item.deleteFlag == 1 ? '#c0c4cc' : item.color }`">
<p class="title" p-key="couponId" :title="item.couponId">
......
src/views/card/gic-card/send-list.vue
......@@ -105,7 +105,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: '卡券日志' }, { breadName: '转赠记录' } ]);
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: '转赠记录' } ]);
},
mounted() {
this.getTableList();
......
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