From fc392a5e019deb16f22656f24c6a393e2ae96551 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 5 Jul 2024 18:19:18 +0800
Subject: [PATCH] =?UTF-8?q?Refactor(=E5=AE=A2=E6=9C=8D):=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=E4=BD=BF=E7=94=A8uid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_common/views/room.vue     | 24 ++++++-----------
 pkg_common/views/roomLogs.vue | 51 +++++++++++++++++------------------
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/pkg_common/views/room.vue b/pkg_common/views/room.vue
index f2debf5..d956d77 100644
--- a/pkg_common/views/room.vue
+++ b/pkg_common/views/room.vue
@@ -49,15 +49,14 @@
 </template>
 
 <script>
-import {userUnionId} from "@/api/public";
-
+import { mapGetters } from 'vuex'
 export default {
   name: "room",
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
       token: null,
-      unionId: null,
+      uid: null,
       userInfo: null,
       storeId: null,
       merName: null,
@@ -72,6 +71,7 @@ export default {
       list: [], //消息列表
     }
   },
+  computed: mapGetters(['userInfo']),
   onLoad(options) {
     this.storeId = options.id;
     this.merName = options.name;
@@ -82,7 +82,8 @@ export default {
     }
     this.token = uni.getStorageSync("login_status");
     this.userInfo = uni.getStorageSync("userInfo");
-    this.getUnionId();
+    this.uid = this.userInfo.uid
+    this.connectSocketInit()
   },
   onUnload() {
     if (this.socketOpen) {
@@ -90,15 +91,6 @@ export default {
     }
   },
   methods: {
-    getUnionId() {
-      userUnionId().then(res => {
-        if (res.success) {
-          this.unionId = res.data;
-          this.connectSocketInit();
-        }
-      });
-    },
-
     getUploadToken() {
       let that = this;
 
@@ -136,7 +128,7 @@ export default {
                       let param = {
                         type: "msg",
                         user_type: 0,
-                        unionid: that.unionId,
+                        uid: that.uid,
                         username: that.userInfo.nickname,
                         header: that.userInfo.avatar,
                         room_id: that.roomId,
@@ -201,7 +193,7 @@ export default {
       let param = {
         type: "msg",
         user_type: 0,
-        unionid: this.unionId,
+        uid: this.uid,
         username: this.userInfo.nickname,
         header: this.userInfo.avatar,
         room_id: this.roomId,
@@ -217,7 +209,7 @@ export default {
       let param = {
         type: "join",
         user_type: 0,
-        unionid: this.unionId,
+        uid: this.uid,
         username: this.userInfo.nickname,
         header: this.userInfo.avatar,
         store_id: this.storeId
diff --git a/pkg_common/views/roomLogs.vue b/pkg_common/views/roomLogs.vue
index 4345112..67f7cc6 100644
--- a/pkg_common/views/roomLogs.vue
+++ b/pkg_common/views/roomLogs.vue
@@ -1,17 +1,21 @@
 <template>
   <view class="common-roomLogs">
-    <view class="item flex" v-for="(item,index) in list" :key="index" @click="goRoom(item)"
-          v-if="list.length>0">
-      <image class="cover flex-0" :src="item.store_avatar || webUrl+'/20221114155314348118.png'"/>
-      <view>
-        <view class="flex jc-between ai-center">
-          <view class="name">{{ item.store_name }}</view>
-          <view class="datetime" v-if="item.last_msg">{{ item.last_msg.created_at }}</view>
+    <view v-if="list.length > 0">
+      <view
+        v-for="(item,index) in list"
+        :key="index" @click="goRoom(item)"
+        class="item flex"
+      >
+        <image class="cover flex-0" :src="item.store_avatar || webUrl+'/20221114155314348118.png'"/>
+        <view>
+          <view class="flex jc-between ai-center">
+            <view class="name">{{ item.store_name }}</view>
+            <view class="datetime" v-if="item.last_msg">{{ item.last_msg.created_at }}</view>
+          </view>
+          <view class="sub one-t" v-if="item.last_msg">{{ item.last_msg.msg_type===0?item.last_msg.msg_content:'[图片]' }}</view>
         </view>
-        <view class="sub one-t" v-if="item.last_msg">{{ item.last_msg.msg_type===0?item.last_msg.msg_content:'[图片]' }}</view>
       </view>
     </view>
-
     <view class="v4-nodata" v-if="list.length===0">
       <image src="@/static/images/img_nodata.png" mode="scaleToFill"/>
       <view class="text">暂无数据</view>
@@ -20,42 +24,35 @@
 </template>
 
 <script>
-import {userUnionId} from "@/api/public";
+import { mapGetters } from 'vuex'
 
 export default {
-  name: "roomLogs",
+  name: 'RoomLogs',
   data() {
     return {
       webUrl:this.$VUE_APP_RESOURCES_URL,
-      unionId: null,
+      uid: null,
       list: []
     }
   },
+  computed: mapGetters(['userInfo']),
   onShow() {
-    this.getUnionId();
+    this.uid = this.userInfo.uid
+    this.fetchList()
   },
   methods: {
     goRoom(item) {
       uni.navigateTo({url: `/pkg_common/views/room?id=${item.store_id}&name=${item.store_name}`})
     },
-
-    getUnionId() {
-      userUnionId().then(res => {
-        if (res.success) {
-          this.unionId = res.data;
-          this.fetchList();
-        }
-      });
-    },
-
     fetchList() {
+      const _this = this
       uni.request({
-        url: this.$SERVICE_API_URL + "/customer-chat-list",
-        method: "POST",
-        data: {unionid: this.unionId},
+        url: _this.$SERVICE_API_URL + '/customer-chat-list',
+        method: 'POST',
+        data: {uid: _this.uid},
         success: res => {
           if (res.data.status_code === 200) {
-            this.list = res.data.content;
+            _this.list = res.data.content
           }
         }
       })