Browse Source

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

dev
douzhuo 2 years ago
parent
commit
1bca75f60f
2 changed files with 61 additions and 8 deletions
  1. +55
    -7
      pages/center/prohibited/details.vue
  2. +6
    -1
      pages/mine/details2.vue

+ 55
- 7
pages/center/prohibited/details.vue View File

@@ -51,7 +51,9 @@

<view class="contentInfo">
<view class="info">
<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
<!-- <text class="AudioUserName">{{ item.speaker | toCapital }}</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>
<view class="contentMain">
@@ -103,7 +105,9 @@
</view>
<view class="contentInfo">
<view class="info">
<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
<!-- <text class="AudioUserName">{{ item.speaker | toCapital }}</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>
<view class="contentMain">
@@ -254,6 +258,7 @@
findTabooWordsList: [], // 违禁词列表
nextPageObj: JSON.parse(uni.getStorageSync('nextPageObj')), // 当前页面筛选内容
isMerge: 0, // 默认合并
isSw:false,
}
},
computed: {
@@ -590,12 +595,25 @@
if (data.data.data.speaker == null) {
this.dshfkjsdkksodofydwfkhwdfkjh = 0;
} else {
this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
.name + "顾问";
if(data.data.data.viewNameFlag == 1){
this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
.name;
}else{
this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
.name + "顾问";
}
this.roleindexbiaoji = data.data.data.speaker - 1;
this.dshfkjsdkksodofydwfkhwdfkjh = data.data.data.speaker - 1;
}

if(data.data.data.viewNameFlag == 1){
let p = [{name:'顾问'}]
this.tablist = [...this.tablist,...p]
this.isSw = true
}else{
this.isSw = false
}
this.speaker = data.data.data.speaker;
//上拉标记点
this.textindex = data.data.data.index;
@@ -676,9 +694,27 @@
var bgcd = this.sliderValue * 1000;
this.newluyinList = [];
this.dialogList = [];
let voFlagValue;
if(this.roleindex==0){
voFlagValue = 0
}else{
voFlagValue = 1
}
let tempRoleIndex;
if(this.isSw){
if(this.roleindex==this.tablist.length-1){
tempRoleIndex = 0
}else{
tempRoleIndex = this.roleindex
}
}else{
tempRoleIndex = this.roleindex
}
uni.request({
url: config.service.getCorpusAnal + '?corpusId=' + this.luyinList[this.csdFileindex].id +
"&bg=" + bgcd + "&speaker=" + this.roleindex, //仅为示例,并非真实接口地址。
"&bg=" + bgcd + "&speaker=" + tempRoleIndex + "&voFlag=" + voFlagValue, //仅为示例,并非真实接口地址。
method: "GET",
header: {
'content-type': 'application/json',
@@ -703,11 +739,22 @@
this.roleindexbiaoji = 0;
this.dshfkjsdkksodofydwfkhwdfkjh = 0;
} else {
this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
.name + "顾问";
if(data.data.data.viewNameFlag == 1){
this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
.name;
}else{
this.tablist[data.data.data.speaker].name = this.tablist[data.data.data.speaker]
.name + "顾问";
}
this.roleindexbiaoji = data.data.data.speaker - 1;
this.dshfkjsdkksodofydwfkhwdfkjh = data.data.data.speaker - 1;
}
if(data.data.data.viewNameFlag == 1){
let p = [{name:'顾问'}]
this.tablist = [...this.tablist,...p]
}
if (this.roleindex > this.tablist.length - 1) {
this.roleindex = this.tablist.length - 1
this.fenjiaoseunfo()
@@ -1199,6 +1246,7 @@
.content {
margin-left: 0;
margin-right: 30upx;
margin: 0 30upx;
}

.play {


+ 6
- 1
pages/mine/details2.vue View File

@@ -221,7 +221,7 @@
<viwe class="tian-view-t1"></viwe>
<viwe class="tian-view-t2">常错词:</viwe>
<viwe class="tian-view-t3">
<input type="text" v-model="thewrongword" :disabled="true" class="tian-input" placeholder="请输入" />
<input type="text" v-model="thewrongword" :disabled="isNum" class="tian-input" placeholder="请输入" />
</viwe>
</view>
<view class="tian-view">
@@ -604,6 +604,7 @@
fdFlag2:null,
tap: true,
isSw:false,
isNum:false
};
},
computed: {
@@ -1564,6 +1565,10 @@
Oftenthewrongword() {
this.reswrongword = "";
this.isshow2 = true;
let reg = /^[0-9]+$/
if(reg.test(this.thewrongword)){
this.isNum = true
}
},
//加精华
Addtheessence() {


Loading…
Cancel
Save