Skip to content

E
ElectricitySheep
Commit b21e324a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 987b7b98
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 32 deletions
src/components/offlineService/osOrderDetails.vue
View file @ b21e324a
......@@ -49,7 +49,6 @@
</el-step>
</template>
</template>
</el-steps>
</el-card>
<el-row :gutter="16">
......@@ -70,29 +69,34 @@
<span
class="el-tag el-tag--success el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.PaymentWayName}}</span>
</div>
<div v-if="dataInfo.OrderInfo.DeliveryMethodName && dataInfo.OrderInfo.DeliveryMethodName!=''" flex="dir:left cross:center" class="item-box">
<div v-if="dataInfo.OrderInfo.DeliveryMethodName && dataInfo.OrderInfo.DeliveryMethodName!=''"
flex="dir:left cross:center" class="item-box">
<span class="label">配送方式:</span>
<span
class="el-tag el-tag--primary el-tag--small el-tag--light is-hit">{{dataInfo.OrderInfo.DeliveryMethodName}}</span>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.CouponMoney && dataInfo.CouponMoney !='' && dataInfo.CouponMoney>0">
<div flex="dir:left cross:center" class="item-box"
v-if="dataInfo.CouponMoney && dataInfo.CouponMoney !='' && dataInfo.CouponMoney>0">
<span class="label">优惠金额:</span>
<div>￥{{dataInfo.CouponMoney}}</div>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.IntegralMoney && dataInfo.IntegralMoney !='' && dataInfo.IntegralMoney>0">
<div flex="dir:left cross:center" class="item-box"
v-if="dataInfo.IntegralMoney && dataInfo.IntegralMoney !='' && dataInfo.IntegralMoney>0">
<span class="label">积分抵用金额:</span>
<div>￥{{dataInfo.IntegralMoney}}</div>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.IntegralNumber && dataInfo.IntegralNumber !='' && dataInfo.IntegralNumber>0">
<div flex="dir:left cross:center" class="item-box"
v-if="dataInfo.IntegralNumber && dataInfo.IntegralNumber !='' && dataInfo.IntegralNumber>0">
<span class="label">积分数:</span>
<div>￥{{dataInfo.IntegralNumber}}</div>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.MemberDiscountCouponList && dataInfo.MemberDiscountCouponList.length >0">
<div flex="dir:left cross:center" class="item-box"
v-if="dataInfo.MemberDiscountCouponList && dataInfo.MemberDiscountCouponList.length >0">
<span class="label">优惠券信息:</span>
<div>
<span v-for="(MItem,Mindex) in dataInfo.MemberDiscountCouponList" :key="Mindex">
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
</span>
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
</span>
</div>
</div>
<div flex="dir:left cross:center" class="item-box">
......@@ -154,7 +158,8 @@
title="点击搜索运单号">
{{item.ExpressNumber}}
</a>
<button type="button" class="el-button el-button--text is-circle" style="padding: 2px 12px;" @click="fhBtn2(dataInfo,item)">
<button type="button" class="el-button el-button--text is-circle" style="padding: 2px 12px;"
@click="fhBtn2(dataInfo,item)">
<i class="el-icon-edit"></i>
</button>
</div>
......@@ -186,7 +191,8 @@
style="color: rgb(64, 158, 255); cursor: pointer; margin-left: 10px;"></i>
</div>
</div>
<div v-if="dataInfo.BuyerMessage && dataInfo.BuyerMessage!=''" flex="dir:left cross:center" class="item-box" style="flex-shrink: 0;">
<div v-if="dataInfo.BuyerMessage && dataInfo.BuyerMessage!=''" flex="dir:left cross:center" class="item-box"
style="flex-shrink: 0;">
<span class="label">买家留言:</span>
<div>
{{dataInfo.BuyerMessage}}
......@@ -196,7 +202,8 @@
</el-col>
<el-col :span="8">
<div flex="dir:top" class="card-box">
<div v-if="dataInfo.DistributionInfo !=undefined &&dataInfo.DistributionInfo.length>0 && dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length==0">
<div
v-if="dataInfo.DistributionInfo !=undefined &&dataInfo.DistributionInfo.length>0 && dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length==0">
<h3>分销信息</h3>
<div v-for="(item,index) in dataInfo.DistributionInfo" :key="index">
<div class="share-title">
......@@ -216,9 +223,9 @@
</div>
</div>
</div>
<div v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0">
<h3 >Vip返利</h3>
<div v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2">
<div v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0">
<h3>Vip返利</h3>
<div v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2">
<div class="share-title">
<span>{{item.GradeDescription}}</span>
</div>
......@@ -231,12 +238,12 @@
<span class="label orange-label">佣金:</span>
<div>￥{{item.Commission}}</div>
</div>
</div>
</div>
</div>
</div>
<div v-if="dataInfo.OrderIntroductionInfo!=undefined && dataInfo.OrderIntroductionInfo.length>0">
<h3 >推荐供应商返佣</h3>
<div v-for="(item,index2) in dataInfo.OrderIntroductionInfo" :key="index2">
<h3>推荐供应商返佣</h3>
<div v-for="(item,index2) in dataInfo.OrderIntroductionInfo" :key="index2">
<div flex="dir:left cross:center" class="item-box">
<span class="label">姓名:</span>
<div>{{item.UserName}}</div>
......@@ -250,8 +257,8 @@
</div>
<div v-if="dataInfo.SmallShopsCommissionInfo!=undefined && dataInfo.SmallShopsCommissionInfo.length>0">
<h3 >微店佣金</h3>
<div v-for="(item,index2) in dataInfo.SmallShopsCommissionInfo" :key="index2">
<h3>微店佣金</h3>
<div v-for="(item,index2) in dataInfo.SmallShopsCommissionInfo" :key="index2">
<div class="share-title">
<span>{{item.SmallShopsName}}</span>
</div>
......@@ -259,16 +266,12 @@
<span class="label">姓名:</span>
<div>{{item.UserName}}</div>
</div>
<div flex="dir:left cross:center" class="item-box share-price">
<span class="label orange-label">佣金:</span>
<div>￥{{item.Commission}}</div>
</div>
</div>
</div>
</div>
</el-col>
</el-row>
......@@ -289,30 +292,31 @@
</el-table-column>
<el-table-column prop="name" label="规格" width="200" align="center">
<template slot-scope="scope">
<el-tag :key="index2" v-for="(list,index2) in scope.row.SpecificationList" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
{{list}}
<el-tag :key="index2" v-for="(list,index2) in scope.row.SpecificationList"
style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
size="mini">
{{list}}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="Unit_Price" label="单价" width="120" align="center">
<template slot-scope="scope">
￥{{scope.row.Unit_Price}}
￥{{scope.row.Unit_Price}}
</template>
</el-table-column>
<el-table-column prop="Number" label="数量" width="80" align="center">
</el-table-column>
<el-table-column prop="Original_Price" label="原价" width="120" align="center">
<template slot-scope="scope">
￥{{scope.row.Original_Price}}
￥{{scope.row.Original_Price}}
</template>
</el-table-column>
<el-table-column prop="Final_Price" label="折扣后" width="120" align="center">
<template slot-scope="scope">
￥{{scope.row.Final_Price}}
￥{{scope.row.Final_Price}}
</template>
</el-table-column>
<el-table-column prop="FreeShippingRemarks" label="备注" width="200" align="center">
<el-table-column prop="FreeShippingRemarks" label="备注" width="200" align="center">
</el-table-column>
</el-table>
<el-form label-width="200px" class="app-order-count-price">
......@@ -653,7 +657,7 @@
}
this.fahuoList = item.DetailList;
},
fhBtn2(dataInfo,item){
fhBtn2(dataInfo, item) {
this.fhDig = true;
this.fhMsg = {
Id: item.Id,
......@@ -680,6 +684,7 @@
OrderId: this.OrderId
}, res => {
this.dataInfo = res.data.data;
console.log("this.dataInfo",this.dataInfo);
let data = res.data.data;
// 未付款
if (data.PaymentTime == '' && data.DeliveryTime == '') {
......@@ -909,6 +914,7 @@
width: 30px;
background-image: url("../../assets/img/userman/status_2.png");
}
.app-order-detail .step01 {
height: 30px;
width: 30px;
......
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