更新

pages/mine/company/addcompany.vue

@@ -166,10 +166,10 @@
 			</view>
 			<view class="title">{{dataDetails.landOwnership=='自有'?'上传房产证':'上传租赁合同（扫描件或图片）'}}</view>
 			<view style='position:relative;'>
-				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
+				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(4)" class="picture">
 					<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
 				</view>
-				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" style='position:relative;'
+				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(4)" style='position:relative;'
 					class="preview-card-img picture">
 					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
@@ -586,6 +586,7 @@
 						// sourceType: ,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
+						
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
@@ -660,6 +661,9 @@
 												});
 												_this.$forceUpdate()
 											break;
+											case 4:
+											   _this.dataDetails.propertyAddressUrl = result
+											break;
 									}
 								}
 							)

pages/order/orderDetails.vue

@@ -30,7 +30,7 @@
 					v-if="dataObj.cargoOwnerStatus=='待确认装车'&&dataObj.cargoOwnerContract!='1'">
 				</u-button>
 
-				<u-button class="btn" text="驳回装车信息" @click="confirmLoading()" v-if="dataObj.cargoOwnerStatus=='待确认装车'">
+				<u-button class="btn" text="驳回装车信息" @click="confirmLoading(5)" v-if="dataObj.cargoOwnerStatus=='待确认装车'">
 				</u-button>
 				<!-- 		<u-button class="btn" text="确认装车" @click="confirmLoading(3)"
 					v-if="dataObj.cargoOwnerStatus=='待确认装车'&&dataObj.cargoOwnerContract=='1'">
@@ -445,13 +445,16 @@
 				this.isShowAlert = true
 			},
 			confirmLoading(type) {
-				if (this.dataObj.cargoOwnerContract != '1') {
+				if(this.type == 3 && this.type == 4){
+					if (this.dataObj.cargoOwnerContract != '1') {
 					uni.showToast({
 						title: '请先签订合同',
 						icon: 'none'
 					})
 					return
 				}
+				}
+				
 				this.type = type
 				if (type == 3) {
 					this.alertTitle = '确认装车？'
@@ -461,6 +464,10 @@
 					this.alertTitle = '确认卸车？'
 					this.confirmText = '确定'
 					this.isShowAlert = true
+				} else if (type == 5) { //驳回装车信息不用签合同
+					this.alertTitle = '确认驳回装车信息？'
+					this.confirmText = '确定'
+					this.isShowAlert = true
 				}
 				
 				// uni.$u.route('/pages/order/confirmLoading', item);
@@ -539,6 +546,8 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
+				}else if(this.type==""){
+					
 				} else {
 					if (this.radiovalue1 == '其他' && !this.value2) {
 						this.$refs.uToast.show({