diff --git a/api/saas.js b/api/saas.js
index cec3c47..2066489 100644
--- a/api/saas.js
+++ b/api/saas.js
@@ -22,6 +22,7 @@ const pricingOrder = (params) => mPost(`/ztb-factory/factory/submit/order-price`
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 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)
const createOrder = (params) => mPost(`/ztb-factory/factory-customer/save/order`, params, sconfig)
const getFactoryOrderList = (params) => mGet(`/ztb-factory/factory/wechat-applet/get/order-list`, params, sconfig)
@@ -51,6 +52,7 @@ export {
getOrderInfo,
createOrder,
checkingOrder,
+ printOrder,
pricingOrder,
paymentOrder,
cancelOrder,
diff --git a/assets/image/icon-print.png b/assets/image/icon-print.png
new file mode 100644
index 0000000..29d454a
Binary files /dev/null and b/assets/image/icon-print.png differ
diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index c550b2d..58134d7 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -1,6 +1,6 @@
// pages/process/order-check/index.js
import Dialog from '../../../components/dialog/dialog'
-import { repeatOrder, getFactoryOrderInfo, checkingOrder} from "../../../api/saas"
+import { repeatOrder, getFactoryOrderInfo, checkingOrder, printOrder} from "../../../api/saas"
const event = require('../../../utils/event')
const util = require('../../../utils/util')
const app = getApp()
@@ -54,6 +54,16 @@ Page({
// 需要手动对 checked 状态进行更新
this.setData({ ['form.isDefault']: detail ? 1 : 0 })
},
+ printOrder: function(){
+ wx.showLoading({ title: '正在获取', mask: true })
+ printOrder({id: this.data.form.id}).then(result => {
+ wx.hideLoading()
+ util.showToast('即将打印,请稍后')
+ }).catch(err => {
+ wx.hideLoading()
+ util.showToast(err)
+ })
+ },
paddingOrder: function(){
this.setData({ ['form.checking']: !this.data.form.checking })
},
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 335ec60..b1ca8a1 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -154,4 +154,10 @@
进行支付
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/process/order-info/index.wxss b/pages/process/order-info/index.wxss
index eb6f9a2..c798c76 100644
--- a/pages/process/order-info/index.wxss
+++ b/pages/process/order-info/index.wxss
@@ -3,6 +3,28 @@
margin-right: 24rpx;
}
+.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);
+}
+
.info_status{
background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);
height:90rpx;
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index f14a9d2..f870413 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -33,7 +33,7 @@
单价(元/公斤)
*
-