提交

@@ -22,7 +22,13 @@ Vue.prototype.$request=function(url,data='',type = 1){
 			uni.showLoading({
 				title:'加载中...'
 			})
-		}else{
+		}
+		if(type == 3){
+			uni.showLoading({
+				title:'发布中...'
+			})
+		}
+		if(type == 2){
 			uni.showLoading({
 				title:'保存中...'
 			})

@@ -20,6 +20,9 @@
 						<view class="my" v-if="item.flow=='out'">
 							<!-- 左-消息 -->
 							<view class="left">
+								<view class="username">
+									<view class="time">{{timeFliter(item.time)}}</view>
+								</view>
 								<!-- 文字消息 -->
 								<view v-if="item.type==TIM.TYPES.MSG_TEXT" class="bubble">
 									<rich-text :nodes="nodesFliter(item.payload.text)"></rich-text>

@@ -300,7 +300,7 @@
 					retMsg = '发布故事'
 				}
 				console.log(retMsg+'参数',this.param)
-				this.$request(url,this.param).then((res)=>{
+				this.$request(url,this.param,3).then((res)=>{
 					console.log(retMsg,res)
 					if(res.code == 1){
 						this.handle = 'publish'

 <template>
 	<view>
-		<map id="around-food-map" @regionchange="regionchange" :style="{width: '100%',height:mapHeight + 'px'}" :scale="scale" :layer-style="'2'" @markertap="markertap" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
+		<map id="around-food-map" @regionchange="regionchange" :style="{width: '100%',height:mapHeight + 'px'}" :scale="scale" :layer-style="'d5f046428dcc29769f0256117754064b'" @markertap="markertap" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
 		<!-- 查询地址区域 -->
 		<view class="searchWrap" :style="{top:statusBarHeight + 'rpx'}">
 			<view class="searchTab">
@@ -619,11 +619,18 @@
 					keywords: this.keywords,
 					location: '',
 					success: (data)=>{
-						this.showSearchLand = true
-						data.tips = data.tips.filter(item =>{  
-						    return item.location.length != 0;  
-						})
-						this.addressList = data.tips	
+						if(data.tips.length > 0){
+							this.showSearchLand = true
+							data.tips = data.tips.filter(item =>{  
+							    return item.location.length != 0;  
+							})
+							this.addressList = data.tips
+						}else{
+							uni.showToast({
+								title:'暂无结果',
+								icon:'none'
+							})
+						}
 						uni.hideLoading()
 					}
 				})

@@ -638,7 +638,8 @@
 	.projectThList .projectDesc{flex: 1;display: flex;align-items: center;justify-content: center;}
 	.projectDesc image{width: 39rpx;height: 39rpx;}
 	.projectTbList{
-		height: 600rpx;
+		min-height: 200rpx;
+		max-height: 600rpx;
 	}
 	.projectTbItem{display: flex;}
 	.projectTbItem .projectTb{display: flex;justify-content: center;align-items: center;width: 176rpx;height: 112rpx;font-size: 28rpx;color: #646566;}

@@ -86,6 +86,7 @@
 					url:"/pages/index/login"
 				})
 			}else{
+				
 				this.getConversationList()
 			}
 		},
@@ -182,7 +183,7 @@
 			},
 			reqUserInfo(item){
 				return new Promise((reslove)=>{
-					this.$request('/user/userInfo',{user_id:item.toAccount}).then((res)=>{
+					this.$request('/user/userInfo',{user_id:item.toAccount},-1).then((res)=>{
 						reslove(res)
 					})
 				})

@@ -29,11 +29,10 @@
 				<view class="infoLeft">
 					性别
 				</view>
-				<view class="infoCenter">
-					{{userInfo.gender == '0' ? '女' : userInfo.gender == '1' ? '男' : ''}}
+				<view class="infoCenter" :class="{xbts:userInfo.gender == '2'}">
+					{{userInfo.gender == '0' ? '女' : userInfo.gender == '1' ? '男' : '请选择您的性别'}}
 				</view>
 				<view class="infoRight">
-					<text v-if="userInfo.gender == '2'" style="color: #c8c9cc;">请选择您的性别</text>
 					<image src="../../static/image/right_icon.png" mode=""></image>
 				</view>
 			</view>
@@ -295,6 +294,9 @@
 					if(res.code == 1){
 						this.userinfo.avatar = this.imgUrl + this.userInfo.avatar
 						uni.setStorageSync('userinfo',JSON.stringify(this.userinfo))
+						let timUserInfo = JSON.parse(uni.getStorageSync('userInfo')) 
+						timUserInfo.img = this.imgUrl + this.userInfo.avatar
+						uni.setStorageSync('userInfo',JSON.stringify(timUserInfo))
 						this.$href('my',2)
 						setTimeout(()=>{
 							uni.showToast({
@@ -383,6 +385,7 @@
 					font-size: 28rpx;
 				}
 			}
+			.infoCenter.xbts{color: #c8c9cc;}
 			.infoRight{
 				height: 32rpx;
 				display: flex;

@@ -12,7 +12,7 @@
 			</view>
 			<view class="recItem" >
 				<view class="recVal">
-					<input type="number" v-model="custNum" placeholder="自定义" style="width: 50%;" placeholder-style="font-size:28rpx"/>
+					<input type="number" v-model="custNum" placeholder="自定义" style="width: 50%;" placeholder-style="font-size:28rpx;color:#4a8b94;"/>
 				</view>
 				<view class="recPrice" style="font-weight: 600;" @click="custom">
 					立即充值
@@ -169,7 +169,6 @@
 			.recPrice{
 				padding-top: 16rpx;
 				text-align: center;
-				color: #35655f;
 				font-size: 28rpx;
 			}
 		}

@@ -421,6 +421,18 @@ page{
 				display: flex;
 				justify-content: flex-end;
 				.left{
+					flex-wrap: wrap;
+					.username{
+						width: 100%;
+						height: 45upx;
+						font-size: 24upx;
+						color: #999;
+						display: flex;
+						justify-content: flex-end;
+						.name{
+							margin-right: 50upx;
+						}
+					}
 					min-height: 80upx;
 					
 					align-items: center;

@@ -125,7 +125,7 @@ const store=new Vuex.Store({
 		 * */
 		unshiftCurrentMessageList(state,data){
 			console.log(data)
-			if(data){
+			if(data && state.currentMessageList.length > 1){
 				state.currentMessageList = [...data,...state.currentMessageList]
 			}
 		}