wkw 4 päivää sitten
vanhempi
sitoutus
c8cd6bea9b

+ 4 - 1
src/views/im/chat/index.vue

@@ -484,7 +484,10 @@ const handleClickOutside = (event) => {
 
 // 页面跳转
 const goBack = () => router.push("im");
-const goDetail = () => router.push("detail");
+const goDetail = () => router.push({
+    path: 'detail',
+    query:{ status:1 }
+  }) // 1:单聊  2:群聊
 </script>
 
 <style lang="less" scoped>

+ 11 - 8
src/views/im/detail/index.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="container">
         <div class="box-item">
-            <div class="item-title">
+            <div class="item-title" v-if="status == 2">
                 <div class="text-lf">群聊成员</div>
-                <div class="text-ri" @click="checkMember">查看8名群成员<svg-icon class="item-icon" name="right1"/></div>
+                <div  class="text-ri" @click="checkMember">查看8名群成员<svg-icon class="item-icon" name="right1"/></div>
             </div>
             <div class="member-box">
-                <div class="member-li" v-for="item in 8">
-                    <van-image class="member-img" round src="https://fastly.jsdelivr.net/npm/@vant/assets/cat.jpeg"/>
-                    <div>希希子</div>
+                <div class="member-li">
+                    <van-image class="member-img" round :src="wsStore.toUserInfo.avatar"/>
+                    <div>{{wsStore.toUserInfo.nickname}}</div>
                 </div>
                 <div class="member-li" @click="addMember">
                     <div class="add">
@@ -18,7 +18,7 @@
                 </div>
             </div>
         </div>
-        <van-cell-group class="user-bar-list">
+        <van-cell-group class="user-bar-list" v-if="status == 2">
             <van-cell
                 title="群聊名称"
                 :value="information.name"
@@ -55,7 +55,7 @@
         <van-cell-group class="user-bar-list">
             <van-cell class="user-bar-list-last" title="查看聊天记录" is-link @click="goChatDetail"></van-cell>
         </van-cell-group>
-        <div class="exit" @click="showExit = true">退出群聊</div>
+        <div class="exit" @click="showExit = true" v-if="status == 2">退出群聊</div>
         <!-- 修改信息弹框 -->
         <van-popup v-model:show="showUpdateName" :style="{ borderRadius:'25px' }">
             <div class="pop-content-password">
@@ -98,11 +98,14 @@
 </template>
 
 <script setup>
+import { useWebSocketStore } from "@/stores/modules/webSocketStore.js";
 import { useRouter,useRoute } from 'vue-router'
 import { reactive } from 'vue'
 import { showNotify } from 'vant';
 const router = useRouter();
-
+const route = useRoute();
+const status = route.query.status;
+const wsStore = useWebSocketStore();
 
 const information = reactive({
     name:'群聊',

+ 11 - 5
src/views/im/index.vue

@@ -65,7 +65,7 @@
           <div class="sheet-text">创建群聊</div>
         </div>
         <div class="sheet-li no-border">
-          <svg-icon class="sheet-icon" name="sm1"/>
+          <svg-icon class="sheet-icon" name="sm1" @click="changeSM"/>
           <div class="sheet-text">扫一扫</div>
         </div>
       </div>
@@ -80,6 +80,7 @@ import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import Discover from './components/Discover/Discover.vue'
 import { useWebSocketStore } from "@/stores/modules/webSocketStore.js";
+import { startScan } from "@/composables/barcodeScanner.js"
 const IM_PATH = import.meta.env.VITE_IM_PATH_FIlE;
 
 
@@ -109,16 +110,21 @@ const goToChat = (item) => {
     query:{ uuid:item.uuid }
   })
 }
+// 扫码
+const changeSM = async () => {
+    const result = await startScan();
+    let walletAddress = result.ScanResult;
+    router.push({
+      path: 'search',
+      query:{ walletAddress }
+    })
+}
 const goToPage = (url) => {
   router.push(url)
 }
 onMounted(()=>{
   getuserList();
-
- 
 })
-
-
 </script>
 
 <style lang="less" scoped>

+ 4 - 3
src/views/im/search/index.vue

@@ -28,9 +28,10 @@
 
 <script setup>
 import { userUuid } from "@/api/path/im.api";
-const router = useRouter()
-
-const userAddress = ref('');
+const router = useRouter();
+const route = useRoute();
+let walletAddress = route.query?.walletAddress || '';
+const userAddress = ref(walletAddress);
 const userInfo = ref({});