diff --git a/api/saas.js b/api/saas.js
index 1de1415..a7c64f6 100644
--- a/api/saas.js
+++ b/api/saas.js
@@ -11,6 +11,7 @@ const sconfig = {
// *****************************************账户业务**********************************************
const loginToken = (params) => mPost(`/recycle-user-center/authorize/get/product-line-token/by/login-token`, params, sconfig)
const getUserInfo = () => mGet(`/recycle-user-center/user/get/user-info`, null, sconfig)
+const getEmployeList = (params) => mGet(`/recycle-user-center/get/self-department-member-list`, params, sconfig)
const getBaseInfo = () => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, null, sconfig)
const getStatisticsInfo = (params) => mGet(`/ztb-factory/get/my-workbench-statistics-info`, params, sconfig)
const bindingAdmin = (params) => mPost(`/recycle-user-center/bind/factory-admin`, params, sconfig)
@@ -29,8 +30,10 @@ const getFactoryOrderList = (params) => mGet(`/ztb-factory/factory/wechat-applet
const getFactoryOrderInfo = (id) => mGet(`/ztb-factory/factory/wechat-applet/get/order-detail/${id}`, null, sconfig)
const getPaperList = (params) => mGet(`/ztb-factory/factory/get/all-product`, params, sconfig)
const getPaperPrice = (params) => mGet(`/ztb-factory/factory/get/product-price-list`, params, sconfig)
+const getPaperInfo = (id) => mGet(`/ztb-factory/factory/get/product-price/${id}`, null, sconfig)
const savePaperPrice = (params) => mPost(`/ztb-factory/factory/save/product-price`, params, sconfig)
-const updatePaperPrice = (params) => mPost(`/ztb-factory/factory/update/product-price`, params, sconfig)
+const editPaperPrice = (params) => mPost(`/ztb-factory/factory/edit/product-price`, params, sconfig)
+const delePaperPrice = (id) => mPost(`/ztb-factory/factory/delete/product-price/${id}`, null, sconfig)
const getCustomerList = (params) => mGet(`/ztb-factory/factory/get/customer-list`, params, sconfig)
const editCustomer = (params) => mPost(`/ztb-factory/factory/edit/customer`, params, sconfig)
const deleteCustomer = (id) => mPost(`/ztb-factory/factory/delete/customer/${id}`, null, sconfig)
@@ -58,8 +61,10 @@ export {
paymentOrder,
cancelOrder,
getPaperPrice,
+ getPaperInfo,
savePaperPrice,
- updatePaperPrice,
+ editPaperPrice,
+ delePaperPrice,
getCustomerList,
editCustomer,
deleteCustomer,
@@ -69,5 +74,6 @@ export {
getPaperList,
repeatOrder,
getStatisticsInfo,
- getCustomerOrderList
+ getCustomerOrderList,
+ getEmployeList
}
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index 5463886..f30ce30 100644
--- a/api/user.js
+++ b/api/user.js
@@ -26,7 +26,6 @@ const generateCode = (params) => mPost('/uec/generate/qrcode', params, config)
const verifyCode = (code, params) => mGet(`/uec/verify/qrcode${code}`, params, config)
const applyEmplyee = (params) => mPost(`/uec/apply/to/be/employee/of/enterprise-department`, params, config)
const getCheckList = (params) => mGet(`/uec/get/employee-joining-department-application-list`, params, config)
-const getEmployeList = (params) => mGet(`/uec/get/self-department-member-list`, params, config)
const auditEmploye = (params) => mPost(`/uec/audit/employee-joining-department-application`, params, config)
const deleteEmploye = (params) => mPost(`/uec/remove/employees`, params, config)
const adminEmploye = (params) => mPost(`/uec/grant/admin-role/to/employees`, params, config)
@@ -203,7 +202,6 @@ export {
generateCode,
applyEmplyee,
getCheckList,
- getEmployeList,
auditEmploye,
deleteEmploye,
adminEmploye
diff --git a/app.json b/app.json
index aeb48dc..ab1186a 100644
--- a/app.json
+++ b/app.json
@@ -21,7 +21,9 @@
"pages/htmls/auths/index",
"pages/message/detail/index",
"pages/storage/index/index",
- "pages/manager/index/index",
+ "pages/setting/index/index",
+ "pages/setting/paper/index",
+ "pages/setting/paper-detial/index",
"pages/client/index/index",
"pages/client/registe/index",
"pages/client/home/index",
diff --git a/pages/home/customer-info/index.js b/pages/home/customer-info/index.js
index bb3ccba..e40f6e0 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 { getCustomerInfo } from "../../../api/saas"
+import { getCustomerInfo, editCustomer } from "../../../api/saas"
const util = require('../../../utils/util')
+const event = require('../../../utils/event')
Page({
/**
@@ -8,9 +9,11 @@ Page({
*/
data: {
form: null,
- base64: null,
- showEmbedded: false,
- customerName: ''
+ show: false,
+ actions: [
+ { id: 2, name: '转账' },
+ { id: 1, name: '现金' }
+ ],
},
/**
* 生命周期函数--监听页面加载
@@ -27,10 +30,37 @@ Page({
})
}
},
- onClickHideEmbedded: function(){
- this.setData({ showEmbedded: false })
+ bindInput: function(e){
+ this.data.form[e.currentTarget.id] = e.detail
+ },
+ chooseMethod: function(){
+ this.setData({ show: true })
+ },
+ onClose: function() {
+ this.setData({ show: false })
+ },
+ onSelect: function({detail}) {
+ this.setData({ ['form.defaultPaymentMethod']: detail.id })
},
registCustomer: function(){
wx.navigateTo({ url: `/pages/client/registe/index?id=${this.data.form.id}` })
+ },
+ submitForm: function(){
+ if (util.isEmpty(this.data.form.name)) {
+ util.showToast('请输入客户姓名')
+ return
+ }
+ if (util.isEmpty(this.data.form.defaultPaymentMethod)) {
+ this.data.form.defaultPaymentMethod = 1
+ }
+ wx.showLoading({ title: '正在获取', mask: true })
+ editCustomer(this.data.form).then(result => {
+ wx.hideLoading()
+ util.showBackToast('修改成功')
+ event.emit('EventMessage', { what: 102, detail: this.data.form })
+ }).catch(err => {
+ wx.hideLoading()
+ util.showToast(err)
+ })
}
})
\ No newline at end of file
diff --git a/pages/home/customer-info/index.json b/pages/home/customer-info/index.json
index 73af34b..b5a92be 100644
--- a/pages/home/customer-info/index.json
+++ b/pages/home/customer-info/index.json
@@ -2,10 +2,11 @@
"usingComponents": {
"van-button": "/components/button/index",
"van-cell": "/components/cell/index",
+ "van-field": "/components/field/index",
"van-loading": "/components/loading/index",
"van-image": "/components/image/index",
"van-icon": "/components/icon/index",
- "van-overlay": "/components/overlay/index",
+ "van-action-sheet": "/components/action-sheet/index",
"van-notice-bar": "/components/notice-bar/index"
}
}
\ No newline at end of file
diff --git a/pages/home/customer-info/index.wxml b/pages/home/customer-info/index.wxml
index b8c5e5e..72fb0e0 100644
--- a/pages/home/customer-info/index.wxml
+++ b/pages/home/customer-info/index.wxml
@@ -1,61 +1,23 @@
客户资料
-
-
-
-
- 客户姓名
- {{form.name}}
-
-
-
-
- 手机号码
- {{form.mobile}}
-
-
-
-
- 付款方式
- {{form.defaultPaymentMethod == 2 ? '转账' : '现金'}}
-
-
-
-
- 银行名称
- {{form.bankName}}
-
-
-
-
- 银行卡号
- {{form.bankCardNo}}
-
-
+
+
+
+
+
+
+
+
+
邀请注册纸通宝
-
+
+ 保存
-
-
-
-
-
-
-
-
- 邀请
- {{customerName}}
- 注册纸通宝
-
- 请让客户使用微信进行扫码注册
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js
index e0b0536..8d73d12 100644
--- a/pages/home/customer-list/index.js
+++ b/pages/home/customer-list/index.js
@@ -1,6 +1,7 @@
// pages/home/customer/index.js
import { getCustomerList } from "../../../api/saas"
const util = require('../../../utils/util')
+const event = require('../../../utils/event')
const app = getApp()
Page({
@@ -19,17 +20,22 @@ Page({
pageNum: 1,
pageSize: 10
},
- // base64: null,
- // showEmbedded: false,
- customerName: ''
+ page: 0,
+ index: 0,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({ height: app.globalData.fragmentHeight - 100 })
+ event.on('EventMessage', this, this.onEvent)
this.fetchCustomerList()
},
+ onEvent: function(message){
+ if (message.what == 102) {
+ this.setData({ [`orderList[${this.data.page}][${this.data.index}]`]: message.detail })
+ }
+ },
onRefreshList: function () {
if (this.data.requesting) {
return
@@ -54,22 +60,9 @@ Page({
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),
- top: 0,
- finished,
- requesting: false,
- loading: false
- })
+ this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), top: 0, finished, requesting: false, loading: false })
} else {
- this.setData({
- [nowList]: respList,
- ['form.pageNum']: (num + 1),
- finished,
- requesting: false,
- loading: false
- })
+ this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
}
} else {
this.setData({ finished: true, requesting: false, loading: false })
@@ -79,20 +72,23 @@ Page({
util.showToast(err)
})
},
- onChange({detail}) {
+ onChange: function({detail}) {
this.data.form.name = detail
},
- onSearch:function(){
+ onSearch: function(){
this.onRefreshList()
},
customerInfo: function(e){
- wx.navigateTo({ url: '/pages/home/customer-info/index?id=' + e.currentTarget.dataset.id })
+ this.data.page = e.currentTarget.dataset.page
+ this.data.index = e.currentTarget.dataset.index
+ var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+ wx.navigateTo({ url: `/pages/home/customer-info/index?id=${item.id}` })
},
- // onClickHideEmbedded: function(){
- // this.setData({ showEmbedded: false })
- // },
bindCustomer: function(e){
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
wx.navigateTo({ url: `/pages/client/registe/index?id=${item.id}` })
+ },
+ onUnload: function(){
+ event.remove('EventMessage', this)
}
})
\ No newline at end of file
diff --git a/pages/home/customer-list/index.wxml b/pages/home/customer-list/index.wxml
index fb2bbca..8732c91 100644
--- a/pages/home/customer-list/index.wxml
+++ b/pages/home/customer-list/index.wxml
@@ -17,7 +17,7 @@
-
+
{{item.name || ''}}
diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js
index 8c65748..4143134 100644
--- a/pages/home/employee/index.js
+++ b/pages/home/employee/index.js
@@ -1,5 +1,6 @@
// pages/home/employee/index.js
-import { getCheckList, getEmployeList, auditEmploye, adminEmploye, deleteEmploye, generateCode } from "../../../api/user"
+import { getCheckList, auditEmploye, adminEmploye, deleteEmploye, generateCode } from "../../../api/user"
+import { getEmployeList } from "../../../api/saas"
const util = require('../../../utils/util')
const app = getApp()
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index ca4ef15..43536e4 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -61,6 +61,12 @@
客户管理
+
+
+
+ 纸品管理
+
+
-
+
-
+
-
- 设置
+
+ 修改密码
-
+
diff --git a/pages/home/mobile/index.js b/pages/home/mobile/index.js
index 2a8b1be..472493f 100644
--- a/pages/home/mobile/index.js
+++ b/pages/home/mobile/index.js
@@ -1,4 +1,5 @@
// pages/home/mobile/index.js
+import { postCaptcha, modifyMobile } from '../../../api/user'
const util = require('../../../utils/util')
const app = getApp()
@@ -53,7 +54,17 @@ Page({
return
}
wx.showLoading({ title: '正在获取', mask: true })
- var form = {account: this.data.form.mobile, accountType: 'MOBILE', purpose: 'RECYCLE_CLIENT_UPDATE_MOBILE' }
+ postCaptcha({ verifiableAccount: this.data.form.mobile, verifiableAccountType: 1, purpose: 3 }).then(result => {
+ wx.hideLoading()
+ this.setData({ codeEnable: true })
+ util.showToast('验证码已经发送')
+ this.countDown = this.countDown || this.selectComponent('.count-down')
+ this.countDown.reset()
+ this.countDown.start()
+ }).catch(error => {
+ wx.hideLoading()
+ util.showToast(error)
+ })
},
onChange: function(e) {
this.setData({ second: e.detail.seconds + ' 秒 ' })
@@ -78,17 +89,15 @@ Page({
return
}
wx.showLoading({ title: '处理中', mask: true })
- var data = { mobile: this.data.form.mobile, captcha: this.data.form.captcha }
this.data.requesting = true
- // /front/customer/mobile修改手机号码
- // request.post('/cloud-print-user-center/user/modify/mobile', data).then(res => {
- // wx.hideLoading()
- // app.accountInfo.mobile = this.data.form.mobile
- // util.showBackToast('修改成功')
- // }).catch(error => {
- // wx.hideLoading()
- // this.data.requesting = false
- // util.showToast(error)
- // })
+ modifyMobile({ mobile: this.data.form.mobile, captcha: this.data.form.captcha }).then(res => {
+ wx.hideLoading()
+ app.userInfo.mobile = this.data.form.mobile
+ util.showBackToast('修改手机号码成功')
+ }).catch(error => {
+ wx.hideLoading()
+ this.data.requesting = false
+ util.showToast(error)
+ })
}
})
\ No newline at end of file
diff --git a/pages/home/mobile/index.wxml b/pages/home/mobile/index.wxml
index e3dcf3f..cc2553e 100644
--- a/pages/home/mobile/index.wxml
+++ b/pages/home/mobile/index.wxml
@@ -1,16 +1,16 @@
-
+
修改手机号码
-{{mobile ? '当前手机号码：' + mobile : '您还没有绑定手机号码'}}
+{{mobile ? '当前手机号码：' + mobile : '您还没有绑定手机号码'}}
-
-
+
+
手机号：
-
+
验证码：
@@ -20,6 +20,7 @@
+
提交
\ No newline at end of file
diff --git a/pages/home/mobile/index.wxss b/pages/home/mobile/index.wxss
index 4f147c6..566ac2a 100644
--- a/pages/home/mobile/index.wxss
+++ b/pages/home/mobile/index.wxss
@@ -1,4 +1 @@
-/* pages/home/mobile/index.wxss */
-page {
- background-color: #fff;
-}
\ No newline at end of file
+/* pages/home/mobile/index.wxss */
\ No newline at end of file
diff --git a/pages/home/password/index.js b/pages/home/password/index.js
index f5b73bf..c32f795 100644
--- a/pages/home/password/index.js
+++ b/pages/home/password/index.js
@@ -85,7 +85,7 @@ Page({
this.data.requesting = true
setPassword(this.data.form).then(res => {
wx.hideLoading()
- util.showBackToast('设置成功')
+ util.showBackToast('修改密码成功')
}).catch(error => {
wx.hideLoading()
this.data.requesting = false
diff --git a/pages/home/setting/index.js b/pages/home/setting/index.js
index b320083..66443d9 100644
--- a/pages/home/setting/index.js
+++ b/pages/home/setting/index.js
@@ -36,8 +36,8 @@ Page({
app.globalData.token = null
app.userInfo = null
finalizeToken()
- wx.redirectTo({ url: '/pages/login/index' })
event.emit('EventMessage', { what: 888, desc: 'Logout' })
+ wx.reLaunch({ url: '/pages/login/index' })
}).catch(error => {
})
}
diff --git a/pages/home/setting/index.wxml b/pages/home/setting/index.wxml
index 03d64a4..dea508f 100644
--- a/pages/home/setting/index.wxml
+++ b/pages/home/setting/index.wxml
@@ -1,6 +1,6 @@
- 重置
+ 设置
diff --git a/pages/login/index.js b/pages/login/index.js
index c729c18..d47bb17 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -100,6 +100,11 @@ Page({
pconfig.header = { 'Authorization': 'QNT ' + result.data }
getUserInfo().then(result => {
wx.hideLoading()
+ if(!result.data.isSaasPerssion){
+ Dialog.alert({ title: '温馨提示', message: '您的打包站还在授权中，请耐心等待，或者联系相关客服人员？' }).then(() => {
+ })
+ return
+ }
app.userInfo = result.data
app.globalData.token = authorization
storage.put('Authorization', app.globalData.token)
diff --git a/pages/manager/index/index.js b/pages/manager/index/index.js
deleted file mode 100644
index 238bd12..0000000
--- a/pages/manager/index/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/manager/index/index.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
-})
\ No newline at end of file
diff --git a/pages/manager/index/index.wxml b/pages/manager/index/index.wxml
deleted file mode 100644
index 51d8e57..0000000
--- a/pages/manager/index/index.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pages/manager/index/index.wxml
diff --git a/pages/manager/index/index.wxss b/pages/manager/index/index.wxss
deleted file mode 100644
index 2ac6361..0000000
--- a/pages/manager/index/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/manager/index/index.wxss */
\ No newline at end of file
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index 836f734..160cb7d 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -58,7 +58,7 @@
{{item.factoryCustomerName}} {{item.factoryCustomerMobile || ''}}
- {{item.bangTime}}
+ {{item.inspectionTime}}
品类：{{item.productName}}
diff --git a/pages/setting/index/index.js b/pages/setting/index/index.js
new file mode 100644
index 0000000..b320083
--- /dev/null
+++ b/pages/setting/index/index.js
@@ -0,0 +1,44 @@
+// pages/home/setting/index.js
+import Dialog from '../../../components/dialog/dialog'
+import util from '../../../utils/util'
+import { finalizeToken } from "../../../api/user"
+const event = require('../../../utils/event')
+const storage = require('../../../utils/storage')
+const app = getApp()
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ agenting: true
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ var agenting = storage.get('saas-agenting')
+ if(!util.isEmpty(agenting)){
+ app.globalData.agenting = agenting
+ }
+ this.setData({ agenting: app.globalData.agenting ? true : false })
+ },
+ settingAgent: function(){
+ var agenting = this.data.agenting ? 0 : 1
+ app.globalData.agenting = agenting
+ storage.put('saas-agenting', agenting)
+ this.setData({ agenting: agenting ? true : false })
+ },
+ loginOut: function () {
+ Dialog.confirm({ title: '温馨提示', message: '确定退出纸通宝账号？' }).then(() => {
+ storage.remove('Authorization')
+ app.globalData.token = null
+ app.userInfo = null
+ finalizeToken()
+ wx.redirectTo({ url: '/pages/login/index' })
+ event.emit('EventMessage', { what: 888, desc: 'Logout' })
+ }).catch(error => {
+ })
+ }
+})
\ No newline at end of file
diff --git a/pages/setting/index/index.json b/pages/setting/index/index.json
new file mode 100644
index 0000000..0783c2d
--- /dev/null
+++ b/pages/setting/index/index.json
@@ -0,0 +1,10 @@
+{
+ "usingComponents": {
+ "van-cell": "/components/cell/index",
+ "van-cell-group": "/components/cell-group/index",
+ "van-info": "/components/info/index",
+ "van-icon": "/components/icon/index",
+ "van-switch": "/components/switch/index",
+ "van-dialog": "/components/dialog/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/setting/index/index.wxml b/pages/setting/index/index.wxml
new file mode 100644
index 0000000..dea508f
--- /dev/null
+++ b/pages/setting/index/index.wxml
@@ -0,0 +1,28 @@
+
+
+ 设置
+
+
+
+
+
+
+ 默认使用千鸟代付
+
+
+
+
+
+
+
+ 修改密码
+
+
+
+
+ 退出当前账号
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/setting/index/index.wxss b/pages/setting/index/index.wxss
new file mode 100644
index 0000000..ebceea0
--- /dev/null
+++ b/pages/setting/index/index.wxss
@@ -0,0 +1 @@
+/* pages/home/setting/index.wxss */
\ No newline at end of file
diff --git a/pages/setting/paper-detial/index.js b/pages/setting/paper-detial/index.js
new file mode 100644
index 0000000..facad49
--- /dev/null
+++ b/pages/setting/paper-detial/index.js
@@ -0,0 +1,20 @@
+// pages/setting/paper-detial/index.js
+import { getPaperInfo, savePaperPrice, editPaperPrice, delePaperPrice } from "../../../api/saas"
+const event = require('../../../utils/event')
+const util = require('../../../utils/util')
+
+Page({
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ }
+
+})
\ No newline at end of file
diff --git a/pages/manager/index/index.json b/pages/setting/paper-detial/index.json
similarity index 100%
rename from pages/manager/index/index.json
rename to pages/setting/paper-detial/index.json
diff --git a/pages/setting/paper-detial/index.wxml b/pages/setting/paper-detial/index.wxml
new file mode 100644
index 0000000..fc28db8
--- /dev/null
+++ b/pages/setting/paper-detial/index.wxml
@@ -0,0 +1,4 @@
+
+
+ 纸品详情
+
diff --git a/pages/setting/paper-detial/index.wxss b/pages/setting/paper-detial/index.wxss
new file mode 100644
index 0000000..26dd70a
--- /dev/null
+++ b/pages/setting/paper-detial/index.wxss
@@ -0,0 +1 @@
+/* pages/setting/paper-detial/index.wxss */
\ No newline at end of file
diff --git a/pages/setting/paper/index.js b/pages/setting/paper/index.js
new file mode 100644
index 0000000..b9d6c93
--- /dev/null
+++ b/pages/setting/paper/index.js
@@ -0,0 +1,77 @@
+// pages/process/order-list/index.js
+import { getPaperPrice } from "../../../api/saas"
+const event = require('../../../utils/event')
+const util = require('../../../utils/util')
+const app = getApp()
+
+Page({
+ // * 页面的初始数据
+ data: {
+ height: app.globalData.fragmentHeight,
+ loading: true,
+ requesting: false,
+ finished: false,
+ top: 0,
+ orderList: [],
+ form: {
+ pageNum: 1,
+ pageSize: 10
+ }
+ },
+ // * 生命周期函数--监听页面加载
+ onLoad: function (options) {
+ event.on('OrderMessage', this, this.onEvent)
+ this.setData({ height: app.globalData.fragmentHeight })
+ this.fetchOrderList()
+ },
+ onEvent: function(message){
+ if (message.what == 12) {
+ this.onRefreshList()
+ }
+ },
+ onRefreshList: function () {
+ if (this.data.requesting) {
+ return
+ }
+ this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false })
+ this.data.lastTime = null
+ this.fetchOrderList()
+ },
+ //1：待定价，2：待过皮重，3：待过磅审核，4：待付款，5：已完成
+ fetchOrderList: function () {
+ if (this.data.requesting || this.data.finished) {
+ return
+ }
+ if (this.data.loading) {
+ this.data.requesting = true
+ } else {
+ this.setData({ requesting: true })
+ }
+ getPaperPrice(this.data.form).then(result => {
+ if (result.data && 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
+ 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)
+ })
+ },
+ lookItem: function (e) {
+ if(e.currentTarget.dataset.page >= 0){
+ var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+ wx.navigateTo({ url: `/pages/setting/paper-detial/index?id=${item.id}` })
+ } else {
+ wx.navigateTo({ url: `/pages/setting/paper-detial/index` })
+ }
+ },
+ onUnload: function(){
+ event.remove('OrderMessage', this)
+ }
+
+})
\ No newline at end of file
diff --git a/pages/setting/paper/index.json b/pages/setting/paper/index.json
new file mode 100644
index 0000000..1f6860f
--- /dev/null
+++ b/pages/setting/paper/index.json
@@ -0,0 +1,9 @@
+{
+ "usingComponents": {
+ "refresh-view": "/components/refresher/index",
+ "van-button": "/components/button/index",
+ "van-cell": "/components/cell/index",
+ "van-divider": "/components/divider/index",
+ "van-loading": "/components/loading/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/setting/paper/index.wxml b/pages/setting/paper/index.wxml
new file mode 100644
index 0000000..44890d6
--- /dev/null
+++ b/pages/setting/paper/index.wxml
@@ -0,0 +1,33 @@
+
+
+ 纸品管理
+
+
+
+
+
+
+
+
+ {{loading? '正在加载' : '暂无数据'}}
+
+
+
+
+ {{item.productName || ''}}
+ 单价范围(元/公斤)：{{item.defaultUnitPrice}} - {{item.highestUnitPrice}}
+
+
+
+
+
+
+ {{finished?'到底啦～':'加载中...'}}
+
+
+
+
+
+
+
+
diff --git a/pages/setting/paper/index.wxss b/pages/setting/paper/index.wxss
new file mode 100644
index 0000000..ccfd702
--- /dev/null
+++ b/pages/setting/paper/index.wxss
@@ -0,0 +1,22 @@
+/* pages/setting/paper/index.wxss */
+.booking-tool {
+ width: calc(100% - 20px);
+ background-color: #008AFF;
+ position: fixed;
+ bottom: 150px;
+ left: 25px;
+}
+
+.roder-add {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 100rpx;
+ height: 100rpx;
+ background-color: #008AFF;
+ border-radius: 50rpx;
+ position: absolute;
+ top: 24px;
+ right: 24px;
+ box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+}
\ No newline at end of file