From 77fb6acc2d953f9d9c30fc31a21e3b8edd6b31a8 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Tue, 20 Sep 2022 11:36:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=A4=8D=E5=88=B6=EF=BC=8C=E5=88=87=E6=8D=A2tab?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widgets/user-info/user-info.vue           | 19 ++++++++++++++-----
 app/src/hooks/useCopy.ts                      | 10 ++++++++++
 .../components/u-tabbar/u-tabbar.vue          |  6 +++---
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 app/src/hooks/useCopy.ts

diff --git a/app/src/components/widgets/user-info/user-info.vue b/app/src/components/widgets/user-info/user-info.vue
index 7c687222..26dfee05 100644
--- a/app/src/components/widgets/user-info/user-info.vue
+++ b/app/src/components/widgets/user-info/user-info.vue
@@ -1,17 +1,18 @@
 <template>
     <view class="user-info flex px-[50rpx] justify-between py-[50rpx]">
-        <navigator
+        <view
             v-if="isLogin"
             class="flex items-center"
-            hover-class="none"
-            url="/pages/user_data/user_data"
+            @click="navigateTo('/pages/user_data/user_data')"
         >
             <u-avatar :src="user.avatar" :size="120"></u-avatar>
             <view class="text-white ml-[20rpx]">
                 <view class="text-2xl">{{ user.nickname }}</view>
-                <view class="text-xs mt-[18rpx]">账号：{{ user.username }}</view>
+                <view class="text-xs mt-[18rpx]" @click.stop="copy(user.username)">
+                    账号：{{ user.username }}
+                </view>
             </view>
-        </navigator>
+        </view>
         <navigator v-else class="flex items-center" hover-class="none" url="/pages/login/login">
             <u-avatar src="/static/images/user/default_avatar.png" :size="120"></u-avatar>
             <view class="text-white text-3xl ml-[20rpx]">未登录</view>
@@ -22,6 +23,8 @@
     </view>
 </template>
 <script lang="ts" setup>
+import { useCopy } from '@/hooks/useCopy'
+
 const props = defineProps({
     content: {
         type: Object,
@@ -39,6 +42,12 @@ const props = defineProps({
         type: Boolean
     }
 })
+const { copy } = useCopy()
+const navigateTo = (url: string) => {
+    uni.navigateTo({
+        url
+    })
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/app/src/hooks/useCopy.ts b/app/src/hooks/useCopy.ts
new file mode 100644
index 00000000..b3571eb4
--- /dev/null
+++ b/app/src/hooks/useCopy.ts
@@ -0,0 +1,10 @@
+export function useCopy() {
+    const copy = (text: string) => {
+        uni.setClipboardData({
+            data: String(text)
+        })
+    }
+    return {
+        copy
+    }
+}
diff --git a/app/src/uni_modules/vk-uview-ui/components/u-tabbar/u-tabbar.vue b/app/src/uni_modules/vk-uview-ui/components/u-tabbar/u-tabbar.vue
index f47a4d97..6e8cb165 100644
--- a/app/src/uni_modules/vk-uview-ui/components/u-tabbar/u-tabbar.vue
+++ b/app/src/uni_modules/vk-uview-ui/components/u-tabbar/u-tabbar.vue
@@ -245,9 +245,9 @@ export default {
                 if(pagePath == this.pageUrl || pagePath == "/" + this.pageUrl) return
                 // 发出事件和修改v-model绑定的值
 			    this.$emit("change", index);
-				uni.switchTab({
-					url: pagePath
-				});
+				// uni.switchTab({
+				// 	url: pagePath
+				// });
 			} else {
 				// 如果配置了papgePath属性，将不会双向绑定v-model传入的value值
 				// 因为这个模式下，不再需要v-model绑定的value值了，而是通过getCurrentPages()适配