主分支覆盖newStyle1分支 解决冲突

config.js

@@ -70,6 +70,8 @@ var config = {
 		getSpeechAnalysis: `${host}/cms/mobile/getBytargetId`,
 		//同音转译接口2
 		getCorpusAnalysis: `${host}/corpus/audioPlay`,
+		// 获取转写内容
+		findAudioContent: `${host}/corpus/findAudioContent`,
 		//查询设备电量
 		findElectricity: `${host}/equipment/findElectricity`,
 		//首页设备查询

manifest.json

@@ -72,7 +72,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx83fec12ec03d9349",
+        "appid" : "wx8f883dca5ecc5510",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

pages/mine/details2.vue

@@ -359,9 +359,22 @@
 					</view>
 				</view>
 				<view v-if="zhixingcenterindex == 1">
-					<view v-if="prohibitedlist.length!=0" class="title1-12" @click="tapbadge(item)"
-						v-for="(item,index) in  prohibitedlist" :key='index'>{{index+1}}.{{item}}</view>
-					<view v-if="prohibitedlist.length==0" style="width: 100%;text-align: center;margin-top: 60rpx;">暂无数据
+					<template v-if="prohibitedlist.guwen.length > 0">
+						<view style="font-size: 30rpx;padding: 12rpx 24rpx;">顾问</view>
+						<view v-if="prohibitedlist.length!=0" class="title1-12" @click="tapbadge(item)"
+							v-for="(item,index) in  prohibitedlist.guwen" :key='index'>
+							{{index+1}}.{{item}}
+						</view>
+					</template>
+					<template v-if="prohibitedlist.kehu.length > 0">
+						<view style="font-size: 30rpx;padding: 12rpx 24rpx;">客户</view>
+						<view v-if="prohibitedlist.length!=0" class="title1-12" @click="tapbadge(item)"
+							v-for="(item,index) in  prohibitedlist.kehu" :key='index'>
+							{{index+1}}.{{item}}
+						</view>
+					</template>
+					<view v-if="prohibitedlist.guwen.length == 0 && prohibitedlist.kehu.length == 0" style="width: 100%;text-align: center;margin-top: 60rpx;">
+						暂无数据
 					</view>
 				</view>
 				<!-- 需求挖掘率 -->
@@ -664,7 +677,14 @@
 				Acquirecustomerintentlist2: [], // 人工校准数组
 				Acquirecustomerintentlist: [], // 系统分析数组
 				zhixingcenterindex: 0, // 销讲总执行率 && 禁忌执行 && 需求挖掘率 选项卡下标
+<<<<<<< HEAD
 				prohibitedlist: [], // 禁忌执行
+=======
+				prohibitedlist: {
+					guwen: [], // 顾问违禁词
+					kehu: [], // 客户违禁词
+				}, // 禁忌执行
+>>>>>>> master
 
 				tablist: [], // 角色列表
 				tablists: [], // 标记顾问的角色列表
@@ -709,7 +729,11 @@
 				effectiveIndexText: '请选择', // 无效原因展示文字
 
 				effectiveitext: '', // 无效原因备注文字
+<<<<<<< HEAD
 				
+=======
+
+>>>>>>> master
 				textItself: '', // 存储修改的常错字对话
 				argtextindex2: 0, // 长按单次选中的对话下标
 
@@ -1161,7 +1185,7 @@
 				this.$u.get("/customer/findTabooWordsByCusId", {
 					cusId: this.customerId
 				}).then(res => {
-					if (res.length) {
+					if (res) {
 						this.prohibitedlist = res;
 					}
 					setTimeout(function() {
@@ -1470,10 +1494,15 @@
 				} else {
 					this.roleSelectArr.push(0)
 				}
+<<<<<<< HEAD
 				this.$u.throttle(() => {
 					this.dialogList = []
 					this.fenjiaoseunfo()
 				}, 1500)
+=======
+				this.dialogList = []
+				this.fenjiaoseunfo()
+>>>>>>> master
 			},
 
 			// 选中全部时互斥全部选项与角色选项
@@ -1775,7 +1804,12 @@
 									translateHtmlContent: this.messagelisy,
 								}
 								this.isshow2 = false;
+<<<<<<< HEAD
 								this.dialogList[this.argtextindex2].onebest = this.textItself.replace(this.thewrongword, this.reswrongword)
+=======
+								this.dialogList[this.argtextindex2].onebest = this.textItself.replace(this.thewrongword,
+									this.reswrongword)
+>>>>>>> master
 								this.cancelBeast()
 								this.$u.post("/corpus/addCorrectWord", parames).then(data => {
 									this.thewrongword = "";
@@ -2058,9 +2092,12 @@
 				if (info.speakerStr) {
 					params.speakerStr = info.speakerStr
 				}
+<<<<<<< HEAD
 				if (info.voFlag) {
 					params.voFlag = info.voFlag
 				}
+=======
+>>>>>>> master
 				this.$u.get(config.service.findAudioContent, params).then(res => {
 					res.forEach(che => {
 						if (che.onebest == info.onebest) {