Skip to content

W
welfare
Commit 6f17e0ce by 黑潮
Options

update: UI调整

parent fbe8c888
Showing with 90 additions and 48 deletions
public/index.html
......@@ -48,7 +48,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js"></script><!-- 图片预览 -->
<script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.12.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.15.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.17.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
</body>
......
src/assets/styles/component.scss
......@@ -507,6 +507,8 @@ p.cell-time {
border-radius: 5px;
}
.goods-text {
flex: 1;
min-width: 0;
margin-left: 18px;
font-size: 14px;
color: #303133;
......@@ -521,6 +523,10 @@ p.cell-time {
}
.goods-text-name {
line-height: 22px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 100%;
}
.goods-sku {
margin-top: 3px;
......
src/components/libs/switch-page.vue
......@@ -16,10 +16,10 @@
</div>
</el-popover>
<transition name="slide-fade">
<div v-if="show" class="page-pop">
<div class="pl15">
<div class="text-right"><i class="el-dialog__close el-icon el-icon-close mr10 cursor" @click="show = false"></i></div>
<div>提示</div>
<div v-if="showCanUseApp" class="page-pop">
<div class="pl15" style="position:relative">
<div class="text-right" style="position:absolute;right:0"><i class="el-dialog__close el-icon el-icon-close mr10 cursor" @click="close"></i></div>
<div class="tip-title">提示</div>
<div class="tips">当前福利支持在以下应用使用</div>
<ul class="app-list">
<li v-for="(item, idx) in appList" :key="idx" @click="goLink(item)">
......@@ -33,7 +33,7 @@
</div>
</div>
</transition>
<el-popover v-model="showCanUseApp" open-delay="200" placement="left-end" width="365" trigger="hover" popper-class="sw-page-pop" @hide="close">
<el-popover open-delay="200" placement="left-end" width="365" trigger="hover" popper-class="sw-page-pop">
<div class="pl15">
<!-- <div class="text-right"><i class="el-dialog__close el-icon el-icon-close mr10 cursor" @click="close"></i></div> -->
<div class="tips">当前福利支持在以下应用使用</div>
......@@ -64,7 +64,7 @@ export default {
return {
showCanUseApp: false,
appList: [],
show: false,
// show: false,
};
},
mounted() {
......@@ -94,7 +94,6 @@ export default {
},
visible() {
let routes = [ '/gic-card/list', '/card-package/list', '/gift-manage/real-gift', '/gift-manage/virtual-gift' ];
console.log(this.$route.path);
return routes.some(i => i.indexOf(this.$route.path) > -1);
}
},
......@@ -104,10 +103,6 @@ export default {
this.showCanUseApp = true;
}
},
'$route'(val) {
let routes = [ '/gic-card/list', '/card-package/list', '/gift-manage/real-gift', '/gift-manage/virtual-gift' ];
this.show = routes.some(i => i.indexOf(this.$route.path) > -1) && this.$route.query.isAdded;
}
}
};
</script>
......@@ -135,11 +130,17 @@ export default {
}
}
}
.tip-title {
font-size: 18px;
font-weight: 400;
color: #303133;
line-height: 25px;
}
.app-block {
padding-left: 20px;
}
.tips {
margin-top: 8px;
margin-top: 20px;
margin-bottom: 8px;
}
.app-list {
......@@ -204,6 +205,7 @@ export default {
<style lang="scss">
.sw-page-pop {
padding: 6px 0 !important;
color: #303133;
}
.page-pop {
transform-origin: calc(100% - 25px) calc(100% - 25px);
......@@ -219,13 +221,14 @@ export default {
border: 1px solid #EBEEF5;
padding: 12px;
z-index: 2000;
color: #606266;
color: #303133;
line-height: 1.4;
text-align: justify;
font-size: 14px;
box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1);
word-break: break-all;
padding: 6px 0 !important;
padding-top: 16px !important;
li {
margin-right: 10px !important;
}
......
src/views/card/gic-card/member-get.vue
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<el-input placeholder="请输入关键字" class="mr10" style="width:290px" v-model="listParams.search" clearable @change="refresh">
<el-select v-model="listParams.searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
<el-option label="卡券名称" :value="1"></el-option>
<el-option label="备注名" :value="2"></el-option>
<el-option label="副标题" :value="3"></el-option>
<el-option label="会员昵称" :value="4"></el-option>
<el-option label="会员手机号" :value="5"></el-option>
<el-option label="会员卡号" :value="6"></el-option>
</el-select>
</el-input>
<el-select class="dm-select mr10 w140" clearable v-model="listParams.cardType" placeholder="所有卡券类型" @change="refresh">
<el-option v-for="(v, i) in cardType" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-select class="dm-select mr10 w140" clearable v-model="listParams.statusFlag" placeholder="所有使用状态" @change="refresh">
<el-option v-for="(v, i) in status" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-select class="w200 mr10" v-model="listParams.visitorFlag" @change="refresh" placeholder="所有用户领取记录" clearable>
<el-select class="mr10" style="width:170px" v-model="listParams.visitorFlag" @change="refresh" placeholder="所有用户领取记录" clearable>
<el-option label="会员领取记录" :value="0"></el-option>
<el-option label="非会员领取记录" :value="1"></el-option>
</el-select>
<el-input placeholder="请输入关键字" class="mr10 w400" v-model="listParams.search" clearable @change="refresh">
<el-select v-model="listParams.searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
<el-option label="卡券名称" :value="1"></el-option>
<el-option label="备注名" :value="2"></el-option>
<el-option label="副标题" :value="3"></el-option>
<el-option label="会员昵称" :value="4"></el-option>
<el-option label="会员手机号" :value="5"></el-option>
<el-option label="会员卡号" :value="6"></el-option>
</el-select>
</el-input>
<el-button class="ml10" type="text" @click="isOpen = !isOpen">{{ isOpen ? '收起' : '展开' }}<i :class="`${isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`"></i></el-button>
<dm-perm-button class="mlAuto" :disabled="$itemPerm($itemCode.gicCardMemberGetExport)" type="primary" icon="iconfont-market4 mr5 icon-icon_yunxiazai" @click="showExport">数据导出</dm-perm-button>
</div>
......
src/views/performance-manage/components/bulk-delivery-dialog.vue
......@@ -9,7 +9,7 @@
:file-list="fileList"
:on-success="onSuccess"
:limit="1"
width="auto"
width="380px"
accept=".xls,.xlsx"
with-credentials
:headers="uploadHeader"
......@@ -17,10 +17,10 @@
<span slot="tip"></span>
<el-button icon="iconfont-components4 icon-cp-shangc upload-icon">上传</el-button>
</dm-upload-file>
<el-button type="text" @click="downloadFile">下载批量发货的模版</el-button>
<el-button type="text" class="btn-download" @click="downloadFile">下载批量发货的模版</el-button>
</div>
<div v-if="showTip" class="mt10" style="margin-left:90px">
成功<span style="color:#2f54eb">{{successCount}}</span>条，失败<span style="color:#F5222d">{{failedCount}}</span>条
成功<span style="color:#2f54eb"> {{successCount}} </span>条，失败<span style="color:#F5222d"> {{failedCount}} </span>条
<el-button class="ml10" type="text" @click="errorInfoDialog.visible = true">查看详情</el-button>
</div>
<el-divider></el-divider>
......@@ -111,4 +111,9 @@ export default {
border-style: dashed;
}
}
.btn-download {
position: absolute;
left: 180px;
top: 9px;
}
</style>
src/views/performance-manage/components/logistics-delivery-dialog.vue
......@@ -2,7 +2,7 @@
<el-dialog :visible.sync="visible" title="物流发货" width="510px" @closed="$emit('close')">
<el-form v-loading="loading" :model="form" :rules="rules" ref="form" label-width="100px">
<el-form-item label="收货信息">
<p>{{data.consignee}} {{data.consigneePhone}}</p>
<p>{{data.consignee}}，{{data.consigneePhone}}</p>
<p>{{data.consigneeAddress}}</p>
</el-form-item>
<el-form-item label="物流公司" prop="logisticsCompanyCode">
......
src/views/performance-manage/components/logistics-info-dialog.vue
<template>
<el-dialog :visible.sync="visible" title="物流发货" width="780px" @closed="$emit('close')">
<div v-loading="loading">
<div>收货信息：{{data.consignee}} {{data.consigneePhone}} {{data.consigneeAddress}}</div>
<div style="color:#303133" v-loading="loading">
<div>收货信息：{{data.consignee}}，{{data.consigneePhone}}，{{data.consigneeAddress}}</div>
<div class="mt20">
<span>
物流公司:
物流公司：
<span v-if="!isEditing">{{data.logisticsCompanyName}}</span>
<el-select class="w160" v-else placeholder="请选择" v-model="logisticsCompanyCode">
<el-option label="顺丰速递" value="SF"></el-option>
......@@ -21,7 +21,7 @@
<el-button type="text" @click="handleEdit">编辑</el-button>
</div>
<div v-else class="fr pt10">
<el-button type="text" @click="handleSave">保存</el-button>
<el-button type="text" @click="handleConfirm">保存</el-button>
<el-button type="text" style="color:#606266" @click="isEditing = false">取消</el-button>
</div>
</template>
......@@ -45,10 +45,10 @@
<div class="empty_block"></div>
</div>
</div>
<div slot="footer">
<!-- <div slot="footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="handleConfirm">确认</el-button>
</div>
</div> -->
</el-dialog>
</template>
......@@ -112,6 +112,9 @@ export default {
.empty_block::after {
content: '暂无物流信息';
}
.el-divider {
background-color: #e4e7ed;
}
.logistics-info {
display: flex;
&>div {
......
src/views/performance-manage/delivery-detail.vue
......@@ -49,29 +49,29 @@
<p>{{deliveryInfo.cancelReason}}</p>
</div>
<el-divider></el-divider>
<p>
<p class="order-label">
发货单信息
</p>
<ul v-if="deliveryInfo.deliveryFlag==1" class="order-info">
<li>发货单号：{{deliveryInfo.deliveryId || '--'}}</li>
<li>履约单号：{{deliveryInfo.orderId || '--'}}</li>
<li>会员姓名：{{deliveryInfo.memberName || '--'}}</li>
<li>会员卡号：{{deliveryInfo.memberCardNo || '--'}}</li>
<li>发货单号：{{deliveryInfo.deliveryId || '--'}}</li>
<li>履约单号：{{deliveryInfo.orderId || '--'}}</li>
<li>会员姓名：{{deliveryInfo.memberName || '--'}}</li>
<li>会员卡号：{{deliveryInfo.memberCardNo || '--'}}</li>
<li>配货方式：物流发货</li>
<li>收货信息：{{deliveryInfo.consignee}} {{deliveryInfo.consigneePhone}} {{deliveryInfo.consigneeAddress}}</li>
</ul>
<ul v-else class="order-info">
<li>发货单号：{{deliveryInfo.deliveryId || '--'}}</li>
<li>履约单号：{{deliveryInfo.orderId || '--'}}</li>
<li>会员姓名：{{deliveryInfo.memberName || '--'}}</li>
<li>会员卡号：{{deliveryInfo.memberCardNo || '--'}}</li>
<li>发货单号：{{deliveryInfo.deliveryId || '--'}}</li>
<li>履约单号：{{deliveryInfo.orderId || '--'}}</li>
<li>会员姓名：{{deliveryInfo.memberName || '--'}}</li>
<li>会员卡号：{{deliveryInfo.memberCardNo || '--'}}</li>
<li>配货方式：上门自提</li>
<li>提货信息：{{deliveryInfo.consignee}} {{deliveryInfo.consigneePhone}}</li>
<li>自提点：{{deliveryInfo.pickUpPointAddress || '--'}}</li>
<li>提货地址：{{deliveryInfo.pickUpPointName || '--'}}</li>
<li>自提点：{{deliveryInfo.pickUpPointAddress || '--'}}</li>
<li>提货地址：{{deliveryInfo.pickUpPointName || '--'}}</li>
<li>提货时间：{{deliveryInfo.pickUpStartTime | formatDate}} - {{deliveryInfo.pickUpStopTime | formatDate}}</li>
</ul>
<el-table :data="giftList">
<el-table class="table" :data="giftList">
<el-table-column label="礼品" width="300">
<template slot-scope="{ row }">
<div class="goods-info">
......@@ -92,7 +92,7 @@
</template>
</el-table-column>
<el-table-column label="礼品编码" prop="giftId"></el-table-column>
<el-table-column label="成本（元）" prop="costPrice"></el-table-column>
<el-table-column label="成本(元)" prop="costPrice"></el-table-column>
<el-table-column label="数量" prop="exchangeQuantity"></el-table-column>
<el-table-column label="物流信息">
<template slot-scope="{ row }">
......@@ -181,6 +181,31 @@ export default {
</script>
<style lang="scss" scoped>
.el-divider {
background-color: #e4e7ed;
}
.order-label {
display: flex;
align-items: center;
line-height: 20px;
color: #303133;
font-weight: 500;
&::before {
display: inline-block;
width: 3px;
background-color: #2f54Eb;
height: 14px;
margin-right: 8px;
content: "";
}
}
.el-table {
/deep/.el-table__row {
td:last-child {
border-left: 1px solid #e4e7ed;
}
}
}
.order-info {
margin: 20px 0;
display: flex;
......
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