diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 273db8a..f790fd2 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -110,24 +110,23 @@ - + 更多 - 设备日志 - + 接待信息 - - {{userlistobj.validInvalidName}} - + - - - 接待信息 - - + @@ -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; diff --git a/pages/mine/messageList.vue b/pages/mine/messageList.vue index 97d608d..45c4baf 100644 --- a/pages/mine/messageList.vue +++ b/pages/mine/messageList.vue @@ -30,9 +30,9 @@ - + {{item.title}} - + @@ -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()