diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js index 7992d4d..a8050f1 100644 --- a/pages/home/customer-list/index.js +++ b/pages/home/customer-list/index.js @@ -174,9 +174,6 @@ Scene({ this.setData({ searchList: result, loading: false }) } }, - // onSearch: function(){ - // this.onRefreshList() - // }, customerInfo: function(e){ var item = null if(util.isEmpty(this.data.form.name)){ @@ -207,18 +204,6 @@ Scene({ } wx.navigateTo({ url: `/pages/home/registe/index?id=${item.id}` }) }, - qrcodeCustomer: function(e){ - var item = null - if(util.isEmpty(this.data.form.name)){ - this.data.page = e.currentTarget.dataset.page - this.data.index = e.currentTarget.dataset.index - item = this.data.orderList[e.currentTarget.dataset.page].data[e.currentTarget.dataset.index] - } else { - this.data.index = e.currentTarget.dataset.index - item = this.data.searchList[e.currentTarget.dataset.index] - } - wx.navigateTo({ url: `/pages/home/qrcode-info/index?id=${item.id}&userId=${item.userId}` }) - }, addCustomer: function(){ wx.navigateTo({ url: `/pages/home/customer-info/index?` }) }, diff --git a/pages/home/employee-info/index.js b/pages/home/employee-info/index.js index 1af2f47..7973cb5 100644 --- a/pages/home/employee-info/index.js +++ b/pages/home/employee-info/index.js @@ -24,7 +24,7 @@ Scene({ if(options.id){ let channel = this.getOpenerEventChannel() let that = this - channel.on('onParam', function (data) { + channel.once('onParam', function (data) { if(data.enterpriseRoleIds && data.enterpriseRoleIds.indexOf(',') > 0){ data.enterpriseRoleIds = data.enterpriseRoleIds.split(',') } else if(data.enterpriseRoleIds && !Array.isArray(data.enterpriseRoleIds)){ diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js index 453d8f5..812fc70 100644 --- a/pages/home/employee/index.js +++ b/pages/home/employee/index.js @@ -2,6 +2,7 @@ import Scene from '../../index/scene' import { getCheckList, auditEmploye, createQrcode } from "../../../api/user" import { getEmployeList } from "../../../api/saas" +const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -25,6 +26,7 @@ Scene({ if(options.type){ this.data.type = Number(options.type) } + event.on('EventMessage', this, this.onEvent) this.setData({ height: app.globalData.fragmentHeight }) this.fetchMemberList() if(this.data.type == 0){ @@ -37,6 +39,11 @@ Scene({ }) } }, + onEvent: function(message){ + if (message.what == 120) { + this.fetchMemberList() + } + }, fetchMemberList: function(){ wx.showLoading({ title: '加载中', mask: true }) if(this.data.type == 0){ @@ -55,7 +62,6 @@ Scene({ }) }, lookItem: function(e){ - var that = this this.data.nowIndex = e.currentTarget.dataset.index var item = this.data.memberList[this.data.nowIndex] if(this.data.type){ @@ -64,14 +70,7 @@ Scene({ wx.navigateBack() } else { wx.navigateTo({ - url: `/pages/home/employee-info/index?id=${item.enterpriseMemberId}`, - events: { - onCallback: (data) => { - if (data.what == 120) { - that.fetchMemberList() - } - } - }, + url: `/pages/home/employee-info/index?type=1&id=${item.enterpriseMemberId}`, success: function(res) { res.eventChannel.emit('onParam', item) } @@ -79,18 +78,10 @@ Scene({ } }, agreeItem: function(e){ - var that = this this.data.nowIndex = e.currentTarget.dataset.index var item = this.data.checkList[this.data.nowIndex] wx.navigateTo({ url: `/pages/home/employee-info/index?id=${item.enterpriseMemberId}`, - events: { - onCallback: (data) => { - if (data.what == 120) { - that.fetchMemberList() - } - } - }, success: function(res) { res.eventChannel.emit('onParam', item) } @@ -113,5 +104,8 @@ Scene({ imageUrl: 'https://img.imgdb.cn/item/607660278322e6675ccd9960.png', path: `pages/login/index?qrcode=${this.data.qrcode}` } + }, + onUnload: function(){ + event.remove('EventMessage', this) } }) \ No newline at end of file diff --git a/pages/home/qrcode-info/index.js b/pages/home/qrcode-info/index.js index c66b59b..41b01cc 100644 --- a/pages/home/qrcode-info/index.js +++ b/pages/home/qrcode-info/index.js @@ -15,7 +15,7 @@ Scene({ type: 0, id: null, userId: null, - form: null, + form: null }, /** * 生命周期函数--监听页面加载 @@ -30,7 +30,12 @@ Scene({ if(this.data.type == 0){ this.fetchCustomerInfo() } else if(this.data.type == 1){ - this.fetchEmplyeeInfo() + let channel = this.getOpenerEventChannel() + let that = this + channel.once('onParam', function (data) { + that.setData({ form: data, type: that.data.type }) + that.showQrCode(`?mark=ztb_saas&QrCodeRecordId=${that.data.id}` ) + }) } } event.on('EventMessage', this, this.onEvent) @@ -41,8 +46,6 @@ Scene({ } else if (message.what == 102) { if(this.data.type == 0){ this.fetchCustomerInfo() - } else if(this.data.type == 1){ - this.fetchEmplyeeInfo() } } }, @@ -89,8 +92,18 @@ Scene({ } }) }, - customerInfo: function(){ - wx.navigateTo({ url: `/pages/home/customer-info/index?id=${this.data.id}&userId=${this.data.userId}` }) + toDetail: function(){ + if(this.data.type == 0){ + wx.navigateTo({ url: `/pages/home/customer-info/index?id=${this.data.id}&userId=${this.data.userId}` }) + } else if(this.data.type == 1){ + var that = this + wx.navigateTo({ + url: `/pages/home/employee-info/index?id=${this.data.id}`, + success: function(res) { + res.eventChannel.emit('onParam', that.data.form) + } + }) + } }, onUnload: function(){ event.remove('EventMessage', this) diff --git a/pages/home/qrcode-info/index.wxml b/pages/home/qrcode-info/index.wxml index 8569dff..98c094e 100644 --- a/pages/home/qrcode-info/index.wxml +++ b/pages/home/qrcode-info/index.wxml @@ -1,15 +1,15 @@ - 客户二维码 + {{type == 0 ? '客户' : '员工'}}二维码 - + - {{form.name || ''}} + {{form.name || form.enterpriseMemberName || ''}} - 联系电话:{{form.mobile}} + 联系电话:{{form.mobile || form.phone}}