From 9c6405b7f23212866e5b2744dc921e18bd8cc5bb Mon Sep 17 00:00:00 2001
From: wangxiaohua <1214073490@qq.com>
Date: Fri, 27 Aug 2021 17:54:23 +0800
Subject: [PATCH 1/2] init
---
pages/center/consumer/consumerDetail.vue | 9 ++++++++-
pages/center/consumer/consumerSearch.vue | 5 +++--
pages/center/records/recordSearch.vue | 5 ++---
utils/http.js | 2 +-
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue
index 73ef627..41e60f9 100644
--- a/pages/center/consumer/consumerDetail.vue
+++ b/pages/center/consumer/consumerDetail.vue
@@ -27,7 +27,7 @@
客户标签：
- 暂无
+ 暂无
{{che.name}}
@@ -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;
})
},
diff --git a/pages/center/consumer/consumerSearch.vue b/pages/center/consumer/consumerSearch.vue
index 3d3282b..8aee4fb 100644
--- a/pages/center/consumer/consumerSearch.vue
+++ b/pages/center/consumer/consumerSearch.vue
@@ -1,7 +1,7 @@
-
+
@@ -37,6 +37,7 @@
{{item.fraction || '0'}}% | {{item.fraction || '0'}}分
+
@@ -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;
diff --git a/pages/center/records/recordSearch.vue b/pages/center/records/recordSearch.vue
index 1035262..641ac6b 100644
--- a/pages/center/records/recordSearch.vue
+++ b/pages/center/records/recordSearch.vue
@@ -1,11 +1,10 @@
-
+
-
-
+
diff --git a/utils/http.js b/utils/http.js
index e87e90a..cf5c4a8 100644
--- a/utils/http.js
+++ b/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'; // 质控正式
From c8d2a1e79acf9df2d2f5ee26d6dccb7c8d164651 Mon Sep 17 00:00:00 2001
From: wangxiaohua <1214073490@qq.com>
Date: Fri, 27 Aug 2021 18:20:10 +0800
Subject: [PATCH 2/2] init
---
pages/center/consumer/consumerSearch.vue | 10 +++++-----
pages/center/consumer/index.vue | 6 +++---
pages/center/records/index.vue | 11 ++++++-----
pages/center/records/recordSearch.vue | 13 +++++++------
4 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/pages/center/consumer/consumerSearch.vue b/pages/center/consumer/consumerSearch.vue
index 8aee4fb..14241ca 100644
--- a/pages/center/consumer/consumerSearch.vue
+++ b/pages/center/consumer/consumerSearch.vue
@@ -33,8 +33,8 @@
添加时间：{{item.createTime}}
- {{item.visitRecord || "0"}}次到访
- {{item.fraction || '0'}}% | {{item.fraction || '0'}}分
+ {{item.visitRecord || '--'}}次到访
+ {{item.fraction || '0'}}% | {{item.mm || '0'}}min
@@ -183,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;
@@ -200,7 +200,7 @@
font-size: 26rpx;
font-weight: 400;
color: #333333;
- margin-right: 24rpx;
+ margin-right: 20rpx;
box-sizing: border-box;
padding: 10rpx 24rpx;
}
diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue
index 0d4c702..d993612 100644
--- a/pages/center/consumer/index.vue
+++ b/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;
}
diff --git a/pages/center/records/index.vue b/pages/center/records/index.vue
index 8647950..b634607 100644
--- a/pages/center/records/index.vue
+++ b/pages/center/records/index.vue
@@ -45,10 +45,11 @@
{{item.agentName}}
代接待
-
+
+
+ 未标记
+ 已标记
+
@@ -473,7 +474,7 @@
}
}
.right{
- width: 192rpx;
+ width: 120rpx;
height: 46rpx;
background: #F4F8FD;
border-radius: 6rpx;
diff --git a/pages/center/records/recordSearch.vue b/pages/center/records/recordSearch.vue
index 641ac6b..24d06f2 100644
--- a/pages/center/records/recordSearch.vue
+++ b/pages/center/records/recordSearch.vue
@@ -12,10 +12,10 @@
{{item.agentName}}
代接待
-
+
+ 未标记
+ 已标记
+
@@ -23,7 +23,8 @@
{{item.visitRecord || "0"}}次到访
- {{item.fraction || '0'}}% | {{item.fraction || '0'}}分
+ {{item.fraction || '0'}}%
+
@@ -213,7 +214,7 @@
}
}
.right{
- width: 192rpx;
+ width: 120rpx;
height: 46rpx;
background: #F4F8FD;
border-radius: 6rpx;