zhongtianhaoyuan 3 年之前
父节点
当前提交
24f49da45c
共有 6 个文件被更改,包括 54 次插入53 次删除
  1. 5 4
      pages.json
  2. 9 9
      pages/mine/index.vue
  3. 29 33
      pages/order/bankCard.vue
  4. 9 5
      pages/order/index.vue
  5. 1 2
      pages/order/orderDetails.vue
  6. 1 0
      pages/public/register.vue

+ 5 - 4
pages.json

@@ -107,13 +107,14 @@
 				"app-plus": {
 					"titleNView": {
 						"buttons": [{
-							"text": "&#xf0141",
-							"fontSrc": "/static/iconfont.ttf",
-							"fontSize": "20"
+							"text": "\ue7c3",
+							"fontSrc": "/static/addfleet/iconfont.ttf",
+							"fontSize": "22"
+							 // "redDot": "true"
 						}]
 					}
 				}
-
+		
 			}
 		},
 		{

+ 9 - 9
pages/mine/index.vue

@@ -11,7 +11,7 @@
 				<u--image class="flex-end" :showLoading="true" :src="headUrl" width="60px" height="60px" shape='circle'>
 				</u--image>
 				<view class="right-text">
-					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }}</view>
+					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 
@@ -141,7 +141,8 @@
 				statusVal: '',
 				isFirstRZ: null,
 				driverCall: '',
-				isFirstSH: false
+				isFirstSH: false,
+				driverSex:"先生"
 
 			};
 		},
@@ -210,19 +211,19 @@
 		},
 		methods: {
 			async getAuthenticationStatus() {
-
 				await this.$request.baseRequest('', '/driverInfo/firstAuthentication', {
 						driverPhone: this.userInfo.phone,
 					}).then(res => {
 						this.firstAuthentication = res.data
 						uni.setStorageSync("firstAuthentication",res.data)//更新缓存数据(解决pc端审核后未及时更新缓存  用于车友判断)
-						console.log("this.firstAuthentication", this.firstAuthentication)
 						if (this.firstAuthentication) {
 							this.isFirstSH = false
 							if (this.firstAuthentication.driverSex == '女') {
+								this.driverSex = "女士"
 								this.userName = this.firstAuthentication.driverCall
 							} else {
 								this.userName = this.firstAuthentication.driverCall
+								this.driverSex = "先生"
 							}
 
 							if (this.firstAuthentication.authenticationStatus == '审核中') {
@@ -279,24 +280,23 @@
 					this.isShowAlert = true;
 				} else {
 					if (type == 1 && this.statusVal == '已认证'||this.statusVal == '证件已过期'||this.statusVal == '身份认证未通过') {
-						console.log(type)
 						src = '/pages/mine/editDriverCertification'
 					}
-					console.log('this.isFirstSH', this.isFirstSH)
 					if ((type == 2 || type == 3) && this.isFirstSH) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "请先完成司机身份认证",
 						})
 					} else if(type == 1&&this.statusVal=='身份认证审核中') {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "正在审核中,请耐心等待!",
+						})
 						return
-						
 					}else{
 						uni.$u.route(src);
 					}
-
 				}
-
 			},
 			toLogin() {
 				console.log("userInfo", this.userInfo)

+ 29 - 33
pages/order/bankCard.vue

@@ -17,8 +17,8 @@
 				<view class="flex flex-end number carNumber">{{item.bankCard}}</view>
 				<view class="flex align-center">
 					<!-- @/static/images/mine/bank/gflogo.png -->
-					<!-- <image class="img left" :src="item.imgLogo" mode='widthFix'> -->
-					<image class="img left" src="@/static/images/mine/bank/zhaoshang.png" mode='widthFix'>
+					<image class="img left" :src="item.imgLogo" mode='widthFix'>
+					<!-- <image class="img left" src="@/static/images/mine/bank/zhaoshang.png" mode='widthFix'> -->
 						
 					</image>
 					<view class="right">
@@ -144,69 +144,66 @@
 					}).then(res => {
 						if (res.code == '200') {
 							this.bankList = res.data
-							console.log("````````````````")
-							console.log(res)
 							for (let i = 0; i < this.bankList.length; i++) {
 								let _obj = this.bankList[i]
 								_obj.bankNo = this.bankList[i].bankCard
 								_obj.bankCard = this.number(_obj.bankCard)
 								switch (_obj.bankDeposit) {
 									case "建设银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/jiansheogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/jh.png"
 										break
 									case "招商银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/zhaoshang.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+											"https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zhaoshang.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zsbg.png"
 										break
 									case "中国银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/zhongyin.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zhongyin.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zsbg.png"
 										break
 									case "邮政银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/youzhenglogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+											"https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/youzhenglogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/nh.png"
 										break
 									case "交通银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/jiaotognlogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+											"https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/jiaotognlogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/jh.png"
 										break
 									case "工商银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gslogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/gslogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zsbg.png"
 										break
 									case "农业银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/nongyelogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/nongyelogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/nh.png"
 										break
 									case "民生银行":
-										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/minshenglogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
+										this.bankList[i].imgLogo ="https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/minshenglogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/nh.png"
 										break
 									case "中信银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/zhongxinlogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+											"https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zhongxinlogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zsbg.png"
 										break
 									case "广发银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gflogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/gflogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zsbg.png"
 										break
 									case "华夏银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/huaxia.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/huaxia.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zsbg.png"
 										break
 									case "兴业银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/xingye.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/xingye.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/jh.png"
 										break
 									default:
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/qitalogo.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/qt.png"
+										this.bankList[i].imgLogo = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/qitalogo.png"
+										this.bankList[i].cardColor = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/qt.png"
 										break
 								}
 							}
@@ -214,7 +211,6 @@
 						} else {
 							uni.$u.toast(res.message);
 						}
-
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
@@ -288,7 +284,7 @@
 	}
 
 	.card-list-item {
-		// background: url(../../../static/images/mine/bank/zsbg.png) center no-repeat;
+		// background: url(https://taohaoliang.oss-cn-beijing.aliyuncs.com/template/zsbg.png) center no-repeat;
 		background-size: cover;
 		padding: 60rpx 43rpx 100rpx 43rpx;
 		border-radius: 20rpx;

+ 9 - 5
pages/order/index.vue

@@ -155,7 +155,7 @@
 					<u-icon name="trash-fill" color="#AFB3BF" size="20" class="back-icon" @click="del"></u-icon>
 				</view>
 				<view class="">
-					<view v-for="(item,index) in useSearchList" :key="index" class="item-style inline-block">
+					<view v-for="(item,index) in useSearchList" :key="index" class="item-style inline-block" @click="getSearch(item)">
 						{{item}}
 					</view>
 				</view>
@@ -378,7 +378,6 @@
 									})
 								}
 							})
-
 						}
 					})
 					.catch(res => {
@@ -489,8 +488,13 @@
 				this.isShowAlert = false
 			},
 			getSearch(e) {
-				// = uni.getStorageSync('useSearchList')
-
+				if(!e){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "搜索内容不能为空!",
+					})
+					return
+				}
 				this.useSearchList.unshift(e)
 				this.useSearchList = [...new Set(this.useSearchList)]
 				uni.setStorageSync("useSearchList", this.useSearchList)
@@ -547,7 +551,7 @@
 						if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
 						this.goods = this.goods.concat(res.data.records); //追加新数据
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
-
+						this.searchKeyWord = ""//搜索完成之后清空筛选内容
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);

+ 1 - 2
pages/order/orderDetails.vue

@@ -29,7 +29,7 @@
 			</view>
 			<view class="item3 flex flex-space-between align-center">
 				<view class="left flex align-center">
-					<u--image :showLoading="true" :src="src" width="44px" height="44px" @click="" shape='circle'>
+					<u--image :showLoading="true" :src="dataObj.cargoOwnerPortrait" width="44px" height="44px" @click="" shape='circle'>
 					</u--image>
 					<view class="name">{{dataObj.cargoOwner}}</view>
 					<view class="flex align-center">
@@ -205,7 +205,6 @@
 				carrierInfo:{},
 				freightInfo:{},
 				cyinfoStatus: '未装车',
-				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				isShowTerminationReason: false,
 				dataObj:{},
 				status1:false,

+ 1 - 0
pages/public/register.vue

@@ -226,6 +226,7 @@
 						verifyCode: this.verifyCode,
 						userName: username,
 						identification:1,//司机标识
+						avatarUrl:"https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData/1656724567954127.png"//司机默认头像
 					}).then(res => {
 						if (res.code == '11002') {
 							uni.showToast({