gjy 2 anos atrás
pai
commit
eb4f0f2b53

+ 2 - 2
config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'https://apitest.eliangeyun.com',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 23 - 14
pages/order/evaluationRecord.vue

@@ -4,7 +4,7 @@
 			<view class="content-list" v-for="(item,index) in list" :key='index'>
 				<view class="top flex flex-space-between">
 					<view  class="left flex">
-						<view>
+						<view @click='toDetail(item.orderId)'>
 							{{item.orderNumber}}
 						</view>
 						<u-icon name="arrow-right" color="#ccc" size="18"></u-icon>
@@ -19,7 +19,7 @@
 					</view>
 					<view>{{item.driverName}}</view>
 				</view>
-				<view class="flex align-center name-row">
+				<view class="flex align-center flex-space-between name-row">
 					<view class="sj-row hz-name">
 						司机信用:
 					</view>
@@ -29,7 +29,7 @@
 						</start>
 					</view>
 				</view>
-				<view class="flex align-center name-row">
+				<view class="flex align-center flex-space-between name-row">
 					<view class="sj-row hz-name">
 						运输效率:
 					</view>
@@ -39,7 +39,7 @@
 						</start>
 					</view>
 				</view>
-				<view class="flex align-center name-row">
+				<view class="flex align-center flex-space-between name-row">
 					<view class="sj-row hz-name">
 						运输安全:
 					</view>
@@ -49,7 +49,7 @@
 						</start>
 					</view>
 				</view>
-				<view class="flex align-center name-row">
+				<view class="flex align-center flex-space-between name-row">
 					<view class="sj-row hz-name">
 						服务质量:
 					</view>
@@ -59,7 +59,7 @@
 						</start>
 					</view>
 				</view>
-				<view class="flex align-center name-row">
+				<view class="flex align-center flex-space-between name-row">
 					<view class="sj-row hz-name">
 						满意度:
 					</view>
@@ -98,19 +98,20 @@
 				<view class="pl-style">
 					{{item.ownerContent}}
 				</view>
-				<view class="color2979ff flex">
-					<view @click="clickZK(item)">展开</view>
-					<u-icon name="arrow-down" color="#2979ff" size="18" v-if="item.isOpen"></u-icon>
-					<u-icon name="arrow-up" color="#2979ff" size="18" v-else></u-icon>
-				</view>
-				<view v-if="item.isOpen" class="img-content">
+				<view class="img-content">
 					<u--image :showLoading="true" :src="item1" width="80px" height="80px" class="img"
 						v-for="(item1,index) in item.imgList"></u--image>
 				</view>
 				<u-line class="line"></u-line>
-				<view class="gray999">
-					{{item.ownerAnonymous==1?"匿名评价":''}}
+				<view class="flex flex-space-between">
+					<view class="gray999">
+						{{item.ownerAnonymous==1?"匿名评价":'未匿名'}}
+					</view>
+					<view style='color:red;' @click='del(item)' class="">
+						删除
+					</view>
 				</view>
+				
 			</view>
 		</mescroll-body>
 	</view>
@@ -170,6 +171,14 @@
 			that = this
 		},
 		methods: {
+			del(item){
+				
+			},
+			toDetail(id) {
+				uni.$u.route('/pages/order/orderDetails', {
+					id: id,
+				});
+			},
 			upCallback(page) {
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
 						evaluatorId: this.userInfo.id,

+ 1 - 1
pages/order/jb.vue

@@ -50,7 +50,7 @@
 				if(photol == false){
 					uni.showModal({
 						title: '提示',
-						content: '您已经关闭相权限,去设置',
+						content: '您已经关闭相权限,去设置',
 						success: function (res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()

+ 2 - 0
pages/order/orderDetails.vue

@@ -696,6 +696,7 @@
 							this.status3 = true
 						}
 						if (res.data.hyCarrierInfo) {
+							this.zcImgList=[]
 							if (res.data.hyCarrierInfo.loadingImg) {
 								let _zcList = res.data.hyCarrierInfo.loadingImg.split(',')
 								for (let i = 0; i < _zcList.length; i++) {
@@ -703,6 +704,7 @@
 								}
 							}
 							if (res.data.hyCarrierInfo.unloadingImg) {
+								this.xcImgList=[]
 								let _xcList = res.data.hyCarrierInfo.unloadingImg.split(',')
 								for (let i = 0; i < _xcList.length; i++) {
 									if (_xcList[i]) this.xcImgList.push(_xcList[i])

+ 2 - 25
pages/release/release.vue

@@ -21,7 +21,7 @@
 		<view class="content1">
 			<view class="row" @click="selectCargoOwner">
 				<view class="left select-sf">{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
-				<view class="right">></view>
+				<view class="right"></view>
 			</view>
 			<!-- 		<view class="row" @click="selectCargoOwner" v-if="dataObj.cargoOwner">
 				<view class="left">{{dataObj.cargoOwner}}</view>
@@ -114,7 +114,7 @@
 				<view class="right"><input type="number" value="" placeholder="输入运费单价" class="input"
 						v-model="dataObj.freightPrice" /></view>
 			</view>
-			<view class="row">
+			<view v-if='dataObj.freightAdvance'  class="row">
 				<view class="left">该任务申请运费垫付</view>
 				<view class="right">
 					<u-switch v-model="dataObj.freightAdvance" @change="change" size="20"></u-switch>
@@ -333,28 +333,6 @@
 			this.goToRecord()
 		},
 		onShow() {
-			if(uni.getStorageSync('addressInfo')){
-				console.log(uni.getStorageSync('addressInfo'))
-				if (uni.getStorageSync('addressInfo').type==0) {
-					this.dataObj.sendCity =uni.getStorageSync('addressInfo').city
-					this.dataObj.sendArea = uni.getStorageSync('addressInfo').area
-					this.dataObj.sendPrivate = uni.getStorageSync('addressInfo').province
-					this.dataObj.sendDetailedAddress = uni.getStorageSync('addressInfo').detailedAddress
-					this.dataObj.sendLongitude = uni.getStorageSync('addressInfo').longitude
-					this.dataObj.sendLatitude = uni.getStorageSync('addressInfo').latitude
-					this.dataObj.senderPhone = uni.getStorageSync('addressInfo').contactPhone
-					this.dataObj.sender = uni.getStorageSync('addressInfo').contacts
-				}else{
-					this.dataObj.unloadDetailedAddress = uni.getStorageSync('addressInfo').detailedAddress
-					this.dataObj.unloadCity = uni.getStorageSync('addressInfo').city
-					this.dataObj.unloadArea = uni.getStorageSync('addressInfo').area
-					this.dataObj.unloadPrivate = uni.getStorageSync('addressInfo').province
-					this.dataObj.unsendLongitude = uni.getStorageSync('addressInfo').longitude
-					this.dataObj.unsendLatitude = uni.getStorageSync('addressInfo').latitude
-					this.dataObj.receiver = uni.getStorageSync('addressInfo').contacts
-					this.dataObj.receiverPhone = uni.getStorageSync('addressInfo').contactPhone
-				} 
-			}
 			_this = this
 			// #ifdef APP-PLUS
 			// let _status = this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
@@ -879,7 +857,6 @@
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false
 					}
 				}
-
 				uni.setStorageSync('releaseCargoOwner', this.dataObj.cargoOwner)
 				this.show = false
 			},

+ 7 - 2
pages/release/selectAddress.vue

@@ -278,8 +278,13 @@
 									data.city = _address.City
 									data.area = _address.Country
 									data.commonId = that.userInfo.id
-									data.type=that.type
-									uni.setStorageSync('addressInfo',data)
+									if(that.type==0){
+										uni.setStorageSync('storage_faddress',data)
+									}else{
+										uni.setStorageSync('storage_saddress',data)
+									}
+									
+									
 									uni.$u.route('/pages/release/release');
 									// that.temporaryAddress.latitude = res.latitude
 									// that.temporaryAddress.longitude = res.longitude