Commit 7a37f7ac authored by Mac's avatar Mac

修改样式

parent fb8a47b0
......@@ -2,10 +2,10 @@
<div class="orderList">
<div class="head-title">
订单列表
<el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
<!-- <el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
</el-button>
<el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
清空回收站</el-button>
清空回收站</el-button> -->
</div>
<div class="content">
<div>
......@@ -133,7 +133,7 @@
</div>
</div>
<div class="app-order-body">
<div class="goods-item" style="width: 65%;">
<div class="goods-item" style="width: 60%;">
<div v-for="(list,index2) in getshangplist(item)" :key="index2" class="goods">
<div >
<img :src="list.HotelImage" v-if='item.OrderType == 1' class="goods-image" />
......@@ -156,9 +156,20 @@
<span style="margin-right: 10px;" v-if='item.OrderType == 2 || item.OrderType == 3'>数量:x{{list.PeopleNumber}}</span>
</div>
<div style="margin-bottom: 5px;" > <span>单价:¥{{list.Unit_Price}}</span></div>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 1'>入店时间:{{list.StartDate}} - {{list.EndDate}}</div>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 1'>
<span>
入店时间:{{list.StartDate}} - {{list.EndDate}}
</span>
</div>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 4'>
上车地点:{{list.DepartAddress}} <span style='margin:0 5px'></span> 下车地点:{{list.ArriveAddress}}</div>
<span>
上车地点:{{list.DepartAddress}}
</span>
<span style='margin:0 5px'></span>
<span>
下车地点:{{list.ArriveAddress}}
</span>
</div>
<div style="margin-bottom: 5px;" v-if='item.OrderType == 4'> </div>
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;" v-if='item.OrderType == 1'>到店时间:{{list.ArrivalTime}} </span>
......@@ -168,7 +179,7 @@
</div>
</div>
<div flex="dir:left box:mean" style="width: 350px;">
<div flex="dir:left box:mean" style="width: 350px;display: flex;align-items: center;justify-content: center;">
<div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计:¥{{item.Income}}
......@@ -292,7 +303,7 @@
<div class="card-footer">
<div>
<div flex="dir:left">
<div class="address-box">联系人: {{item.Consignee}} 电话:{{item.Mobile}} <span style="margin-left:15px" v-if="item.CancelRemark && item.CancelRemark!=''">取消备注:{{item.CancelRemark}}</span> </div>
<div class="address-box">联系人: {{item.Consignee}} <span style='margin:0 5px'></span> 电话:{{item.Mobile}} <span style="margin-left:15px" v-if="item.CancelRemark && item.CancelRemark!=''">取消备注:{{item.CancelRemark}}</span> </div>
<!-- <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button> -->
</div>
......@@ -352,7 +363,7 @@
</div>
</div>
<div class="app-order-body">
<div class="goods-item" style="width: 65%;">
<div class="goods-item" style="width: 60%;">
<div v-for="(list,index2) in item.SDGoodsList" :key="index2" class="goods">
<div>
<img :src="list.CoverImagePath" class="goods-image" />
......@@ -361,10 +372,7 @@
<div class="goods-name">
<div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;">
<span class="el-tag el-tag--warning el-tag--mini el-tag--light is-hit"
style="margin-right: 5px;">
{{list.OrderTypeName}}
</span>
{{list.GoodsName}}
</div>
</div>
......@@ -392,7 +400,7 @@
<span>赞羊小计:¥{{list.SmallShopsCostPrice}}</span>
</div>
</div>
<div flex="dir:left box:mean" style="width: 350px;">
<div flex="dir:left box:mean" style="width: 350px;display: flex;align-items: center;justify-content: center;">
<div flex="cross:center main:center"
style="display: flex;flex-direction: column;align-items: flex-start;width: 55%;">
<span style="cursor:pointer">小计:¥{{list.Final_Price}}
......@@ -443,7 +451,7 @@
</div>
</div>
<div class="billStyle"
v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) && TenantId==1">
v-if="(list.SFinanceList.length>0|| list.ZFinanceList.length >0) ">
<div class="billStyle_item" style="border-right: 1px solid #EBEEF5">
收入单据:
<span v-for="(item,index2) in list.SFinanceList" :key="index2" @click="goSF(item)">
......@@ -562,7 +570,7 @@
<div class="card-footer">
<div>
<div flex="dir:left">
<div class="address-box">联系人: {{item.Consignee}} 电话:{{item.Mobile}}
<div class="address-box">联系人: {{item.Consignee}} <span style='margin:0 5px'></span> 电话: {{item.Mobile}}
出发地:{{item.ShoppingAddress}}
{{item.SDGoodsList[0].CarType!=5 ?('目的地:'+item.DestinationAddress):''}}
</div>
......
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