gjy 2 years ago
parent
commit
6637dda83d

+ 1 - 1
common/appUpdate.js

@@ -6,7 +6,7 @@ export default function appUpdate() {
 		
 	let baseUrlNew = config.def().baseUrlNew
 	uni.request({
-	    url: 'https://apitest.eliangeyun.com/appVersion/selectInfo',
+	    url: 'https://api.changyuntong56.com/appVersion/selectInfo',
 	    data: {
 	    	appid: plus.runtime.appid,
 	    	version: plus.runtime.version,

+ 0 - 1
config/index.js

@@ -1,7 +1,6 @@
 const dev = {
 	baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-		
 	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',

+ 1 - 1
pages/goodSource/index.vue

@@ -503,7 +503,7 @@
 						driverCommonId: res2.data.commonId,
 						commonId: item.commonId,
 						compId:item.compId,
-						cargoOwnerName: item.cargoOwnerReallyName,
+						cargoOwnerName: item.cargoOwnerName,
 						cargoOwner: item.cargoOwner,
 						sendPrivate: item.sendPrivate,
 						sendCity: item.sendCity,

+ 1 - 0
pages/goodSource/shippingDetails.vue

@@ -258,6 +258,7 @@
 			},
 			confirmClick() {
 				let item = this.detailData
+				console.log(item)
 				var that=this
 				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 					driverPhone: this.userInfo.phone,

+ 2 - 2
pages/order/orderDetails.vue

@@ -451,7 +451,7 @@
 									obj: JSON.stringify({id:that.id,carrierId:that.dataObj.hyCarrierInfo.id}),
 								});
 							}else{
-								that.alertTitle = '尚未添加车辆!'
+								that.alertTitle = '尚未完成车辆认证!'
 								that.showCancelButton = false
 								that.confirmText = '立即添加'
 								that.isShowAlert = true
@@ -471,7 +471,7 @@
 				uni.$u.route('/pages/order/confirmUnloading', {obj:JSON.stringify(item)});
 			},
 			confirmClick() {
-				if(this.alertTitle == '尚未添加车辆!'){
+				if(this.alertTitle == '尚未完成车辆认证!'){
 					uni.$u.route('/pages/mine/manageVehicles/index');
 				}else{
 					let  that = this

+ 3 - 3
pages/order/signContract.vue

@@ -60,7 +60,7 @@
 			</view>
 			<view class='row-between'>
 				<view class="gray">车牌号</view>
-				<view class=""  :style="{'color':dataDetails.carrierInfo.carNo?'#000':':#BBBBBB'}" @click="carClick">
+				<view class=""  :style="{'color':dataDetails.carrierInfo.carNo?'#000':'#BBBBBB'}" @click="carClick">
 					{{dataDetails.carrierInfo.carNo?dataDetails.carrierInfo.carNo:'请选择车牌号'}}
 					<!--< u--input placeholder="请输入车牌号" border="none" readOnly v-model="dataDetails.carrierInfo.carNo"
 						inputAlign='right' clearable></u--input> -->
@@ -75,7 +75,7 @@
 			<view class='row-between'>
 				<view class="gray">挂车号(选填)</view>
 				<view class="flex">
-					<view :style="{'color':dataDetails.trailerNumber?'#000':':#BBBBBB'}">{{dataDetails.trailerNumber?dataDetails.trailerNumber:'请输入挂车号'}}</view>
+					<view :style="{'color':dataDetails.trailerNumber?'#000':'#BBBBBB'}">{{dataDetails.trailerNumber?dataDetails.trailerNumber:'自动获取'}}</view>
 					<!-- <u--input placeholder="请输入挂车号" border="none" readOnly v-model="dataDetails.trailerNumber"
 						inputAlign='right' clearable></u--input> -->
 				</view>
@@ -224,7 +224,7 @@
 				endShow: false,
 				contractCheck: false, //判断合同是否提交
 				proportion: "", //垫付比例
-
+				status:false,
 
 			};
 		},

+ 1 - 1
pages/riders/index.vue

@@ -7,7 +7,7 @@
 				<view class="center_top_btn" :class="indexbtn == 2? '':'center_top_btn1'" @click="changebtn(2)">车队
 				</view>
 			</view>
-			<view class="top_img">
+			<view style='position:absolute;right:0;' class="top_img">
 				<u--image :showLoading="true" class="flex-end" src="../../static/images/riders/geren.png" width="35px"
 					height="35px" @click="myPage"></u--image>
 			</view>