Merge branch 'master' into xbx

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/41

pages/messages/messagesList.vue

@@ -113,10 +113,7 @@
 		font-size: 26rpx;
 		color: #666666;
 		height: 30rpx;
-		height: 30rpx;
-		overflow:hidden; //超出的文本隐藏
-		text-overflow:ellipsis; //用省略号显示
-		white-space:nowrap; //不换行
+		line-height: 30rpx;
 	}
 	.times{
 		position: absolute;

pages/messages/privateChat.vue

@@ -312,7 +312,7 @@
 		box-sizing: border-box;
 	}
 	.chatInterface .top{
-		font-size: 24rpx;
+		font-size: 20rpx;
 		height: 90rpx;
 		display: flex;
 		flex-direction: column;
@@ -322,7 +322,7 @@
 		color: blue;
 	}
 	.chatInterface .top .description{
-		text-decoration: underline;
+		/* text-decoration: underline; */
 	}
 
 	.chatInterface .message-item{

pages/release/zhibo.nvue

@@ -10,7 +10,7 @@
                 <div class="head">
                     <div style="flex-direction: row;align-items:center">
                         <text class="title">全部商品</text>
-                        <text class="num">2件</text>
+                        <text class="num">{{list.length}}件</text>
                     </div>
                     <!-- <div class="add">
                         <text style="font-size:28rpx;color: #fff;text-align:center">添加/管理商品</text>
@@ -59,12 +59,12 @@
             <text class="menutitle">直播工具</text>
             <view class="menutool">
                 <view class="menutoolitem" @click="switchCamera">
-                    <image class="menutoolitemimg"></image>
+                    <image src="../../static/images/fanzhuan.png" class="menutoolitemimg"></image>
                     <text class="menutoolitemtitle">翻转</text>
                 </view>
                  <picker @change="bindPickerChange" :value="meiyan" :range="[1,2,3,4,5,6,7,8,9]">
                         <view class="menutoolitem">
-                            <image class="menutoolitemimg"></image>
+                            <image src="../../static/images/meiyan.png" class="menutoolitemimg"></image>
                             <text class="menutoolitemtitle">美颜</text>
                         </view>
                 </picker>
@@ -630,6 +630,7 @@
                         arr.push(this.list[i].goods_id)
                     }
                 }
+                console.log(arr.join(','))
                 let that = this
                 uni.request({
                     url:"https://dmmall.sdbairui.com/storeapi/Streaming/updateGoods",

static/imservice.js

@@ -299,7 +299,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){
@@ -325,7 +326,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(this.friends)  
                 that.friendsarr = []
                 for(let i in this.friends){
@@ -424,7 +426,8 @@ 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){
@@ -448,7 +451,8 @@ 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){