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'
+    import imBase from '../../mixins/imBase.js'
-    
+
-    export default {
+    export default {
-        mixins: [
+        mixins: [
-            imBase
+            imBase
         ],
         props: {
             conversationType: {
@@ -42,17 +42,17 @@
         },
         data() {
             return {
-                focusState: false,
+                focusState: false,
                 inputTxt: ''
             }
         },
         methods: {
             sent() {
-                if (!this.disabled) {
+                if (!this.disabled) {
-                    im.sentText(this.conversationType, this.targetId, this.inputTxt, this.sender, () => {
+                    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 sentText from './sent/sentText'
-    import sentVoice from './sentVoice'
+    import sentVoice from './sent/sentVoice'
-    import sentPopups from './sentPopups'
+    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',
+        name: 'showText',
-        mixins:[imBase],
+        mixins: [
+            imBase,
+        ],
         props: {
             message: {
                 type: Object,
@@ -49,14 +51,17 @@
 
         .name {
             font-size: 24rpx;
-            color: $text-gray-m;
+            color: $text-gray-m;
-            margin-bottom: 10rpx;
         }
 
         .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({

pages/im/group/announceCreate.vue

@@ -1,12 +1,23 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
+<<<<<<< HEAD
         <block v-if="type !== 'cheack'">
             <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
             <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
         </block>
         <block v-if="type === 'cheack'">
             <view class="content-a"> {{content}} </view>
+=======
+        
+        <block v-if="type === 'check'">
+            <view class="content"> {{content}} </view>
+        </block>
+        
+        <block v-else>
+            <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
+            <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
+>>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
         </block>
     </view>
 </template>
@@ -31,7 +42,11 @@
             }
         },
         onLoad(e) {
+<<<<<<< HEAD
             console.log(e,'e,,,,,')
+=======
+            console.log('E', e);
+>>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
             this.targetId = e.targetId
             if (e.type) {
                 this.type = e.type
@@ -41,8 +56,10 @@
             }
             if (e.aId) {
                 this.aId = e.aId
+                uni.setNavigationBarTitle({
+                    title: '群公告'
+                })
                 getGroupAnnouncement(this.targetId, this.aId).then(res => {
-                    console.log(res.content)
                     this.content = res.content
                 }).catch(err => {
                     uni.showToast({
@@ -103,7 +120,7 @@
             }
         }
 
-        .content-a {
+        .content {
             color: $text-color;
             font-size: $title-size;
             line-height: 1.7;

pages/im/mixins/imBase.js

@@ -1,10 +1,6 @@
 import utils from '@/utils/index.js'
 
 export default {
-    onLoad() {},
-    data() {
-        return {}
-    },
     computed: {
         contact() {
             return function(targetId) {