Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

# Conflicts:
#	config/index.js

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',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

pages/goodSource/cargoOwnerSee.vue

@@ -131,7 +131,7 @@
 				dataObj: {},
 				show: false,
 				columns: [
-					['反馈', '举报']
+					['投诉', '举报']
 				],
 				id: "",
 				objectInfo: {},
@@ -214,7 +214,7 @@
 			},
 			confirmBtn(e) {
 				console.log(e.value)
-				if (e.value == '反馈') {
+				if (e.value == '投诉') {
 					uni.$u.route('/pages/goodSource/fk', {
 						val: JSON.stringify(this.objectInfo)
 					});

pages/goodSource/fk.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="content">
 		<view class="row1 flex flex-space-between">
-			<view>被反馈人</view>
+			<view>被投诉人</view>
 			<view class='flex'>
-				<image :src="dataDetails.driverPortrait" mode="widthFix"  style="width: 40rpx;height: 40rpx;"> </image>
+				<image :src="dataDetails.driverPortrait" mode="widthFix"  style="width: 40rpx;height: 40rpx;" class="img_css"> </image>
 				<view>{{dataDetails.cargoOwnerName}}</view>
 			</view>
 		</view>
 		<u-line class="line"></u-line>
 		<view class="row2">
-			<view class="title">反馈信息</view>
+			<view class="title">投诉信息</view>
 			<u--textarea v-model="value1" placeholder="输入要反馈的内容,10-300字" count maxlength='300'></u--textarea>
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
@@ -35,7 +35,6 @@
 		},
 		onLoad(options) {
 			this.dataDetails = JSON.parse(options.val)
-			console.log(this.dataDetails)
 			this.imgList = []
 		},
 		computed: {
@@ -47,11 +46,16 @@
 					title: '加载中'
 				})
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
-						commonId: this.userInfo.id,
-						name: this.dataDetails.cargoOwnerName,
+						initiator:this.firstAuthentication.driverName,
+						initiatorNumber:this.firstAuthentication.driverPhone,
+						commonId: this.firstAuthentication.commonId,
+						passive: this.dataDetails.cargoOwnerName,
+						passiveNumber: this.dataDetails.cargoOwnerPhone,
+						passiveCommonId:this.dataDetails.commonId,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 1,
+						objectFlag:2
 					}).then(res => {
 						let that = this
 						uni.hideLoading()

pages/goodSource/jb.vue

@@ -47,11 +47,16 @@
 					title: '加载中'
 				})
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
-						commonId: this.userInfo.id,
-						name: this.dataDetails.cargoOwnerName,
+						initiator:this.firstAuthentication.driverName,
+						initiatorNumber:this.firstAuthentication.driverPhone,
+						commonId: this.firstAuthentication.commonId,
+						passive: this.dataDetails.cargoOwnerName,
+						passiveNumber: this.dataDetails.cargoOwnerPhone,
+						passiveCommonId:this.dataDetails.commonId,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 2,
+						objectFlag:2
 					}).then(res => {
 						let that = this
 						uni.hideLoading()
@@ -59,10 +64,12 @@
 							type: 'success',
 							message: "举报成功",
 							complete() {
-								uni.$u.route('/pages/order/driverDetail', {
-									driver: JSON.stringify(that.dataDetails)
-								});
-
+								// uni.$u.route('/pages/order/driverDetail', {
+								// 	driver: JSON.stringify(that.dataDetails)
+								// });
+								uni.navigateBack({
+									delta:1
+								})
 							}
 						})
 					})
@@ -118,6 +125,7 @@
 
 	.img {
 		width: 40rpx;
+		height: 40rpx;
 	}
 
 	.row1,

pages/mine/settings/editPassword.vue

@@ -146,7 +146,7 @@
 				uni.showLoading({
 					title: '重置密码中'
 				})
-				this.$request.baseRequest('post','/commonUser/resetPassword',{phone:this.phone,password:this.password,verifyCode:this.verifyCode}).then(res => {
+				this.$request.baseRequest('post','/commonUser/resetPassword',{phone:this.phone,password:this.password,verifyCode:this.verifyCode,identification:1}).then(res => {
 				    console.log("重置密码",res)
 					// 获得数据
 					if(res.data.code==200){

pages/order/confirmLoading.vue

@@ -124,7 +124,7 @@
 				alertTitle: '',
 				keyShow: false,
 				carNumber: '',
-				gjList: []
+				gjList: [],
 			}
 		},
 		onLoad(options) {
@@ -382,6 +382,13 @@
 					}
 					this.alertTitle = '确定暂存装车信息？'
 				} else {
+					if (!this.detailData.contractNo) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "合同未签订不能提交！"
+						})
+						return
+					}
 					this.alertTitle = '确定提交装车信息？'
 				}
 				this.isShowAlert = true
@@ -452,11 +459,15 @@
 					delete this.detailData.carrierInfo.sendArea;
 				}
 				this.detailData.carrierInfo = {}
-				
+				uni.showLoading({
+				    title: '加载中'
+				   })
 				this.detailData.carrierInfo.statusFlag = this.detailData.statusFlag
+				this.detailData.carrierInfo.id = this.id
 				this.detailData.carrierInfo.loadingImg = this.imgList.toString()
 				this.$request.baseRequest('post', '/carrierInfo/loadingAdd', this.detailData.carrierInfo).then(res => {
 						if (res.code == 200) {
+							uni.hideLoading()
 							let _title = ''
 							if (this.detailData.statusFlag == 1) {
 								_title = '暂存成功！'

pages/public/code.vue

@@ -120,7 +120,8 @@
 					that.$request.baseRequest('get', '/commonUser/loginVerifyCode', {
 							phone: this.phone,
 							verifyCode: this.inputList,
-							loginFlag: 2
+							loginFlag: 2,
+							identification:1
 						}).then(res => {
 							if (res.code == 200) {
 								uni.setStorageSync('userInfo', res.data)

pages/public/login.vue

@@ -154,7 +154,7 @@
 				    plus.runtime.quit();
 				}
 			},
-			passlogin(e) {debugger
+			passlogin(e) {
 				var that = this
 				uni.showLoading({
 					title: '登录中',
@@ -164,7 +164,8 @@
 				that.$request.baseRequest('get', '/commonUser/login', {
 						phone: this.phone,
 						password: this.password,
-						loginFlag: 2
+						loginFlag: 2,
+						identification: 1
 					}).then(res => {
 						if (res.code == 200) {
 							console.log("userInfo", res.data)

pages/public/register.vue

@@ -224,7 +224,8 @@
 						phone: this.phone,
 						password: this.password,
 						verifyCode: this.verifyCode,
-						userName: username
+						userName: username,
+						identification:1,//司机标识
 					}).then(res => {
 						if (res.code == '11002') {
 							uni.showToast({
@@ -248,7 +249,8 @@
 							that.$request.baseRequest('get', '/commonUser/login', {
 									phone: this.phone,
 									password: this.password,
-									loginFlag: 2
+									loginFlag: 2,
+									identification:1  //司机标识
 								}).then(res => {
 									if (res.code == 200) {
 										// // pc登录