diff --git a/commons/css/base/background.wxss b/commons/css/base/background.wxss
index c49c5fa..479ed36 100644
--- a/commons/css/base/background.wxss
+++ b/commons/css/base/background.wxss
@@ -10,6 +10,7 @@
.bg-1a{background-color: #1a1a1a;}
.bg-36afa2{background-color:#36afa2;}
.bg-f9394d{background-color:#f9394d;}
+.bg-3f4047{background-color:#3f4047;}
.bg-000-op30{background-color:rgba(0,0,0,.3);}
.bg-000-op50{background-color:rgba(0,0,0,.5);}
diff --git a/commons/css/base/border.wxss b/commons/css/base/border.wxss
index a00a1e1..72308f0 100644
--- a/commons/css/base/border.wxss
+++ b/commons/css/base/border.wxss
@@ -21,6 +21,7 @@
.bbs-2-36afa2{border-bottom:#36afa2 2rpx solid;box-sizing:border-box;}
.bds-2-f9394d{border:#f9394d 2rpx solid;box-sizing:border-box;}
+.bts-1-474a65{border-top:#474a65 1rpx solid; box-sizing:border-box;}
.bbs-1-474a65{border-bottom:#474a65 1rpx solid; box-sizing:border-box;}
.last-b-none:last-child{border-bottom:none;}
diff --git a/commons/css/base/fontColor.wxss b/commons/css/base/fontColor.wxss
index fc6c4c3..a484399 100644
--- a/commons/css/base/fontColor.wxss
+++ b/commons/css/base/fontColor.wxss
@@ -13,4 +13,5 @@
.color-f9394d{color:#f9394d;}
.color-fe4109{color:#fe4109;}
.color-36afa2{color:#36afa2;}
-.color-00c800{color:#00c800;}
\ No newline at end of file
+.color-00c800{color:#00c800;}
+.color-575b6a{color:#575b6a;}
\ No newline at end of file
diff --git a/commons/css/base/padding.wxss b/commons/css/base/padding.wxss
index 7f096ba..499f949 100644
--- a/commons/css/base/padding.wxss
+++ b/commons/css/base/padding.wxss
@@ -1,3 +1,4 @@
+.inner6{padding:6rpx;}
.inner8{padding:8rpx;}
.inner10{padding:10rpx;}
.inner20{padding:20rpx;}
diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js
index 7a2dd8b..ebfe261 100644
--- a/pages/customer/detail/index.js
+++ b/pages/customer/detail/index.js
@@ -44,7 +44,7 @@ Page({
isShowTimePicker:false,
weekList:['日','一','二','三','四','五','六'],
dateList:[],
- nextIndex:-1,//下次回访时间
+ nextIndex:-1,//计划回访时间
},
onLoad(options) {
for (let key in options) {
@@ -396,7 +396,7 @@ Page({
}
else if((this.data.statuskey==0||this.data.statuskey==1)&&this.data.nextIndex == -1){
wx.showToast({
- title: '请选择下次回访时间',
+ title: '请选择计划回访时间',
icon: 'none'
})
}
@@ -802,7 +802,7 @@ Page({
},
- //选择下次回访时间
+ //选择计划回访时间
optday(e){
if(this.data.nextIndex != e.currentTarget.dataset.index){
this.setData({
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index 7a28b56..9c9db50 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -161,7 +161,7 @@
>
- 下次回访时间
+ 计划回访时间
@@ -222,7 +222,7 @@
- 下次回访时间
+ 计划回访时间
请选择
{{dateList[nextIndex].year}}-{{dateList[nextIndex].month}}-{{dateList[nextIndex].day}}
diff --git a/pages/customer/filterList/index.js b/pages/customer/filterList/index.js
index 319e77e..338e22c 100644
--- a/pages/customer/filterList/index.js
+++ b/pages/customer/filterList/index.js
@@ -23,6 +23,8 @@ Page({
o_type:'',//排序类型
visit:'',//只显示待回访客户(1是)
a_id:'',//活动ID
+ level:'',//客户级别
+ status:'',//客户状态
},
onLoad(options) {
for (let key in options) {
@@ -91,6 +93,12 @@ Page({
if(this.data.a_id != ''){
params['a_id'] = this.data.a_id;
}
+ if(this.data.level != ''){
+ params['level'] = this.data.level;
+ }
+ if(this.data.status != ''){
+ params['status'] = this.data.status;
+ }
_.apiQuery.getAppCustomersList(params).then(res => {
this.setData({
total: res.data.total,
diff --git a/pages/index/index.js b/pages/index/index.js
index 61269a8..2036867 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -47,6 +47,8 @@ Page({
banneractive3: 0,
remindTab:[],//调拨盘点入口
remindMsg:[],//调拨盘点弹框
+ levelStIndex:0,
+ levelSt:[],//客户等级
isShowVersionInfo:false,//是否显示版本更新
versionInfo:{
number:'V3.0.28',
@@ -310,6 +312,7 @@ Page({
_.apiQuery.getAppUserCal(params).then(res => {
this.setData({
userCal:res.data,
+ levelSt:res.data.levelSt,
})
if(res.data.deallist.length>0){
@@ -492,6 +495,13 @@ Page({
app.setStorage('appversion',this.data.versionInfo.number)
},
+ //切换tab
+ changeTab(e){
+ this.setData({
+ levelStIndex:e.currentTarget.dataset.index,
+ })
+ },
+
//页面相关事件处理函数--监听用户下拉动作
onPullDownRefresh: function () {
this.setData({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 979765f..8d5bf10 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -66,7 +66,7 @@
-->
- 客户代办事项
+ 客户跟进事项
@@ -83,19 +83,37 @@
-
-
-
-
-
- {{item.title}}
-
-
- {{item.total}}
-
-
+
+
+
+
+ {{item.title}}
+
+
-
+
+
+
+ {{item.num}}
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ {{item.total}}
+
+
+
+
+
订单代办事项
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 8c28f5b..c861f7e 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -9,4 +9,6 @@
.indicator-pin2{width:20rpx;height:6rpx;display:inline-block;background-color:#fad6c9;cursor:pointer;transition:all .3s ease-in-out;-ms-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;margin:0 6rpx;vertical-align:top}
.indicator-pin2.active{background-color:#f9394d;}
-.peg-tip{top:-7rpx;}
\ No newline at end of file
+.peg-tip{top:-7rpx;}
+
+.glider{position:absolute; border-radius:9px; height:18px; background:#3da35a; z-index:1; transition:0.25s ease-out; }
\ No newline at end of file