zhongtianhaoyuan 3 år sedan
förälder
incheckning
d0d9b57ad2
5 ändrade filer med 37 tillägg och 18 borttagningar
  1. 7 3
      pages.json
  2. 15 11
      pages/mine/index.vue
  3. 3 0
      pages/news/index.vue
  4. 8 0
      pages/news/newsSee.vue
  5. 4 4
      pages/order/index.vue

+ 7 - 3
pages.json

@@ -56,15 +56,19 @@
 				"navigationStyle": "custom"
 			}
 
-		}
-
-		, {
+		}, {
 			"path": "pages/news/index",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
 
+		},{
+			"path": "pages/news/newsSee",
+			"style": {
+				"navigationBarTitleText": "系统消息",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
 			"path": "pages/mine/index",

+ 15 - 11
pages/mine/index.vue

@@ -11,7 +11,8 @@
 				<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 : '立即登录' }} {{hasLogin?driverSex:""}}</view>
+					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}
+					</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 			</view>
@@ -102,7 +103,7 @@
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
-		<!-- 	<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/evaluate')">
+			<!-- 	<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/evaluate')">
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/set.png" mode='widthFix'>
 					</image>
@@ -140,7 +141,7 @@
 				isFirstRZ: null,
 				driverCall: '',
 				isFirstSH: false,
-				driverSex:""
+				driverSex: ""
 
 			};
 		},
@@ -180,7 +181,7 @@
 		},
 		async onLoad() {
 			that = this
-		
+
 			// let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 			// 	driverPhone: this.userInfo.phone,
 			// }).then(res => {
@@ -194,7 +195,7 @@
 			// } else {
 			// 	console.log(1231233212332312312213)
 			// }
-		
+
 
 		},
 		computed: {
@@ -213,15 +214,18 @@
 						driverPhone: this.userInfo.phone,
 					}).then(res => {
 						this.firstAuthentication = res.data
-						uni.setStorageSync("firstAuthentication",res.data)//更新缓存数据(解决pc端审核后未及时更新缓存  用于车友判断)
+						uni.setStorageSync("firstAuthentication", res.data) //更新缓存数据(解决pc端审核后未及时更新缓存  用于车友判断)
 						if (this.firstAuthentication) {
 							this.isFirstSH = false
 							if (this.firstAuthentication.driverSex == '女') {
 								this.driverSex = "女士"
 								this.userName = this.firstAuthentication.driverCall
-							} else {
+							} else if (this.firstAuthentication.driverSex == '男') {
 								this.userName = this.firstAuthentication.driverCall
 								this.driverSex = "先生"
+							} else {
+								this.userName = this.firstAuthentication.driverCall
+								this.driverSex = ""
 							}
 
 							if (this.firstAuthentication.authenticationStatus == '审核中') {
@@ -277,7 +281,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {
-					if (type == 1 && this.statusVal == '已认证'||this.statusVal == '证件已过期'||this.statusVal == '身份认证未通过') {
+					if (type == 1 && this.statusVal == '已认证' || this.statusVal == '证件已过期' || this.statusVal == '身份认证未通过') {
 						src = '/pages/mine/editDriverCertification'
 					}
 					if ((type == 2 || type == 3) && this.isFirstSH) {
@@ -285,13 +289,13 @@
 							type: 'error',
 							message: "请先完成司机身份认证",
 						})
-					} else if(type == 1&&this.statusVal=='身份认证审核中') {
+					} else if (type == 1 && this.statusVal == '身份认证审核中') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "正在审核中,请耐心等待!",
 						})
 						return
-					}else{
+					} else {
 						uni.$u.route(src);
 					}
 				}
@@ -410,7 +414,7 @@
 		}
 
 		.flex-space-between {
-			margin:10rpx 0 50rpx 0;
+			margin: 10rpx 0 50rpx 0;
 		}
 	}
 </style>

+ 3 - 0
pages/news/index.vue

@@ -165,6 +165,9 @@
 					});
 			},
 			read(val) {
+				if(val.newsType == '系统消息'){
+					uni.$u.route("/pages/news/newsSee&_obj="+JSON.stringify(val))
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask: true

+ 8 - 0
pages/news/newsSee.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 4 - 4
pages/order/index.vue

@@ -324,10 +324,10 @@
 					}
 				}
 			})
-			// this.upCallback({
-			// 	size: 10,
-			// 	num: 1
-			// })
+			this.upCallback({
+				size: 10,
+				num: 1
+			})
 		},
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop