合并代码

pages/mine/details2.vue

@@ -110,24 +110,23 @@
 				</view>
 				<view class="fill"></view>
 				<!-- audioinfo2 -->
-				<view class="tmmchen" v-if="Menulistisshow">
+				<view class="tmmchen">
 					<image @click="Receivedetailsabouttab('Receivedetailsabout')" src="../../static/images/allimg.png"
 						mode=""></image>
 					<view @click="Receivedetailsabouttab('Receivedetailsabout')">更多</view>
 					<view class="allimg" v-if="Thetapeidisshow">
-						<view v-if="eqLog!=-1" @click="eqLogClick()" style="line-height: 70rpx;margin-top: 10rpx;">设备日志
-						</view>
+						<template v-if="eqLog!=-1">
+							<view @click="eqLogClick()" style="line-height: 70rpx;margin-top: 10rpx;">设备日志
+							</view>
+						</template>
 						<view @click="Receivetap()" style="line-height: 70rpx;margin-top: 10rpx;">接待信息</view>
-						<view @click="alllogo()" style="line-height:70rpx;">
-							{{userlistobj.validInvalidName}}
-						</view>
+						<template v-if="Menulistisshow">
+							<view @click="alllogo()" style="line-height:70rpx;">
+								{{userlistobj.validInvalidName}}
+							</view>
+						</template>
 					</view>
 				</view>
-				<view class="tmmchen" @click="Receivetap()" v-else>
-					<image @click="Receivedetailsabouttab('Receivedetailsabout')"
-						src="../../static/images/audioinfo2.png" mode=""></image>
-					<view @click="Receivedetailsabouttab('Receivedetailsabout')">接待信息</view>
-				</view>
 			</view>
 		</view>
 		<template v-else>
@@ -401,8 +400,10 @@
 								</view>
 								<view v-if="subitem.show" style="padding: 30rpx 0;">
 									<view class="hsnrtest">话术内容</view>
-									<view class="Level3che" @click="clickWajue(che)" v-for="(che,inc) in subitem.questionList" :key='inc'>
-										<view class="title1" :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
+									<view class="Level3che" @click="clickWajue(che)"
+										v-for="(che,inc) in subitem.questionList" :key='inc'>
+										<view class="title1"
+											:style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">
 											{{inc+1}}.{{che.question}}
 										</view>
 										<view class="jiantobox">
@@ -527,7 +528,7 @@
 				</view>
 			</view>
 		</template>
-		
+
 		<!-- 修改角色 -->
 		<view class="zhezhao" v-if="roleisshaw" @tap="unmarktap()"></view>
 		<view class="bounced" v-if="roleisshaw">
@@ -571,7 +572,6 @@
 
 		data() {
 			return {
-				icon:2,
 				customStyle: {
 					'width': '320rpx',
 					'font-size': '34rpx',
@@ -697,7 +697,6 @@
 					return this.getTime(e);
 				}
 			},
-			
 		},
 		onLoad(options) {
 			this.LOADING = true
@@ -838,9 +837,9 @@
 					this.wajueshow = true
 					return;
 				}
-				
+
 				this.wajueshow = true
-				if(!this.flag){
+				if (!this.flag) {
 					this.flag = true
 					uni.request({
 						url: config.service.addWordMining,
@@ -1374,7 +1373,7 @@
 				if (this.roleSelectArr.findIndex(item => item == 0) == -1) {
 					str += `&speakerStr=${this.roleSelectArr.join(',')}`
 				}
-				
+
 				uni.request({
 					url: `${config.service.getCorpusAnal}${str}`,
 					method: "GET",
@@ -1404,8 +1403,8 @@
 							this.tablist[0].select = true
 							this.tablist[res.speaker].name = this.tablist[res.speaker].name + "顾问";
 						}
-						
-						
+
+
 						this.newluyinList = jsonInfo;
 						if (this.textindex == null) {
 							return
@@ -1918,7 +1917,7 @@
 				uni.request({
 					url: config.service.getCorpusAnal + '?corpusId=' + this.luyinList[this.csdFileindex].id +
 						"&bg=" + info.bg + "&speaker=" + this.roleindex + '&voFlag=0' +
-						'&num=50',	
+						'&num=50',
 					method: "GET",
 					header: {
 						'content-type': 'application/json',
@@ -1962,8 +1961,6 @@
 						this.newluyinList = jsonInfo;
 						console.log(this.newluyinList)
 						this.dialogList.push(jsonInfo[this.textindex]);
-						console.log('this.dialogList')
-						console.log(this.dialogList)
 						var itc = parseInt(info.bg / 1000)
 						this.toSearch(itc)
 					},
@@ -2261,6 +2258,7 @@
 					color: #fff;
 				}
 			}
+
 			&::-webkit-scrollbar {
 				width: 0;
 				height: 0;

pages/mine/messageList.vue

@@ -30,9 +30,9 @@
 									<template v-else>
 										{{ fomatDate(item.createTime) }}
 									</template>
-									
+
 									{{item.title}}
-									
+
 									<template v-if="item.readFlag==0">
 										<view class="notRead"></view>
 									</template>
@@ -175,16 +175,21 @@
 			},
 
 			updateInit() {
+				let obj = {
+					messageType: this.list[this.current].id,
+					id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
+					num: this.pageNum,
+					size: this.pageSize
+				}
+				if (this.current == 0) {
+					obj.projectId = uni.getStorageSync('buildingID').id
+				} else {
+					obj.projectId = ''
+				}
 				uni.request({
 					url: config.service.updateList,
 					method: "GET",
-					data: {
-						messageType: this.list[this.current].id,
-						projectId: uni.getStorageSync('buildingID').id,
-						id: uni.getStorageSync('weapp_session_userInfo_data').accountId,
-						num: this.pageNum,
-						size: this.pageSize
-					},
+					data: obj,
 					header: {
 						'content-type': 'application/json',
 						'Access-Token': uni.getStorageSync('weapp_session_login_data').token
@@ -194,7 +199,7 @@
 							if (this.pageNum != 1) {
 								this.updateAnnList = [...this.updateAnnList, ...res.data.data.list.results];
 							} else {
-								
+
 								this.updateAnnList = res.data.data.list.results || []
 							}
 						}
@@ -245,7 +250,7 @@
 					})
 				}
 			},
-			
+
 			fomatDate(date) {
 				if (!date) return '--'
 				let arr = date.split(' ')
@@ -253,7 +258,7 @@
 				let result = str.split('-')
 				return `${result[1]}月${result[2]}日`
 			},
-		
+
 			// 转换时间
 			getTimeLine(date, type = 1) {
 				let resu = '--'
@@ -263,10 +268,10 @@
 				let arr = date.split(' ')
 				let str = arr[0]
 				let result = str.split('-')
-			
+
 				let m = (time.getMonth() + 1) < 10 ? `0${time.getMonth() + 1}` : (time.getMonth() + 1)
 				let d = time.getDate() < 10 ? `0${time.getDate()}` : time.getDate()
-			
+
 				if (type == 1) {
 					resu = `${m}.${d}-${result[1]}.${result[2]}`
 				} else {
@@ -274,7 +279,7 @@
 				}
 				return resu
 			},
-			
+
 			change(index) {
 				this.current = index;
 				this.initPage()