更新

common/helper.js

@@ -114,10 +114,16 @@ const contactCustomerService = (item) => {
 }
 // 获取市、区简称
 const filterUrban = (s) => {
-	return s.substring(0, s.length - 1)
+	if (s.lastIndexOf('市') != -1) {
+		return s.substring(0, s.length - 1)
+	}
+	return s
 }
 const filterArea = (q) => {
-	return q.substring(0, q.length - 1)
+	if (q.lastIndexOf('区') != -1) {
+		return q.substring(0, q.length - 1)
+	}
+	return q
 }
 //获取省份简称
 const getProvinceAbbreviation = (province) => {

pages/goodSource/index.vue

@@ -95,6 +95,7 @@
 								<view class="gray">评分</view>
 								<view class="number-color">99%</view>
 							</view>
+							
 							<view class="sum flex fontsize-24">
 								<view class="gray">发运次数</view>
 								<view class="number-color">106</view>

pages/mine/editDriverCertification.vue

@@ -48,8 +48,6 @@
 				</view>
 				<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(1,index)"
 					class="preview-card-img picture">
-
-
 					<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 				</view>
 
@@ -58,6 +56,10 @@
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传身份证国徽面</view>
 				</view>
+				<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(1,index)"
+					class="preview-card-img picture">
+					<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
+				</view>
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
 					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard">
@@ -706,10 +708,10 @@
 
 	.preview-card-img {
 
-		/deep/uni-image>div,
-		uni-image>img {
-			transform: scale(1.5) rotate(-90deg);
-		}
+		// /deep/uni-image>div,
+		// uni-image>img {
+		// 	transform: scale(1.5) rotate(-90deg);
+		// }
 	}
 
 	.del-card {

pages/mine/manageBankCards/addBankCard.vue

@@ -30,13 +30,13 @@
 			</view>
 			<view class="flex row">
 				<view class="left-text khzh-styel">开户支行</view>
-				<view class="flex" v-if="isShowManualInput">
+				<view class="flex align-center" v-if="isShowManualInput">
 					<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
 						v-model="dataDetails.bankDepositBranch">
 					</u--input>
 					<view @click="manualInput" class="type">选择支行</view>
 				</view>
-				<view class="flex" v-if="!isShowManualInput">
+				<view class="flex align-center" v-if="!isShowManualInput">
 					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 					</u--input> -->
 					<view class="select-bankzh" @click="selectZhbank">
@@ -390,7 +390,7 @@
 
 	.select-bankzh {
 		width: 230rpx;
-		height: 48rpx;
+		// height: 48rpx;
 	}
 
 	.type {
@@ -403,6 +403,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		height: 68rpx;
 	}
 
 	.submit-btn {

pages/mine/manageBankCards/editBankCard.vue

@@ -23,13 +23,13 @@
 			</view>
 			<view class="flex row">
 				<view class="left-text khzh-styel">开户支行</view>
-				<view class="flex" v-if="isShowManualInput">
+				<view class="flex align-center" v-if="isShowManualInput">
 					<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='left' border="none"
 						v-model="dataDetails.bankDepositBranch">
 					</u--input>
 					<view @click="manualInput" class="type">选择支行</view>
 				</view>
-				<view class="flex" v-if="!isShowManualInput">
+				<view class="flex align-center" v-if="!isShowManualInput">
 					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 					</u--input> -->
 					<view class="select-bankzh" @click="selectZhbank">选择开户支行</view>
@@ -283,7 +283,7 @@
 
 	.select-bankzh {
 		width: 230rpx;
-		height: 48rpx;
+		// height: 48rpx;
 	}
 
 	.type {
@@ -296,6 +296,7 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		height: 68rpx;
 	}
 
 	.submit-btn {

pages/mine/manageBankCards/index.vue

@@ -37,6 +37,7 @@
 			</view>
 		</view>
 		<!-- <view @click="addBankCard">添加银行卡</view> -->
+		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -48,7 +49,11 @@
 	export default {
 		data() {
 			return {
-				bankList: []
+				bankList: [],
+				obj:{},
+				index:null,
+				isShowAlert:false,
+				alertTitle:'确认删除该银行卡？'
 			};
 		},
 		computed: {
@@ -61,6 +66,27 @@
 			this.init();
 		},
 		methods: {
+			confirmClick(){
+				this.isShowAlert = false
+				this.$request.baseRequest('post', '/driverPayeeInfo/api/deleteDriverPayee', {
+						id: this.obj.id
+					}).then(res => {
+						if (res.code == '200') {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "删除成功！",
+							})
+							this.bankList.splice(this.index, 1)
+						}
+				
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			cancelClick(){
+				this.isShowAlert = false
+			},
 			radioChange(val) {
 				for (let i = 0; i < this.bankList.length; i++) {
 					if (val.id == this.bankList[i].id) {
@@ -191,21 +217,10 @@
 				})
 			},
 			del(val, index) {
-				this.$request.baseRequest('post', '/driverPayeeInfo/api/deleteDriverPayee', {
-						id: val.id
-					}).then(res => {
-						if (res.code == '200') {
-							this.$refs.uToast.show({
-								type: 'success',
-								message: "删除成功！",
-							})
-							this.bankList.splice(index, 1)
-						}
-
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+				this.obj = val
+				this.index = index
+				this.isShowAlert = true
+		
 			}
 		},
 

pages/mine/manageVehicles/editVehicle.vue

@@ -6,7 +6,7 @@
 				<view class="left left-text">车牌号</view>
 				<view class="right flex">
 					<input class="car-uumber" v-model='dataDetails.carNumber' @click.stop="handleShowKeyboard(index)"
-						:disabled="true" placeholder="输入车牌号" name="input"></input>
+						:disabled="f" placeholder="输入车牌号" name="input" @focus='focus()' @blur='blur()'></input>
 
 				</view>
 			</view>
@@ -117,6 +117,13 @@
 			}]
 		},
 		methods: {
+			focus(e){
+				console.log('11111')
+				console.log(e)
+			},
+			blur(e){
+				console.log(e)
+			},
 			// 车型切换
 			changeCarModel(e) {
 				const {

pages/mine/manageVehicles/index.vue

@@ -15,25 +15,32 @@
 		</view>
 		<view class="car-list" v-for="(item,index) in carList" :key="index">
 			<view class="left-img">
-				<image style="width: 100%;height:100%; background-color: #eeeeee;border-radius:10rpx;" mode="widthFix" :src="item.addressUrl"></image>
+				<image style="width: 100%;height:100%; background-color: #eeeeee;border-radius:10rpx;" mode="widthFix"
+					:src="item.addressUrl"></image>
 			</view>
 			<view class="car-list-item">
 				<view class="row1">
 					{{item.carNumber}}
 				</view>
 				<view class="row2">
-					<u-icon name="edit-pen" size="26" style="margin-right: 20rpx;" @click="edit(item)" v-if="item.status!='审核中'"></u-icon>
+					<u-icon name="edit-pen" size="26" style="margin-right: 20rpx;" @click="edit(item)"
+						v-if="item.status!='审核中'"></u-icon>
 					<u-icon name="trash" size="26" @click="del(item,index)"></u-icon>
 				</view>
 				<view class="row3">
 					<view class="text">车辆状态：</view>
-					<u-tag v-if="item.status=='已认证'" :text="item.status" type="success" plain plainFill size="mini"></u-tag>
-					<u-tag v-if="item.status=='未通过'" :text="item.status" type="error" plain plainFill size="mini"></u-tag>
-					<u-tag v-if="item.status=='审核中'" :text="item.status" type="warning" plain plainFill size="mini"></u-tag>
+					<u-tag v-if="item.status=='已认证'" :text="item.status" type="success" plain plainFill size="mini">
+					</u-tag>
+					<u-tag v-if="item.status=='未通过'" :text="item.status" type="error" plain plainFill size="mini">
+					</u-tag>
+					<u-tag v-if="item.status=='审核中'" :text="item.status" type="warning" plain plainFill size="mini">
+					</u-tag>
 				</view>
 			</view>
 		</view>
-<u-toast ref="uToast"></u-toast>
+		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
+			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -45,11 +52,15 @@
 	export default {
 		data() {
 			return {
-				carList:[],
+				carList: [],
+				obj: {},
+				index: null,
+				isShowAlert: false,
+				alertTitle: '确认删除该车辆？'
 			};
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo','firstAuthentication']),
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),
 		},
 		onLoad(options) {
 			console.log(this.firstAuthentication.id)
@@ -61,6 +72,28 @@
 			console.log(options)
 		},
 		methods: {
+			confirmClick() {
+				this.isShowAlert = false
+				this.$request.baseRequest('post', '/driverCarInfo/api/deleteDriverCar', {
+						id: this.obj.id
+					}).then(res => {
+						if (res.code == '200') {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "删除成功！",
+							})
+							this.carList.splice(this.index, 1)
+							uni.hideLoading()
+						}
+
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
 			init() {
 				this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
 						driverId: this.userInfo.driverId,
@@ -68,7 +101,7 @@
 					}).then(res => {
 						if (res.code == '200') {
 							this.carList = res.data
-						}else{
+						} else {
 							uni.$u.toast(res.message);
 						}
 
@@ -81,29 +114,13 @@
 				uni.$u.route('/pages/mine/manageVehicles/addVehicle');
 			},
 			edit(val) {
-				uni.$u.route('/pages/mine/manageVehicles/editVehicle',val);
+				uni.$u.route('/pages/mine/manageVehicles/editVehicle', val);
 			},
-			del(val,index) {
-				uni.showLoading({
-					mask:true,
-					title:'加载中'
-				})
-				this.$request.baseRequest('post', '/driverCarInfo/api/deleteDriverCar', {
-						id:val.id
-					}).then(res => {
-						if (res.code == '200') {
-							this.$refs.uToast.show({
-								type: 'success',
-								message: "删除成功！",
-							})
-								this.carList.splice(index,1)
-								uni.hideLoading()
-						}
-				
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+			del(val, index) {
+			this.obj = val
+			this.index = index
+			this.isShowAlert = true
+
 			}
 		},
 	}
@@ -165,6 +182,7 @@
 		background-size: 100% 100%;
 		padding: 60rpx 43rpx;
 		width: 70%;
+
 		.row1 {
 			font-size: 36rpx;
 			font-weight: 700;
@@ -180,7 +198,8 @@
 			display: flex;
 		}
 	}
-	.left-img{
+
+	.left-img {
 		width: 30%;
 		display: flex;
 		align-items: center;

pages/news/index.vue

@@ -127,12 +127,39 @@
 						id: val.id,
 					}).then(res => {
 						this.mescroll.resetUpScroll()
+						this.look()
 						uni.hideLoading()
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
 			},
+			look(){
+				that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
+					reCommonId: this.userInfo.id,
+				}).then(res3 => {
+					
+					if (res3.data||res3.data==0) {
+						let name = 'myTip';
+						let value = res3.data
+						if (value == 0) {
+							uni.removeTabBarBadge({
+								index: 2
+							})
+						}
+						that.$store.commit('$uStore', {
+							name,
+							value
+						});
+						if (value != 0 && value) {
+							uni.setTabBarBadge({
+								index: 2,
+								text: value + ""
+							})
+						}
+					}
+				})
+			},
 			back() {
 				uni.navigateBack({
 

uni_modules/mescroll-uni/components/mescroll-diy/beibei/mescroll-uni-option.js

@@ -27,7 +27,7 @@ const GlobalOption = {
 		zh: {
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- END --', // 没有更多数据的提示文本
+				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 暂无相关数据 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-diy/xinlang/mescroll-uni-option.js

@@ -35,7 +35,7 @@ const GlobalOption = {
 			},
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- END --', // 没有更多数据的提示文本
+				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 空空如也 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni-option.js

@@ -35,7 +35,7 @@ const GlobalOption = {
 			},
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- END --', // 没有更多数据的提示文本
+				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 空空如也 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js

@@ -95,7 +95,7 @@ MeScroll.prototype.extendUpScroll = function(optUp) {
 		noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看
 		offset: 150, // 距底部多远时,触发upCallback,仅mescroll-uni生效 ( mescroll-body配置的是pages.json的 onReachBottomDistance )
 		textLoading: '加载中 ...', // 加载中的提示文本
-		textNoMore: '-- END --', // 没有更多数据的提示文本
+		textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
 		bgColor: "transparent", // 背景颜色 (建议在pages.json中再设置一下backgroundColorBottom)
 		textColor: "gray", // 文本颜色 (当bgColor配置了颜色,而textColor未配置时,则textColor会默认为白色)
 		inited: null, // 初始化完毕的回调