diff --git a/service/Application/Admin/Controller/OrderController.class.php b/service/Application/Admin/Controller/OrderController.class.php index 2e67b5b7e..a1409e2ac 100755 --- a/service/Application/Admin/Controller/OrderController.class.php +++ b/service/Application/Admin/Controller/OrderController.class.php @@ -318,6 +318,30 @@ class OrderController extends CommonController $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } + /** + * [Confirm 订单确认] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-15T11:03:30+0800 + */ + public function Confirm() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + // 订单确认 + $params = $_POST; + $params['user_id'] = $params['value']; + $params['creator'] = $this->admin['id']; + $params['creator_name'] = $this->admin['username']; + $ret = OrderService::OrderConfirm($params); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); + } + /** * 订单支付 * @author Devil diff --git a/service/Application/Admin/View/Default/Config/Index.html b/service/Application/Admin/View/Default/Config/Index.html index a4911c5e8..eac7de556 100755 --- a/service/Application/Admin/View/Default/Config/Index.html +++ b/service/Application/Admin/View/Default/Config/Index.html @@ -33,6 +33,14 @@ +
+ + +
value="{{$data.common_share_giving_integral_frequency.value}}" /> diff --git a/service/Application/Admin/View/Default/Goods/SaveInfo.html b/service/Application/Admin/View/Default/Goods/SaveInfo.html index b4d11a1f9..d4b4f5238 100755 --- a/service/Application/Admin/View/Default/Goods/SaveInfo.html +++ b/service/Application/Admin/View/Default/Goods/SaveInfo.html @@ -149,15 +149,15 @@
- checked="true" /> + checked="true" />
- checked="true" /> + checked="true" />
- checked="true" /> + checked="true" />
diff --git a/service/Application/Admin/View/Default/Order/Index.html b/service/Application/Admin/View/Default/Order/Index.html index 29cd250c5..278572f6b 100755 --- a/service/Application/Admin/View/Default/Order/Index.html +++ b/service/Application/Admin/View/Default/Order/Index.html @@ -216,6 +216,9 @@
+ + + diff --git a/service/Application/Home/View/Default/Buy/Index.html b/service/Application/Home/View/Default/Buy/Index.html index 1507063de..5e5d74980 100755 --- a/service/Application/Home/View/Default/Buy/Index.html +++ b/service/Application/Home/View/Default/Buy/Index.html @@ -275,7 +275,7 @@ function BuySubmitBack(e) } setTimeout(function() { - window.location.href = e.data.pay_url; + window.location.href = e.data.jump_url; }, 1500); } else { $('form.form-validation').find('button[type="submit"]').button('reset'); diff --git a/service/Application/Home/View/Default/Goods/Index.html b/service/Application/Home/View/Default/Goods/Index.html index 5afb05b54..6014069fc 100755 --- a/service/Application/Home/View/Default/Goods/Index.html +++ b/service/Application/Home/View/Default/Goods/Index.html @@ -118,7 +118,7 @@ - +