Merge branch 'fix-auth'

veaba · Mar 1, 2020 · 1bb2f19 · 1bb2f19
2 parents 411466e + 81a5db0
commit 1bb2f19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/client/src/chartLib/mapv_data.js b/client/src/chartLib/mapv_data.js
@@ -5,15 +5,14 @@
  ***********************/
 import {geo, getCenterByCityName} from "./map_geo";
 
-/***/
 export function getCoorDinates(cityName) {
 	let coordinates = geo[cityName] || [];
 	// console.info('coordinates=>',coordinates,cityName);
 	if (!coordinates.length) {
 		const {lng = "", lat = ""} = getCenterByCityName(cityName) || {};
 		if (!lng) {
 			coordinates = ["", ""];
-			console.info('==>', cityName);
+			// console.info('==>', cityName);
 		} else {
 			coordinates = [lng, lat];
 		}

diff --git a/client/src/components/modules/Barrage.vue b/client/src/components/modules/Barrage.vue
@@ -28,7 +28,7 @@
 								>
 										<img :src="item.avatarUrl||''" :alt="item.name||''">
 										<span v-show="item.name">{{item.name}}：</span>
-										<span :style="{color:item.color}">{{item.message||""}}  ==>{{item.random}}</span>
+										<span :style="{color:item.color}">{{item.message||""}}</span>
 								</li>
 						</transition-group>
 
@@ -204,7 +204,7 @@
 					return false
 				}
 				this.$nextTick(() => {
-					this.inputContent = '武汉加油' + new Date()
+					this.inputContent = '武汉加油!'
 				});
 				emitSocket('talk', this.inputContent);
 			}