Skip to content

J
jiedao-app-customer-new-master
Commit 7db939c9 authored by honghy's avatar honghy Committed by wux
Browse files
Options

订单详情样式调整

parent b60f2151
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 66 deletions
src/pages/orderInfo/orderInfo.vue
View file @ 7db939c9
...@@ -134,12 +134,9 @@ ...@@ -134,12 +134,9 @@
<text>{{$lang.lang.orderInfo.logistics}}</text> <text>{{$lang.lang.orderInfo.logistics}}</text>
</view> </view>
<view class="order-info-txt"> <view class="order-info-txt">
<view class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?orderData.initialLogisticsInfoDto[$lang.startTitle]:''}}</view> <view class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.startTitleZh):''}}</view>
<!-- <view class="">{{$lang.lang.orderInfo.address}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startAddressZh:orderData.logisticsInfoDto.startAddressEn):''}} </view> --> <!-- <view class="">{{$lang.lang.orderInfo.address}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startAddressZh:orderData.logisticsInfoDto.startAddressEn):''}} </view> -->
<!-- <view class="begin">{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?(orderData.initialLogisticsInfoDto[$lang.destCountryTitle]+'-'+(objectCity?objectCity[$lang.title]:'')+'-'+orderData.initialLogisticsInfoDto[$lang.destTitle]):''}}</view>--> <view>{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?(orderData.initialLogisticsInfoDto.destCountryTitleZh+'-'+(objectCity?objectCity.titleZh:'')+'-'+orderData.initialLogisticsInfoDto.destTitleZh):(orderData.initialLogisticsInfoDto.destCountryTitleEn+'-'+(objectCity?objectCity.titleEn:'')+'-'+orderData.initialLogisticsInfoDto.destTitleEn)):''}}</view>
</view>
<view class="order-info-txt">
<view class="begin">{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?(orderData.initialLogisticsInfoDto[$lang.destCountryTitle]+'-'+(objectCity?objectCity[$lang.title]:'')+'-'+orderData.initialLogisticsInfoDto[$lang.destTitle]):''}}</view>
</view> </view>
<view class="order-info-txt"> <view class="order-info-txt">
<view class="">{{$lang.lang.orderInfo.transport}}：{{getConfigLabel('transport',orderData.transportId)}}</view> <view class="">{{$lang.lang.orderInfo.transport}}：{{getConfigLabel('transport',orderData.transportId)}}</view>
...@@ -163,63 +160,57 @@ ...@@ -163,63 +160,57 @@
</view> </view>
<view class="order-info-line"> <view class="order-info-line">
<view class="order-info-line-v"> <view class="order-info-line-v">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.marks}}：{{orderData.marks}}</view> <view style="height: 100upx;">{{$lang.lang.orderInfo.marks}}：{{orderData.marks}}</view>
<view style="min-height: 36px;"> <view style="height: 100upx;">
{{$lang.lang.orderInfo.warehouse}}：{{orderData.sumNum||0}}{{$lang.lang.orderInfo.box}} {{$lang.lang.orderInfo.warehouse}}：{{orderData.sumNum||0}}{{$lang.lang.orderInfo.box}}
{{orderData.sumWeight||0}}KG {{orderData.sumWeight||0}}KG
{{orderData.sumVolume||0}}m³ {{orderData.sumVolume||0}}m³
{{orderData.sumQuantity||0}}{{$lang.lang.create.aunit}} {{orderData.sumQuantity||0}}{{$lang.lang.create.aunit}}
</view> </view>
<view style="min-height: 36px;" v-if="orderData.drawee==1">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignor}}</view> <view style="height: 100upx;" v-if="orderData.drawee==1">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignor}}</view>
<view style="min-height: 36px;" v-else-if="orderData.drawee==2">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignee}}</view> <view style="height: 100upx;" v-else-if="orderData.drawee==2">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignee}}</view>
<view style="min-height: 36px;" v-else @click="showCustomDrawee">{{$lang.lang.create.payer}}：{{$lang.lang.create.customDrawee}}</view> <view style="height: 100upx;" v-else @click="showCustomDrawee">{{$lang.lang.create.payer}}：{{$lang.lang.create.customDrawee}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.objectport}}:{{orderData.productRecord==1?$lang.lang.orderInfo.ourUndertakes:$lang.lang.orderInfo.customerUndertakes}}</view> <view style="height: 100upx;">{{$lang.lang.orderInfo.objectport}}:{{orderData.productRecord==1?$lang.lang.orderInfo.ourUndertakes:$lang.lang.orderInfo.customerUndertakes}}</view>
<view style="min-height: 36px;">{{$lang.lang.create.special}}:{{packageTypeName||''}}</view> <view style="height: 100upx;">{{$lang.lang.create.special}}:{{packageTypeName||''}}</view>
</view>
<view class="order-info-line-v"> <template v-if="basicShowMore">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.formInfo}}：{{orderData.costVO?orderData.costVO.totalNum:0}}{{$lang.lang.orderInfo.box}} <view style="height: 100upx;">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
{{orderData.costVO?orderData.costVO.totalWeight:0}}KG <view style="height: 100upx;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">
{{orderData.costVO?orderData.costVO.totalVolume:0}}m³
{{orderData.costVO?orderData.costVO.totalQuantity:0}}{{$lang.lang.create.aunit}}
</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.datas}}：{{orderData.sumNum}}{{$lang.lang.orderInfo.box}} {{orderData.vweight}}KG {{orderData.wvolume}}m³ {{orderData.sumQuantity}}{{$lang.lang.create.aunit}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view style="min-height: 36px;">{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
</view>
</view>
<view class="addicon" @click="basicShowMore=!basicShowMore">
<image src="/static/img/add.png" v-if="!basicShowMore"></image>
<image src="/static/img/sub.png" v-else></image>
</view>
<view :class="basicShowMore?'showInfoClass':'hideInfoClass'" >
<view class="order-info-line" >
<view class="order-info-line-v">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">
{{$lang.lang.orderInfo.clearCard}}： {{$lang.lang.orderInfo.clearCard}}：
<template v-if="orderData.customsClearCert !== null"> <template v-if="orderData.customsClearCert !== null">
{{orderData.customsClearCert? $lang.lang.orderInfo.is : $lang.lang.orderInfo.no}} {{orderData.customsClearCert? $lang.lang.orderInfo.is : $lang.lang.orderInfo.no}}
</template> </template>
<template v-else>-</template> <template v-else>-</template>
</view> </view>
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.unpack}}：{{orderData.isUnpack?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view> <view style="height: 100upx;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.unpack}}：{{orderData.isUnpack?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view> <view style="height: 100upx;">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view>
<view style="min-height: 72px;" v-if="orderData.isExternalWarehouse&& orderData.externalWarehousedtolist && orderData.externalWarehousedtolist.length"> <view style="height: 200upx;" v-if="orderData.isExternalWarehouse&& orderData.externalWarehousedtolist && orderData.externalWarehousedtolist.length">
<text>{{$lang.lang.orderInfo.warehouseName}}:{{$lang.lang.orderInfo.externalWarehouse}}</text> <text>{{$lang.lang.orderInfo.warehouseName}}:{{$lang.lang.orderInfo.externalWarehouse}}</text>
<text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text> <text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text>
<text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text> <text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text>
</view> </view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creatorName}}</view> <view style="height: 100upx;">{{$lang.lang.orderInfo.creator}}:{{orderData.creatorName}}</view>
</template>
</view> </view>
<view class="order-info-line-v"> <view class="order-info-line-v">
<view style="min-height: 36px;">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view> <view style="height: 100upx;">{{$lang.lang.orderInfo.formInfo}}：{{orderData.costVO?orderData.costVO.totalNum:0}}{{$lang.lang.orderInfo.box}}
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearRemark}}：{{orderData.remarks||$lang.lang.orderInfo.none}}</view> {{orderData.costVO?orderData.costVO.totalWeight:0}}KG
<view style="min-height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.create.nowChange}}：{{orderData.isSingleTicketTransport?$lang.lang.create.is:$lang.lang.create.fou}}</view> {{orderData.costVO?orderData.costVO.totalVolume:0}}m³
<view style="min-height: 36px;">{{$lang.lang.orderInfo.tidanPrice}}:{{orderData.displayBillLadingPrice?$lang.lang.orderInfo.show:$lang.lang.orderInfo.noShow}}</view> {{orderData.costVO?orderData.costVO.totalQuantity:0}}{{$lang.lang.create.aunit}}
<view style="min-height: 36px;">{{$lang.lang.create.quickNo}}:{{orderData.number}}</view>
<view style="min-height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime|$parseTime}}</view>
</view> </view>
<view style="height: 100upx;">{{$lang.lang.orderInfo.datas}}：{{orderData.sumNum}}{{$lang.lang.orderInfo.box}} {{orderData.vweight}}KG {{orderData.wvolume}}m³ {{orderData.sumQuantity}}{{$lang.lang.create.aunit}}</view>
<view style="height: 100upx;">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
<view style="height: 100upx;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view style="height: 100upx;">{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
<template v-if="basicShowMore">
<view style="height: 100upx;">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view>
<view style="height: 100upx;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearRemark}}：{{orderData.remarks||$lang.lang.orderInfo.none}}</view>
<view style="height: 100upx;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.create.nowChange}}：{{orderData.isSingleTicketTransport?$lang.lang.create.is:$lang.lang.create.fou}}</view>
<view style="height: 100upx;">{{$lang.lang.orderInfo.tidanPrice}}:{{orderData.displayBillLadingPrice?$lang.lang.orderInfo.show:$lang.lang.orderInfo.noShow}}</view>
<view style="height: 100upx;">{{$lang.lang.create.quickNo}}:{{orderData.number}}</view>
<view style="height: 100upx;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime|$parseTime}}</view>
</template>
</view> </view>
</view> </view>
</view> </view>
...@@ -253,10 +244,10 @@ ...@@ -253,10 +244,10 @@
<view class="order-info-line" > <view class="order-info-line" >
<view class="order-info-line-v"> <view class="order-info-line-v">
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.orderInfo.prod}}:{{item[$lang.prodTitle]}}</text> <text>{{$lang.lang.orderInfo.prodZh}}:{{item.prodTitleZh}}/{{item.prodTitleEn}}</text>
</view> </view>
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.orderInfo.formInfo}}:&nbsp;{{item.num}}{{$lang.lang.orderInfo.box}}&nbsp;{{item.weight}}KG&nbsp;{{item.volume}}m³&nbsp;{{item.quantity}}{{$lang.lang.create.aunit}}</text> <text>{{$lang.lang.orderInfo.formInfo}}:{{item.num}}{{$lang.lang.orderInfo.box}}{{item.weight}}KG{{item.volume}}m³{{item.quantity}}{{$lang.lang.create.aunit}}</text>
</view> </view>
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.orderInfo.works}}:{{item.worth}}RMB</text> <text>{{$lang.lang.orderInfo.works}}:{{item.worth}}RMB</text>
...@@ -283,8 +274,11 @@ ...@@ -283,8 +274,11 @@
<text v-else>{{item.brandType?($lang.lang.orderInfo.have+$lang.lang.orderInfo.brand):($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text> <text v-else>{{item.brandType?($lang.lang.orderInfo.have+$lang.lang.orderInfo.brand):($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text>
</view> </view>
<view class="order-table-v"> <view class="order-table-v">
<text>{{ $lang.lang.orderInfo.inWarehouseInfo }}:&nbsp;{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.cartonsNum : 0 }}{{ $lang.lang.orderInfo.box }}{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.weight : 0 }}KG{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.volume : 0 }}m³{{ item.warehouseInInfoVO ? item.warehouseInInfoVO.quantityAll : 0 }}{{ $lang.lang.create.aunit }} <text>{{$lang.lang.orderInfo.inWarehouseInfo}}:</text>
</text> <text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:0}}{{$lang.lang.orderInfo.box}}</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.weight:0}}KG</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.volume:0}}m³</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.quantityAll:0}}{{$lang.lang.create.aunit}}</text>
</view> </view>
<view class="order-table-v"> <view class="order-table-v">
<text>{{$lang.lang.create.quickNo}}:{{item.warehouseInInfoVO?item.warehouseInInfoVO.expressNo:item.expressNo}}</text> <text>{{$lang.lang.create.quickNo}}:{{item.warehouseInInfoVO?item.warehouseInInfoVO.expressNo:item.expressNo}}</text>
...@@ -362,10 +356,10 @@ ...@@ -362,10 +356,10 @@
<text>{{$lang.lang.orderInfo.marks}}:{{orderData.marks}}</text> <text>{{$lang.lang.orderInfo.marks}}:{{orderData.marks}}</text>
<text>{{$lang.lang.orderInfo.consigneeAndTel}}：{{orderData.consigneeVO?orderData.consigneeVO.name:''}}|{{orderData.consigneeVO?orderData.consigneeVO.countryCode:''}}{{orderData.consigneeVO?orderData.consigneeVO.phone:''}}</text> <text>{{$lang.lang.orderInfo.consigneeAndTel}}：{{orderData.consigneeVO?orderData.consigneeVO.name:''}}|{{orderData.consigneeVO?orderData.consigneeVO.countryCode:''}}{{orderData.consigneeVO?orderData.consigneeVO.phone:''}}</text>
<text>{{$lang.lang.orderInfo.consignorAndTel}}：{{orderData.consignorVO?orderData.consignorVO.name:''}}|{{orderData.consignorVO?orderData.consignorVO.countryCode:''}}{{orderData.consignorVO?orderData.consignorVO.phone:''}}</text> <text>{{$lang.lang.orderInfo.consignorAndTel}}：{{orderData.consignorVO?orderData.consignorVO.name:''}}|{{orderData.consignorVO?orderData.consignorVO.countryCode:''}}{{orderData.consignorVO?orderData.consignorVO.phone:''}}</text>
<text>{{$lang.lang.orderInfo.ballAddress}}：{{orderData.logisticsInfoDto?orderData.logisticsInfoDto[$lang.destTitle]:''}}</text> <text>{{$lang.lang.orderInfo.ballAddress}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.destTitleZh:orderData.logisticsInfoDto.destTitleEn):''}}</text>
</view> </view>
<view class="order_info" v-for="(item,index) in orderData.orderItemVOList" :key="index"> <view class="order_info" v-for="(item,index) in orderData.orderItemVOList" :key="index">
<text>{{$lang.lang.orderInfo.goodsRemark}}:{{item[$lang.prodTitle]}}</text> <text>{{$lang.lang.orderInfo.goodsRemark}}:{{item.prodTitleZh}}/{{item.prodTitleEn}}</text>
<view> <view>
<text>{{$lang.lang.orderInfo.brand}}：{{item.brandName?item.brandName:($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text> <text>{{$lang.lang.orderInfo.brand}}：{{item.brandName?item.brandName:($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text>
<text>{{$lang.lang.orderInfo.num}}：{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:0}}</text> <text>{{$lang.lang.orderInfo.num}}：{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:0}}</text>
......
src/static/css/orderInfo.css
View file @ 7db939c9
...@@ -164,10 +164,11 @@ page{ ...@@ -164,10 +164,11 @@ page{
.order-nav-v view{ .order-nav-v view{
height: 100%; height: 100%;
width: 30%; width: 30%;
text-align: left; text-align: center;
line-height: 90upx;
font-size: var(--f26); font-size: var(--f26);
position: relative; display: flex;
justify-content: center;
align-items: center;
color: var(--c9); color: var(--c9);
} }
.order-nav-v .act{ .order-nav-v .act{
...@@ -188,11 +189,11 @@ page{ ...@@ -188,11 +189,11 @@ page{
} }
.order-nav-v .act text{ .order-nav-v .act text{
position: relative; position: relative;
padding-bottom: 30upx; padding-bottom: 10upx;
} }
.order-nav-v .act text::after{ .order-nav-v .act text::after{
content: ''; content: '';
width: 66upx; width: 100%;
height: 3px; height: 3px;
background: var(--c396); background: var(--c396);
position: absolute; position: absolute;
...@@ -234,7 +235,7 @@ page{ ...@@ -234,7 +235,7 @@ page{
} }
.order-table-v{ .order-table-v{
/* display: flex; */ /* display: flex; */
height: 70upx; height: 100upx;
display: flex; display: flex;
} }
.order-table-v text{ .order-table-v text{
......
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