From a22b3fba7172e46386eb665dd38a5568af4fe4b1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 11 Aug 2020 09:36:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/informations/notice/notice.vue |  4 ++--
 pageB/follow/index.vue                    |  6 +++---
 pages/information/information.vue         |  2 +-
 static/imservice.js                       | 13 +++++++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue
index b212e45..712914a 100644
--- a/components/informations/notice/notice.vue
+++ b/components/informations/notice/notice.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="notice">
-		<view v-for="(item,index) in notice" :key="index">
+		<view v-for="(item,index) in notice" :key="index"  @click="gotoInfo(index)">
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
 				<image :src="item.picture" mode="aspectFill" ></image>
 				<view class="text_view u-line-2">{{ item.content }}</view>
-				<view class="notice_list" @click="gotoInfo(index)">
+				<view class="notice_list">
 					<text>查看详情</text>
 					<u-icon name="arrow-right" color="#666"></u-icon>
 				</view>
diff --git a/pageB/follow/index.vue b/pageB/follow/index.vue
index 32aa774..2147b98 100644
--- a/pageB/follow/index.vue
+++ b/pageB/follow/index.vue
@@ -4,8 +4,8 @@
             <image src="/static/image/common/10.png"></image>
             <text>输入达人名称</text>
         </view>
-        <view class="list">
-            <darenItem style="margin-top:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
+        <view class="list" style="margin-left:-20rpx">
+            <darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
         </view>
     </view>
 </template>
@@ -76,7 +76,7 @@ export default {
 		},
 		searchValue() {
 			uni.navigateTo({
-				url: '/pageB/search/index?type=1'
+				url: '/pageB/search/index?type=2'
 			})
 		},
 	},
diff --git a/pages/information/information.vue b/pages/information/information.vue
index f44ad09..8a4444d 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -10,7 +10,7 @@
 			<!-- 正文内容 -->
 		</view>
 		<!-- <view class="sousuo"></view> -->
-		<view class="backes">
+		<view class="backes" style="border-bottom: 1px #ececec solid;">
 			<titles :information="information_dles"></titles>
 		</view>
 		<!-- 消息通知 -->
diff --git a/static/imservice.js b/static/imservice.js
index f2d1e6f..098524d 100644
--- a/static/imservice.js
+++ b/static/imservice.js
@@ -297,7 +297,8 @@ IMService.prototype.initialIMListeners = function () {
                         friend.text = message.type != "text" ? "其他消息" : message.payload.text
                         let time = new Date(message.timestamp)
                         friend.date = message.timestamp
-                        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+                        
                         console.log(that.friends)
                         that.friendsarr = []
                         for(let i in that.friends){
@@ -322,7 +323,7 @@ IMService.prototype.initialIMListeners = function () {
                 friend.text = message.type != "text" ? "其他消息" : message.payload.text
                 let time = new Date(message.timestamp)
                 friend.date = message.timestamp
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
                 console.log(this.friends)  
                 that.friendsarr = []
                 for(let i in this.friends){
@@ -537,7 +538,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
                 friend.text = message
                 let time = new Date()
                 friend.date = time.getTime()
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+               
+
                 console.log(that.friends)
                 that.friendsarr = []
                 for(let i in that.friends){
@@ -561,7 +564,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
         friend.text = message
         let time = new Date()
         friend.date = time.getTime()
-        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+        
+
         console.log(this.friends)  
         that.friendsarr = []
         for(let i in this.friends){