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

pages/center/Piabodata/Groupcontrast.vue

@@ -68,7 +68,7 @@
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="single">
 			<view class="title">
-				<view class="title1" style="flex: 1;">销讲排名（TOP10）</view>
+				<view class="title1" style="flex: 1;">销讲执行排名（TOP10）</view>
 				<!-- <view class="title3" style="flex: 1;">
 					<view class="title3-box">
 						<view style="height: 42rpx;" :class="{ activecltab: activeTotal2 == 0 }">执行率</view>
@@ -81,7 +81,7 @@
 			
 			<view class="hejibox">
 				<view class="heji">楼盘：{{newTeam3||0}}</view>
-				<view class="heji">均值：{{newAvg3||0}}</view>
+				<view class="heji">均值：{{newAvg3||0}}%</view>
 			</view>
 			<view class="jindu">
 				<scroll-view style="height: 300rpx;" scroll-y="true" >
@@ -91,7 +91,7 @@
 							<view style="width: 440rpx;margin-left: 10rpx;">
 								<u-line-progress height="24" :show-percent="false" active-color="#9B6BDF" :percent="item.zxl1"></u-line-progress>
 							</view>
-							<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}</view>
+							<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
 						</view>
 					</view>
 				 </scroll-view>
@@ -101,7 +101,7 @@
 		<view style="width: 100%;height: 20rpx;background: #FAFAFA;"></view>
 		<view class="single">
 			<view class="title">
-				<view class="title1" style="flex: 1;">顾问排名（TOP10）</view>
+				<view class="title1" style="flex: 1;">顾问执行排名（TOP10）</view>
 				<!-- <view class="title3" style="flex: 1;">
 					<view class="title3-box">
 						<view style="height: 42rpx;" :class="{ activecltab: activeTotal2 == 0 }">执行率</view>
@@ -124,7 +124,7 @@
 							<view style="width: 440rpx;margin-left: 10rpx;">
 								<u-line-progress height="24" :show-percent="false" active-color="#9B6BDF" :percent="item.zxl1"></u-line-progress>
 							</view>
-							<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}</view>
+							<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
 						</view>
 					</view>
 				 </scroll-view>

pages/center/Piabodata/Theteamcompared.vue

@@ -168,7 +168,7 @@
 								<view style="width: 440rpx;margin-left: 10rpx;">
 									<u-line-progress height="24" :show-percent="false" active-color="#FBA448" :percent="item.zxl1"></u-line-progress>
 								</view>
-								<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}</view>
+								<view class="jindu-zxl">{{item.zxl==null?0:item.zxl}}%</view>
 							</view>
 						</view>
 					</view>