Skip to content

J
jiedao-app-customer-new-master
Commit c78fa375 authored by 我在何方's avatar 我在何方 Committed by dragondean@qq.com
Browse files
Options

订单详情ui更改

parent ad739298
Show whitespace changes
Inline Side-by-side
Showing with 215 additions and 147 deletions
src/pages/orderInfo/orderInfo.vue
View file @ c78fa375
......@@ -9,8 +9,8 @@
</view>
<!-- <view class="start-bar"></view> -->
<view class="order-title">
<view class="">{{$lang.lang.orderInfo.info}}-{{orderData.orderNo}}{{orderData.tidanNo?'-'+orderData.tidanNo:''}}</view>
<text>{{$lang.lang.orderInfo.orderNo}}：{{orderData.orderNo}}</text>
<view class="">{{$lang.lang.orderInfo.info}}-{{orderData.orderNo}}{{orderData.tidanNo?'-'+orderData.tidanNo:''}}<text style="margin-left: 10px;padding: 0 4px;" @click="copyText(orderData.orderNo)">{{$lang.lang.orderInfo.copy}}</text></view>
<!-- <text>{{$lang.lang.orderInfo.orderNo}}：{{orderData.orderNo}}</text> -->
</view>
<view class="items items1">
<view class="items-v">
......@@ -59,7 +59,7 @@
</view>
</view>
<view class="items">
<view class="items" v-if="orderData.consigneeVO">
<view class="items-v">
<image src=".../../static/img/order-user.png" mode=""></image>
<view class="items-v-it">
......@@ -81,14 +81,14 @@
<text class="items-rf">{{orderData.consigneeVO?orderData.consigneeVO.harvestMethod==1?$lang.lang.orderInfo.own:$lang.lang.orderInfo.toRoom:''}}</text>
</view>
</view>
<view class="items-v">
<view class="items-v" v-if="orderData.consigneeVO.harvestMethod==2">
<image src=".../../static/img/order-area.png" mode=""></image>
<view class="items-v-it">
<text>{{$lang.lang.orderInfo.consigneeCity}}:</text>
<text class="items-rf">{{addressName||$lang.lang.orderInfo.none}}</text>
</view>
</view>
<view class="items-v">
<view class="items-v" v-if="orderData.consigneeVO.harvestMethod==2">
<image src=".../../static/img/order-location.png" mode=""></image>
<view class="items-v-it noborder">
<text>{{$lang.lang.orderInfo.consigneeAdd}}:</text>
......@@ -132,13 +132,16 @@
<view class="order-info-title">
<image src=".../../static/img/order-express.png" mode=""></image>
<text>{{$lang.lang.orderInfo.logistics}}</text>
<text class="mudi">{{$lang.lang.orderInfo.endCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.destTitleZh:orderData.initialLogisticsInfoDto.destTitleEn):''}}</text>
<text class="mudi">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.startTitleZh):''}}</text>
</view>
<view class="order-info-txt">
<view class="">{{$lang.lang.orderInfo.startCity}}：{{orderData.initialLogisticsInfoDto?($lang.locale=='zh'?orderData.initialLogisticsInfoDto.startTitleZh:orderData.initialLogisticsInfoDto.destTitleEn):''}}</view>
<!-- <view class="">{{$lang.lang.orderInfo.address}}：{{orderData.logisticsInfoDto?($lang.locale=='zh'?orderData.logisticsInfoDto.startAddressZh:orderData.logisticsInfoDto.startAddressEn):''}} </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="">{{$lang.lang.orderInfo.transport}}：{{getConfigLabel('transport',orderData.transportId)}}</view>
<view class="" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.channel}}：{{getChannelName(orderData.channelId)}}</view>
<view class="" v-if="orderData.type">{{$lang.lang.orderInfo.typeName}}：{{typeName}}</view>
</view>
</view>
</view>
......@@ -151,50 +154,56 @@
</view>
<view class="order-info-line">
<view class="order-info-line-v">
<view class="">{{$lang.lang.orderInfo.marks}}：{{orderData.marks}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.formInfo}}：{{orderData.costVO?orderData.costVO.totalNum:0}}{{$lang.lang.orderInfo.box}}
{{orderData.costVO?orderData.costVO.totalWeight:0}}KG
{{orderData.costVO?orderData.costVO.totalVolume:0}}m³
{{orderData.costVO?orderData.costVO.totalQuantity:0}}{{$lang.lang.create.aunit}}
</view>
<view class="">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view>
<view class="">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view class="">{{$lang.lang.orderInfo.singleWay}}：{{getConfigLabel('suingMethod',orderData.issuingMethod)||$lang.lang.orderInfo.none}}</view>
<view class="">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view>
</view>
<view class="order-info-line-v">
<view class="">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.marks}}：{{orderData.marks}}</view>
<view style="height: 36px;">
{{$lang.lang.orderInfo.warehouse}}：{{orderData.sumNum||0}}{{$lang.lang.orderInfo.box}}
{{orderData.sumWeight||0}}KG
{{orderData.sumVolume||0}}m³
{{orderData.sumQuantity||0}}{{$lang.lang.create.aunit}}
</view>
<view class="">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
<view style="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>{{$lang.lang.create.baojia}}: {{offerNumber||''}}</view>
<view style="height: 36px;" v-if="orderData.drawee==1">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignor}}</view>
<view style="height: 36px;" v-else-if="orderData.drawee==2">{{$lang.lang.create.payer}}：{{$lang.lang.create.consignee}}</view>
<view style="height: 36px;" v-else>{{$lang.lang.create.payer}}：{{orderData.customDraweeVOList?orderData.customDraweeVOList[0].name:''}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.objectport}}:{{orderData.productRecord==1?$lang.lang.orderInfo.ourUndertakes:$lang.lang.orderInfo.customerUndertakes}}</view>
<view style="height: 36px;">{{$lang.lang.create.special}}:{{packageTypeName||''}}</view>
</view>
<view class="order-info-line-v">
<view style="height: 36px;">{{$lang.lang.orderInfo.formInfo}}：{{orderData.costVO?orderData.costVO.totalNum:0}}{{$lang.lang.orderInfo.box}}
{{orderData.costVO?orderData.costVO.totalWeight:0}}KG
{{orderData.costVO?orderData.costVO.totalVolume:0}}m³
{{orderData.costVO?orderData.costVO.totalQuantity:0}}{{$lang.lang.create.aunit}}
</view>
<view style="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="height: 36px;">{{$lang.lang.orderInfo.customsType}}：{{getConfigLabel('customsType',orderData.customsType)}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.isCargoControl}}：{{orderData.isCargoControl?$lang.lang.orderInfo.yes:$lang.lang.orderInfo.no}}</view>
<view>{{$lang.lang.create.specialNote}}: {{orderData.packageRemarks||''}}</view>
</view>
</view>
<view class="order-info" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">
<view class="order-info-v">
<view class="order-info-title">
<image src=".../../static/img/order-car.png" mode=""></image>
<text>{{$lang.lang.orderInfo.transInfo}}</text>
<view class="addicon" @click="basicShowMore=!basicShowMore">
<image src="/static/img/addicon.png"></image>
</view>
<view class="order-info-line">
<view :class="basicShowMore?'showInfoClass':'hideInfoClass'" >
<view class="order-info-line" >
<view class="order-info-line-v">
<view class="">{{$lang.lang.orderInfo.doubleClear}}：{{getConfigLabel('doubleClear',orderData.doubleClear)||$lang.lang.orderInfo.none}}</view>
<view class="">{{$lang.lang.orderInfo.clearCard}}：{{orderData.customsClearCert?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view class="">{{$lang.lang.orderInfo.unpack}}：{{orderData.isUnpack?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.time}}：{{orderData.deliveryDate||$lang.lang.orderInfo.none}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearCard}}：{{orderData.customsClearCert?$lang.lang.orderInfo.is:$lang.lang.orderInfo.no}}</view>
<view style="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: 36px;">{{$lang.lang.orderInfo.loans}}：{{orderData.collectionProxy?($lang.lang.orderInfo.yes+' ('+orderData.collectionProxy+getType(orderData.collectionProxyCurrency)+')'):$lang.lang.orderInfo.no}}</view>
<view style="height: 72px;" v-if="orderData.isExternalWarehouse&&orderData.externalWarehousedtolist.length>0">
<text>{{$lang.lang.orderInfo.warehouseName}}:{{$lang.lang.orderInfo.externalWarehouse}}</text>
<text>{{$lang.lang.orderInfo.estLoading}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</text>
<text>{{$lang.lang.orderInfo.loadingAddress}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</text>
</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.creator}}:{{orderData.creator}}</view>
</view>
<view class="order-info-line-v">
<!-- <view class="" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.air}}：{{getClientaName(orderData.airlineCompany)||$lang.lang.orderInfo.none}}</view> -->
<view class="" v-if="orderData.transportId==2">{{$lang.lang.orderInfo.ship}}：{{getClientaName(orderData.shippingCompany)||$lang.lang.orderInfo.none}}</view>
<view class="">{{$lang.lang.orderInfo.clearRemark}}：{{orderData.remarks||$lang.lang.orderInfo.none}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.levite}}：{{getConfigLabel('warehouseType',orderData.warehouseType)}}</view>
<view style="height: 36px;" v-if="['3','4'].indexOf(orderData.transportId+'') > -1">{{$lang.lang.orderInfo.clearRemark}}：{{orderData.remarks||$lang.lang.orderInfo.none}}</view>
<view style="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>
<view style="height: 36px;">{{$lang.lang.orderInfo.tidanPrice}}:{{orderData.displayBillLadingPrice?$lang.lang.orderInfo.show:$lang.lang.orderInfo.noShow}}</view>
<view style="height: 36px;">{{$lang.lang.create.quickNo}}:{{orderData.number}}</view>
<view style="height: 36px;">{{$lang.lang.orderInfo.createTime}}：{{orderData.createTime}}</view>
</view>
</view>
</view>
</view>
......@@ -215,86 +224,70 @@
</view>
<view class="order-table" v-if="activeIndex==0&&orderData.orderItemVOList&&orderData.orderItemVOList.length>0">
<view class="order-table-th" style="width: 30%;">
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.index}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.prodZh}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.prodEn}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.brand}}</text>
</view>
<view style="width: 100%;" v-for="(item,index) in orderData.orderItemVOList" :key="index">
<view class="number_shop">{{parseInt(index)+1}}</view>
<view class="order-info-line" >
<view class="order-info-line-v">
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.formNum}}</text>
<text>{{$lang.lang.orderInfo.prodZh}}:{{item.prodTitleZh}}/{{item.prodTitleEn}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.leviteNum}}</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 class="order-table-v">
<text>{{$lang.lang.orderInfo.unit}}</text>
<text>{{$lang.lang.orderInfo.works}}:{{item.worth}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.works}}(RMB)</text>
</view>
<view class="order-info-line-v">
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.material}}</text>
<text>{{$lang.lang.orderInfo.brand}}:</text>
<text v-if="item.brandName">{{item.brandName}}</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 class="order-table-v">
<text>{{$lang.lang.orderInfo.volume}}(m³)</text>
<text>{{$lang.lang.orderInfo.inWarehouseInfo}}:</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:item.num}}{{$lang.lang.orderInfo.box}}</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.weight:item.weight}}KG</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.volume:item.volume}}m³</text>
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.quantityAll:item.quantity}}{{$lang.lang.create.aunit}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.weight}}(kg)</text>
<text>{{$lang.lang.create.quickNo}}:{{item.warehouseInInfoVO?item.warehouseInInfoVO.expressNo:item.expressNo}}</text>
</view>
<view class="order-table-v">
<text>{{$lang.lang.create.num}}({{$lang.lang.create.aunit}})</text>
</view>
</view>
<scroll-view scroll-x="true" class="order-scroll" style="width: 70%;">
<view class="order-table-th" :style="{width:tdWidth+'px'}" v-for="(item,index) in orderData.orderItemVOList" :key="index">
<view class="order-table-v">
<text>{{index+1}}</text>
<view class="addicon" @click="shopShowMore=!shopShowMore">
<image src="/static/img/addicon.png"></image>
</view>
<view :class="shopShowMore?'showInfoClass':'hideInfoClass'" >
<view class="order-info-line">
<view class="order-info-line-v">
<view class="order-table-v">
<text>{{item.prodTitleZh}}</text>
</view>
<view class="order-table-v twotext">
<text>{{item.prodTitleEn}}</text>
<text>{{$lang.lang.exception.type}}:</text>
<text >{{item.warehouseType}}</text>
</view>
<view class="order-table-v">
<text v-if="item.brandName">{{item.brandName}}</text>
<text v-else>{{item.brandType?($lang.lang.orderInfo.have+$lang.lang.orderInfo.brand):($lang.lang.orderInfo.none+$lang.lang.orderInfo.brand)}}</text>
<text>{{$lang.lang.orderInfo.material}}:</text>
<text>{{getConfigLabel('material',item.material)}}</text>
</view>
<view class="order-table-v">
<text>{{item.num}}</text>
<text>{{$lang.lang.create.link}}:{{item.link}}</text>
</view>
<view class="order-table-v">
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.cartonsNum:'0'}}</text>
</view>
<view class="order-info-line-v">
<view class="order-table-v">
<text>{{$lang.lang.orderInfo.unitType}}:</text>
<text>{{getConfigLabel('unit',item.unit)}}</text>
</view>
<view class="order-table-v">
<text>{{item.worth}}</text>
<text>{{$lang.lang.orderInfo.quickNos}}:{{item.expressNo}}</text>
</view>
<view class="order-table-v">
<text>{{getConfigLabel('material',item.material)}}</text>
</view>
<view class="order-table-v">
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.volume:item.volume}}</text>
</view>
<view class="order-table-v">
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.weight:item.weight}}</text>
</view>
<view class="order-table-v">
<text>{{item.warehouseInInfoVO?item.warehouseInInfoVO.quantityAll:item.quantity}}</text>
</view>
</view>
</scroll-view>
</view>
<view class="order-info" v-if="activeIndex==1">
<steper :talk="orderData.orderTimeVOList"></steper>
......@@ -388,7 +381,8 @@
doubleClear:[],
suingMethod:[],
unit:[],
material:[]
material:[],
packageType:[],
},
clientaData:[],
channelData:[],
......@@ -406,7 +400,13 @@
phoneHeight:0,
phoneWidth:0,
showMore:false,
offerNumber:''
offerNumber:'',
objectCity:'',
typeName:'',
packageTypeName:'',
basicShowMore:false,
shopShowMore:false
}
},
onLoad(options) {
......@@ -430,6 +430,7 @@
this.orderConfig('suing_method','suingMethod')
this.orderConfig('packaging_type','unit')
this.orderConfig('product_material','material')
this.orderConfig('order_special_needs', 'packageType')
this.getClientaData()
this.getChanel()
if(options.id){
......@@ -486,6 +487,25 @@
if(res.data.orderItemVOList&&res.data.orderItemVOList.length>0&&res.data.orderItemVOList.length<5){
that.tdWidth = that.widowsWidth/res.data.orderItemVOList.length
}
if(res.data.initialLogisticsInfoDto&&res.data.initialLogisticsInfoDto.destCityId){
that.getObjectCity(res.data.initialLogisticsInfoDto.destCityId)
}
if(res.data.type){
if(res.data.type.includes(1)){
that.typeName += this.$lang.lang.create.service
}
if(res.data.type.includes(2)){
that.typeName += this.$lang.lang.create.oversears
}
}
if(res.data.packageType){
that.config.packageType.forEach(item=>{
if(res.data.packageType.includes(item.value)){
that.packageTypeName += that.$lang.locale=='zh'?item.label:item.labelEn
}
})
}
if(res.data.consigneeVO&&res.data.consigneeVO.country){
var orderAdderss = ''
var country = that.address.find(item=>item.id == res.data.consigneeVO.country)||''
......@@ -570,6 +590,14 @@
}
}
},
//获取城市
getObjectCity(id){
this.$request.get('/app-api/ecw/region/get',{id:id}).then(res => {
if(res.code==0&&res.data){
this.objectCity = res.data
}
})
},
//获取出货渠道
getChanel(){
this.$request.get('/app-api/ecw/channel/select').then(res => {
......@@ -826,6 +854,17 @@
this.offerNumber = res.data.number
}
})
},
copyText(text){
uni.setClipboardData({
data:text,
success:()=>{
uni.showToast({
title:this.$lang.lang.notices.copySuccess,
icon:"none",
})
}
})
}
}
}
......
src/static/css/orderInfo.css
View file @ c78fa375
......@@ -13,10 +13,10 @@ page{
font-size: var(--f30);
margin-bottom: 10upx;
}
.order-title text{
/* .order-title text{
font-size: var(--f24);
color: var(--c6);
}
} */
.items1{
background-image: url(@/static/img/info_bg.png) !important;
background-repeat: no-repeat;
......@@ -111,12 +111,12 @@ page{
align-items: center;
justify-content: space-between;
}
.order-info-txt view{
/* margin-bottom: 20upx; */
}
.order-info-txt view:last-child{
/* .order-info-txt view{
margin-bottom: 20upx;
} */
/* .order-info-txt view:last-child{
margin-bottom: 0;
}
} */
.order-info-line{
display: flex;
......@@ -125,11 +125,20 @@ page{
}
.order-info-line-v{
flex: 1;
border: 1px solid #333;
}
.order-info-line .order-info-line-v:last-child{
border-left: none !important;
}
.order-info-line-v view{
margin-bottom: 20upx;
display: flex;
align-items: center;
padding-left: 8rpx;
border-bottom: 1px solid #333;
}
.order-info-line-v view:last-child{
border-bottom: none !important;
}
.order-nav{
width: 90%;
......@@ -218,6 +227,7 @@ page{
.order-table-v{
/* display: flex; */
height: 70upx;
display: flex;
}
.order-table-v text{
display:inline-block;
......@@ -226,10 +236,10 @@ page{
height: auto;
line-height: 32upx;
}
.order-table-v:nth-child(2n){
/* .order-table-v:nth-child(2n){
background-color: var(--ce9);
color: var(--c6);
}
} */
.order-table-v1{
width: 20%;
display: flex;
......@@ -321,3 +331,22 @@ page{
.hideInfoClass{
display: none;
}
.addicon{
width: 60rpx;
height: 60rpx;
display: flex;
align-items: center;
justify-content: center;
}
.addicon image{
width: 48rpx;
height: 48rpx;
}
.number_shop{
background-color: #80ffff;
border: 1px solid #333;
border-bottom: none;
margin-bottom: -20upx;
padding-left: 8rpx;
}
\ No newline at end of file
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