diff --git a/app.json b/app.json
index 81b42cb..8fa9c05 100644
--- a/app.json
+++ b/app.json
@@ -66,7 +66,9 @@
"pages/storeData/subData/index",
"pages/signup/code",
"pages/signup/index",
- "pages/signup/status"
+ "pages/signup/status",
+ "pages/clues/index",
+ "pages/clues/detail/index"
],
"echarts": [
{
@@ -92,14 +94,9 @@
"lcb-channelTabBarNav": "/components/channel-tab-bar/index",
"lcb-shopTabBarNav": "/components/shop-tab-bar/index",
"lcb-backChannel": "/components/backChannel/index",
- "QYWXcontact": "plugin://contactPlugin/cell",
"kefuSuccess": "/components/kefuSuccess/index"
},
"plugins": {
- "contactPlugin": {
- "version": "1.4.1",
- "provider": "wx104a1a20c3f81ec2"
- }
},
"navigateToMiniProgramAppIdList": [
"wx98e64c11aac45966"
diff --git a/commons/js/config.js b/commons/js/config.js
index 1eeb891..ccbb830 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -1,4 +1,4 @@
-const env = "p";
+const env = "d";
const version = 1,
@@ -14,7 +14,7 @@ key = '71fd71173b776766a2ae1209d9a2c2ed';
let api, baseUrl;
if (env == "d") {
- baseUrl = "https://liche-api-dev.xiaoyu.com/hd/";
+ baseUrl = "https://api.ss.haodian.cn/hd/";
} else if (env == "t") {
baseUrl = "https://api.test.liche.cn/hd/";
} else if (env == "p") {
@@ -75,6 +75,7 @@ api = {
appUserResetbiz: "app/user/resetbiz", //更新用户店铺id
appXzStat: "app/xz/stat", //获取电话统计数据
appCity: "app/city", //获取系统配置城市
+ appCityLists: "app/city/lists", //获取城市列表
materialHomeTabs: "material/home/tabs", //推广素材_tab
materialHomeLists: "material/home/lists", //推广素材_lists
@@ -170,6 +171,8 @@ api = {
appResetgroupid:'app/user/resetgroupid', //切换角色
+ appClues: "app/clues", //获取线索列表 获取线索详情
+ appCluesLogs: "app/clueslogs", //线索日志
}
//远程图片存储地址
diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js
index fd3874d..e94a572 100644
--- a/commons/js/utils/apiQuery.js
+++ b/commons/js/utils/apiQuery.js
@@ -405,6 +405,13 @@ apiQuery.getAppCity = function(params){
})
}
+//获取城市列表
+apiQuery.getAppCityLists = function(params){
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appCityLists, 2, params, "GET", resolve, reject)
+ })
+}
+
//推广素材_tab
apiQuery.getMaterialHomeTabs = function(params){
return new Promise(function (resolve, reject) {
@@ -980,4 +987,23 @@ apiQuery.putAppResetgroupid = function (params) {
})
}
+//获取线索列表
+apiQuery.getAppCluesList = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appClues, 2, params, "GET", resolve, reject)
+ })
+}
+
+//获取线索详情
+apiQuery.getAppCluesDetails = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appClues, 2, params, "GET", resolve, reject)
+ })
+}
+//获取线索日志
+apiQuery.getAppCluesLogs = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appCluesLogs, 2, params, "GET", resolve, reject)
+ })
+}
export default apiQuery;
\ No newline at end of file
diff --git a/pages/channel/index.js b/pages/channel/index.js
index 1bcc717..368a419 100644
--- a/pages/channel/index.js
+++ b/pages/channel/index.js
@@ -62,7 +62,7 @@ Page({
onShow: function () {
this.getHoursTip()
- this.getAppTransferRemind()
+ //this.getAppTransferRemind()
},
//生命周期函数--监听页面卸载
@@ -138,53 +138,31 @@ Page({
//20240526 获取系统配置城市省市
getAppArea(){
- let area_list = [{
- "name": "福建省",
- "id": 1,
- "propvince_id": "35",
- "children": [{
- "id":"19","city_id":"350900","name":"宁德市"},
- {"id":"18","city_id":"350700","name":"南平市"}]
- },{
- "name": "湖南省",
- "id": 1,
- "propvince_id": "36",
- "children": [{
- "city_id": "120900",
- "id": "20",
- "name": "长沙市",
- },{
- "city_id": "120000",
- "id": "21",
- "name": "湘潭市",
- }]
- }]
-
- let area_id = [35,350900]
-
-
- let areaArr = []
- // let cur_index = []
- area_list.forEach((item,index) => {
- if(item.propvince_id==area_id[0]){
- item.children.forEach((it,idx)=>{
- if(it.city_id==area_id[1]){
- // cur_index = [item.propvince_id,it.city_id]
- this.setData({
- areaIndex: [index,idx]
- })
- areaArr = [area_list,area_list[index].children]
- return;
- }
- })
- }
+ _.apiQuery.getAppCityLists().then(res => {
+ let area_list = res.data.area_list
+ let area_id = res.data.default_area_id
+ let areaArr = []
+ // let cur_index = []
+ area_list.forEach((item,index) => {
+ if(item.propvince_id==area_id[0]){
+ item.children.forEach((it,idx)=>{
+ if(it.city_id==area_id[1]){
+ // cur_index = [item.propvince_id,it.city_id]
+ this.setData({
+ areaIndex: [index,idx]
+ })
+ areaArr = [area_list,area_list[index].children]
+ return;
+ }
+ })
+ }
+ });
+ this.setData({
+ area_id: area_id,
+ area_list: area_list,
+ areaArr: areaArr
+ })
});
- this.setData({
- area_id: area_id,
- area_list: area_list,
- areaArr: areaArr
- // cityList: res.data.list,
- })
},
@@ -214,8 +192,10 @@ Page({
//20240526选择地区
changeArea(e){
this.setData({
+ city_id:this.data.area_list[e.detail.value[0]].children[e.detail.value[1]].city_id,
areaIndex: e.detail.value,
- })
+ })
+ this.getAppUserBizs()
},
//20240526地区联动
@@ -227,10 +207,9 @@ Page({
multiIndex[columnIndex] = columnValue;
- console.log(e)
- console.log(multiIndex)
- console.log(multiData)
-
+ // console.log(e)
+ // console.log(multiIndex)
+ // console.log(multiData)
this.setData({
areaArr: [
multiData,
diff --git a/pages/clues/detail/index.js b/pages/clues/detail/index.js
new file mode 100644
index 0000000..201d3c2
--- /dev/null
+++ b/pages/clues/detail/index.js
@@ -0,0 +1,252 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+const innerAudioContext = wx.createInnerAudioContext();
+let interval = null
+Page({
+ data: {
+ imgUrl:_.config.imgUrl,
+ tabid:1,
+ tab:[
+ {"id":1,"title":"跟进记录",is_show_all:true}
+ ],
+ logslist: [],//日志列表
+ pageNo: 1,
+ noData: false,
+ end: false,
+ load: true,
+ loading: false,
+ currentIndex:'-1',//日志播放录音
+ play: false,//日志播放录音
+
+ userInfo:'',
+ },
+ onLoad(options) {
+ for (let key in options) {
+ this.setData({
+ [key]: options[key]
+ })
+ }
+
+ this.getAppCluesDetails()
+ this.getAppCluesLogs()
+ innerAudioContext.onEnded(() => {
+ this.offaudio()
+ })
+
+ },
+ onshow() {
+
+ },
+
+ //生命周期函数--监听页面隐藏
+ onHide: function () {
+ this.offaudio()
+ },
+
+ //生命周期函数--监听页面卸载
+ onUnload: function () {
+ this.offaudio()
+ },
+
+ //获取用户信息
+ getUserInfo(){
+ _.apiQuery.getUserInfo().then(res => {
+ this.setData({
+ userInfo: res,
+ })
+ });
+ },
+
+ //获取客户详情
+ getAppCluesDetails(){
+ let params = {};
+ params['id'] = this.data.id;
+ _.apiQuery.getAppCluesDetails(params).then(res=>{
+ this.setData({
+ detailinfo:res.data
+ })
+ wx.stopPullDownRefresh()
+ })
+ },
+ //获取日志
+ getAppCluesLogs(){
+ this.setData({
+ load: false,
+ loading: true,
+ })
+ let params = {};
+ params['page'] = this.data.pageNo;
+ params['size'] = 10;
+ params['id'] = this.data.id;
+ _.apiQuery.getAppCluesLogs(params).then(res => {
+
+ let list = res.data.list
+ list.forEach(item => {
+ if(item.record_url){
+ item.alltime=this.format(item.second)
+ }
+ })
+ this.setData({
+ pageNo: this.data.pageNo + 1,
+ logslist: this.data.logslist.concat(list),
+ load: true,
+ loading: false,
+ })
+ if (res.data.total == 0) {
+ this.setData({
+ noData: true
+ })
+ } else if (this.data.logslist.length == res.data.total) {
+ this.setData({
+ end: true
+ })
+ }
+ wx.stopPullDownRefresh()
+ });
+ },
+ //点击
+ handle_slider_move_start(e){
+ clearTimeout(interval)
+ innerAudioContext.stop()
+ this.setData({
+ currentIndex:e.currentTarget.dataset.index,
+ play:false,
+ })
+ },
+ //推送链接
+ pushLink(e){
+ if(e.currentTarget.dataset.url){
+ _.$router.openUrlScheme(e.currentTarget.dataset.url)
+ }
+ },
+ //拖动中
+ hanle_slider_changing(e){
+ clearTimeout(interval)
+ innerAudioContext.stop()
+ this.setData({
+ currentime:e.detail.value,
+ currentx:this.format(parseInt(e.detail.value))
+ })
+ innerAudioContext.src = this.data.logslist[e.currentTarget.dataset.index].record_url
+ },
+
+ //拖动结束
+ hanle_slider_change(e){
+ clearTimeout(interval)
+ innerAudioContext.stop()
+ this.setData({
+ currentime:e.detail.value,
+ currentx:this.format(parseInt(e.detail.value))
+ })
+ innerAudioContext.src = this.data.logslist[e.currentTarget.dataset.index].record_url
+ innerAudioContext.seek(parseInt(this.data.currentime))
+ },
+
+ //离开页面
+ offaudio() {
+ this.setData({
+ currentIndex:'-1',
+ play: false,
+ currentime:0,
+ currentx:'00:00'
+ })
+ innerAudioContext.stop()
+ clearTimeout(interval)
+ },
+
+ //操作录音
+ audioPlay: function (e) {
+ clearTimeout(interval)
+ if(this.data.currentIndex != e.currentTarget.dataset.index){
+ innerAudioContext.stop()
+ this.setData({
+ currentIndex:e.currentTarget.dataset.index,
+ currentime:0,
+ play:true,
+ })
+ innerAudioContext.src = this.data.logslist[e.currentTarget.dataset.index].record_url
+ innerAudioContext.play()
+ this.countDown()
+ }else{
+ if(this.data.play){
+ this.setData({
+ play:false,
+ })
+ innerAudioContext.pause()
+ }else{
+ this.setData({
+ play:true,
+ })
+ innerAudioContext.play()
+ this.countDown()
+ }
+ }
+ },
+
+ //播放录音时间
+ countDown:function () {
+ interval = setInterval(res => {
+ this.setData({
+ currentime:this.data.currentime + 1,
+ currentx:this.format(this.data.currentime + 1)
+ })
+ }, 1000)
+ },
+
+ //查看图片
+ previewImage(e){
+ if(e.currentTarget.dataset.type=='logs'){
+ wx.previewImage({
+ current:e.currentTarget.dataset.current,
+ urls:this.data.logslist[e.currentTarget.dataset.index].imgs,
+ })
+ }
+ else if(e.currentTarget.dataset.type=='gw_img'){
+ wx.previewImage({
+ current:this.data.wxgrimg_url,
+ urls:[this.data.wxgrimg_url],
+ })
+ }
+ },
+ //置顶操作
+ optTop(e){
+ let params = {};
+ params['id'] = this.data.id;
+ params['is_top'] = this.data.detailinfo.is_top==1?0:1;
+ _.apiQuery.putAppCustomers(params).then(res=>{
+
+ //刷新列表页
+ let pages = getCurrentPages();
+ let prevPage = null; //上一个页面
+ if (pages.length >= 2) {
+ prevPage = pages[pages.length - 2]; //上一个页面
+ if(prevPage.route == 'pages/customer/index'||prevPage.route == 'pages/customer/filterList/index'){
+ prevPage.onPullDownRefresh()
+ }
+ }
+
+ this.getAppCustomersDetails()
+ })
+ },
+
+
+ //页面相关事件处理函数--监听用户下拉动作
+ onPullDownRefresh(){
+ this.setData({
+ logslist: [],
+ pageNo: 1,
+ noData: false,
+ end: false,
+ load: true,
+ loading: false,
+ })
+ this.getAppCustomersDetails()
+ },
+
+ //页面上拉触底事件的处理函数
+ onReachBottom(){
+ if (this.data.noData || this.data.end||!this.data.load) return;
+ this.getAppCustomerlogs()
+ },
+
+})
\ No newline at end of file
diff --git a/pages/clues/detail/index.json b/pages/clues/detail/index.json
new file mode 100644
index 0000000..8ea59a6
--- /dev/null
+++ b/pages/clues/detail/index.json
@@ -0,0 +1,7 @@
+{
+ "navigationBarTitleText": "线索详情",
+ "enablePullDownRefresh": true,
+ "usingComponents": {
+
+ }
+}
\ No newline at end of file
diff --git a/pages/clues/detail/index.wxml b/pages/clues/detail/index.wxml
new file mode 100644
index 0000000..ff91dd0
--- /dev/null
+++ b/pages/clues/detail/index.wxml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+ {{detailinfo.name}}编号 {{detailinfo.id}}
+
+
+
+ {{detailinfo.mobile}}
+
+
+
+
+ {{key}}
+ {{value}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.val}}
+ {{item.name}}
+
+
+
+
+
+
+
+ 用户跟踪
+
+
+
+
+
+
+
+ {{item.c_time}}
+
+
+ {{item.content}}
+
+
+
+
+
+ {{currentIndex==index?currentx:'00:00'}} / {{item.alltime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回列表
+
+
+
+
diff --git a/pages/clues/detail/index.wxss b/pages/clues/detail/index.wxss
new file mode 100644
index 0000000..0080f2a
--- /dev/null
+++ b/pages/clues/detail/index.wxss
@@ -0,0 +1,87 @@
+.tabmenu2{display:inline-block;line-height:72rpx;}
+.tabmenu2.active view.relative{display:inline-block;}
+.tabmenu2.active view.relative::before{display:inline-block;position:absolute;bottom:0;left:50%;transform:translate(-50%,0);width:64rpx;height:4rpx;content:"";background-color:#36afa2;}
+
+.width-25{width:25rpx;}
+
+/* .orderDtail-log::before{
+ content: '';
+ position: absolute;
+ top: 10rpx;
+ bottom: 10rpx;
+ background-color: #1a1a1a;
+ width: 2rpx;
+ left:10rpx;
+} */
+/* .orderDtail-log-item::before{
+ content:'';
+ position:absolute;
+ top:8rpx;
+ background-color: #1a1a1a;
+ width:2rpx;
+ height:1000rpx;
+ left:10rpx;
+} */
+.orderDtail-log-item{
+ padding-bottom: 40rpx;
+ line-height: 1.6;
+}
+.orderDtail-log-item:first-child{
+ margin-top: 0;
+}
+.orderDtail-log-line{
+ top: 8rpx;
+ left:16rpx;
+ width:2rpx;
+ height:2rpx;
+}
+.orderDtail-log-line::before{
+ content:'';
+ position:absolute;
+ left:0;
+ bottom:8rpx;
+ background-color: #1a1a1a;
+ width:2rpx;
+ height:1000rpx;
+}
+.orderDtail-log-line2{
+ top:8rpx;
+ bottom:-8rpx;
+ left:16rpx;
+ width:2rpx;
+ background-color: #1a1a1a;
+}
+.orderDtail-log-dot{
+ top: 8rpx;
+ left:6rpx;
+ width: 23rpx;
+ height: 23rpx;
+ border-radius: 100%;
+ background-color: #fff;
+}
+.orderDtail-log-dot::before{
+ width: 18rpx;
+ height: 18rpx;
+ background-color: #fff;
+}
+.orderDtail-log-dot::after{
+ width: 12rpx;
+ height: 12rpx;
+ background-color: #1a1a1a;
+}
+.orderDtail-log-dot::before,.orderDtail-log-dot::after{
+ content: '';
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%,-50%);
+ border-radius: 100%;
+}
+
+.orderDtail-log .orderDtail-log-content{
+ position:relative;
+ top:-20rpx;
+}
+.icon-jiantou-up{
+ left:6rpx;
+}
\ No newline at end of file
diff --git a/pages/clues/index.js b/pages/clues/index.js
new file mode 100644
index 0000000..e4a7890
--- /dev/null
+++ b/pages/clues/index.js
@@ -0,0 +1,79 @@
+import _ from '../../commons/js/commons'
+import popularData from '../../commons/js/lib/popularData';
+const app = getApp()
+Page({
+ data: {
+ key:'',//tab状态值
+ list: [],//客户列表
+ pageNo: 1,
+ noData: false,
+ end: false,
+ load: true,
+ loading: false,
+ isfirstonShow: true,
+ },
+ onLoad(options) {
+ this.getAppCluesList()
+ },
+
+ onShow(){
+
+ },
+
+ //获取客户列表
+ getAppCluesList(){
+ this.setData({
+ load: false,
+ loading: true,
+ })
+ let params = {};
+ params['page'] = this.data.pageNo;
+ params['size'] = 10;
+ _.apiQuery.getAppCluesList(params).then(res => {
+ this.setData({
+ total: res.data.total,
+ pageNo: this.data.pageNo + 1,
+ list: this.data.list.concat(res.data.list),
+ load: true,
+ loading: false,
+ })
+ if (res.data.total == 0) {
+ this.setData({
+ noData: true
+ })
+ } else if (this.data.list.length == res.data.total) {
+ this.setData({
+ end: true
+ })
+ }
+ wx.stopPullDownRefresh()
+ });
+ },
+
+ //推送链接
+ pushLink(e){
+ if(e.currentTarget.dataset.url){
+ _.$router.openUrlScheme(e.currentTarget.dataset.url)
+ }
+ },
+
+ //页面相关事件处理函数--监听用户下拉动作
+ onPullDownRefresh(){
+ this.setData({
+ list: [],
+ pageNo: 1,
+ noData: false,
+ end: false,
+ load: true,
+ loading: false,
+ })
+ this.getAppCustomersDefeats()
+ },
+
+ //页面上拉触底事件的处理函数
+ onReachBottom(){
+ if (this.data.noData || this.data.end||!this.data.load) return;
+ this.getAppCustomersDefeats()
+ },
+
+})
\ No newline at end of file
diff --git a/pages/clues/index.json b/pages/clues/index.json
new file mode 100644
index 0000000..c7ab758
--- /dev/null
+++ b/pages/clues/index.json
@@ -0,0 +1,7 @@
+{
+ "navigationBarTitleText": "线索池",
+ "enablePullDownRefresh": true,
+ "usingComponents": {
+
+ }
+}
\ No newline at end of file
diff --git a/pages/clues/index.wxml b/pages/clues/index.wxml
new file mode 100644
index 0000000..fea66e6
--- /dev/null
+++ b/pages/clues/index.wxml
@@ -0,0 +1,21 @@
+
+
+
+ 共{{total}}个
+
+
+
+
+ {{item.name}}
+ ({{item.mobile}})
+
+ 详细信息
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/clues/index.wxss b/pages/clues/index.wxss
new file mode 100644
index 0000000..12c7779
--- /dev/null
+++ b/pages/clues/index.wxss
@@ -0,0 +1,4 @@
+.tip-radius{
+ background-color:#fff5f6;
+ border-radius:0 20rpx 20rpx 15rpx;
+}
\ No newline at end of file
diff --git a/pages/customer/addCard/index.js b/pages/customer/addCard/index.js
index 076c91a..cbe4661 100644
--- a/pages/customer/addCard/index.js
+++ b/pages/customer/addCard/index.js
@@ -24,7 +24,6 @@ Page({
status:0,//状态
statuslist:[
'未见客户',
- '到店客户',
],
c_brands:[
@@ -38,9 +37,7 @@ Page({
{id:5, name:'零跑'},
],
- of_id:'',
of2_id:'',
- of1Index:-1,
of2Index:-1,
cityIndex:-1,
@@ -180,9 +177,7 @@ Page({
changeStatus(e) {
if(this.data.status != e.detail.value){
this.setData({
- of_id:'',
of2_id:'',
- of1Index:-1,
of2Index:-1,
of2Arr:[],
status:e.detail.value,
@@ -294,24 +289,13 @@ Page({
icon: 'none'
})
}
- else if (that.data.c_brandArray.length>0&&that.data.c_brandIndex == -1 ) {
- wx.showToast({
- title: '请选择客户品牌归属',
- icon: 'none'
- })
- }
- else if (that.data.sources.length>0&&that.data.of_id == '' ) {
+
+ else if (that.data.of2Arr.length>0&&that.data.of2_id == '' ) {
wx.showToast({
title: '请选择客户来源',
icon: 'none'
})
}
- else if (that.data.sources.length>0&&that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
- wx.showToast({
- title: '请选择'+that.data.sources[that.data.of1Index].name+'类型',
- icon: 'none'
- })
- }
else if (that.data.city_id == '' ) {
wx.showToast({
title: '请选择所在城市',
@@ -370,9 +354,6 @@ Page({
if(this.data.c_brandIndex != -1){
params['c_brand'] = this.data.c_brandArray[this.data.c_brandIndex].id;
}
- if(this.data.of_id != ''){
- params['of_id'] = this.data.of_id;
- }
if(this.data.of2_id != ''){
params['of2_id'] = this.data.of2_id;
}
@@ -423,11 +404,8 @@ Page({
timeIndex:-1,//预计购车时间索引
submitFlag:false,
-
- of_id:'',
of2_id:'',
of2Arr:[],
- of1Index:-1,
of2Index:-1,
})
that.getAppCustomersTag()
@@ -459,37 +437,22 @@ Page({
let params = {};
params['status'] = this.data.status;
_.apiQuery.getAppCustomersOffline_sources(params).then(res => {
- let of1Arr = []
- res.data.sources.forEach(item => {
- of1Arr.push(item.name)
+ let of2Arr = []
+ res.data.forEach(item => {
+ of2Arr.push(item['name'])
})
this.setData({
- of1Arr,
- sources:res.data.sources
+ of2Arr:of2Arr,
+ sources:res.data
})
});
},
//客户来源
changeOf1(e) {
- if(this.data.of1Index!=e.detail.value){
- let of2Arr = []
- this.data.sources[e.detail.value].list.forEach(item => {
- of2Arr.push(item.name)
- })
- this.setData({
- of2Arr,
- of2Index:-1,
- of_id:this.data.sources[e.detail.value].id,
- of1Index:e.detail.value,
- })
- }
- },
-
- changeOf2(e) {
if(this.data.of2Index!=e.detail.value){
this.setData({
- of2_id:this.data.sources[this.data.of1Index].list[e.detail.value].id,
+ of2_id:this.data.sources[e.detail.value].id,
of2Index:e.detail.value,
})
}
diff --git a/pages/customer/addCard/index.wxml b/pages/customer/addCard/index.wxml
index f72ba0a..35be91f 100644
--- a/pages/customer/addCard/index.wxml
+++ b/pages/customer/addCard/index.wxml
@@ -22,6 +22,7 @@
+
-
+
客户来源
-
- 请选择
- {{of1Arr[of1Index]}}
-
-
-
-
-
- {{sources[of1Index].name}}
-
-
+
请选择
{{of2Arr[of2Index]}}
diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js
index 3873a8b..5051b0d 100644
--- a/pages/customer/detail/index.js
+++ b/pages/customer/detail/index.js
@@ -89,7 +89,7 @@ Page({
this.getTimePicker()
this.getUserInfo()
-
+
},
onshow() {
@@ -1027,7 +1027,7 @@ Page({
icon: 'none'
})
- this.getAppCustomerlogsRefresh()()
+ this.getAppCustomerlogsRefresh()
})
}
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index cf5ae16..801d416 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -169,8 +169,12 @@
-->
-
- 返回列表
+
+ 战败
+
+
+ 再战
+
@@ -205,7 +209,7 @@
客户跟进
-
+
生成订单
@@ -251,6 +255,7 @@
+
@@ -262,10 +267,10 @@
-
+
未见客户
-
+
到店客户
diff --git a/pages/customer/editCard/index.js b/pages/customer/editCard/index.js
index 8b8962b..b209bae 100644
--- a/pages/customer/editCard/index.js
+++ b/pages/customer/editCard/index.js
@@ -28,9 +28,9 @@ Page({
submitFlag:false,
- of_id:'',
+ // of_id:'',
of2_id:'',
- of1Index:-1,
+ // of1Index:-1,
of2Index:-1,
c_brandIndex:-1,
@@ -62,7 +62,7 @@ Page({
baseinfo:res.data.baseinfo,
name:res.data.baseinfo.name.value?res.data.baseinfo.name.value:'',
mobile:res.data.baseinfo.mobile.value?res.data.baseinfo.mobile.value:'',
- of_id:res.data.baseinfo.of_id.of_id?res.data.baseinfo.of_id.of_id:'',
+ // of_id:res.data.baseinfo.of_id.of_id?res.data.baseinfo.of_id.of_id:'',
of2_id:res.data.baseinfo.of_id.of2_id?res.data.baseinfo.of_id.of2_id:'',
wxgr:res.data.baseinfo.wxgr,
wxgrimg:res.data.baseinfo.wxgrimg,
@@ -385,18 +385,12 @@ Page({
icon: 'none'
})
}
- else if (that.data.sources.length>0&&that.data.of_id == '' ) {
+ else if (that.data.sources.length>0&&that.data.of2_id == '' ) {
wx.showToast({
title: '请选择客户来源',
icon: 'none'
})
}
- else if (that.data.sources.length>0&&that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
- wx.showToast({
- title: '请选择'+that.data.sources[that.data.of1Index].name+'类型',
- icon: 'none'
- })
- }
else if (that.data.city_id == '' ) {
wx.showToast({
title: '请选择所在城市',
@@ -454,9 +448,6 @@ Page({
if(this.data.c_brandIndex != -1){
params['c_brand'] = this.data.c_brandArray[this.data.c_brandIndex].id;
}
- if(that.data.of_id != that.data.baseinfo.of_id.of_id){
- params['of_id'] = that.data.of_id;
- }
if(that.data.of2_id != that.data.baseinfo.of_id.of2_id){
params['of2_id'] = that.data.of2_id;
}
@@ -527,60 +518,31 @@ Page({
//客户来源
getAppCustomersOffline_sources(){
_.apiQuery.getAppCustomersOffline_sources().then(res => {
- let of1Arr = []
- res.data.sources.forEach(item => {
- of1Arr.push(item.name)
+ let of2Arr = []
+ res.data.forEach(item => {
+ of2Arr.push(item.name)
})
this.setData({
- of1Arr,
- sources:res.data.sources
+ of2Arr,
+ sources:res.data
})
- if(this.data.of_id != ''){
- res.data.sources.forEach((item,index) => {
- if(item.id == this.data.of_id){
+ if(this.data.of2_id != ''){
+ res.data.forEach((item,index) => {
+ if(item.id == this.data.of2_id){
this.setData({
- of1Index:index,
+ of2Index:index,
})
}
})
- if(this.data.of2Index != ''){
- let of2Arr = []
- res.data.sources[this.data.of1Index].list.forEach((item,index) => {
- of2Arr.push(item.name)
- if(item.id == this.data.of2_id){
- this.setData({
- of2Index:index,
- })
- }
- })
- this.setData({
- of2Arr,
- })
- }
}
});
},
//客户来源
- changeOf1(e) {
- if(this.data.of1Index!=e.detail.value){
- let of2Arr = []
- this.data.sources[e.detail.value].list.forEach(item => {
- of2Arr.push(item.name)
- })
- this.setData({
- of2Arr,
- of2Index:-1,
- of_id:this.data.sources[e.detail.value].id,
- of1Index:e.detail.value,
- })
- }
- },
-
changeOf2(e) {
if(this.data.of2Index!=e.detail.value){
this.setData({
- of2_id:this.data.sources[this.data.of1Index].list[e.detail.value].id,
+ of2_id:this.data.sources[e.detail.value].id,
of2Index:e.detail.value,
})
}
diff --git a/pages/customer/editCard/index.wxml b/pages/customer/editCard/index.wxml
index 8fbcf0f..0b1b071 100644
--- a/pages/customer/editCard/index.wxml
+++ b/pages/customer/editCard/index.wxml
@@ -13,6 +13,7 @@
+
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 411b62c..177694d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -108,7 +108,6 @@ Page({
onShow: function () {
this.getHoursTip()
-
//确保bizID重置完成再执行
if(this.data.isResetbiz){
this.setData({
@@ -118,10 +117,10 @@ Page({
isShowGoods:false,
});
this.getAppUserCal()
- this.getAppTransferRemind()
- this.getAppInventoryRemind()
- this.getAppGoodsRemind()
- this.getAppStatisticsHcust()
+ // this.getAppTransferRemind()
+ // this.getAppInventoryRemind()
+ // this.getAppGoodsRemind()
+ // this.getAppStatisticsHcust()
}
},
@@ -159,10 +158,10 @@ Page({
});
this.getUserInfo()
this.getAppUserCal()
- this.getAppTransferRemind()
- this.getAppInventoryRemind()
- this.getAppGoodsRemind()
- this.getAppStatisticsHcust()
+ // this.getAppTransferRemind()
+ // this.getAppInventoryRemind()
+ // this.getAppGoodsRemind()
+ // this.getAppStatisticsHcust()
});
},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7d0325d..af9331e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -43,7 +43,7 @@
数据看板
-
+
{{item.today.value}}/{{item.month.value}}
{{item.today.title}}/{{item.month.title}}
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index dfecf3b..fbebb98 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -29,6 +29,7 @@
+
diff --git a/project.config.json b/project.config.json
index af4d6c4..de99dab 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,29 +1,29 @@
-{
- "appid": "wx71095d4049de3ed1",
- "compileType": "miniprogram",
- "libVersion": "3.0.0",
- "packOptions": {
- "ignore": [],
- "include": []
- },
- "setting": {
- "coverView": true,
- "es6": true,
- "postcss": true,
- "minified": true,
- "enhance": true,
- "showShadowRootInWxmlPanel": true,
- "packNpmRelationList": [],
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
- },
- "condition": false
- },
- "condition": {},
- "editorSetting": {
- "tabIndent": "insertSpaces",
- "tabSize": 2
- }
+{
+ "appid": "wx4733380c110313ec",
+ "compileType": "miniprogram",
+ "libVersion": "3.0.0",
+ "packOptions": {
+ "ignore": [],
+ "include": []
+ },
+ "setting": {
+ "coverView": true,
+ "es6": true,
+ "postcss": true,
+ "minified": true,
+ "enhance": true,
+ "showShadowRootInWxmlPanel": true,
+ "packNpmRelationList": [],
+ "babelSetting": {
+ "ignore": [],
+ "disablePlugins": [],
+ "outputPath": ""
+ },
+ "condition": false
+ },
+ "condition": {},
+ "editorSetting": {
+ "tabIndent": "insertSpaces",
+ "tabSize": 2
+ }
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 6f54125..a1753b1 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,27 +1,28 @@
-{
- "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "projectname": "XiaoChengXu-LiCheBao",
- "setting": {
- "compileHotReLoad": true
- },
- "condition": {
- "miniprogram": {
- "list": [
- {
- "name": "待跟进客户",
- "pathName": "pages/customer/filterList/index",
- "query": "status=1&visit=1&title=待跟进客户",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "建卡",
- "pathName": "pages/customer/addCard/index",
- "query": "status=0",
- "launchMode": "default",
- "scene": null
- }
- ]
- }
- }
+{
+ "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+ "projectname": "XiaoChengXu-LiCheBao",
+ "setting": {
+ "compileHotReLoad": true,
+ "urlCheck": true
+ },
+ "condition": {
+ "miniprogram": {
+ "list": [
+ {
+ "name": "待跟进客户",
+ "pathName": "pages/customer/filterList/index",
+ "query": "status=1&visit=1&title=待跟进客户",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "建卡",
+ "pathName": "pages/customer/addCard/index",
+ "query": "status=0",
+ "launchMode": "default",
+ "scene": null
+ }
+ ]
+ }
+ }
}
\ No newline at end of file