diff --git a/src/pageB/offline_order/store/order_preview.vue b/src/pageB/offline_order/store/order_preview.vue
new file mode 100644
index 0000000..da19df0
--- /dev/null
+++ b/src/pageB/offline_order/store/order_preview.vue
@@ -0,0 +1,338 @@
+
+
+
+
+ 门店
+
+ {{ store ? store.title : '请选择门店' }}
+
+
+
+
+
+ 订单明细
+ 新增
+
+
+
+
+
+ 商品分类
+ {{ orderItem.productCategory.name }}
+
+
+ 商品总额
+ ¥{{ orderItem.productsTotalAmount }}
+
+
+ 优惠折扣
+ {{ orderItem.discount ? (orderItem.discount+'折') : '无' }}
+
+
+ 应付金额
+ ¥{{ orderItem.paymentAmount }}
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+ 合计:¥{{ paymentAmount }}
+ 生成订单
+
+
+
+
+
+
+
+
+
+ 商品分类
+
+
+ {{ orderItemForm.productCategory ? orderItemForm.productCategory.name : '商品分类' }}
+
+
+
+
+ 商品总额
+
+
+
+
+
+ 折扣
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pageB/offline_order/store/order_preview_qrcode.vue b/src/pageB/offline_order/store/order_preview_qrcode.vue
new file mode 100644
index 0000000..43d1eaf
--- /dev/null
+++ b/src/pageB/offline_order/store/order_preview_qrcode.vue
@@ -0,0 +1,48 @@
+
+
+
+ 请用户通过微信扫码进入小程序生成订单
+
+ 继续下单
+ 个人中心
+
+
+
+
+
+
diff --git a/src/pageB/offline_order/user/order_preview.vue b/src/pageB/offline_order/user/order_preview.vue
new file mode 100644
index 0000000..46434b1
--- /dev/null
+++ b/src/pageB/offline_order/user/order_preview.vue
@@ -0,0 +1,252 @@
+
+
+
+
+
+
+
+ 商品分类
+ {{ item.product_category.name }}
+
+
+ 商品总额
+ ¥{{ item.products_total_amount }}
+
+
+ 折扣金额
+ {{ item.discount_reduction_amount > 0 ? ('-¥'+item.discount_reduction_amount) : '无' }}
+
+
+ 应付金额
+ ¥{{ item.payment_amount }}
+
+
+
+
+
+
+
+
+ 订单总额
+ ¥{{ order.products_total_amount }}
+
+
+ 折扣金额
+ {{ order.discount_reduction_amount > 0 ? ('-¥'+order.discount_reduction_amount) : '无' }}
+
+
+ 会员积分抵扣(积分余额:{{ order.remaining_points }})
+
+ -¥{{ pointDiscount.amount }}
+ 请选择
+
+
+
+ 无可用
+
+
+
+
+
+
+ 实付金额:
+ ¥{{ paymentAmount }}
+
+
+
+
+
+
+ 积分(剩余: {{ order.remaining_points }})
+
+
+ 暂不使用积分
+
+
+
+
+ 抵扣¥{{ order.points_discount_amount }}使用{{ order.available_points }}积分
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+ 合计:¥{{ paymentAmount }}
+ 立即支付
+
+
+
+
+
+
diff --git a/src/pageB/offline_order/user/payment_results.vue b/src/pageB/offline_order/user/payment_results.vue
new file mode 100644
index 0000000..42f7479
--- /dev/null
+++ b/src/pageB/offline_order/user/payment_results.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+ 返回首页
+
+
+
+
+
+
+
+ 返回首页
+
+
+
+
+
+
+
+
+
diff --git a/src/pages.json b/src/pages.json
index 362aa53..bd1b97a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -607,6 +607,38 @@
"navigationBarTitleText": "活动",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "offline_order/store/order_preview",
+ "style": {
+ "navigationBarTitleText": "线下订单",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "default"
+ }
+ },
+ {
+ "path": "offline_order/store/order_preview_qrcode",
+ "style": {
+ "navigationBarTitleText": "二维码",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "default"
+ }
+ },
+ {
+ "path": "offline_order/user/order_preview",
+ "style": {
+ "navigationBarTitleText": "确认订单",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "default"
+ }
+ },
+ {
+ "path": "offline_order/user/payment_results",
+ "style": {
+ "navigationBarTitleText": "支付结果",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "default"
+ }
}
]
}
diff --git a/src/pages/me/me.vue b/src/pages/me/me.vue
index a94ec41..8bbf9c1 100644
--- a/src/pages/me/me.vue
+++ b/src/pages/me/me.vue
@@ -186,6 +186,9 @@
帮用户下单
+
+ 线下订单
+
diff --git a/src/pages/welcome/index.vue b/src/pages/welcome/index.vue
index 77019e0..ce9629e 100644
--- a/src/pages/welcome/index.vue
+++ b/src/pages/welcome/index.vue
@@ -38,6 +38,12 @@
url: '/pageB/select_product/com_order?id=' + scene.o
})
}
+ // 线下订单
+ else if (scene.offline_order) {
+ uni.reLaunch({
+ url: '/pageB/offline_order/user/order_preview?id=' + scene.offline_order
+ })
+ }
// 扫码桌号
else if (scene.d) {
const desk = scene.d