diff --git a/api/saas.js b/api/saas.js index a41ed54..f35e6f1 100644 --- a/api/saas.js +++ b/api/saas.js @@ -14,6 +14,7 @@ const getUserInfo = () => mGet(`/recycle-user-center/user/get/user-info`, null, const getBaseInfo = () => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, null, sconfig) const bindingAdmin = (params) => mPost(`/recycle-user-center/bind/factory-admin`, params, sconfig) const getOrderList = (params) => mGet(`/ztb-factory/factory-customer/get/order-list`, params, sconfig) +const getReceiptList = (params) => mGet(`/ztb-factory/factory/get/order-receipt-proof-audit-list`, params, sconfig) const getOrderInfo = (id) => mGet(`/ztb-factory/factory-customer/get/order-detail/${id}`, null, sconfig) const pricingOrder = (params) => mPost(`/ztb-factory/factory/submit/order-price`, params, sconfig) const cancelOrder = (id) => mPost(`/ztb-factory/factory/cancel/order/${id}`, null, sconfig) @@ -40,6 +41,7 @@ export { getFactoryOrderList, getFactoryOrderInfo, getOrderList, + getReceiptList, getOrderInfo, createOrder, checkingOrder, diff --git a/pages/home/customer/index.js b/pages/home/customer/index.js index 6bd6c3b..a08ef8f 100644 --- a/pages/home/customer/index.js +++ b/pages/home/customer/index.js @@ -1,5 +1,5 @@ // pages/home/customer/index.js -import { getFactoryOrderList, cancelOrder } from "../../../api/saas" +import { getCustomerList, cancelOrder } from "../../../api/saas" const util = require('../../../utils/util') const app = getApp() @@ -15,7 +15,6 @@ Page({ top: 0, orderList: [], form: { - funcType: 0, pageNum: 1, pageSize: 10 } @@ -25,6 +24,7 @@ Page({ */ onLoad: function (options) { this.setData({ height: app.globalData.fragmentHeight - 100 }) + this.fetchCustomerList() }, onRefreshList: function () { this.setData({ @@ -33,10 +33,10 @@ Page({ loading: true, finished: false }) - this.fetchOrderList() + this.fetchCustomerList() }, //1:待定价,2:待过皮重,3:待过磅审核,4:待付款,5:已完成 - fetchOrderList: function () { + fetchCustomerList: function () { if (this.data.requesting || this.data.finished) { return } @@ -45,7 +45,7 @@ Page({ } else { this.setData({ requesting: true }) } - getFactoryOrderList(this.data.form).then(result => { + getCustomerList(this.data.form).then(result => { if (result.data && result.data.records.length) { var respList = result.data.records let nowList = `orderList[${this.data.orderList.length}]` diff --git a/pages/home/customer/index.wxml b/pages/home/customer/index.wxml index 6630c7e..c73f8cb 100644 --- a/pages/home/customer/index.wxml +++ b/pages/home/customer/index.wxml @@ -7,7 +7,7 @@ 搜索 - + diff --git a/pages/login/index.js b/pages/login/index.js index cf6c2ee..2b1b0f5 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -24,7 +24,7 @@ Page({ regist: false, metaData: null, code: null, - // code: '?mark=cloudprint&QrCodeRecordId=554273274725535744' + // code: '?mark=ztb_saas&QrCodeRecordId=554273274725535744' }, /************************************** 初始化登录流程 ********************************************/ onLoad: function (options) { diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index f84a99a..9968144 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -7,7 +7,7 @@ - {{userInfo.enterpriseName}} + {{userInfo.factoryName}} diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js index b3dd18b..159845b 100644 --- a/pages/process/order-list/index.js +++ b/pages/process/order-list/index.js @@ -1,6 +1,6 @@ // pages/process/order-list/index.js import Dialog from '../../../components/dialog/dialog' -import { getFactoryOrderList, cancelOrder } from "../../../api/saas" +import { getFactoryOrderList, cancelOrder, getReceiptList } from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -67,56 +67,68 @@ Page({ } else { this.setData({ requesting: true }) } - getFactoryOrderList(this.data.form).then(result => { - if (result.data && result.data.records.length) { - var respList = result.data.records - // 对返回的消息列表进行处理,将同一天的消息显示在一起 - for (let i = 0; i < respList.length; i++) { - if (util.isEmpty(this.data.lastTime)) { - this.data.lastTime = respList[i].createTime - if (this.data.lastTime.length > 10) { - this.data.lastTime = this.data.lastTime.substring(0, 10) - } - respList[i].tipsTime = this.data.lastTime - } else { - var itemTime = respList[i].createTime - if (itemTime.length > 10) { - itemTime = itemTime.substring(0, 10) - } - if (this.data.lastTime !== itemTime) { - respList[i].tipsTime = itemTime - } - this.data.lastTime = itemTime + if(this.data.form.funcType == 3){ + getReceiptList(this.data.form).then(result => { + this.handResult(result) + }).catch(err => { + this.setData({ requesting: false, loading: false }) + util.showToast(err) + }) + } else { + getFactoryOrderList(this.data.form).then(result => { + this.handResult(result) + }).catch(err => { + this.setData({ requesting: false, loading: false }) + util.showToast(err) + }) + } + }, + handResult: function(result){ + if (result.data && result.data.records.length) { + var respList = result.data.records + // 对返回的消息列表进行处理,将同一天的消息显示在一起 + for (let i = 0; i < respList.length; i++) { + if (util.isEmpty(this.data.lastTime)) { + this.data.lastTime = respList[i].createTime + if (this.data.lastTime.length > 10) { + this.data.lastTime = this.data.lastTime.substring(0, 10) } - } - 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), - top: 0, - finished, - requesting: false, - loading: false - }) + respList[i].tipsTime = this.data.lastTime } else { - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - finished, - requesting: false, - loading: false - }) + var itemTime = respList[i].createTime + if (itemTime.length > 10) { + itemTime = itemTime.substring(0, 10) + } + if (this.data.lastTime !== itemTime) { + respList[i].tipsTime = itemTime + } + this.data.lastTime = itemTime } + } + 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), + top: 0, + finished, + requesting: false, + loading: false + }) } else { - this.setData({ finished: true, requesting: false, loading: false }) + this.setData({ + [nowList]: respList, + ['form.pageNum']: (num + 1), + finished, + requesting: false, + loading: false + }) } - }).catch(err => { - this.setData({ requesting: false, loading: false }) - util.showToast(err) - }) + } else { + this.setData({ finished: true, requesting: false, loading: false }) + } }, cancelOrder: function(e){ Dialog.confirm({ title: '温馨提示', message: '确定取消该订单?' }).then(() => {