Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1
# Conflicts: # main.js
This commit is contained in:
commit
78c99caaa5
|
|
@ -1644,6 +1644,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.call-list-huawei {
|
.call-list-huawei {
|
||||||
|
.kj{
|
||||||
|
width: 18rpx !important;
|
||||||
|
height: 22rpx !important;
|
||||||
|
}
|
||||||
.item {
|
.item {
|
||||||
padding: 24rpx 32rpx 0 32rpx !important;
|
padding: 24rpx 32rpx 0 32rpx !important;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
|
||||||
|
|
@ -147,6 +147,9 @@
|
||||||
} else {
|
} else {
|
||||||
LeftTitle.value = ''
|
LeftTitle.value = ''
|
||||||
}
|
}
|
||||||
|
// 同步获取系统信息
|
||||||
|
const systemInfo = uni.getSystemInfoSync();
|
||||||
|
data.statusBarHeight = systemInfo.statusBarHeight || 0;
|
||||||
if (props.isTipLayer) {
|
if (props.isTipLayer) {
|
||||||
if (uni.getStorageSync("call_" + props.type) == props.type) {
|
if (uni.getStorageSync("call_" + props.type) == props.type) {
|
||||||
showTipLayer.value = false
|
showTipLayer.value = false
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@
|
||||||
v-html="item.chatList?.[item.chatList?.length - 1]?.content || ''"></view>
|
v-html="item.chatList?.[item.chatList?.length - 1]?.content || ''"></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="box-right h100 flex-column flex-align-center">
|
<view class="box-right h100 flex-column flex-align-center">
|
||||||
<image v-if="phone == 'iphone'" class="m-t-4"
|
<image v-if="phone == 'iphone'" src="/static/image/phone-message/iphone/right.png">
|
||||||
src="/static/image/phone-message/iphone/right.png"></image>
|
</image>
|
||||||
<image v-if="item.noNotice && phone == 'iphone'" class="m-t-8"
|
<image v-if="item.noNotice && phone == 'iphone'" class="m-t-8"
|
||||||
src="/static/image/phone-message/iphone/notice.png"></image>
|
src="/static/image/phone-message/iphone/notice.png"></image>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue