From a2c8be90aa771c5347b4563df162c002c31087af Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 17 May 2021 16:34:11 +0800 Subject: [PATCH] no message --- pages/process/index/index.js | 24 +++++++++++++- pages/process/outside-info/index.js | 10 ++++++ pages/process/outside-info/index.wxml | 4 +++ pages/process/payment/index.js | 48 ++++++++++++++++++++++----- pages/process/payment/index.wxml | 6 ++-- 5 files changed, 79 insertions(+), 13 deletions(-) diff --git a/pages/process/index/index.js b/pages/process/index/index.js index 863e96c..a5003bf 100644 --- a/pages/process/index/index.js +++ b/pages/process/index/index.js @@ -136,6 +136,28 @@ Component({ } else { this.data.tabList[2].badge = '' } + + if(Number(result.data.offsiteWaitReceiptNum) > 0){ + this.data.tabList1[0].badge = Number(result.data.offsiteWaitReceiptNum) + } else { + this.data.tabList1[0].badge = '' + } + if(Number(result.data.offsiteWaitPriceNum) > 0){ + this.data.tabList1[1].badge = Number(result.data.offsiteWaitPriceNum) + } else { + this.data.tabList1[1].badge = '' + } + if(Number(result.data.offsiteWaitPayOrderNum) > 0){ + this.data.tabList1[2].badge = Number(result.data.offsiteWaitPayOrderNum) + } else { + this.data.tabList1[2].badge = '' + } + if(Number(result.data.offsiteCompleted) > 0){ + this.data.tabList1[3].badge = Number(result.data.offsiteCompleted) + } else { + this.data.tabList1[3].badge = '' + } + if(util.isEmpty(result.data.availableCreditLine)){ result.data.availableCreditLine = app.userInfo.availableCreditLine } @@ -143,7 +165,7 @@ Component({ result.data.usedCreditLine = app.userInfo.usedCreditLine } var vdateString = util.formatDate(new Date(vdate[0]), 'Y-M-D') + '至' + util.formatDate(new Date(vdate[1]), 'Y-M-D') - this.setData({ tabList: this.data.tabList, totalInfo: result.data, vdate, vdateString }) + this.setData({ tabList: this.data.tabList, tabList1: this.data.tabList1, totalInfo: result.data, vdate, vdateString }) if(loading){ wx.hideLoading() } diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js index 232bab2..73ab2ac 100644 --- a/pages/process/outside-info/index.js +++ b/pages/process/outside-info/index.js @@ -70,5 +70,15 @@ Scene({ wx.hideLoading() util.showToast(err) }) + }, + paymentOrder: function(){ + let pages = getCurrentPages() //当前页面栈 + for (let index = 0; index < pages.length; index++) { + if (pages[index].route.indexOf('pages/process/payment/index') >= 0) { + wx.navigateBack() + return + } + } + wx.navigateTo({ url: `/pages/process/payment/index?id=${this.data.form.scrapPaperReceiptId}` }) } }) \ No newline at end of file diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml index ce179df..775162c 100644 --- a/pages/process/outside-info/index.wxml +++ b/pages/process/outside-info/index.wxml @@ -144,6 +144,10 @@ 重新定价 审核通过 + + 进行支付 + 客户结算 + diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js index 024f815..537ea3f 100644 --- a/pages/process/payment/index.js +++ b/pages/process/payment/index.js @@ -1,7 +1,7 @@ // pages/process/payment/index.js import Scene from '../../index/scene' import Dialog from '../../../components/dialog/dialog' -import { getPeymentList, paymentOrder, getFactoryOrderInfo, getSideOrderInfo } from "../../../api/saas" +import { getPeymentList, paymentOrder, getFactoryOrderInfo, getSideOrderInfo, getCustomerInfo } from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const math = require('../../../utils/math') //导入模块 @@ -28,6 +28,7 @@ Scene({ ids: [], payRemark: '' }, + settleType: '1', requesting: false, popup: false, show: false, @@ -58,24 +59,49 @@ Scene({ this.data.id = options.id wx.showLoading({ title: '正在获取', mask: true }) getSideOrderInfo({id: options.id}).then(result => { - wx.hideLoading() this.data.amount = 0 + var settleWeight = 0 + var productName = '' for (let index = 0; index < result.data.productCategoryInfos.length; index++) { const element = result.data.productCategoryInfos[index] - element.fileList = [] - for (let k = 0; k < element.weightNoteImages.length; k++) { - element.fileList.push({url: element.weightNoteImages[k]}) + // element.fileList = [] + // for (let k = 0; k < element.weightNoteImages.length; k++) { + // element.fileList.push({url: element.weightNoteImages[k]}) + // } + if(util.isEmpty(productName)){ + productName = element.productCategoryName + } else { + productName += ',' + element.productCategoryName } + settleWeight = math.plus(element.settleWeight, settleWeight) element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice) this.data.amount = math.plus(this.data.amount, element.settlePrice) } + result.data.id = result.data.scrapPaperReceiptId + result.data.productName = productName + result.data.settleWeight = settleWeight + result.data.settlePrice = this.data.amount this.setData({ orderList: [result.data], amount: this.data.amount, orderStatus: result.data.orderStatus }) + this.fetchCustomerInfo(result.data) }).catch(err => { wx.hideLoading() util.showToast(err) }) } }, + fetchCustomerInfo: function(orderInfo){ + getCustomerInfo(orderInfo.factoryCustomerId).then(result => { + wx.hideLoading() + this.data.params.bankCardNo = result.data.bankCardNo + this.data.settleType = '' + result.data.defaultPaymentMethod + this.data.params.ids = [] + this.data.params.ids.push(orderInfo.scrapPaperReceiptId) + this.setData({ params: this.data.params }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + }, amountList: function(orderList){ var amount = 0 this.data.params.ids = [] @@ -85,7 +111,7 @@ Scene({ amount = math.plus(amount, element.settlePrice) this.data.params.ids.push(element.id) if(index == 0 && Number(element.settleType) == 2 && !util.isEmpty(element.bankCardNo)){ - this.data.params.settleType = '2' + this.data.settleType = '2' this.data.params.bankCardNo = element.bankCardNo } } @@ -103,14 +129,14 @@ Scene({ } }, onTypeChange: function({detail}){ - this.setData({ ['params.settleType']: detail }) + this.setData({ settleType: detail }) }, onTypeClick(e) { if(Number(e.currentTarget.dataset.name == 2) && util.isEmpty(this.data.params.bankCardNo)){ util.showToast('暂无客户银行卡信息，无法进行银行卡转账') return } - this.setData({ ['params.settleType']: e.currentTarget.dataset.name }) + this.setData({ settleType: e.currentTarget.dataset.name }) }, onChange: function(e){ var item = this.data.orderList[e.currentTarget.dataset.index] @@ -127,6 +153,10 @@ Scene({ }, lookItem: function(e){ var item = this.data.orderList[e.currentTarget.dataset.index] + if(!util.isEmpty(item.scrapPaperReceiptId)){ + wx.navigateTo({ url: `/pages/process/outside-info/index?id=${item.scrapPaperReceiptId}` }) + return + } wx.showLoading({ title: '正在获取', mask: true }) getFactoryOrderInfo(item.id).then(result => { this.setData({ popup: true, detail: result.data }) @@ -190,7 +220,7 @@ Scene({ return } Dialog.confirm({ title: '温馨提示', message: '订单已经付款，在此进行确认？' }).then(() => { - this.agentPayment(this.data.params.settleType) + this.agentPayment(this.data.settleType) }).catch(err => { }) }, diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index 3d40aac..5bbb375 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -15,7 +15,7 @@ 付款方式 - + @@ -62,8 +62,8 @@ 品类：{{item.productName}} - 重量：{{item.settleWeight}}公斤 - 金额：{{formate.formateAmount(item.settlePrice)}}元 + 重量：{{item.settleWeight}}公斤 + 金额：{{formate.formateAmount(item.settlePrice, 2)}}元