achao пре 2 година
родитељ
комит
8316c9427e

+ 2 - 2
pages/cargoTerminal/cargoTerminal.vue

@@ -15,9 +15,9 @@
 		</view>
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
 			:down="downOption">
-			<view v-for="(good,index) in goods" :key="index" @click="toDetail(good.id)">
+			<view v-for="(good,index) in goods" :key="index">
 				<view v-if="good.peripheralInfo==1&&isFirstIndex==index" class="other-goods">周边货源</view>
-				<view class="good-list">
+				<view class="good-list" @click="toDetail(good.id)">
 					<view class="good-view">
 						<!-- 			<image src="@/static/images/goodSource/xf.png" mode="widthFix" class="xf-iamge"
 							v-if="good.freightAdvance==1"></image> -->

+ 65 - 38
pages/cargoTerminal/cargoTerminalDetail.vue

@@ -9,29 +9,34 @@
 					发货地
 				</view>
 				<view class="right">
-					{{dataObj.sendPrivate}}  {{dataObj.sendCity}}  {{dataObj.sendArea}}
+					{{dataObj.sendPrivate}} {{dataObj.sendCity}} {{dataObj.sendArea}}
 				</view>
 			</view>
 			<view class="row2 row right">
+				<view class="left">
+					地址
+				</view>
+				<view class="right">
 					{{dataObj.sendDetailedAddress}}
+				</view>
 			</view>
 			<view class="row3 row">
 				<view class="left">
 					卸货地
 				</view>
 				<view class="right">
-					{{dataObj.unloadPrivate}}  {{dataObj.unloadCity}}  {{dataObj.unloadArea}}
+					{{dataObj.unloadPrivate}} {{dataObj.unloadCity}} {{dataObj.unloadArea}}
 				</view>
 			</view>
 			<view class="row4 row right">
-					{{dataObj.unloadDetailedAddress}}
+				{{dataObj.unloadDetailedAddress}}
 			</view>
 			<view class="row5 row">
 				<view class="left">
 					装车时间
 				</view>
 				<view class="right">
-					{{dataObj.loadingDate}}  {{dataObj.periodOfTime}}
+					{{date}}  {{time}}
 				</view>
 			</view>
 			<view class="row6 row">
@@ -167,18 +172,24 @@
 	export default {
 		data() {
 			return {
-				dataObj:{}
+				dataObj: {},
+				date:"",
+				time:''
 			};
 		},
 		onLoad(options) {
 			this.id = options.id
 			this.init()
 		},
-		methods:{
-			init(){
-				this.$request.baseRequest('get', '/hyReleaseGoodsInfo/seeTask', {id:this.id}).then(res => {
+		methods: {
+			init() {
+				this.$request.baseRequest('get', '/hyReleaseGoodsInfo/seeTask', {
+						id: this.id
+					}).then(res => {
 						uni.hideLoading()
 						this.dataObj = res.data
+						this.date = this.dataObj.loadingDate.split(",")[0]+'~'+this.dataObj.loadingDate.split(",")[this.dataObj.loadingDate.split(",").length-1]
+						this.time = this.dataObj.periodOfTime.split(",")[0]+'~'+this.dataObj.periodOfTime.split(",")[1]
 					})
 					.catch(res => {});
 			},
@@ -187,42 +198,58 @@
 </script>
 
 <style lang="scss" scoped>
-	.content{
+	.content {
 		padding: 20rpx;
 	}
-	.content1,.content2,.content3{
+
+	.content1,
+	.content2,
+	.content3 {
 		background: #fff;
 		border-radius: 20rpx;
-		padding:20rpx;
+		padding: 20rpx;
 		box-sizing: border-box;
 		margin-bottom: 20rpx;
 	}
-.row{
-	display: flex;
-	justify-content: space-between;
-	margin-bottom: 10rpx;
-	.left{
-		color: rgba(153,153,153,1);
+
+	.row {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 10rpx;
+
+		.left {
+			width: 200rpx;
+			text-align: left;
+			// background: red;
+			color: rgba(153, 153, 153, 1);
+		}
 	}
-}
-.right{
-	display: flex;
-	justify-content: flex-end;
-}
-.row8{
-	display: flex;
-	flex-direction: column;
-}
-.title{
-	    font-weight: 700;
-	    font-size: 32rpx;
-	    color: rgb(51, 51, 51);
+
+	.right {
+		display: flex;
+		justify-content: flex-end;
+		text-align: right;
+	}
+
+	.row8 {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.title {
+		font-weight: 700;
+		font-size: 32rpx;
+		color: rgb(51, 51, 51);
 		margin: 20rpx 0;
-}
-.row2,.row4,.row8 .top{
-	color:rgb(153, 153, 153)
-}
-.row7 .right{
-	color:rgb(255, 134, 0) ;
-}
-</style>
+	}
+
+	.row2,
+	.row4,
+	.row8 .top {
+		// color: rgb(153, 153, 153)
+	}
+
+	.row7 .right {
+		color: rgb(255, 134, 0);
+	}
+</style>

+ 2 - 2
pages/cargoTerminal/hzSelectCity.vue

@@ -7,7 +7,7 @@
 			<view class="end-place" :class="type==1?'active1':''" @click="changeCity(1)">选择收货地</view>
 		</view>
 		<view class="container">
-			<view class="row2">
+			<!-- <view class="row2">
 				<view class="content1" v-if="type==0">
 					<view class="history-city-title">历史发货地</view>
 					<view class="city-list">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="page">
 			<view class="title flex flex-space-between">