diff --git a/api/saas.js b/api/saas.js index a7d6ad1..c43de95 100644 --- a/api/saas.js +++ b/api/saas.js @@ -52,6 +52,11 @@ const getChanelList = (params) => mGet(`/ztb-factory/factorydeliverychannel/get/ const saveChanel = (params) => mPost(`/ztb-factory/factorydeliverychannel/save/factory-delivery-channel`, params, sconfig) const getCardList = (params) => mGet(`/ztb-factory/get/self-factory/card-list`, params, sconfig) const removeCardNop = (cardNo) => mPost(`/ztb-factory/remove/not-bind-card/${cardNo}`, null, sconfig) +const getCarList = (params) => mGet(`/ztb-factory/factory/get/factory-car-list`, params, sconfig) +const getCarInfo = (id) => mGet(`/ztb-factory/factory/get/factory-car/${id}`, null, sconfig) +const editCar = (params) => mPost(`/ztb-factory/factory/edit/factory-car`, params, sconfig) +const saveCar = (params) => mPost(`/ztb-factory/factory/save/factory-car`, params, sconfig) +const deleteCar = (id) => mPost(`/ztb-factory/factory/delete/factory-car/${id}`, null, sconfig) const getPoundList = () => mGet(`/ztb-factory/get/self-factory-weight-note-list`, null, sconfig) const getPoundInfo = (id) => mGet(`/ztb-factory/get/weight-note-detail/${id}`, null, sconfig) @@ -150,5 +155,10 @@ export { getReceiptReport, getSalesReport, getGrossReport, - getAgentReport + getAgentReport, + getCarList, + getCarInfo, + saveCar, + editCar, + deleteCar, } \ No newline at end of file diff --git a/app.js b/app.js index 1432a24..160b1cb 100644 --- a/app.js +++ b/app.js @@ -1,8 +1,8 @@ //app.js App({ - evn: 2, // 0: 开发版本；1：测试版本；2：生产版本 + evn: 0, // 0: 开发版本；1：测试版本；2：生产版本 tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], - version: '2.1.0', + version: '2.2.0', xAppId: '503258978847953926', userInfo: null, //----------------------------------------------globalData-------------------------------------- diff --git a/app.json b/app.json index c81093c..1601aa0 100644 --- a/app.json +++ b/app.json @@ -54,7 +54,9 @@ "pages/setting/password/index", "pages/setting/mobile/index", "pages/setting/paper-list/index", - "pages/setting/paper-detial/index" + "pages/setting/paper-detial/index", + "pages/setting/vehicle-list/index", + "pages/setting/vehicle-detial/index" ], "subpackages": [ { diff --git a/pages/home/customer-info/index.js b/pages/home/customer-info/index.js index 2ac746f..2cb54b8 100644 --- a/pages/home/customer-info/index.js +++ b/pages/home/customer-info/index.js @@ -1,6 +1,7 @@ // pages/home/customer-info/index.js import Scene from '../../index/scene' -import { getCustomerInfo, getBankList, editCustomer, saveCustomer} from "../../../api/saas" +import Dialog from '../../../components/dialog/dialog' +import { getCustomerInfo, getBankList, editCustomer, saveCustomer, deleteCustomer} from "../../../api/saas" const util = require('../../../utils/util') const event = require('../../../utils/event') const app = getApp() @@ -146,5 +147,19 @@ Scene({ } } }) + }, + deleteForm: function(){ + Dialog.confirm({ title: '温馨提示', message: '确定删除该客户？' }).then(() => { + wx.showLoading({ title: '正在处理', mask: true }) + deleteCustomer(this.data.form.id).then(result => { + wx.hideLoading() + util.showBackToast('客户已删除') + event.emit('EventMessage', { what: 101 }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + }).catch(err => { + }) } }) \ No newline at end of file diff --git a/pages/home/customer-info/index.json b/pages/home/customer-info/index.json index 36f609f..449ab55 100644 --- a/pages/home/customer-info/index.json +++ b/pages/home/customer-info/index.json @@ -10,6 +10,7 @@ "van-notice-bar": "/components/notice-bar/index", "van-picker": "/components/picker/index", "van-popup": "/components/popup/index", + "van-dialog": "/components/dialog/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/home/customer-info/index.wxml b/pages/home/customer-info/index.wxml index 9e12963..12e234e 100644 --- a/pages/home/customer-info/index.wxml +++ b/pages/home/customer-info/index.wxml @@ -20,14 +20,16 @@ wx:if="{{form.defaultPaymentMethod == 2}}" /> - + 选择客户进行绑定 确认绑定 - + 邀请注册纸通宝 + 删除客户 + 确认绑定 @@ -36,4 +38,5 @@ + \ No newline at end of file diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js index da46668..167f6f2 100644 --- a/pages/home/customer-list/index.js +++ b/pages/home/customer-list/index.js @@ -36,7 +36,10 @@ Scene({ this.fetchCustomerList() }, onEvent: function(message){ - if (message.what == 102) { + console.log(message) + if (message.what == 101) { + this.onRefreshList() + } else if (message.what == 102) { this.setData({ [`orderList[${this.data.page}][${this.data.index}]`]: message.detail }) } }, diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index e5637d1..e265080 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -45,6 +45,9 @@ + + + diff --git a/pages/setting/vehicle-detial/index.js b/pages/setting/vehicle-detial/index.js new file mode 100644 index 0000000..b551c2f --- /dev/null +++ b/pages/setting/vehicle-detial/index.js @@ -0,0 +1,98 @@ +// pages/setting/paper-detial/index.js +import Scene from '../../index/scene' +import Dialog from '../../../components/dialog/dialog' +import { getCarInfo, saveCar, editCar, deleteCar } from "../../../api/saas" +const event = require('../../../utils/event') +const util = require('../../../utils/util') +const app = getApp() + +Scene({ + /** + * 页面的初始数据 + */ + data: { + safeBottom: app.globalData.safeBottom, + form: {} + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + if(options.id){ + wx.showLoading({ title: '正在获取', mask: true }) + getCarInfo(options.id).then(result => { + wx.hideLoading() + this.setData({ form: result.data, safeBottom: app.globalData.safeBottom }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + } + }, + showPlate: function(e){ + if(e.currentTarget.id == 'plateNumber'){ + this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') + this.keyboard.show(this.data.form.plateNumber, 0) + } else { + var that = this + var events = {} + events.onCallback = function(data){ + if (data.what == 121) { + that.data.form.driverId = data.detail.enterpriseMemberId + that.setData({ ['form.driverName']: data.detail.enterpriseMemberName }) + } + } + wx.navigateTo({url: `/pages/home/employee/index?type=1`, events}) + } + }, + onPlatenumber: function({detail}){ + if(detail && detail.plateNumber){ + this.setData({ ['form.plateNumber']: detail.plateNumber }) + } + }, + deleteForm: function(e){ + Dialog.confirm({ title: '温馨提示', message: '确定删除该纸品？' }).then(() => { + wx.showLoading({ title: '正在处理', mask: true }) + deleteCar(this.data.form.id).then(result => { + wx.hideLoading() + util.showBackToast('删除成功') + event.emit('OrderMessage', { what: 201 }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + }).catch(err => { + }) + }, + submitForm: function(e){ + if(util.isEmpty(this.data.form.plateNumber)){ + util.showToast('请输入车牌号码') + return + } + if(util.isEmpty(this.data.form.driverId)){ + util.showToast('请选择司机') + return + } + wx.showLoading({ title: '正在处理', mask: true }) + if(util.isEmpty(this.data.form.id)){ + saveCar(this.data.form).then(result => { + wx.hideLoading() + util.showBackToast('添加成功') + event.emit('OrderMessage', { what: 201 }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + } else { + editCar(this.data.form).then(result => { + wx.hideLoading() + util.showBackToast('修改成功') + event.emit('OrderMessage', { what: 202, detail: this.data.form }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + } + } + +}) \ No newline at end of file diff --git a/pages/setting/vehicle-detial/index.json b/pages/setting/vehicle-detial/index.json new file mode 100644 index 0000000..de5df39 --- /dev/null +++ b/pages/setting/vehicle-detial/index.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "van-button": "/components/button/index", + "van-field": "/components/field/index", + "van-dialog": "/components/dialog/index", + "vehicle-keyboard": "/components/vehicle-keyboard/index", + "van-notice-bar": "/components/notice-bar/index", + "notification": "/pages/message/notification/index" + } +} \ No newline at end of file diff --git a/pages/setting/vehicle-detial/index.wxml b/pages/setting/vehicle-detial/index.wxml new file mode 100644 index 0000000..ba1c37a --- /dev/null +++ b/pages/setting/vehicle-detial/index.wxml @@ -0,0 +1,21 @@ + + + 车辆详情 + + + + + + + + 删除 + + 保存 + + + + + + \ No newline at end of file diff --git a/pages/setting/vehicle-detial/index.wxss b/pages/setting/vehicle-detial/index.wxss new file mode 100644 index 0000000..26dd70a --- /dev/null +++ b/pages/setting/vehicle-detial/index.wxss @@ -0,0 +1 @@ +/* pages/setting/paper-detial/index.wxss */ \ No newline at end of file diff --git a/pages/setting/vehicle-list/index.js b/pages/setting/vehicle-list/index.js new file mode 100644 index 0000000..9e797aa --- /dev/null +++ b/pages/setting/vehicle-list/index.js @@ -0,0 +1,85 @@ +// pages/process/order-list/index.js +import Scene from '../../index/scene' +import { getCarList } from "../../../api/saas" +const event = require('../../../utils/event') +const util = require('../../../utils/util') +const app = getApp() + +Scene({ + // * 页面的初始数据 + data: { + height: app.globalData.fragmentHeight, + loading: true, + requesting: false, + finished: false, + top: 0, + orderList: [], + form: { + pageNum: 1, + pageSize: 15 + }, + page: -1, + index: -1 + }, + // * 生命周期函数--监听页面加载 + onLoad: function (options) { + event.on('OrderMessage', this, this.onEvent) + this.setData({ height: app.globalData.fragmentHeight }) + this.fetchOrderList() + }, + onEvent: function(message){ + if (message.what == 201) { + this.onRefreshList() + } else if (message.what == 202) { + this.setData({ [`orderList[${this.data.page}][${this.data.index}]`]: message.detail }) + } + }, + onRefreshList: function () { + if (this.data.requesting) { + return + } + this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) + this.fetchOrderList() + }, + fetchOrderList: function () { + if (this.data.requesting || this.data.finished) { + return + } + this.data.requesting = true + getCarList(this.data.form).then(result => { + if (result.data && result.data.records && result.data.records.length) { + var respList = result.data.records + let nowList = `orderList[${this.data.orderList.length}]` + var num = this.data.form.pageNum + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total + if(this.data.form.pageNum == 1){ + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, top: 0, requesting: false, loading: false }) + } else { + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) + } + } else { + this.setData({ finished: true, requesting: false, loading: false }) + } + }).catch(err => { + this.setData({ requesting: false, loading: false }) + util.showToast(err) + }).then(() => { + this.refresh = this.refresh || this.selectComponent('#refresh') + this.refresh.setRefresh(false) + }) + }, + lookItem: function (e) { + if(e.currentTarget.dataset.page >= 0){ + this.data.page = e.currentTarget.dataset.page + this.data.index = e.currentTarget.dataset.index + var item = this.data.orderList[this.data.page][ this.data.index] + wx.navigateTo({ url: `/pages/setting/vehicle-detial/index?id=${item.id}` }) + } else { + wx.navigateTo({ url: `/pages/setting/vehicle-detial/index` }) + } + }, + onUnload: function(){ + event.remove('OrderMessage', this) + } + +}) \ No newline at end of file diff --git a/pages/setting/vehicle-list/index.json b/pages/setting/vehicle-list/index.json new file mode 100644 index 0000000..c8031fb --- /dev/null +++ b/pages/setting/vehicle-list/index.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "refresh-view": "/components/refresh-view/index", + "van-button": "/components/button/index", + "van-cell": "/components/cell/index", + "van-divider": "/components/divider/index", + "van-loading": "/components/loading/index", + "notification": "/pages/message/notification/index" + } +} \ No newline at end of file diff --git a/pages/setting/vehicle-list/index.wxml b/pages/setting/vehicle-list/index.wxml new file mode 100644 index 0000000..ebba2dc --- /dev/null +++ b/pages/setting/vehicle-list/index.wxml @@ -0,0 +1,35 @@ + + + 车辆管理 + + + + + + + + + {{loading? '正在加载' : '暂无数据'}} + + + + + 车牌号你：{{item.plateNumber}} + + 司机：{{item.driverName}}({{item.mobile}}) + + + + + + + + {{finished?'到底啦～':'加载中...'}} + + + + + + + + diff --git a/pages/setting/vehicle-list/index.wxss b/pages/setting/vehicle-list/index.wxss new file mode 100644 index 0000000..66e6996 --- /dev/null +++ b/pages/setting/vehicle-list/index.wxss @@ -0,0 +1 @@ +/* pages/setting/paper-list/index.wxss */ \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index d90bbc4..7eb5774 100644 --- a/utils/util.js +++ b/utils/util.js @@ -215,7 +215,7 @@ function throttle(fn, interval) { fn.call(context,arguments); enterTime = backTime;//赋值给第一次触发的时间，这样就保存了第二次触发的时间 } - }; + } } module.exports = {