From 32041e558503a18d0ba51d6e53d38554d00ba56e Mon Sep 17 00:00:00 2001
From: npmrun <kk1549469775@gmail.com>
Date: Tue, 27 Sep 2022 17:32:58 +0800
Subject: [PATCH] fixed bug

---
 pages/Sub/Socket/Socket.vue                         |  6 +++---
 pages/index/index.vue                               | 17 ++++++++++++++++-
 uni_modules/niu-ui/assets/style/common.scss         |  2 +-
 uni_modules/niu-ui/components/niu-tabs/niu-tabs.vue |  2 --
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pages/Sub/Socket/Socket.vue b/pages/Sub/Socket/Socket.vue
index 127b59b..abed088 100644
--- a/pages/Sub/Socket/Socket.vue
+++ b/pages/Sub/Socket/Socket.vue
@@ -21,7 +21,7 @@
 				</view>
 				<view class="other talk" v-if="item.ev==='text'&&item.user&&item.user.id!=loginName">
 					<view class="talk__info">
-						他
+						{{item.user.id}}
 					</view>
 					<view class="talk__content" @click="clickSend(item,index)">
 						<view class="text">
@@ -30,7 +30,7 @@
 						<view class="error" v-if="item._success==2"></view>
 					</view>
 				</view>
-				<view class="my talk" v-if="item.ev==='text'&&item.user&&item.user.id==loginName">
+				<view class="my talk" v-if="item.ev==='text'&&(item.user&&item.user.id==loginName || item._success==2)">
 					<view class="talk__content" @click="clickSend(item,index)">
 						<view class="error" v-if="item._success==2"></view>
 						<view class="text">
@@ -38,7 +38,7 @@
 						</view>
 					</view>
 					<view class="talk__info">
-						我
+						{{loginName}}
 					</view>
 				</view>
 			</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5434472..f80021a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<niu-page Tab>
-		<niu-navbar fixed adjust middleLayout='left' :back="false" color="white" bg="#39b54a">
+		<niu-navbar offsetHide forceFixed fixed adjust middleLayout='left' :back="false" color="white" bg="#39b54a">
 			爱能森组件库
 			<template #right>
 				asd
@@ -42,6 +42,18 @@
 		<view>{{$n.data.navbarTop}}px</view>
 		<view>{{$n.data.navbarTop }}</view>
 		<view :style="{backgroundColor: 'red', height: $n.data.navbarTop +'px'}"></view>
+		<view style="padding: 15rpx;background-color: white;">
+			<niu-input leftText="账号" arraw border closeable focus></niu-input>
+			<niu-input leftText="密码" border rightText="$" closeable></niu-input>
+			<niu-input @send="sendCode" sendcode border sendcodeBorder></niu-input>
+			<niu-input border></niu-input>
+			<niu-input border></niu-input>
+			<niu-input border></niu-input>
+			<niu-input border></niu-input>
+			<niu-input border></niu-input>
+			<niu-input border></niu-input>
+			<niu-input border></niu-input>
+		</view>
 		<niu-tabbar></niu-tabbar>
 	</niu-page>
 </template>
@@ -57,6 +69,9 @@
 			console.log(this.$n.data.navbarTop);
 		},
 		methods: {
+			sendCode(done){
+				done(true)
+			},
 			go(path) {
 				uni.navigateTo({
 					url: path
diff --git a/uni_modules/niu-ui/assets/style/common.scss b/uni_modules/niu-ui/assets/style/common.scss
index 4c109a6..718cc61 100644
--- a/uni_modules/niu-ui/assets/style/common.scss
+++ b/uni_modules/niu-ui/assets/style/common.scss
@@ -4,7 +4,7 @@
 	    font-size: 28rpx;
 	    line-height: 1.2; //
 		color: #000;
-		color: darkred;
+		// color: darkred;
 	}
 	page .tabpage {
 		// 怪异盒模型
diff --git a/uni_modules/niu-ui/components/niu-tabs/niu-tabs.vue b/uni_modules/niu-ui/components/niu-tabs/niu-tabs.vue
index e1873af..19e3886 100644
--- a/uni_modules/niu-ui/components/niu-tabs/niu-tabs.vue
+++ b/uni_modules/niu-ui/components/niu-tabs/niu-tabs.vue
@@ -202,9 +202,7 @@
 				if (isClick && this.value == index) return
 				if (this.allLeft.length) {
 					this.$emit("change", index)
-					console.log(this.allLeft, this.barPer);
 					this.barWidth = this.allLeft[index][1] * this.barPer
-					console.log(this.barWidth);
 					this.barLeft = this.allLeft[index][0] + (this.allLeft[index][1] - this.barWidth)/2
 					this.left = (this.allLeft[index][0] - this.allLeft[index][1] * 2)
 				}