From 78d4611fb2fbe233265be441690dc4acf79f27c1 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Thu, 24 Feb 2022 09:28:59 +0800
Subject: [PATCH] =?UTF-8?q?mixins=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/sentPopups.vue | 19 ++++++++++---------
 pages/im/components/sentText.vue   | 11 ++++++-----
 pages/im/components/sentVoice.vue  | 17 +++++++++--------
 pages/im/mixins/imBase.js          | 19 ++++++++-----------
 pages/im/mixins/onGroupDismiss.js  |  6 ++----
 5 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/pages/im/components/sentPopups.vue b/pages/im/components/sentPopups.vue
index fb84f54..87200e7 100644
--- a/pages/im/components/sentPopups.vue
+++ b/pages/im/components/sentPopups.vue
@@ -34,8 +34,12 @@
 <script>
     import im from '@/utils/im/index.js'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         data() {
             return {
                 callActions: [{
@@ -64,15 +68,11 @@
                 default: ''
             }
         },
-        computed: {
-            sender() {
-                return this.$store.getters.sender
-            }
-        },
         methods: {
             singleCall(e) {
                 uni.navigateTo({
-                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type + '&isCall=true'
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type +
+                        '&isCall=true'
                 })
             },
             onPopupsItem(type) {
@@ -140,13 +140,14 @@
 <style lang="scss" scoped>
     .sent--popups {
         background: white;
-        padding: 30rpx 15rpx;
-        display: flex;
+        padding: 30rpx 15rpx;
+        display: flex;
         flex-wrap: wrap;
         flex-direction: row;
+
         .item {
             width: 150rpx;
-            margin: 15rpx;
+            margin: 15rpx;
             text-align: center;
         }
 
diff --git a/pages/im/components/sentText.vue b/pages/im/components/sentText.vue
index efa4034..e10bece 100644
--- a/pages/im/components/sentText.vue
+++ b/pages/im/components/sentText.vue
@@ -8,8 +8,12 @@
 <script>
     import im from '@/utils/im/index.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-
-    export default {
+    import imBase from '../mixins/imBase.js'
+    
+    export default {
+        mixins: [
+            imBase
+        ],
         props: {
             conversationType: {
                 type: Number,
@@ -23,9 +27,6 @@
         computed: {
             disabled() {
                 return this.inputTxt.length === 0
-            },
-            sender() {
-                return this.$store.getters.sender
             }
         },
         mounted() {
diff --git a/pages/im/components/sentVoice.vue b/pages/im/components/sentVoice.vue
index ae7a66d..a27134d 100644
--- a/pages/im/components/sentVoice.vue
+++ b/pages/im/components/sentVoice.vue
@@ -14,8 +14,12 @@
 <script>
     import im from '@/utils/im/index.js'
     import permision from '@/utils/permission.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             conversationType: {
                 type: Number,
@@ -35,11 +39,6 @@
                 recorderManager: null
             }
         },
-        computed: {
-            sender() {
-                return this.$store.getters.sender
-            }
-        },
         created() {
             this.recorderManager = uni.getRecorderManager()
         },
@@ -100,8 +99,8 @@
 
 <style scoped lang="scss">
     .send--voice {
-        .voice {
-            display: flex;
+        .voice {
+            display: flex;
             background: $window-color;
             height: 70rpx;
             line-height: 70rpx;
@@ -110,13 +109,14 @@
             width: 500rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
+
             .button {
                 font-size: 30rpx;
                 color: #333;
             }
         }
 
-        .modal {
+        .modal {
             display: flex;
             background: rgba(0, 0, 0, .6);
             position: fixed;
@@ -129,6 +129,7 @@
             flex-direction: column;
             align-items: center;
             justify-content: center;
+
             .icon {
                 width: 88rpx;
                 height: 88rpx;
diff --git a/pages/im/mixins/imBase.js b/pages/im/mixins/imBase.js
index ed9dbaa..b67aef0 100644
--- a/pages/im/mixins/imBase.js
+++ b/pages/im/mixins/imBase.js
@@ -1,13 +1,9 @@
 import utils from '@/utils/index.js'
 
-const imBase = {
-    onLoad() {
-      console.log('IM BASE MININX');  
-    },
-    data() {
-        return {
-            
-        }
+export default {
+    onLoad() {},
+    data() {
+        return {}
     },
     computed: {
         contact() {
@@ -17,8 +13,9 @@ const imBase = {
         },
         avatarSize() {
             return utils.rpx2px(84)
+        },
+        sender() {
+            return this.$store.getters.sender
         }
     }
-}
-
-export default imBase
+}
diff --git a/pages/im/mixins/onGroupDismiss.js b/pages/im/mixins/onGroupDismiss.js
index 1f76c40..002c4c0 100644
--- a/pages/im/mixins/onGroupDismiss.js
+++ b/pages/im/mixins/onGroupDismiss.js
@@ -1,5 +1,5 @@
 // 监听群解散的消息，直接跳转到会话列表页面
-const onGroupDismiss = {
+export default {
     data() {
         return {
             currentTargetId: ''
@@ -31,6 +31,4 @@ const onGroupDismiss = {
         uni.$off('onGroupDismiss_' + this.currentTargetId)
         uni.$off('onGroupRemoveYou_' + this.currentTargetId)
     }
-}
-
-export default onGroupDismiss
+}