merge

pages/im/components/conversation/messageCell.vue

@@ -21,7 +21,7 @@
 <script>
     import messagePreview from './messagePreview'
     import utils from '@/utils/index.js'
-    import imBase from '../mixins/imBase.js'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
         mixins: [

pages/im/components/conversationList.vue

@@ -17,7 +17,7 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
-    import messageCell from './messageCell'
+    import messageCell from './conversation/messageCell'
 
     export default {
         props: {

pages/im/components/sent/sentPopups.vue

@@ -33,8 +33,7 @@
 
 <script>
     import im from '@/utils/im/index.js'
-    import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
-    import imBase from '../mixins/imBase.js'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
         mixins: [

pages/im/components/sent/sentText.vue

@@ -8,11 +8,11 @@
 <script>
     import im from '@/utils/im/index.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-    import imBase from '../mixins/imBase.js'
-    
-    export default {
-        mixins: [
-            imBase
+    import imBase from '../../mixins/imBase.js'
+
+    export default {
+        mixins: [
+            imBase
         ],
         props: {
             conversationType: {
@@ -42,17 +42,17 @@
         },
         data() {
             return {
-                focusState: false,
+                focusState: false,
                 inputTxt: ''
             }
         },
         methods: {
             sent() {
-                if (!this.disabled) {
-                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => {
+                if (!this.disabled) {
+                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => {
                         RongIMLib.clearTextMessageDraft(this.conversationType, this.targetId)
                         this.$emit('success')
-                        this.inputTxt = ''
+                        this.inputTxt = ''
                     })
                 }
             },

pages/im/components/sent/sentVoice.vue

@@ -14,8 +14,8 @@
 <script>
     import im from '@/utils/im/index.js'
     import permision from '@/utils/permission.js'
-    import imBase from '../mixins/imBase.js'
-
+    import imBase from '../../mixins/imBase.js'
+    
     export default {
         mixins: [
             imBase

pages/im/components/sentMessageBar.vue

@@ -16,9 +16,9 @@
 </template>
 
 <script>
-    import sentText from './sentText'
-    import sentVoice from './sentVoice'
-    import sentPopups from './sentPopups'
+    import sentText from './sent/sentText'
+    import sentVoice from './sent/sentVoice'
+    import sentPopups from './sent/sentPopups'
 
     export default {
         props: {

pages/im/components/show/showText.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="msg--text">
         <message-state :message="message" :isGroup="isGroup" :isRemote="isRemote" />
-
+
         <view class="">
             <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
             <view :class="['text', isRemote ? 'left': 'right']">{{ content }}</view>
@@ -11,11 +11,13 @@
 
 <script>
     import messageState from './messageState'
-    import imBase from '../../mixins/imBase.js'
-    
+    import imBase from '../../mixins/imBase.js'
+
     export default {
-        name: 'showText',
-        mixins:[imBase],
+        name: 'showText',
+        mixins: [
+            imBase,
+        ],
         props: {
             message: {
                 type: Object,
@@ -49,14 +51,17 @@
 
         .name {
             font-size: 24rpx;
-            color: $text-gray-m;
-            margin-bottom: 10rpx;
+            color: $text-gray-m;
         }
 
         .text {
             box-sizing: border-box;
             max-width: 502rpx;
+<<<<<<< HEAD
             padding:10rpx 30rpx;
+=======
+            padding: 20rpx 24rpx;
+>>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
             line-height: 46rpx;
             font-size: 32rpx;
             color: $text-color;

pages/im/components/showMessageCell.vue

@@ -68,10 +68,17 @@
                 }
             },
             // 跳转群公告
+<<<<<<< HEAD
             toAnnounce(message) {
                 if (message.content.extra) {
                     uni.navigateTo({
                         url: '/pages/im/group/announceCreate?type=cheack&targetId=' + message.targetId + '&aId=' + message.content.extra
+=======
+            toAnnounce(targetId) {
+                if (targetId) {
+                    uni.navigateTo({
+                        url: '/pages/im/group/announceCreate?type=check&targetId=' + this.message.targetId + '&aId=' + targetId
+>>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
                     })
                 } else {
                     uni.showToast({