Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

pages/mine/company/editcompany.vue

@@ -299,7 +299,7 @@
 					})
 					return true
 				}
-				if (this.dataDetails.companyName.length<4||this.dataDetails.companyName.length<25) {
+				if (this.dataDetails.companyName.length<4||this.dataDetails.companyName.length>25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "企业名称字数在4-25个字！",
@@ -366,13 +366,13 @@
 						return true
 					}
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "视频认证不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "视频认证不能为空！",
+				// 	})
+				// 	return true
+				// }
 			},
 			submit() {
 				if (this.validate()) return
@@ -583,6 +583,7 @@
 	}
 
 	.preview-card-img {
+		overflow: hidden;
 		// /deep/uni-image>div, uni-image>img {
 		//     transform: scale(1.5) rotate(-90deg);
 		// }
@@ -731,4 +732,5 @@
 	.myVideo{
 		
 	}
+
 </style>

pages/mine/index.vue

@@ -171,7 +171,7 @@
 		methods: {
 			confirmClick() {
 							// #ifdef APP-PLUS
-								if (this.alertTitle = '账号审核中') {
+								if (this.alertTitle == '账号审核中') {
 									if (uni.getSystemInfoSync().platform == 'ios') {
 										plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 									} else if (uni.getSystemInfoSync().platform == 'android') {

pages/news/index.vue

@@ -230,7 +230,7 @@
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {
-						this.news = res.data.records
+						this.news = this.news.concat(res.data.records); //追加新数据
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
 					})
 					.catch(res => {

pages/order/index.vue

@@ -451,16 +451,16 @@
 				this.isShowAlert = true
 			},
 			confirmClick() {
-							// #ifdef APP-PLUS
-								if (this.alertTitle = '账号审核中') {
-									if (uni.getSystemInfoSync().platform == 'ios') {
-										plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
-									} else if (uni.getSystemInfoSync().platform == 'android') {
-										plus.runtime.quit();
-									}
-									return
-								}
-								// #endif
+				// #ifdef APP-PLUS
+				if (this.alertTitle == '账号审核中') {
+					if (uni.getSystemInfoSync().platform == 'ios') {
+						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					} else if (uni.getSystemInfoSync().platform == 'android') {
+						plus.runtime.quit();
+					}
+					return
+				}
+				// #endif
 				that.isShowAlert = false
 				if (this.type == 1 || this.type == 2) {
 					let _title = ''
@@ -470,7 +470,7 @@
 						}).then(res => {
 							if (res.code == 200) {
 								if (this.type == 1) {
-									_title = '抢单成功'
+									_title = '接单单成功'
 								} else {
 									_title = '拒绝订单成功'
 								}
@@ -483,7 +483,7 @@
 								})
 							} else {
 								if (this.type == 1) {
-									_title = '抢单失败'
+									_title = '接单失败'
 								} else {
 									_title = '拒绝订单失败'
 								}

pages/release/release.vue

@@ -309,7 +309,7 @@
 		onShow() {
 
 			console.log("点击发布")
-			if (!_this.hasLogin) {
+			if (!this.hasLogin) {
 				uni.$u.route('/pages/public/login');
 				return
 			}
@@ -330,9 +330,9 @@
 			this.getSFList()
 		},
 		async onLoad() {
-			that = this
+			_this = this
 			// #ifdef APP-PLUS
-			let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+			let _status = await this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
 				phone: this.userInfo.phone,
 			}).then(res => {
 				return res.data.authenticationStatus
@@ -386,16 +386,12 @@
 			this.dataObj.taskValidity = '长期'
 			
 			
-		},
-		onLoad(options) {
-
-		
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			getSFList() {
+			getSFList() {debugger
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
 						commonId: this.userInfo.id
@@ -409,6 +405,7 @@
 						let _self = res.data.companyInfoList
 						//代理货主
 						let _dlhz = res.data.cargoOwnerCompInfoList
+						if(!_dlhz) _dlhz=[]
 						for (let i = 0; i < _self.length; i++) {
 							if (_self[i].status == '已认证') {
 								this.qyList.push(_self[i])
@@ -579,7 +576,7 @@
 			},
 			confirmClick() {
 							// #ifdef APP-PLUS
-								if (this.alertTitle = '账号审核中') {
+								if (this.alertTitle == '账号审核中') {
 									if (uni.getSystemInfoSync().platform == 'ios') {
 										plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 									} else if (uni.getSystemInfoSync().platform == 'android') {