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

pages/center/consumer/consumerDetail.vue

@@ -27,7 +27,7 @@
 					</view>
 					<view class="content-sec-lab">
 						客户标签：
-						<text v-if="item.demand.cusSemanticWordsList.length==0">暂无</text>
+						<text v-if="customerInfo.demand.cusSemanticWordsList.length==0">暂无</text>
 						<view v-else class="content-sec-tips" v-for="(che,ind) in customerInfo.demand.cusSemanticWordsList" :key='ind'>{{che.name}}</view>
 						
 					</view>
@@ -249,6 +249,13 @@
 					if(res.fraction==null){
 						res.fraction='0';
 					}
+					if(res.demand.cusSemanticWordsList!=null){
+						res.demand.cusSemanticWordsList.forEach(che=>{
+							if(che.isInterval==0){
+							 che.name=che.name+che.unit+'-'+che.endName+che.unit;
+							}
+						})
+					}   
 					this.customerInfo = res;
 				})
 			},

pages/center/consumer/consumerSearch.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
 		<view style="width: 690rpx;margin: 0 auto;margin-top: 20rpx;">
-			<u-search  @search='searchinfo()' placeholder="请输入" v-model="keyword"></u-search>
+			<u-search  @search='searchinfo()' :show-action='false' placeholder="请输入" v-model="keyword"></u-search>
 		</view>
 		<!-- <view @click="searchinfo()">搜索</view> -->
 		<view class="content">
@@ -33,10 +33,11 @@
 						添加时间：<view class="content-sec-lab1">{{item.createTime}}</view>
 					</view>
 					<view class="content-sec-num">
-						<view class="">{{item.visitRecord || "0"}}次到访</view>
-						<view class="">{{item.fraction || '0'}}% | {{item.fraction || '0'}}分</view>
+						<view class="">{{item.visitRecord || '--'}}次到访</view>
+						<view class="">{{item.fraction || '0'}}% | {{item.mm || '0'}}<text style="font-size: 24rpx;">min</text></view>
 					</view>
 				</view>
+				<view style="width: 100%;height: 20rpx;background: #F8F8F8;"></view>
 			</view>
 		</view>	
 	</view>
@@ -123,7 +124,7 @@
 		.content-tips{
 			background: #fff;
 			// box-sizing: border-box;
-			margin-bottom: 20rpx;
+			// margin-bottom: 20rpx;
 			overflow: hidden;
 			.content-first{
 				padding: 19rpx 30rpx;
@@ -182,12 +183,12 @@
 					font-size: 30rpx;
 					font-weight: 400;
 					color: #666666;
-					line-height: 30rpx;
+					line-height: 46rpx;
 					.content-sec-lab1{
 						color: #333333;
 					}
 					.content-sec-tips{
-						max-width:174rpx ;
+						max-width:160rpx ;
 						height: 46rpx;
 						background: #F2F2F2;
 						border-radius: 6rpx;
@@ -199,7 +200,7 @@
 						font-size: 26rpx;
 						font-weight: 400;
 						color: #333333;
-						margin-right: 24rpx;
+						margin-right: 20rpx;
 						box-sizing: border-box;
 						padding: 10rpx 24rpx;
 					}

pages/center/consumer/index.vue

@@ -462,12 +462,12 @@
 					font-size: 30rpx;
 					font-weight: 400;
 					color: #666666;
-					line-height: 30rpx;
+					line-height: 46rpx;
 					.content-sec-lab1{
 						color: #333333;
 					}
 					.content-sec-tips{
-						max-width:174rpx ;
+						max-width:160rpx ;
 						height: 46rpx;
 						background: #F2F2F2;
 						border-radius: 6rpx;
@@ -479,7 +479,7 @@
 						font-size: 26rpx;
 						font-weight: 400;
 						color: #333333;
-						margin-right: 24rpx;
+						margin-right: 20rpx;
 						box-sizing: border-box;
 						padding: 10rpx 24rpx;
 					}

pages/center/records/index.vue

@@ -45,10 +45,11 @@
 					<view class="name">{{item.agentName}}</view>
 					<view class="status" v-if="item.replaceReception==1">代接待</view>
 				</view>
-				<!-- <view class="right">
-					<view class="point"></view>
-					<view class="">优秀案例</view>
-				</view> -->
+				<view class="right">
+					<!-- <view class="point"></view> -->
+					<view v-if="item.markAdvisor==0" class="">未标记</view>
+					<view v-if="item.markAdvisor==1" class="">已标记</view>
+				</view>
 				</view>
 				<view class="content-sec">
 					<view class="left">
@@ -473,7 +474,7 @@
 					}
 				}
 				.right{
-					width: 192rpx;
+					width: 120rpx;
 					height: 46rpx;
 					background: #F4F8FD;
 					border-radius: 6rpx;

pages/center/records/recordSearch.vue

@@ -1,11 +1,10 @@
 <template>
 	<view class="box">
 		<view style="width: 690rpx;margin: 0 auto;margin-top: 20rpx;">
-			<u-search @search='searchinfo()' placeholder="请输入" v-model="keyword"></u-search>
+			<u-search @search='searchinfo()' :show-action='false' placeholder="请输入" v-model="keyword"></u-search>
 		</view>
 		<!-- <view @click="searchinfo()">搜索</view> -->
-		<view class="content">
-			
+		<view class="content" style="background: #F8F8F8;">
 			<view class="content-tips" v-for="(item,index) in recordList" :key='index'  @click="tapThevisiting(item)">
 				<view class="content-first">
 				<view class="left">
@@ -13,10 +12,10 @@
 					<view class="name">{{item.agentName}}</view>
 					<view class="status" v-if="item.replaceReception==1">代接待</view>
 				</view>
-				<!-- <view class="right">
-					<view class="point"></view>
-					<view class="">优秀案例</view>
-				</view> -->
+				<view class="right">
+					<view v-if="item.markAdvisor==0" class="">未标记</view>
+					<view v-if="item.markAdvisor==1" class="">已标记</view>
+				</view>
 				</view>
 				<view class="content-sec">
 					<view class="left">
@@ -24,7 +23,8 @@
 						<view class="arriveNum">{{item.visitRecord || "0"}}次到访</view>
 					</view>
 					<view class="right">
-						{{item.fraction || '0'}}% | {{item.fraction || '0'}}分
+						{{item.fraction || '0'}}% 
+						<!-- | {{item.fraction || '0'}}分 -->
 					</view>
 				</view>
 				<view class="content-last">
@@ -214,7 +214,7 @@
 					}
 				}
 				.right{
-					width: 192rpx;
+					width: 120rpx;
 					height: 46rpx;
 					background: #F4F8FD;
 					border-radius: 6rpx;

utils/http.js

@@ -1,6 +1,6 @@
 
 const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
-// const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙
+// const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙	
 // const baseUrl = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪
 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏
 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式