Merge branch 'master' into consultant

pages/center/Piabodata/TrendAnalysis.vue

@@ -1537,11 +1537,11 @@
 		border-bottom: none;
 	}
 	.grid:nth-child(2) {
-		border-bottom: none;
+		// border-bottom: none;
 	}
 
 	.grid:nth-child(3) {
 		width: 50%;
-		border-right: none;
+		// border-right: none;
 	}
 </style>

pages/center/Piabodata/requireminingAnalysis.vue

@@ -40,7 +40,7 @@
 					<view><text class="bold">平均需求挖掘率：</text>筛选时间内，有效接待中已标记顾问的需求挖掘执行率的平均值；</view>
 					<view><text class="bold">未标记：</text>筛选时间内，有效接待中未标记顾问的接待数；</view>
 					<view><text class="bold">有效接待：</text>筛选时间内，标记为有效的接待数，不包含待接单；</view>
-					<view><text class="bold">未挖掘需求数：</text>筛选时间内，需求挖掘平均执行率为0的需求数；</view>
+					<view><text class="bold">未挖掘需求数：</text>筛选时间内，需求挖掘平均执行率为0的接待数；</view>
 				</view>
 			</view>
 			<view class="close" @click="showDesc=false">X</view>
@@ -58,7 +58,7 @@
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="single">
 			<view class="title">
-				<view class="title1">平均需求挖掘分布</view>
+				<view class="title1">需求挖掘分布</view>
 			</view>
 			<view class="uchaserbox">
 				<qiun-data-charts 
@@ -330,7 +330,7 @@
                 data: [
 									{"name":"30%以下","value":res.a},
 									{"name":"30%～50%","value":res.b},
-									{"name":"50%～70%","value":res.c},
+									{"name":"51%～70%","value":res.c},
 									{"name":"70%以上","value":res.d},
 								]
               }
@@ -461,6 +461,7 @@
 			},
 			//时间切换
 			tabtimetap(index, text) {
+				this.activeTotal = index;
 				if (index == 4) {
 					this.calendarShow = true;
 				} else {
@@ -469,7 +470,6 @@
 					this.time = text
 					this.getdata()
 				}
-				this.activeTotal = index;
 				this.timeshow = false
 			},
 			// 顾问选择
@@ -649,9 +649,8 @@
 	}
 	.tabdada {
 		width: 100%;
-		height: 580rpx;
-		overflow-y: auto;
-		padding-bottom: 20rpx;
+		height: auto;
+		padding-bottom: 40rpx;
 		.tabth {
 		width: 100%;
 		height: 28rpx;

pages/center/consumer/consumerDetail.vue

@@ -199,12 +199,14 @@
 						<view class="hsnrtest" v-if="subitem.show">话术内容</view>
 						<view class="Level3che" @tap="clickaudeopal(che)" v-if="subitem.show"
 							v-for="(che,inc) in subitem.children" :key='inc'>
-							<view class="title1">{{inc+1}}.{{che.name}}</view>
+							<!-- che.selected==0 为本次接待-蓝色 ，viewFlag==1 为2次接待-黄色  未执行-灰色-->
+							<view class="title1" :style="che.viewFlag==1?'color:#FF8C13':che.selected!=0?'color: #666':''">{{inc+1}}.{{che.name}}</view>
 							<view class="jiantobox">
-								<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
+								<image v-if="che.selected==0&&che.viewFlag != 1" class="arrow" src="/static/images/rate-checked.png"
 									mode="" />
-									<image v-if="che.selected==1" class="arrow" src="/static/images/rate-nocheck.png"
+								<image v-else-if="che.selected==0&&che.viewFlag == 1" class="arrow" src="/static/images/checked-yellow.png"
 									mode="" />
+								<image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
 							</view>
 						</view>
 						<view v-if="subitem.show" style="width: 100%;height: 30rpx;"></view>
@@ -250,9 +252,12 @@
 							<view class="hsnrtest">话术内容</view>
 							<view class="Level3che"
 								v-for="(che,inc) in item.questionList" :key='inc'>
-								<view class="title1">{{inc+1}}.{{che.question}}</view>
+								<view class="title1" :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">{{inc+1}}.{{che.question}}</view>
 								<view class="jiantobox">
+										<!-- 0本次选中 1未选中 2上次选中 -->
 									<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
+										mode="" />
+										<image v-else-if="che.selected==2" class="arrow" src="/static/images/checked-yellow.png"
 										mode="" />
 										<image v-else class="arrow" src="/static/images/rate-nocheck.png"
 										mode="" />
@@ -279,10 +284,12 @@
 								<view class="hsnrtest">话术内容</view>
 								<view class="Level3che"
 									v-for="(che,inc) in subitem.questionList" :key='inc'>
-									<view class="title1">{{inc+1}}.{{che.question}}</view>
+								<view class="title1" :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">{{inc+1}}.{{che.question}}</view>
 									<view class="jiantobox">
-										<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
-											mode="" />
+											<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
+										mode="" />
+										<image v-else-if="che.selected==2" class="arrow" src="/static/images/checked-yellow.png"
+										mode="" />
 										<image v-else class="arrow" src="/static/images/rate-nocheck.png"
 											mode="" />
 									</view>
@@ -371,7 +378,7 @@
 			// 客户详情需求挖掘话术
 			getfindKeyWordsBycusId() {
 				this.$u.get("/cusLvStatistics/findKeyWordsBycusId?cusId=" + this.customerId).then(res => {
-					console.log(res)
+					// console.log(res)
 					if(res.length){
 						 res.forEach(item=>{
 							item.show = false
@@ -560,6 +567,7 @@
 									rate: item.fraction,
 									name: item.name,
 									sort: item.sort,
+									viewFlag: item.viewFlag,
 									show: false,
 									ratepercent: 0,
 									children: []
@@ -579,6 +587,7 @@
 										rate: subitem.fraction,
 										selected: subitem.selected,
 										name: subitem.name,
+										viewFlag: subitem.viewFlag,
 										show: false,
 										marketingId: subitem.marketingId,
 										children: []
@@ -595,6 +604,7 @@
 											id: subitem.id,
 											rate: subitem.fraction,
 											selected: subitem.selected,
+											viewFlag: subitem.viewFlag,
 											name: subitem.name,
 											marketingId: subitem.marketingId,
 										})

pages/index/customer.vue

@@ -104,11 +104,13 @@
 		},
 		computed: {
 			zhipai() {
-				if (this.dataCode == 6) {
-					return this.checkAuthority('顾问指派顾问')
+				if (this.isAdd == 0) {
+					// 如果改角色是顾问
+					if (this.dataCode == 6) {
+						return this.checkAuthority('顾问指派顾问')
+					} else return true
 				} else {
-					if (this.isAdd == 0) return true
-					else return false
+					return false
 				}
 			}
 		},

pages/mine/details2.vue

@@ -299,9 +299,12 @@
 						<view class="hsnrtest" v-if="subitem.show">话术内容</view>
 						<view class="Level3che" @tap="clickaudeopal(che)" v-if="subitem.show"
 							v-for="(che,inc) in subitem.children" :key='inc'>
-							<view class="title1" :class="{gray: che.viewFlag == 1}">{{inc+1}}.{{che.name}}</view>
+							<!-- che.selected==0 为本次接待 ，viewFlag==1 为2次接待  -->
+							<view class="title1" :style="che.viewFlag==1?'color:#FF8C13':che.selected!=0?'color: #666':''">{{inc+1}}.{{che.name}}</view>
 							<view class="jiantobox">
-								<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
+								<image v-if="che.selected==0&&che.viewFlag != 1" class="arrow" src="/static/images/rate-checked.png"
+									mode="" />
+								<image v-else-if="che.selected==0&&che.viewFlag == 1" class="arrow" src="/static/images/checked-yellow.png"
 									mode="" />
 								<image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
 							</view>
@@ -346,12 +349,12 @@
 						<view class="hhhbox" v-if="item.show" style="padding: 30rpx;">
 							<view class="hsnrtest">话术内容</view>
 							<view class="Level3che" v-for="(che,inc) in item.questionList" :key='inc'>
-								<view class="title1" :style="che.selected==2?'color:#666':che.selected==1?'color: #666':''">{{inc+1}}.{{che.question}}</view>
+								<view class="title1" :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">{{inc+1}}.{{che.question}}</view>
 								<view class="jiantobox">
 									<!-- 0本次选中 1未选中 2上次选中 -->
 									<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
 										mode="" />
-										<image v-else-if="che.selected==2" class="arrow" src="/static/images/rate-checked.png"
+										<image v-else-if="che.selected==2" class="arrow" src="/static/images/checked-yellow.png"
 										mode="" />
 									<image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
 								</view>
@@ -376,15 +379,13 @@
 							<view v-if="subitem.show" style="padding: 30rpx 0;">
 								<view class="hsnrtest">话术内容</view>
 								<view class="Level3che" v-for="(che,inc) in subitem.questionList" :key='inc'>
-								<view class="title1" :style="che.selected==2?'color:#666':che.selected==1?'color: #666':''">{{inc+1}}.{{che.question}}</view>
-									<!-- <view class="title1">{{inc+1}}.{{che.question}}</view> -->
+								<view class="title1" :style="che.selected==2?'color:#FF8C13':che.selected==1?'color: #666':''">{{inc+1}}.{{che.question}}</view>
 									<view class="jiantobox">
 										<!-- 0本次选中 1未选中 2上次选中 -->
 									<image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png"
 										mode="" />
-										<image v-else-if="che.selected==2" class="arrow" src="/static/images/rate-checked.png"
+										<image v-else-if="che.selected==2" class="arrow" src="/static/images/checked-yellow.png"
 										mode="" />
-										<!-- <image v-if="che.selected==0" class="arrow" src="/static/images/rate-checked.png" mode="" /> -->
 										 <image v-else class="arrow" src="/static/images/rate-nocheck.png" mode="" />
 									</view>
 								</view>
@@ -2824,10 +2825,6 @@
 					font-weight: 400;
 				}
 
-				.gray {
-					color: #979797 !important;
-				}
-
 				.jiantobox {
 					width: 30rpx;
 					height: 30rpx;