合并

assets/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "custom-icon"; /* Project id 3313719 */
-  src: url('//at.alicdn.com/t/font_3313719_ypu6lrn9x9.woff2?t=1649868360208') format('woff2'),
-       url('//at.alicdn.com/t/font_3313719_ypu6lrn9x9.woff?t=1649868360208') format('woff'),
-       url('//at.alicdn.com/t/font_3313719_ypu6lrn9x9.ttf?t=1649868360208') format('truetype');
+  src: url('//at.alicdn.com/t/font_3313719_j4c9gx8u1.woff2?t=1650419820540') format('woff2'),
+       url('//at.alicdn.com/t/font_3313719_j4c9gx8u1.woff?t=1650419820540') format('woff'),
+       url('//at.alicdn.com/t/font_3313719_j4c9gx8u1.ttf?t=1650419820540') format('truetype');
 }
 
 .custom-icon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.custom-icon-icon-back2:before {
+  content: "\e630";
+}
+
 .custom-icon-youjiantou:before {
   content: "\e637";
 }

pages/friend/personal.vue

@@ -26,8 +26,10 @@
 
 			<view class="personalHead personalHead-friend" :style="'height: 375px;background: url('+detail.faceImage+') no-repeat   center  ;background-size: 100%;'">
 				
-				<u-navbar :border-bottom="false" :backTextStyle="backTextStyle" :backIconColor="backIconColor" :background="navbarBg" >
-				
+				<u-navbar :is-back="false" :border-bottom="false" :backTextStyle="backTextStyle" :backIconColor="backIconColor" :background="navbarBg" >
+					<view class="slot-wrap">
+						<u-icon class="navbar-back" custom-prefix="custom-icon" name="icon-back2" >111</u-icon>
+					</view>
 				</u-navbar>
 			
  			</view>
@@ -108,7 +110,7 @@
 								<span v-for="(item,index) in hobbyList"
 								:key="index"
 								>{{item.hobbyName}}</span>
-						
+								<view v-if="islogin&&hobbyList.length==0">暂未填写</view>
 							</view>
 						</view>
 					</view>
@@ -120,7 +122,7 @@
 					</view>
 					<view class="personal-con">
 						<view class="personal-text">
-							{{detail.selfEvaluation}}
+							{{detail.selfEvaluation?detail.selfEvaluation:'暂未填写'}}
  						</view>
 					</view>
 				</view>
@@ -333,7 +335,13 @@
 	}
 </style>
 <style lang="scss" scoped>
-	 
+	 .slot-wrap{
+		 padding-left:20px;
+		 .navbar-back{
+			 font-size: 20px;
+			 opacity: 0.5;
+		 }
+	 }
 	.personal{
 		margin-top: -44px;
 	}

pages/user/index.vue

@@ -91,6 +91,9 @@
 					<u-icon custom-prefix="custom-icon" name="youjiantou" color="#B3B3B3"></u-icon>
 				</view>
 			</view>
+			<view>
+				<u-modal v-model="show" @confirm="confirm" show-cancel-button="true" ref="uModal" :asyncClose="true" :content="content"></u-modal>
+			</view>
 			<view class="user-cell-item">
 				<view class="user-cell-l" @click="logout">
 					<u-icon custom-prefix="custom-icon" name="logout-box-r-fill" color="#FF695B" size="40"></u-icon>
@@ -122,9 +125,10 @@
 					faceImage:'/static/img/sexMan.png'
 				},
 				personalInfoProgress:0,
-				logined:false
+				logined:false,
+				show: false,
+				content: '是否退出账号'
 			}
- 
 
 		},
 		 
@@ -182,16 +186,11 @@
 				})
 			},
 			logout(){
-				// if(!_self.logined)
-				// 	return;
-				// var openId=this.carhelp.getOpenId()
-				// console.log('openId1'+openId)
-				// this.carhelp.logoff()
-				// openId=this.carhelp.getOpenId()
-				// console.log('openId2'+openId)
-				// _self.logined = false;
-				// _self.personalInfo = {};
-				
+				if(this.carhelp.getPersonInfo().id != null) {
+					this.show = true;
+				}						
+			},
+			confirm() {
 				if(this.carhelp.getPersonInfo().id != null) {
 					var id = this.carhelp.getPersonInfo().id
 				}

pages/user/message.vue

@@ -2,11 +2,13 @@
   <view>
 	<u-navbar title="留言"></u-navbar>	
 	<view class="message">
+		<u-notice-bar style="position: sticky;top:40px" mode="horizontal" :list="noticebar"></u-notice-bar>
+		
 		 <scroll-view id="scrollview" class="chat-window" scroll-y="true" :style="{height: style.contentViewHeight + 'px'}" :scroll-with-animation="true" :scroll-top="scrollTop">
 			<view class="cu-chat">
 				<view class="messageRecord">
-					<u-divider  style="background-color: #ffffff;" >最多显示40条信息，可尝试索要微信聊天噢</u-divider>
-					
+				<u-divider  style="background-color: #ffffff;"  v-if="list.length ==40" >最多显示40条信息</u-divider>
+				
 					
 					<template v-for="(item ,index) in list"  > 
 						
@@ -55,6 +57,7 @@
 	export default {
 		data() {
 			return {
+				noticebar:["请勿随意泄露个人信息谨防诈骗，如合适请添加对方微信。"],
 				beMemberId:"",
 				src1: '/static/img/sexMan.png',
 				src2:'/static/img/sexWoman.png',