mod: update ui

cyjme · Jan 12, 2018 · 96fd8a0 · 96fd8a0
1 parent 834a463
commit 96fd8a0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -120,7 +120,7 @@ export default {
       console.warn("userId in websocket",this.currentUser);
       var data = JSON.stringify({
         type: "login",
-        token: this.currentUser.userId 
+        token: this.currentUser.userId
       });
       this.ws.send(data);
       this.wsConStatus = true;
@@ -316,7 +316,7 @@ body {
 }
 #profile {
   position: fixed;
-  height: 180px;
+  height: 50px;
   width: 100%;
   overflow: hidden;
   text-align: center;
@@ -341,7 +341,7 @@ body {
 #profile p {
   font-weight: 600;
   font-size: 15px;
-  margin: 118px 0 -1px;
+  /*margin: 118px 0 -1px;*/
   opacity: 100;
   -webkit-transition: all 200ms cubic-bezier(0, 0.995, 0.99, 1);
   -moz-transition: all 200ms cubic-bezier(0, 0.995, 0.99, 1);
@@ -366,7 +366,7 @@ body {
 #chat-messages {
   background: white;
   position: fixed;
-  top: 180px;
+  top: 50px;
   bottom: 60px;
   opacity: 100;
   margin-top: 0;

diff --git a/src/config.js b/src/config.js
@@ -1,9 +1,9 @@
-const wsUrl = "wss://msg-server.ideapar.com"
-const apiUrl = "https://msg-server.ideapar.com"
+const wsUrl = "wss://msg-server.ideapar.com";
+const apiUrl = "https://msg-server.ideapar.com";
 const qiniu = {
-    fetchTokenUrl:"https://msg-server.ideapar.com/qiniuToken",
-    domain:"https://qiniu.ideapar.com/"
-}
+  fetchTokenUrl: "https://msg-server.ideapar.com/qiniuToken",
+  domain: "https://qiniu.ideapar.com/"
+};
 // const wsUrl = "ws://localhost:9009"
 // const apiUrl = "http://localhost:9009"
 // const qiniu = {
@@ -12,7 +12,7 @@ const qiniu = {
 // }
 
 export default {
-    wsUrl,
-    apiUrl,
-    qiniu
+  wsUrl,
+  apiUrl,
+  qiniu
 }
diff --git a/src/route/chat/index.vue b/src/route/chat/index.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-    <div id="chatview" class="p1">    	
+    <div id="chatview" class="p1">
         <div id="profile">
             <div id="close" @click="goToContacts">
                 <div class="cy s1 s2 s3"></div>
@@ -15,11 +15,11 @@
                 <template v-if="msg.to == to">
                   <div v-if="currentUser.avt==''?true:false" class="text-avatar">{{currentUser.nick.substring(0,1)}}</div>
                   <img v-if="currentUser.avt==''?false:true" :src="currentUser.avt" />
-                </template> 
+                </template>
                 <template v-if="msg.to != to">
                   <div v-if="profile.avt==''?true:false" class="text-avatar">{{profile.nick.substring(0,1)}}</div>
                   <img v-if="profile.avt==''?false:true" :src="profile.avt" />
-                </template> 
+                </template>
             	<!-- <img :src="msg.to == to?currentUser.avt:profile.avt" /> -->
                 <div class="bubble">
                   <template v-if="msg.contentType==='img'">
@@ -39,13 +39,13 @@
         	<input type="text" v-model="inputText" placeholder="please Input" v-on:keyup.enter="handleClickSend"/>
             <button id="send" @click="handleClickSend"></button>
         </div>
-    
+
     <!-- <img :src="profile==null?'':profile.avatar" class="floatingImg"> -->
-    <template v-if="profile==null?false:true">
-      <div v-if="profile.avt==''?true:false" class="text-avatar-chat floatingImg">{{profile.nick.substring(0,1)}}</div>
-      <img v-if="profile.avt==''?false:true" :src="profile.avt" class="floatingImg"/>
-    </template> 
-    </div>        
+    <!--<template v-if="profile==null?false:true">-->
+      <!--<div v-if="profile.avt==''?true:false" class="text-avatar-chat floatingImg">{{profile.nick.substring(0,1)}}</div>-->
+      <!--<img v-if="profile.avt==''?false:true" :src="profile.avt" class="floatingImg"/>-->
+    <!--</template> -->
+    </div>
 
 </div>
 </template>