Commit 6746f369 authored by 罗超's avatar 罗超

2

parent 6ec8a923
...@@ -15,18 +15,18 @@ ...@@ -15,18 +15,18 @@
</div> </div>
<div class="content"> <div class="content">
<div> <div>
<span>下单时间:</span> <span style="font-size:14px">下单时间:</span>
<el-date-picker v-model="dateList" @change="(msg.pageIndex = 1), getList()" size="small" type="datetimerange" <el-date-picker v-model="dateList" @change="(msg.pageIndex = 1), getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期"> range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
<span style="margin-left: 15px">所属平台:</span> <span style="margin-left: 15px;font-size:14px">所属平台:</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderSource" size="small" <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderSource" size="small"
placeholder="请选择"> placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option> <el-option label="全部平台" :value="0"></el-option>
<el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<span style="margin-left: 15px">订单类型:</span> <span style="margin-left: 15px;font-size:14px">订单类型:</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderType" size="small" <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.OrderType" size="small"
placeholder="请选择"> placeholder="请选择">
<el-option label="全部订单" :value="0"></el-option> <el-option label="全部订单" :value="0"></el-option>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-option> </el-option>
</el-select> </el-select>
<span style="margin-left: 15px">配送方式:</span> <span style="margin-left: 15px;font-size:14px">配送方式:</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.DeliveryMethod" size="small" <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.DeliveryMethod" size="small"
placeholder="请选择"> placeholder="请选择">
<el-option label="全部订单" :value="0"></el-option> <el-option label="全部订单" :value="0"></el-option>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</el-option> </el-option>
</el-select> </el-select>
<el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()" clearable <el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()" clearable
style="margin-left: 15px; width: 300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal" style="margin-left: 15px;font-size:14px; width: 300px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
size="small"> size="small">
<el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择"> <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择">
<el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id"> <el-option v-for="item in option" :key="item.Id" :label="item.name" :value="item.Id">
...@@ -57,19 +57,19 @@ ...@@ -57,19 +57,19 @@
justify-content: space-between; justify-content: space-between;
"> ">
<div> <div>
<span style="margin-left: 15px">线下订单:</span> <span style="margin-left: 15px;font-size:14px">线下订单:</span>
<el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.IsOffline" size="small" <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.IsOffline" size="small"
placeholder="请选择"> placeholder="请选择">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option label="是" :value="1"></el-option> <el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option> <el-option label="否" :value="0"></el-option>
</el-select> </el-select>
<span style="margin-left: 15px">主播名称:</span> <span style="margin-left: 15px;font-size:14px">主播名称:</span>
<el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()" <el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()"
clearable style="margin-top: 10px; width: 200px" class="input-with-select" placeholder="请输入主播名称" clearable style="margin-top: 10px; width: 200px" class="input-with-select" placeholder="请输入主播名称"
v-model="msg.AnchorName" size="small"> v-model="msg.AnchorName" size="small">
</el-input> </el-input>
<el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px" <el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px;font-size:14px"
@change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox> @change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox>
</div> </div>
<div style=" <div style="
...@@ -228,6 +228,7 @@ ...@@ -228,6 +228,7 @@
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size:14px;
" size="mini"> " size="mini">
{{ msg }} {{ msg }}
</el-tag> </el-tag>
...@@ -265,6 +266,7 @@ ...@@ -265,6 +266,7 @@
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
width: 55%; width: 55%;
font-size:14px;
"> ">
<span style="cursor: pointer">小计:¥{{ list.Final_Price }} <span style="cursor: pointer">小计:¥{{ list.Final_Price }}
<img v-if="item.PaymentTime == ''" @click="EditPrice(item, 1, list)" <img v-if="item.PaymentTime == ''" @click="EditPrice(item, 1, list)"
...@@ -285,7 +287,7 @@ ...@@ -285,7 +287,7 @@
</span> </span>
</div> </div>
<!-- <div flex="cross:center main:center" style="width: 45px;">数量:x {{list.Number}}</div>--> <!-- <div flex="cross:center main:center" style="width: 45px;">数量:x {{list.Number}}</div>-->
<div flex="cross:center main:center" style="display: flex; flex-direction: column"> <div flex="cross:center main:center" style="display: flex; flex-direction: column;font-size:14px;">
<div>数量:x {{ list.Number }}</div> <div>数量:x {{ list.Number }}</div>
<el-tag v-if=" <el-tag v-if="
list.IsApplyForAfterSale && list.IsApplyForAfterSale &&
...@@ -1847,7 +1849,7 @@ ...@@ -1847,7 +1849,7 @@
</script> </script>
<style> <style scoped>
.orderList .remark-box { .orderList .remark-box {
padding-top: 3px; padding-top: 3px;
margin-left: 7px; margin-left: 7px;
...@@ -1905,6 +1907,7 @@ ...@@ -1905,6 +1907,7 @@
.app-order-list .card-footer { .app-order-list .card-footer {
background: #f3f5f6; background: #f3f5f6;
padding: 10px 20px; padding: 10px 20px;
font-size: 14px;
} }
.app-order-list .app-order-info>div { .app-order-list .app-order-info>div {
...@@ -1938,6 +1941,7 @@ ...@@ -1938,6 +1941,7 @@
.app-order-list .express-price { .app-order-list .express-price {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
font-size: 14px;
} }
.app-order-list .goods-item { .app-order-list .goods-item {
...@@ -1973,6 +1977,7 @@ ...@@ -1973,6 +1977,7 @@
.app-order-list .goods-item .goods-info { .app-order-list .goods-item .goods-info {
width: 50%; width: 50%;
margin-top: 5px; margin-top: 5px;
font-size: 14px;
} }
.app-order-list .goods-image { .app-order-list .goods-image {
...@@ -2006,7 +2011,7 @@ ...@@ -2006,7 +2011,7 @@
top: 20px; top: 20px;
right: 25px; right: 25px;
color: #7c868d; color: #7c868d;
font-size: 18px; font-size: 16px;
padding: 0; padding: 0;
display: none; display: none;
} }
...@@ -2039,6 +2044,7 @@ ...@@ -2039,6 +2044,7 @@
.orderList .app-order-list .app-order-item .el-card__header { .orderList .app-order-list .app-order-item .el-card__header {
padding: 0; padding: 0;
font-size: 14px;
} }
.orderList .app-order-list .app-order-item { .orderList .app-order-list .app-order-item {
...@@ -2053,6 +2059,7 @@ ...@@ -2053,6 +2059,7 @@
min-width: 750px; min-width: 750px;
display: flex; display: flex;
position: relative; position: relative;
font-size: 14px;
} }
.orderList .app-order-title div { .orderList .app-order-title div {
...@@ -2065,6 +2072,7 @@ ...@@ -2065,6 +2072,7 @@
line-height: 40px; line-height: 40px;
display: flex; display: flex;
min-width: 750px; min-width: 750px;
font-size: 14px;
} }
.orderList .content { .orderList .content {
...@@ -2086,6 +2094,7 @@ ...@@ -2086,6 +2094,7 @@
.orderList .billStyle .billStyle_item { .orderList .billStyle .billStyle_item {
width: 50%; width: 50%;
padding: 5px; padding: 5px;
font-size: 14px;
} }
.orderList .billStyle .billtext { .orderList .billStyle .billtext {
......
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