前端

App.vue

@@ -37,8 +37,8 @@
 			// #ifdef APP-PLUS
 			console.log(uni.getStorageSync('userInfo'))
 			if(uni.getStorageSync('userInfo')){
-				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
-					phone: uni.getStorageSync('userInfo').phone,
+				that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+					driverPhone:uni.getStorageSync('userInfo').phone,
 				}).then(res => {
 					if (res.data.authenticationStatus == '已禁用') {
 						

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',

manifest.json

@@ -145,6 +145,20 @@
                         }
                     }
                 }
+            },
+            "AJ-Alert" : {
+                "__plugin_info__" : {
+                    "name" : "原生 弹窗 Alert 提示框  dialog 支持苹果安卓 - [试用版，仅用于自定义调试基座]",
+                    "description" : "uni的showModel样式单一，直接写vue弹窗又遮盖不了原生的组件，这是一个优化原生弹窗api",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=1664",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "1664",
+                    "parameters" : {}
+                }
             }
         }
     },

pages/goodSource/index.vue

@@ -186,32 +186,33 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		watch:{
-			startPlace(){
-				console.log(this.startPlace)
-                this.upCallback();
-            },
+			// startPlace(){
+			// 	console.log(this.startPlace)
+   //              this.upCallback({page});
+   //          },
 		},
 		onShow() {
 			//获取上一次点击起装卸地
 			if (uni.getStorageSync('fPlaceObj')) {
 				this.startPlace = uni.getStorageSync('fPlaceObj');
-				this.upCallback({size:10,num:1})
+
 			} else {
 				// #ifdef APP-PLUS
 				var that=this
 				console.log('good',1111)
 				// this.$nextTick(function(){
 					this.getLngLat();
-				// })
-				
+				// })		
 				// #endif
 			}
 			if (uni.getStorageSync('sPlaceObj')) {
 				this.endPlace = uni.getStorageSync('sPlaceObj');
-				this.upCallback({size:10,num:1})
+				
 			} else {
 				this.endPlace.selected = '全国'
 			}
+			this.upCallback({size:10,num:1})
+			var that= this
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
@@ -288,32 +289,37 @@
 			},
 			confirmClick() {
 				let item = this.ObjSelect
-				let _obj = {
-					driverCommonId: this.firstAuthentication.commonId,
-					commonId: item.commonId,
-					cargoOwnerName: item.cargoOwnerName,
-					cargoOwner: item.cargoOwner,
-					sendPrivate: item.sendPrivate,
-					sendCity: item.sendCity,
-					sendArea: item.sendArea,
-					sendDetailedAddress: item.sendDetailedAddress,
-					unloadPrivate: item.unloadPrivate,
-					unloadCity: item.unloadCity,
-					unloadArea: item.unloadArea,
-					unloadDetailedAddress: item.unloadDetailedAddress,
-					goodsName: item.goodsName,
-					distance: item.distance,
-					freightPrice: item.freightPrice,
-					driverName: this.firstAuthentication.driverName,
-					driverPhone: this.firstAuthentication.driverPhone,
-					cargoOwnerPhone: item.cargoOwnerPhone,
-					id:item.id,
-					billingMethod:item.billingMethod,
-					freightAdvance:item.freightAdvance
-				}
-				this.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
+				var that=this
+				console.log(this.userInfo.phone)
+				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+					driverPhone: this.userInfo.phone,
+				}).then(res2 => {
+					let _obj = {
+						driverCommonId: res2.data.commonId,
+						commonId: item.commonId,
+						cargoOwnerName: item.cargoOwnerName,
+						cargoOwner: item.cargoOwner,
+						sendPrivate: item.sendPrivate,
+						sendCity: item.sendCity,
+						sendArea: item.sendArea,
+						sendDetailedAddress: item.sendDetailedAddress,
+						unloadPrivate: item.unloadPrivate,
+						unloadCity: item.unloadCity,
+						unloadArea: item.unloadArea,
+						unloadDetailedAddress: item.unloadDetailedAddress,
+						goodsName: item.goodsName,
+						distance: item.distance,
+						freightPrice: item.freightPrice,
+						driverName: res2.data.driverName,
+						driverPhone: res2.data.driverPhone,
+						cargoOwnerPhone: item.cargoOwnerPhone,
+						id:item.id,
+						billingMethod:item.billingMethod,
+						freightAdvance:item.freightAdvance
+					}
+					that.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						if (res.code == 200) {
-							this.$refs.uToast.show({
+							that.$refs.uToast.show({
 								type: 'success',
 								message: "抢单成功！",
 								complete() {
@@ -323,7 +329,8 @@
 								}
 							})
 						} else {
-							this.$refs.uToast.show({
+							console.log(res)
+							that.$refs.uToast.show({
 								type: 'error',
 								message: res.message,
 							})
@@ -332,6 +339,8 @@
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
+				
+				});
 				this.isShowAlert = false
 			},
 			cancelClick() {
@@ -470,13 +479,18 @@
 										console.log(res.data.records)
 										uni.hideLoading()
 										that.mescroll.endBySize(res.data.records.length, res.data.total);
-										that.goods = res.data.records
-										for (let i = 0; i < that.goods.length; i++) {
-											if (that.goods[i].peripheralInfo == 1) {
-												that.isFirstIndex = i
-												return
+										if(res.data.records){
+											that.goods = res.data.records
+											for (let i = 0; i < that.goods.length; i++) {
+												if (that.goods[i].peripheralInfo == 1) {
+													that.isFirstIndex = i
+													return
+												}
 											}
+										}else{
+											that.goods=[]
 										}
+										
 									}
 									uni.hideLoading()
 								})
@@ -551,6 +565,7 @@
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
+				var that =this
 				let _pickerSelect;
 				if (this.pickerSelect == '运费先付') {
 					_pickerSelect = 1
@@ -628,45 +643,49 @@
 						console.log(_data)
 						this.$request.baseRequest('get', '/publishTaskInfo/selectGoodsSource', _data).then(res => {
 								if (res.code == 200) {
-									console.log(res.data.records)
-									// if(res.data.records){
-										
-									// }
-									for(var i=0;i<res.data.records.length;i++){
-										if(res.data.records[i].cargoDistance){
-											if(res.data.records[i].cargoDistance>10){
-												res.data.records[i].cargoDistance=res.data.records[i].cargoDistance.toFixed(0)
-											}else{
-												res.data.records[i].cargoDistance=res.data.records[i].cargoDistance.toFixed(1)
-											}	
-										}
-										if(res.data.records[i].distance){
-											if(res.data.records[i].distance>10){
-												res.data.records[i].distance=res.data.records[i].distance.toFixed(0)
-											}else{
-												res.data.records[i].distance=res.data.records[i].distance.toFixed(1)
+									uni.hideLoading()
+									if (page.num == 1) {
+										this.goods = [];
+										// this.otherGoods = []
+									};
+									console.log(res.data.records,1111111)
+									if(res.data.records){
+										for(var i=0;i<res.data.records.length;i++){
+											if(res.data.records[i].cargoDistance){
+												if(res.data.records[i].cargoDistance>10){
+													res.data.records[i].cargoDistance=res.data.records[i].cargoDistance.toFixed(0)
+												}else{
+													res.data.records[i].cargoDistance=res.data.records[i].cargoDistance.toFixed(1)
+												}	
+											}
+											if(res.data.records[i].distance){
+												if(res.data.records[i].distance>10){
+													res.data.records[i].distance=res.data.records[i].distance.toFixed(0)
+												}else{
+													res.data.records[i].distance=res.data.records[i].distance.toFixed(1)
+												}
+												
 											}
-											
 										}
 									}
-									uni.hideLoading()
 									this.mescroll.endBySize(res.data.records.length, res.data.total);
 									// for (var i = 0; i < res.data.records.length; i++) {
 									// 	res.data.records[i].cargoOwnerName1=
 									// }
-									if (page.num == 1) {
-										this.goods = [];
-										// this.otherGoods = []
-									}; //如果是第一页需手动制空列表
-									that.goods = that.goods.concat(res.data.records);
-									for (let i = 0; i < that.goods.length; i++) {
-										if (that.goods[i].peripheralInfo == 1) {
-											that.isFirstIndex = i
-											return
+									 //如果是第一页需手动制空列表
+									if(res.data.records){
+										that.goods = that.goods.concat(res.data.records);
+										for (let i = 0; i < that.goods.length; i++) {
+											if (that.goods[i].peripheralInfo == 1) {
+												that.isFirstIndex = i
+												return
+											}
 										}
+									}else{
+										that.goods=[]
 									}
+									
 								}
-								uni.hideLoading()
 							})
 							.catch(res => {
 								uni.$u.toast(res.message);

pages/goodSource/selectCity.vue

@@ -162,7 +162,7 @@
 						for (var q = 0; q < this.fcitylist.length; q++) {
 							if(this.fcitylist[q].label==this.fchoosecity){
 								this.fcitylist[q].checked=true
-								this.farealist = this.fcitylist[i].child
+								this.farealist = this.fcitylist[q].child
 								for (var area = 0; area < this.farealist.length; area++) {
 									if(this.farealist[area].label==this.fchoosearea){
 										this.farealist[area].checked=true
@@ -193,7 +193,7 @@
 							for (var q = 0; q < this.scitylist.length; q++) {
 								if(this.scitylist[q].label==this.schoosecity){
 									this.scitylist[q].checked=true
-									this.sarealist = this.scitylist[i].child
+									this.sarealist = this.scitylist[q].child
 									for (var area = 0; area < this.sarealist.length; area++) {
 										if(this.sarealist[area].label==this.schoosearea){
 											this.sarealist[area].checked=true

pages/goodSource/shippingDetails.vue

@@ -97,7 +97,11 @@
 				</view>
 				<view class="flex align-center">
 					<view class="left">车型</view>
-					<view class="right"><text v-if='carLength!="不限"'>{{carLength}} </text> <text v-if='carType!="不限"'>| {{carType}} </text><text v-if='carWeight!="不限"'>| {{carWeight}} </text></view>
+					<view v-if='carLength!=""&&carType!="不限"&&carWeight!=""' class="right">
+						{{carLength}} | 
+						<text v-if='carType!="不限"'> {{carType}} </text>
+						| {{carWeight}}</view>
+						<view class="right" v-else>空</view>
 				</view>
 				<view class="flex mt20">
 					<view class="left">描述</view>
@@ -156,6 +160,7 @@
 				} else if (this.detailData.carLength) {
 					length = "小于" + this.detailData.carLength + '米'
 				}
+				console.log(length)
 				return length
 			},
 			carType() {
@@ -174,6 +179,7 @@
 						_val += '自卸车'
 					}
 				}
+				console.log(_val)
 				return _val
 			},
 			carWeight() {
@@ -187,6 +193,7 @@
 				} else if (this.detailData.loadWeight) {
 					weight = "小于" + this.detailData.loadWeight + '吨'
 				}
+				console.log(weight)
 				return weight
 			},
 		},

pages/mine/fankui.vue

@@ -0,0 +1,30 @@
+<template>
+	<view>
+		<suggest @submit="submit"></suggest>
+	</view>
+</template>
+
+<script>
+	import suggest from "@/components/bert-suggest/suggest.vue"
+	export default {
+	    components: { suggest },
+	    methods: {
+	        submit(v) {
+				uni.showModal({
+					title: '提示',
+					content: "感谢您提供反馈意见，我们将立即联系您",
+					showCancel: false,
+					confirmText: '确定',
+					success: () => {
+						uni.navigateBack()
+					}
+				})
+	            console.log(v)
+	        }
+	    }
+	}
+</script>
+
+<style>
+
+</style>

pages/mine/index.vue

@@ -4,8 +4,8 @@
 		<view class="top-height"></view>
 		<view class="head">
 			<view class="row1">
-				<u--image class="flex-end" :showLoading="true" src="../../static/images/mine/saoma.png" width="30px"
-					height="30px"></u--image>
+			<!-- 	<u--image class="flex-end" :showLoading="true" src="../../static/images/mine/saoma.png" width="30px"
+					height="30px"></u--image> -->
 			</view>
 			<view class="row2 flex align-center">
 				<u--image class="flex-end" :showLoading="true" :src="headUrl" width="60px" height="60px" shape='circle'>

pages/mine/manageVehicles/addVehicle.vue

@@ -1386,7 +1386,7 @@
 		position: fixed;
 		bottom:0;left:0;
 		width:100%;
-		padding:40rpx 20rpx;
+		padding:40rpx 0;
 		background:#fff;
 	}
 	.submit-btn {

pages/mine/manageVehicles/editVehicle.vue

@@ -1390,7 +1390,7 @@
 		position: fixed;
 		bottom:0;left:0;
 		width:100%;
-		padding:40rpx 20rpx;
+		padding:40rpx 0;
 		background:#fff;
 	}
 	.submit-btn {

pages/order/orderDetails.vue

@@ -6,7 +6,7 @@
 			<view class='title flex flex-center'>
 				<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
 				<view class="nav-title">订单</view>
-				<u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService()"></u-icon>
+				<u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService"></u-icon>
 			</view>
 		</view>
 		<view class="content1">

pages/public/code.vue

@@ -113,6 +113,16 @@
 			submit(e) {
 				if (e.detail.value.length == 6) {
 					var that = this
+					that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+						driverPhone: this.phone,
+					}).then(res2 => {
+						if (res.data.authenticationStatus == '已禁用') {
+							that.$refs.uToast.show({
+								type: 'error',
+								message: "账号审核中！"
+							})
+							return
+						}
 					uni.showLoading({
 						title: '登录中',
 						mask: true
@@ -148,14 +158,6 @@
 										}
 									}
 								})
-								that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
-									driverPhone: this.phone,
-								}).then(res2 => {
-									if (res.data.statusFlag == '已禁用') {
-										this.isShowAlert = true
-										uni.hideLoading()
-										return
-									}
 									uni.setStorageSync('pcuserInfo', res.data)
 									uni.setStorageSync('userInfo', res.data)
 									uni.setStorageSync('firstAuthentication', res2.data)
@@ -177,7 +179,7 @@
 										url: '/pages/goodSource/index'
 									});
 									uni.hideLoading()
-								})
+								
 
 							} else {
 								uni.hideLoading()
@@ -195,6 +197,7 @@
 								duration: 2000
 							})
 						});
+					})
 				}
 			}
 

pages/public/login.vue

@@ -22,10 +22,9 @@
 				<view style='position:relative;'>
 					<input placeholder-style="color:#AFB3BF" class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
 					<input placeholder-style="color:#AFB3BF" class='password' v-model='password' v-else type="text" placeholder="请输入密码">
-					<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
-							v-if="isShowPassword=='password'"></u-icon>
 					<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
 						</u-icon>
+						
 				</view>
 			</view>
 			<button :class='phone!=""&&password!=""?"active":""' @click='passlogin'
@@ -37,6 +36,7 @@
 				<view @click='gocode' style='flex:1;text-align:center;' class="Regular">验证码登录</view>
 			</view>
 		</view>
+		<u-toast ref="uToast"></u-toast>
 		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' confirmText='退出登录' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 	</view>
@@ -144,8 +144,8 @@
 			},
 			passlogin(e) {
 				var that = this
-				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
-					phone: this.phone,
+				that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+					driverPhone: this.phone,
 				}).then(res => {
 					if (res.data.authenticationStatus == '已禁用') {
 						that.$refs.uToast.show({