From 4afb83a120132f1b9dce7b7681dc7b4096109d85 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 28 Apr 2021 14:22:40 +0800 Subject: [PATCH] no message --- api/saas.js | 2 ++ pages/process/order-info/index.js | 17 ++++++++++++++--- pages/process/order-info/index.wxml | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/api/saas.js b/api/saas.js index fd7dd99..25c206e 100644 --- a/api/saas.js +++ b/api/saas.js @@ -24,6 +24,7 @@ const getOrderInfo = (id) => mGet(`/ztb-factory/factory-customer/get/order-detai const pricingOrder = (params) => mPost(`/ztb-factory/factory/submit/order-price`, params, sconfig) const cancelOrder = (id) => mPost(`/ztb-factory/factory/cancel/order/${id}`, null, sconfig) const repeatOrder = (id) => mPost(`/ztb-factory/factory/renew/empty-weight/${id}`, null, sconfig) +const repeatPrice = (id) => mPost(`/ztb-factory/factory/renew/order-price/${id}`, null, sconfig) const checkingOrder = (params) => mPost(`/ztb-factory/factory/audit-pass/order`, params, sconfig) const printOrder = (params) => mPost(`/ztb-factory/print/weight-order`, params, sconfig) const paymentOrder = (params) => mPost(`/ztb-factory/factory/pay/selected-order`, params, sconfig) @@ -96,6 +97,7 @@ export { registeCustomer, getPaperList, repeatOrder, + repeatPrice, getStatisticsInfo, getCustomerOrderList, getEmployeList, diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js index 812a28c..dd4a9cb 100644 --- a/pages/process/order-info/index.js +++ b/pages/process/order-info/index.js @@ -1,7 +1,7 @@ // pages/process/order-check/index.js import Scene from '../../index/scene' import Dialog from '../../../components/dialog/dialog' -import { repeatOrder, getFactoryOrderInfo, checkingOrder, printOrder} from "../../../api/saas" +import { repeatOrder, repeatPrice, getFactoryOrderInfo, checkingOrder, printOrder} from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -101,8 +101,19 @@ Scene({ }) }) }, - checkOrder: function(){ - wx.showLoading({ title: '正在获取', mask: true }) + priceOrder: function(e){ + wx.showLoading({ title: '正在处理', mask: true }) + repeatPrice(this.data.form.id).then(result => { + wx.hideLoading() + util.showBackToast('订单已处理') + event.emit('OrderMessage', { what: 12, desc: 'checkingOrder' }) + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + }, + checkOrder: function(e){ + wx.showLoading({ title: '正在处理', mask: true }) checkingOrder({ id: this.data.form.id }).then(result => { wx.hideLoading() util.showBackToast('订单审核已通过') diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml index c7c09d3..9decbcf 100644 --- a/pages/process/order-info/index.wxml +++ b/pages/process/order-info/index.wxml @@ -157,9 +157,9 @@ - 重新过皮重 - 重新定价 - 通过审核 + 重新过皮重 + 重新定价 + 通过审核 进行支付 客户结算