diff --git a/addon/cashier/shop/view/order/detail.html b/addon/cashier/shop/view/order/detail.html index 83c763f..cf71d06 100644 --- a/addon/cashier/shop/view/order/detail.html +++ b/addon/cashier/shop/view/order/detail.html @@ -97,7 +97,7 @@ - +
订单状态
@@ -146,7 +146,7 @@
-
+
{/foreach} {else/} @@ -214,7 +214,7 @@
{/if} - + {if !empty($order_detail['package_list'])} @@ -274,7 +274,7 @@ {/foreach} - +
@@ -478,7 +478,7 @@ laytpl(getTpl).render(data, function (html) { layer.open({ type: 1, - shadeClose: true, + shadeClose: true, shade: 0.3, fixed: false, scrollbar: false, @@ -593,4 +593,4 @@
-{/block} \ No newline at end of file +{/block} diff --git a/addon/cashier/shop/view/public/js/order_list.js b/addon/cashier/shop/view/public/js/order_list.js index 2d72a4a..3cc5a8a 100644 --- a/addon/cashier/shop/view/public/js/order_list.js +++ b/addon/cashier/shop/view/public/js/order_list.js @@ -397,4 +397,4 @@ $(".layui-colla-title").on("click", function(){ }else if($(".layui-colla-title>i").hasClass("layui-icon-up") === true){ $(".layui-colla-title .put-open").html("收起"); } -}) \ No newline at end of file +}) diff --git a/addon/store/store/view/public/js/order_list.js b/addon/store/store/view/public/js/order_list.js index 4f7338a..e4aef5e 100644 --- a/addon/store/store/view/public/js/order_list.js +++ b/addon/store/store/view/public/js/order_list.js @@ -249,4 +249,4 @@ function showMore(order_id) { $(".more-operation[data-order-id='" + order_id + "']").hide(); } }); -} \ No newline at end of file +} diff --git a/app/api/controller/Ordercreate.php b/app/api/controller/Ordercreate.php index ac46046..f12828d 100644 --- a/app/api/controller/Ordercreate.php +++ b/app/api/controller/Ordercreate.php @@ -40,7 +40,7 @@ class Ordercreate extends BaseApi 'site_id' => $this->site_id,//站点id 'member_id' => $this->member_id, 'is_balance' => isset($this->params[ 'is_balance' ]) ? $this->params[ 'is_balance' ] : 0,//是否使用余额 - 'is_point' => isset($this->params[ 'is_point' ]) ? $this->params[ 'is_point' ] : 1,//是否使用积分 + 'is_point' => 1,//是否使用积分 'order_from' => $this->params[ 'app_type' ], 'order_from_name' => $this->params[ 'app_type_name' ], 'pay_password' => isset($this->params[ 'pay_password' ]) ? $this->params[ 'pay_password' ] : '',//支付密码 @@ -149,7 +149,7 @@ class Ordercreate extends BaseApi 'site_id' => $this->site_id,//站点id 'member_id' => $this->member_id, 'is_balance' => isset($this->params[ 'is_balance' ]) ? $this->params[ 'is_balance' ] : 0,//是否使用余额 - 'is_point' => isset($this->params[ 'is_point' ]) ? $this->params[ 'is_point' ] : 0,//是否使用积分 + 'is_point' => 1,//强制使用积分 'order_from' => $this->params[ 'app_type' ], 'order_from_name' => $this->params[ 'app_type_name' ], 'delivery' => isset($this->params[ "delivery" ]) && !empty($this->params[ "delivery" ]) ? json_decode($this->params[ "delivery" ], true) : [], diff --git a/app/shop/controller/Printer.php b/app/shop/controller/Printer.php index 1992fc9..1cd1be6 100644 --- a/app/shop/controller/Printer.php +++ b/app/shop/controller/Printer.php @@ -25,9 +25,14 @@ class Printer extends Controller public function batchPrintOrder() { $order_id = input('order_id', 0); + $type = input('type', 1); $order_common_model = new OrderCommonModel(); $order_detail = $order_common_model->getUnRefundOrderDetail($order_id)[ "data" ]; $this->assign("order_detail", $order_detail); - return $this->fetch('order/batch_print_order'); + if($type == 1){ + return $this->fetch('order/batch_print_order'); + }else{ + return $this->fetch('order/batch_print_order_new'); + } } -} \ No newline at end of file +} diff --git a/app/shop/view/order/batch_print_order_new.html b/app/shop/view/order/batch_print_order_new.html new file mode 100644 index 0000000..7bbfe26 --- /dev/null +++ b/app/shop/view/order/batch_print_order_new.html @@ -0,0 +1,161 @@ + + + + + + 打印发货单 + + + + + +
+ + + + + + + + + + + + + + + + + + + + {php} + $total_goods_num = 0; + $total_goods_money = 0.00; + $promotion_money = 0.00; + {/php} + {foreach $order_detail['order_goods'] as $list_k => $order_goods_item} + {php} + $total_goods_num += $order_goods_item['num']; + $total_goods_money += $order_goods_item['goods_money']; + $promotion_money += $order_goods_item['promotion_money'] + $order_goods_item['coupon_money'] + $order_goods_item['adjust_money'] + $order_goods_item['point_money']; + {/php} + + + + + + + + + {/foreach} + + {php} + $total_goods_money = number_format($total_goods_money,2); + $order_money = number_format($order_detail['order_money'] - $order_detail['refund_money'], 2); + if($order_money < 0 || empty($order_detail['order_goods'])) $order_money = 0.00; + + $promotion_money = number_format($promotion_money,2); + + {/php} + + + + + + + + + + + + + + + + + + +
+

{$order_detail.site_name} 发货单

+
+
+ 收货人：{$order_detail.name} + 电话:{$order_detail.mobile} +
+
地址：{$order_detail.full_address} {$order_detail.address}
+
+ 订单号：{$order_detail.order_no} + 下单时间：{$order_detail.create_time|date="Y-m-d"} +
+ {if !empty($order_detail.promotion_type_name)} +
+ 订单活动：{$order_detail.promotion_type_name} +
+ {/if} +
+ 卖家备注：{$order_detail.remark} +
+
+ 买家备注：{$order_detail.buyer_message} +
+
序号商品名称商品编码数量
{$list_k+1}{$order_goods_item.sku_name}{$order_goods_item.sku_no}{$order_goods_item.num}
合计{$total_goods_num}
+
+ + + diff --git a/app/shop/view/order/order_common_action.html b/app/shop/view/order/order_common_action.html index 557a4ee..22c98b5 100644 --- a/app/shop/view/order/order_common_action.html +++ b/app/shop/view/order/order_common_action.html @@ -69,8 +69,8 @@ function orderAction(fun, order_id){ } //打印发货单 -function printDeliverOrder(order_id){ - var url = ns.url("shop/printer/batchprintorder",{order_id: order_id}); +function printDeliverOrder(order_id,type){ + var url = ns.url("shop/printer/batchprintorder",{order_id: order_id,type: type}); var LODOP=getLodop(); if(LODOP) { LODOP.PRINT_INIT("发货单打印"); @@ -242,4 +242,4 @@ function takeDelivery(order_id, type = 0){ } -{include file="app/shop/view/order/order_adjust_price.html" /} \ No newline at end of file +{include file="app/shop/view/order/order_adjust_price.html" /} diff --git a/app/shop/view/public/js/order_list.js b/app/shop/view/public/js/order_list.js index a2a6c1d..6123a61 100644 --- a/app/shop/view/public/js/order_list.js +++ b/app/shop/view/public/js/order_list.js @@ -244,10 +244,10 @@ Order.prototype.header = function (hasThead) { var colgroup = ''; var thead = ''; if (hasThead) thead = ''; - + for (var i = 0; i < this.cols.length; i++) { var align = this.cols[i].align ? "text-align:" + this.cols[i].align : ""; - + colgroup += ''; if (hasThead) { thead += ''; @@ -298,7 +298,7 @@ Order.prototype.tbody = function () { tbody += '
'; tbody += '下单时间：' + ns.time_to_date(order.create_time) + ''; - + tbody += '订单来源：'+ order.order_from_name + (order.is_video_number ? '（视频号）' : '') +''; // tbody += '订单类型：' + order.order_type_name + ''; @@ -316,7 +316,8 @@ Order.prototype.tbody = function () { tbody += ''; tbody += '
'; if ((order.order_type == 1 || order.order_type == 3) && (order.order_status == 1 || order.order_status == 3 || order.order_status == 10)) { - tbody += '打印发货单'; + tbody += '打印发货单'; + tbody += '打印发货单(无金额)'; // tbody += '打印发货单'; } @@ -412,4 +413,4 @@ $(".layui-colla-title").on("click", function(){ }else if($(".layui-colla-title>i").hasClass("layui-icon-up") === true){ $(".layui-colla-title .put-open").html("收起"); } -}) \ No newline at end of file +}) diff --git a/app/shop/view/public/js/pickuporder.js b/app/shop/view/public/js/pickuporder.js index 463e342..90f0942 100644 --- a/app/shop/view/public/js/pickuporder.js +++ b/app/shop/view/public/js/pickuporder.js @@ -328,4 +328,4 @@ $(".layui-colla-title").on("click", function(){ }else if($(".layui-colla-title>i").hasClass("layui-icon-up") === true){ $(".layui-colla-title .put-open").html("收起"); } -}) \ No newline at end of file +})