更新

pages/order/fk.vue

@@ -22,7 +22,7 @@
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
 		<view class="row3" @click="$u.throttle(submit, 5000)">提交</view>
-		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
+		<u-picker :show="isShow" ref="uPicker" :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>
 		<u-toast ref="uToast"></u-toast>
@@ -41,9 +41,9 @@
 				imgList: [],
 				value1: '',
 				fileList1: [],
-				orderList:[],
+				orderList: [],
 				dataDetails: {},
-				isShow:false,
+				isShow: false,
 			};
 		},
 		computed: {
@@ -54,34 +54,34 @@
 			console.log(this.dataDetails)
 			this.imgList = []
 		},
-		onShow(){
+		onShow() {
 			uni.showLoading({
 				title: '加载中'
 			})
-			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder',{
-				commonId: this.dataDetails.commonId,
-				cargoCommonId:this.userInfo.id
-			}).then(res => {
-				let that = this
-				uni.hideLoading()
-				this.orderList=[res.data]
-				// console.log(this.orderList)
-			})
-			.catch(res => {
-				uni.$u.toast(res.message);
-			});
+			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder', {
+					commonId: this.dataDetails.commonId,
+					cargoCommonId: this.userInfo.id
+				}).then(res => {
+					uni.hideLoading()
+					this.orderList = [res.data]
+					// console.log(this.orderList)
+				})
+				.catch(res => {
+					uni.$u.toast(res.message);
+				});
 		},
 		methods: {
-			confirmorder(e){
+			confirmorder(e) {
 				console.log(e)
-				this.dataDetails.orderId=e.value[0].id
-				this.dataDetails.orderNo=e.value[0].orderNo
-				this.isShow=false
+				this.dataDetails.orderId = e.value[0].id
+				this.dataDetails.orderNo = e.value[0].orderNo
+				this.isShow = false
 			},
-			selectorder(){
-				this.isShow=true
+			selectorder() {
+				this.isShow = true
 			},
 			submit() {
+				var that = this
 				if (!this.value1) {
 					that.$refs.uToast.show({
 						type: 'error',
@@ -89,10 +89,10 @@
 					})
 					return
 				}
-				if (this.value1.length<10||this.value1.length>300) {
+				if (this.value1.length < 10 || this.value1.length > 300) {
 					that.$refs.uToast.show({
 						type: 'error',
-						message: "投诉信息输入错误！",
+						message: "投诉信息需输入10 ~ 300字之间！",
 					})
 					return
 				}
@@ -100,18 +100,18 @@
 					title: '加载中'
 				})
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
-					    initiator:this.dataDetails.cargoOwner,
-						initiatorNumber:this.dataDetails.cargoOwnerPhone,
+						initiator: uni.getStorageSync("firstAuthentication").name,
+						initiatorNumber: uni.getStorageSync("firstAuthentication").phone,
 						commonId: this.userInfo.id,
 						passive: this.dataDetails.driverName,
 						passiveNumber: this.dataDetails.driverPhone,
-						passiveCommonId:this.dataDetails.commonId,
-						orderId:this.dataDetails.orderId,
-						orderNo:this.dataDetails.orderNo,
+						passiveCommonId: this.dataDetails.commonId,
+						orderId: this.dataDetails.orderId,
+						orderNo: this.dataDetails.orderNo,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 1,
-						objectFlag:1,
+						objectFlag: 1,
 					}).then(res => {
 						let that = this
 						uni.hideLoading()
@@ -119,10 +119,10 @@
 							type: 'success',
 							message: "反馈成功",
 							complete() {
-								uni.navigateBack({
-									delta:1
-								})
-								
+								// uni.navigateBack({
+								// 	delta:1
+								// })
+
 							}
 						})
 					})

pages/order/index.vue

@@ -18,7 +18,7 @@
 			<view class="fixed1"></view>
 			<view class="fix-content">
 				<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
-					@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
+					@custom="getSearch" @search="getSearch" :clearabled="true" style="margin: 0 auto;"></u-search>
 				<view class="tab-content">
 					<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
 						:inactiveStyle="{color:'white'}" :activeStyle="{
@@ -261,7 +261,7 @@
 					right: "30rpx",
 					padding: "6rpx 20rpx",
 					margin: '0 20rpx 0 0',
-					"border-radius": '30rpx'
+					"border-radius": '30rpx',
 				},
 				isdblclick:0,
 				upOption: {
@@ -768,7 +768,7 @@
 		padding: 20rpx;
 		position: fixed;
 		z-index: 99;
-		width: 100%;
+		width: 98%;
 		// margin-top: var(--status-bar-height);
 		// padding-bottom: 320rpx;
 	}

pages/order/jb.vue

@@ -22,7 +22,7 @@
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
 		<view class="row3" @click="$u.throttle(submit(), 1000)">提交</view>
-		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
+		<u-picker :show="isShow" ref="uPicker" :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>
 		<u-toast ref="uToast"></u-toast>
@@ -35,16 +35,16 @@
 	} from 'vuex';
 	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uploadImage from '@/components/ossutil/uploadFile.js';
-	
+
 	export default {
 		data() {
 			return {
 				imgList: [],
 				value1: '',
 				fileList1: [],
-				orderList:[],
+				orderList: [],
 				dataDetails: {},
-				isShow:false,
+				isShow: false,
 			};
 		},
 		computed: {
@@ -56,52 +56,51 @@
 			console.log(this.dataDetails)
 			this.imgList = []
 		},
-		onShow(){
+		onShow() {
 			uni.showLoading({
 				title: '加载中'
 			})
-			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder',{
-				commonId: this.dataDetails.commonId,
-				cargoCommonId:this.userInfo.id
-			}).then(res => {
-				let that = this
-				uni.hideLoading()
-				this.orderList=[res.data]
-				// console.log(this.orderList)
-			})
-			.catch(res => {
-				uni.$u.toast(res.message);
-			});
+			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder', {
+					commonId: this.dataDetails.commonId,
+					cargoCommonId: this.userInfo.id
+				}).then(res => {
+					uni.hideLoading()
+					this.orderList = [res.data]
+					// console.log(this.orderList)
+				})
+				.catch(res => {
+					uni.$u.toast(res.message);
+				});
 		},
 		methods: {
-			confirmorder(e){
+			confirmorder(e) {
 				console.log(e)
-				this.dataDetails.orderId=e.value[0].id
-				this.dataDetails.orderNo=e.value[0].orderNo
-				this.isShow=false
+				this.dataDetails.orderId = e.value[0].id
+				this.dataDetails.orderNo = e.value[0].orderNo
+				this.isShow = false
 			},
-			selectorder(){
-				this.isShow=true
+			selectorder() {
+				this.isShow = true
 			},
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相机权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			submit() {
-				var that=this
+				var that = this
 				if (!this.value1) {
 					that.$refs.uToast.show({
 						type: 'error',
@@ -109,7 +108,7 @@
 					})
 					return
 				}
-				if (this.value1.length<10||this.value1.length>300) {
+				if (this.value1.length < 10 || this.value1.length > 300) {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "举报信息输入错误！",
@@ -120,18 +119,18 @@
 					title: '加载中'
 				})
 				this.$request.baseRequest('post', '/feedbackReport/api/addInfo', {
-						initiator:this.dataDetails.cargoOwner,
-						initiatorNumber:this.dataDetails.cargoOwnerPhone,
+						initiator: uni.getStorageSync("firstAuthentication").name,
+						initiatorNumber: uni.getStorageSync("firstAuthentication").phone,
 						commonId: this.userInfo.id,
 						passive: this.dataDetails.driverName,
 						passiveNumber: this.dataDetails.driverPhone,
-						orderId:this.dataDetails.orderId,
-						orderNo:this.dataDetails.orderNo,
-						passiveCommonId:this.dataDetails.commonId,
+						orderId: this.dataDetails.orderId,
+						orderNo: this.dataDetails.orderNo,
+						passiveCommonId: this.dataDetails.commonId,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 2,
-						objectFlag:1,
+						objectFlag: 1,
 					}).then(res => {
 						let that = this
 						uni.hideLoading()
@@ -139,10 +138,10 @@
 							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)
 								});
-								
+
 							}
 						})
 					})