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

pages/center/prohibited/details.vue

@@ -44,7 +44,8 @@
 						<view class="text">
 							<view class="avatar">
 								<view :style="[SPEAKERSTYLE(item.speaker)]">
-									<image v-if="item.isShow && item.isShow == 0" :src="Aimg" mode="widthFix"></image>
+									<!-- <image v-if="item.isShow && item.isShow == 0" :src="Aimg" mode="widthFix"></image> -->
+									<text v-if="item.isShow == 0">顾</text>
 									<text v-else>{{ item.speaker | toCapital }}</text>
 								</view>
 							</view>
@@ -52,7 +53,7 @@
 							<view class="contentInfo">
 								<view class="info">
 									<!-- <text class="AudioUserName">{{ item.speaker | toCapital }}</text> -->
-									<text class="AudioUserName" v-if="item.isShow == 0">{{ item.username }}</text>
+									<text class="AudioUserName" v-if="item.isShow == 0">{{item.username}}</text>
 									<text class="AudioUserName" v-else>{{ item.speaker | toCapital }}</text>
 									<text>{{conversionTiame(item.bg/1000)}}</text>
 								</view>
@@ -99,7 +100,8 @@
 							:data-speaker="item.speaker">
 							<view class="avatar">
 								<view :style="[SPEAKERSTYLE(item.speaker)]">
-									<image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image>
+									<!-- <image v-if="item.isShow == 0" :src="Aimg" mode="widthFix"></image> -->
+									<text v-if="item.isShow == 0">顾</text>
 									<text v-else>{{ item.speaker | toCapital }}</text>
 								</view>
 							</view>
@@ -304,6 +306,38 @@
 		},
 
 		methods: {
+			SPEAKERSTYLE(index) {
+				let obj = {
+					color: '',
+				}
+				switch (index) {
+					case 1:
+						obj.color = '#60CBEC';
+						break;
+					case 2:
+						obj.color = '#EC8B47';
+						break;
+					case 3:
+						obj.color = '#4F861E';
+						break;
+					case 5:
+						obj.color = '#4980C8';
+						break;
+					case 6:
+						obj.color = '#60CBEC';
+						break;
+					case 7:
+						obj.color = '#EC8B47';
+						break;
+					case 8:
+						obj.color = '#4F861E';
+						break;
+					default:
+						obj.color = '#9F61C8';
+						break;
+				}
+				return obj
+			},
 			// 获取违禁词
 			findTabooWords() {
 				this.$u.get('/customer/findTabooWords', {
@@ -1246,7 +1280,7 @@
 					.content {
 						margin-left: 0;
 						margin-right: 30upx;
-						margin: 0 30upx;
+						// margin: 0 30upx;
 					}
 
 					.play {