Bladeren bron

Merge branch 'dev' of http://git.2weisou.com/liumin/NewZkgj into dev

dev
jyt 2 jaren geleden
bovenliggende
commit
bc4b3e2aa7
2 gewijzigde bestanden met toevoegingen van 12 en 11 verwijderingen
  1. +11
    -10
      pages/center/prohibited/details.vue
  2. +1
    -1
      pages/center/prohibited/index.vue

+ 11
- 10
pages/center/prohibited/details.vue Bestand weergeven

@@ -11,11 +11,13 @@
</view>
</view>
<!-- 详细信息 -->
<view class="h-b-btm">
<view class="h-b-btm" style="margin: 19rpx 0 30rpx;">
<view class="item">
<image class="item-imgs" src="@/static/images/img/time.png" mode=""></image>
{{ userlistobj.createTime || '' }}
</view>
</view>
<view class="h-b-btm">
<view class="item">
<image class="item-imgs" src="@/static/images/img/voice.png" mode=""></image>
{{ userlistobj.mm || '' }}m
@@ -29,7 +31,7 @@
</view>
<!-- tab选择框 -->
<template v-if="isShowMerge">
<u-tabs :list="list" :is-scroll="false" bg-color="transparent" :show-bar="false" :current="current"
<u-tabs :activeItemStyle="{background: '#2979ff', color: '#fff'}" :list="list" :is-scroll="false" bg-color="transparent" :show-bar="false" :current="current"
@change="change"></u-tabs>
</template>
<template v-if="current == 0">
@@ -1044,19 +1046,17 @@
flex-direction: column;

.header {
padding: 20rpx;
padding: 19rpx 30rpx 0;
width: 100%;
height: 210rpx;

.h-box {
padding: 0 16rpx;
width: 100%;
height: 100%;
background: #fff;
border-radius: 16rpx;

.h-b-top {
padding: 20rpx 0;
display: flex;
align-items: center;
justify-content: space-between;
@@ -1149,7 +1149,6 @@
font-size: 36upx;
color: #999999;
background: #FFFFFF;
margin-top: 30upx;
overflow-y: scroll;
width: 100%;

@@ -1174,12 +1173,12 @@

.text {
margin: 50upx 30upx;
line-height: 80upx;
display: flex;
align-items: center;


.avatar {
margin-right: 24rpx;
width: 64upx;
height: 64upx;
line-height: 64upx;
@@ -1234,9 +1233,7 @@
color: #ccc;
font-size: 18rpx;
font-size: 30rpx;
padding: 0 28rpx;


.AudioUserName {
margin-right: 20rpx;
}
@@ -1269,6 +1266,10 @@
&.reverse {
flex-direction: row-reverse;
text-align: right;
.avatar {
margin-left: 24rpx;
}

.content {
margin-left: 0;


+ 1
- 1
pages/center/prohibited/index.vue Bestand weergeven

@@ -429,7 +429,7 @@
let str = '';
switch (status) {
case 0:
str = '待处理'
str = '有效违禁'
break;
case 1:
str = '有效违禁'


Laden…
Annuleren
Opslaan