Browse Source

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

dev
jyt 2 years ago
parent
commit
bc4b3e2aa7
2 changed files with 12 additions and 11 deletions
  1. +11
    -10
      pages/center/prohibited/details.vue
  2. +1
    -1
      pages/center/prohibited/index.vue

+ 11
- 10
pages/center/prohibited/details.vue View File

@@ -11,11 +11,13 @@
</view> </view>
</view> </view>
<!-- 详细信息 --> <!-- 详细信息 -->
<view class="h-b-btm">
<view class="h-b-btm" style="margin: 19rpx 0 30rpx;">
<view class="item"> <view class="item">
<image class="item-imgs" src="@/static/images/img/time.png" mode=""></image> <image class="item-imgs" src="@/static/images/img/time.png" mode=""></image>
{{ userlistobj.createTime || '' }} {{ userlistobj.createTime || '' }}
</view> </view>
</view>
<view class="h-b-btm">
<view class="item"> <view class="item">
<image class="item-imgs" src="@/static/images/img/voice.png" mode=""></image> <image class="item-imgs" src="@/static/images/img/voice.png" mode=""></image>
{{ userlistobj.mm || '' }}m {{ userlistobj.mm || '' }}m
@@ -29,7 +31,7 @@
</view> </view>
<!-- tab选择框 --> <!-- tab选择框 -->
<template v-if="isShowMerge"> <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> @change="change"></u-tabs>
</template> </template>
<template v-if="current == 0"> <template v-if="current == 0">
@@ -1044,19 +1046,17 @@
flex-direction: column; flex-direction: column;


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


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


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


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


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




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


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


.content { .content {
margin-left: 0; margin-left: 0;


+ 1
- 1
pages/center/prohibited/index.vue View File

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


Loading…
Cancel
Save