merge
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
<list class="chat-scroll">
|
<list class="chat-scroll">
|
||||||
<cell class="cell" v-for="(item, index) in messages" :key="index">
|
<cell class="cell" v-for="(item, index) in messages" :key="index">
|
||||||
<view class="cell-time">
|
<view class="cell-time">
|
||||||
<text class="cell-time-text">{{ item.sentTime|timeCustomCN }}</text>
|
<text class="cell-time-text">{{ customCN(item.sentTime) }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
|
<view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
|
||||||
<image class="active" :src="userInfo.portraitUrl" mode="aspectFill"
|
<image class="active" :src="userInfo.portraitUrl" mode="aspectFill"
|
||||||
@@ -52,6 +52,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import {
|
||||||
|
timeCustomCN
|
||||||
|
} from '@/utils/filters.js'
|
||||||
import * as RongIMLib from "@/uni_modules/RongCloud-IMWrapper/js_sdk/index"
|
import * as RongIMLib from "@/uni_modules/RongCloud-IMWrapper/js_sdk/index"
|
||||||
import im from '@/utils/im/index.js'
|
import im from '@/utils/im/index.js'
|
||||||
import permision from "@/js_sdk/wa-permission/permission.js"
|
import permision from "@/js_sdk/wa-permission/permission.js"
|
||||||
@@ -147,6 +150,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
customCN(val) {
|
||||||
|
return timeCustomCN(val)
|
||||||
|
},
|
||||||
// 检查安卓录制权限
|
// 检查安卓录制权限
|
||||||
async getAndroidPermission() {
|
async getAndroidPermission() {
|
||||||
return await permision.requestAndroidPermission('android.permission.RECORD_AUDIO')
|
return await permision.requestAndroidPermission('android.permission.RECORD_AUDIO')
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ const filterHash = (str, num) => {
|
|||||||
return String(str).substr(0, length) + '...' + String(str).substr(-4)
|
return String(str).substr(0, length) + '...' + String(str).substr(-4)
|
||||||
}
|
}
|
||||||
|
|
||||||
const timeCustomCN = (val) => {
|
export const timeCustomCN = (val) => {
|
||||||
val = timeStamp(val, 'Y-m-d H:i:s')
|
val = timeStamp(val, 'Y-m-d H:i:s')
|
||||||
let currentDate = new Date();
|
let currentDate = new Date();
|
||||||
let currentD = currentDate.getDate();
|
let currentD = currentDate.getDate();
|
||||||
|
|||||||
Reference in New Issue
Block a user