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

pages.json

@@ -39,7 +39,7 @@
 			{
 				"pagePath": "pages/mine/index",
 				"iconPath": "static/mine/wode.png",
-				"selectedIconPath": "static/mine/tongzhi_check.png",
+				"selectedIconPath": "static/mine/wode_check.png",
 				"text": "我的"
 			}
 		],

pages/mine/company/addcompany.vue

@@ -94,12 +94,12 @@
 				<view v-if='!dataDetails.propertyAddressUrl' @click="uploadImg(2)" class="picture">
 					<image class="xj-image" src="@/static/mine/company/tianjiazhaopian@3x.png"></image>
 				</view>
-				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" class="preview-card-img picture">
+				<view v-if='dataDetails.propertyAddressUrl' @click.stop="uploadImg(2)" style='position:relative;' class="preview-card-img picture">
 					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
-					<image class="uploadimage" :src="dataDetails.propertyAddressUrl" mode="aspectFit"></image>
+					<image class="uploadimage uploadimage-small" :src="dataDetails.propertyAddressUrl" mode="aspectFit"></image>
 				</view>
 			</view>
 		</view>
@@ -235,6 +235,25 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			// getList(){
+			// 	uni.showLoading({
+			// 		title: '加载中',
+			// 		mask:true
+			// 	})
+			// 	var _this=this
+			// 	this.$request.baseRequest('get', '/companyInfo/getCompanyInfo', {id:this.dataDetails.id}).then(res => {
+			// 		uni.hideLoading()
+			// 		_this.dataDetails=res.data
+			// 	})
+			// 	.catch(res => {
+			// 		uni.hideLoading()
+			// 		uni.showToast({
+			// 			title: res.message,
+			// 			icon: 'none',
+			// 			duration: 2000
+			// 		})
+			// 	});
+			// },
 			companyNameBlur(){
 				this.$request.baseRequest('get', '/companyInfo/repeatCompanyInfo', {
 						commonId: this.userInfo.id,
@@ -297,7 +316,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个字！",
@@ -447,7 +466,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
+							uploadImage(res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
@@ -476,7 +495,7 @@
 						sourceType: ['camera'],
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image',res.tempFilePaths[0], 'appData/',
+							uploadImage(res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)
@@ -555,7 +574,9 @@
 	page {
 		background: #F5F6FA;
 	}
-
+/deep/uni-image.uploadimage-small{
+	width:100% !important;
+}
 	.next {
 		color: #2772FB;
 		font-size: 13px;

pages/order/addEvaluation.vue

@@ -123,7 +123,7 @@
 			}
 		},
 		onNavigationBarButtonTap() {
-			debugger
+			// debugger
 			let _data = {
 				evaluatoredId: this.objData.commonId,
 				evaluatorId: this.objData.cargoCommonId,
@@ -202,7 +202,7 @@
 
 			},
 			getVal(e) {
-				debugger
+				// debugger
 				this.starIndex = e.value
 				console.log(e)
 			},

pages/order/driverDetail.vue

@@ -67,10 +67,10 @@
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 				class="mescroll">
 				<view class="flex flex-space-between">
-					<view :class="btnData == 1 ? 'btn-active':'btn'" @click="btnChange(1)">全部(1)</view>
-					<view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view>
-					<view :class="btnData == 3 ? 'btn-active':'btn'" @click="btnChange(3)">好评(1)</view>
-					<view :class="btnData == 4 ? 'btn-active':'btn'" @click="btnChange(4)">差评(1)</view>
+					<view :class="btnData == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{list.length}})</view>
+					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view> -->
+					<view :class="btnData == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{list3.length}})</view>
+					<view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{list4.length}})</view>
 				</view>
 				<view class="evaluate_css" v-for="(item,index) in list">
 					<view class="flex">
@@ -137,7 +137,7 @@
 		},
 		data() {
 			return {
-				btnData: 1,
+				btnData: '',
 				tabIndex: 1,
 				index: 1,
 				show: false,
@@ -150,7 +150,10 @@
 					name: '司机',
 				}, {
 					name: '评价',
-				}]
+				}],
+
+				list3:[],
+				list4:[]
 			};
 		},
 		onNavigationBarButtonTap(e) {
@@ -191,11 +194,31 @@
 				this.tabIndex = index
 			},
 			btnChange(num) {
-				debugger
+				// debugger
 				this.btnData = num
-				// this.getList()
+				this.getList()
 			},
 			upCallback(page) {
+				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
+						driverId: this.objectInfo.driverId,
+						flag: 1,
+						pageSize: page.size,
+						haoType:1,
+						currentPage: page.num
+					}).then(res => {
+						if (page.num == 1) that.list3 = [];
+						that.list3 = that.list3.concat(res.data.records); //追加新数据
+					})
+					that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
+							driverId: this.objectInfo.driverId,
+							flag: 1,
+							pageSize: page.size,
+							haoType:2,
+							currentPage: page.num
+						}).then(res => {
+							if (page.num == 1) that.list4 = [];
+							that.list4 = that.list4.concat(res.data.records); //追加新数据
+						})
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
 						driverId: this.objectInfo.driverId,
 						flag: 1,
@@ -205,6 +228,7 @@
 						debugger
 						if (page.num == 1) that.list = [];
 						that.list = that.list.concat(res.data.records); //追加新数据
+
 						for (let i = 0; i < that.list.length; i++) {
 							if (that.list[i].ownerUrl) {
 								that.list[i].imgList = that.list[i].ownerUrl.split(',')

pages/order/index.vue

@@ -990,6 +990,7 @@
 
 	.look-map {
 		background: #2772FB;
+		border:1px solid #2772FB;
 		color: white;
 	}
 	.evaluatePage{

pages/release/release.vue

@@ -586,7 +586,7 @@
 								}
 								// #endif
 				this.isShowAlert = false
-				if (this.validate()) return
+				
 				if (this.dataObj.billingMethod == '元/吨') {
 					this.dataObj.billingMethod = 0
 				} else {
@@ -843,7 +843,10 @@
 				this.dataDetails.type = n
 			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true;
+				
+				
 			},
 		}
 	}