Commit 9e764a92 by 陈羽

update: style

parent ede92715
......@@ -17,14 +17,14 @@
<div class="section">
<div class="operate-top">
<div class="fl">
<div class="search-item">
<div class="search-item m-r-10">
<el-select v-model="query.activityStatus" placeholder="所有活动状态" clearable class="w-160" @change="getSearchList('1')">
<el-option label="未开始" :value="0"></el-option>
<el-option label="进行中" :value="1"></el-option>
<el-option label="已结束" :value="2"></el-option>
</el-select>
</div>
<div class="search-item">
<div class="search-item m-r-10">
<el-input v-model.trim="query.activityName" placeholder="请输入关键词进行搜索" prefix-icon="el-icon-search" clearable class="w-300" @change="getSearchList('1')"></el-input>
</div>
<div class="search-item">
......@@ -206,6 +206,9 @@ export default {
margin: 24px;
padding: 24px;
}
.m-r-10 {
margin-right: 10px;
}
.w-280 {
width: 280px;
}
......
......@@ -17,21 +17,21 @@
<div class="section">
<div class="operate-top">
<div class="fl">
<div class="search-item">
<div class="search-item m-r-10">
<el-input v-model.trim="searchValue" placeholder="请输入优惠券名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
</div>
<div class="search-item">
<div class="search-item m-r-10">
<el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getListCurr">
<el-option label="已上架" :value="2"></el-option>
<el-option label="已下架" :value="1"></el-option>
</el-select>
</div>
<div class="search-item">
<div class="search-item m-r-10">
<el-checkbox v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
</div>
</div>
<div class="fr">
<div class="search-item">
<div class="search-item m-r-10">
<el-select v-model="goodsType" placeholder="请选择批量操作" clearable @change="handleData">
<el-option label="批量上架" :value="0"></el-option>
<el-option label="批量下架" :value="1"></el-option>
......@@ -671,6 +671,9 @@ export default {
margin: 24px;
padding: 24px;
}
.m-r-10 {
margin-right: 10px;
}
.w-280 {
width: 280px;
}
......
......@@ -18,8 +18,8 @@
<!-- <div class="page-info">
<h3><i class="el-icon-info"></i>优惠券已支持主图和图文详情,如需再发布以“微信兑换券”来配送的礼品,请直接前往优惠券中设置</h3>
</div>-->
<div class="search-wrap" style="height: 74px;display: flex;justify-content: space-between;margin-bottom: 22px;">
<div class="left" style="height: 74px;display: flex;gap:8px;flex-wrap: wrap;">
<div class="search-wrap" style="display: flex;justify-content: space-between;margin-bottom: 20px;">
<div class="left" style="display: flex;gap:10px;flex-wrap: wrap;">
<div class="search-content-item" style="height:32px;">
<el-input v-model="searchValue" placeholder="请输入礼品名称/编码进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
</div>
......@@ -46,11 +46,11 @@
<el-option v-for="(v, i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId">
<span class="fl">{{ v.categoryName }}</span>
</el-option> </el-select
><el-checkbox style="margin-left:8px;" v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
><el-checkbox style="margin-left:10px;" v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
</div>
<div class="search-content-item" style="height:32px;"></div>
</div>
<div class="right" style="display: flex;justify-content: space-between;width:318px;padding-left:8px;box-sizing: border-box;">
<div class="right" style="display: flex;justify-content: space-between;width:322px;padding-left:10px;box-sizing: border-box;">
<div class="search-content-item" style="width:214px;">
<el-select v-model="goodsType" placeholder="请选择批量操作" clearable @change="handleData">
<el-option label="批量上架" :value="0"></el-option>
......@@ -58,7 +58,7 @@
<el-option label="批量删除" :value="2"></el-option>
</el-select>
</div>
<el-button type="primary" @click="addGift" style="height:32px;margin-left:8px;">新增礼品</el-button>
<el-button type="primary" @click="addGift" style="height:32px;margin-left:10px;">新增礼品</el-button>
</div>
</div>
<div v-loading="loading">
......
......@@ -17,14 +17,14 @@
<div>
<div class="operate-top">
<div class="fl">
<div class="search-item"><span>下单时间</span><el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker></div>
<div class="search-item m-r-10"><span>下单时间</span><el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker></div>
<!-- <div class="search-item">
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getList">
<el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货(虚拟商品)" :value="3"></el-option>
</el-select>
</div> -->
<div class="search-item">
<div class="search-item m-r-10">
<el-input placeholder="请输入关键词搜索" v-model.trim="searchValue" style="width:280px;" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchType" slot="prepend" placeholder="请选择" style="width:100px;">
<el-option label="订单编号" :value="1"></el-option>
......@@ -445,6 +445,9 @@ export default {
};
</script>
<style lang="less" scoped>
.m-r-10 {
margin-right: 10px;
}
.search-item > span {
margin-right: 8px;
font-size: 14px;
......
......@@ -56,7 +56,7 @@
<div class="right">
<el-button type="primary" @click="betachDeliver">批量发货</el-button>
<el-button plain @click="exportExcel"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
<el-button plain @click="exportExcel"><i class="iconfont icon-icon_yunxiazai" style="margin-right:10px"></i>导出订单</el-button>
</div>
</div>
</div>
......@@ -887,15 +887,15 @@ export default {
background: #fff;
.left {
display: flex;
gap: 8px;
gap: 10px;
flex-wrap: wrap;
}
.right {
display: flex;
justify-content: space-between;
width: 213px;
width: 220px;
height: 32px;
padding-left: 8px;
padding-left: 10px;
box-sizing: border-box;
}
}
......
......@@ -17,16 +17,16 @@
<div>
<div class="operate-top">
<div class="fl">
<div class="search-item">
<div class="search-item m-r-10">
<el-date-picker class="date-picker" @change="changeTime" v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div>
<div class="search-item">
<div class="search-item m-r-10">
<el-select v-model="refundType" placeholder="退款方式" clearable class="w-140" @change="getListCurr">
<el-option label="仅退款" :value="1"></el-option>
<el-option label="退货退款" :value="2"></el-option>
</el-select>
</div>
<div class="search-item">
<div class="search-item m-r-10">
<el-input placeholder="请输入关键词搜索" v-model.trim="searchValue" style="width:280px;" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)">
<el-select v-model="searchType" slot="prepend" placeholder="请选择" style="width:100px;">
<el-option label="退款单编号" :value="1"></el-option>
......@@ -444,7 +444,9 @@ export default {
margin: 24px;
padding: 24px;
}
.m-r-10 {
margin-right: 10px;
}
.operate-top {
background: #fff;
height: 32px;
......
......@@ -32,11 +32,11 @@
<div v-show="pickStatus" style="padding:24px;">
<div class="operate-top">
<div class="fl">
<div class="search-item">
<div class="search-item m-r-10">
<el-input v-model="searchValue" placeholder="请输入自提点名称/code" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
<div class="search-item">
<el-autocomplete prefix-icon="el-icon-search" popper-class="autocomplete-wrap" class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" clearable :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
<div class="search-item m-r-10">
<el-autocomplete prefix-icon="el-icon-search" popper-class="autocomplete-wrap" class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
<template slot-scope="{ item }">{{ item.creatorName }}</template>
</el-autocomplete>
</div>
......@@ -48,9 +48,9 @@
</div>
</div>
<div class="fr">
<el-button plain @click="exportData"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>
<el-button plain @click="setPicked">自提设置</el-button>
<el-button type="primary" @click="addStore('-1')">新增自提点</el-button>
<el-button plain @click="exportData" style="margin:0 10px 0 0"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>
<el-button plain @click="setPicked" style="margin:0 10px 0 0">自提设置</el-button>
<el-button type="primary" @click="addStore('-1')" style="margin:0 ">新增自提点</el-button>
</div>
</div>
<div v-loading="loading">
......@@ -377,6 +377,9 @@ export default {
};
</script>
<style scoped>
.m-r-10 {
margin-right: 10px;
}
.w-140 {
width: 140px;
}
......
......@@ -16,7 +16,7 @@
<div>
<div class="operate-top">
<div class="fl">
<div class="search-item">
<div class="search-item" style="margin-right:10px">
<el-input v-model="searchValue" placeholder="请输入卡券名称/礼品名称/编码" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
<div class="search-item">
......
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