diff --git a/README.md b/README.md deleted file mode 100755 index 922d933..0000000 --- a/README.md +++ /dev/null @@ -1,93 +0,0 @@ -FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。 - - -## 主要特性 - -* 基于`Auth`验证的权限管理系统 - * 支持无限级父子级权限继承，父级的管理员可任意增删改子级管理员及权限设置 - * 支持单管理员多角色 - * 支持管理子级数据或个人数据 -* 强大的一键生成功能 - * 一键生成CRUD,包括控制器、模型、视图、JS、语言包、菜单、回收站等 - * 一键压缩打包JS和CSS文件，一键CDN静态资源部署 - * 一键生成控制器菜单和规则 - * 一键生成API接口文档 -* 完善的前端功能组件开发 - * 基于`AdminLTE`二次开发 - * 基于`Bootstrap`开发，自适应手机、平板、PC - * 基于`RequireJS`进行JS模块管理，按需加载 - * 基于`Less`进行样式开发 -* 强大的插件扩展功能，在线安装卸载升级插件 -* 通用的会员模块和API模块 -* 共用同一账号体系的Web端会员中心权限验证和API接口会员权限验证 -* 二级域名部署支持，同时域名支持绑定到应用插件 -* 多语言支持，服务端及客户端支持 -* 支持大文件分片上传、剪切板粘贴上传、拖拽上传，进度条显示，图片上传前压缩 -* 支持表格固定列、固定表头、跨页选择、Excel导出、模板渲染等功能 -* 强大的第三方应用模块支持([CMS](https://www.fastadmin.net/store/cms.html)、[CRM](https://www.fastadmin.net/store/facrm.html)、[企业网站管理系统](https://www.fastadmin.net/store/ldcms.html)、[知识库文档系统](https://www.fastadmin.net/store/knowbase.html)、[在线投票系统](https://www.fastadmin.net/store/vote.html)、[B2C商城](https://www.fastadmin.net/store/shopro.html)、[B2B2C商城](https://www.fastadmin.net/store/wanlshop.html)) -* 整合第三方短信接口(阿里云、腾讯云短信) -* 无缝整合第三方云存储(七牛云、阿里云OSS、腾讯云存储、又拍云)功能，支持云储存分片上传 -* 第三方富文本编辑器支持(Summernote、百度编辑器) -* 第三方登录(QQ、微信、微博)整合 -* 第三方支付(微信、支付宝)无缝整合，微信支持PC端扫码支付 -* 丰富的插件应用市场 - -## 安装使用 - -https://doc.fastadmin.net - -## 在线演示 - -https://demo.fastadmin.net - -用户名：admin - -密　码：123456 - -提　示：演示站数据无法进行修改，请下载源码安装体验全部功能 - -## 界面截图 -![控制台](https://images.gitee.com/uploads/images/2020/0929/202947_8db2d281_10933.gif "控制台") - -## 问题反馈 - -在使用中有任何问题，请使用以下联系方式联系我们 - -问答社区: https://ask.fastadmin.net - -Github: https://github.com/karsonzhang/fastadmin - -Gitee: https://gitee.com/karson/fastadmin - -## 特别鸣谢 - -感谢以下的项目,排名不分先后 - -ThinkPHP：http://www.thinkphp.cn - -AdminLTE：https://adminlte.io - -Bootstrap：http://getbootstrap.com - -jQuery：http://jquery.com - -Bootstrap-table：https://github.com/wenzhixin/bootstrap-table - -Nice-validator: https://validator.niceue.com - -SelectPage: https://github.com/TerryZ/SelectPage - -Layer: https://layuion.com/layer/ - -DropzoneJS: https://www.dropzonejs.com - - -## 版权信息 - -FastAdmin遵循Apache2开源协议发布，并提供免费使用。 - -本项目包含的第三方源码和二进制文件之版权信息另行标注。 - -版权所有Copyright © 2017-2024 by FastAdmin (https://www.fastadmin.net) - -All rights reserved。 diff --git a/addons/alioss/config.php b/addons/alioss/config.php index 0b96622..517713d 100644 --- a/addons/alioss/config.php +++ b/addons/alioss/config.php @@ -108,7 +108,7 @@ return [ 'title' => '上传有效时长', 'type' => 'string', 'content' => [], - 'value' => '3000', + 'value' => 60 * 60 * 2, 'rule' => 'required', 'msg' => '', 'tip' => '用户停留页面上传有效时长，单位秒', diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 52a4a55..aa13e7f 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -55,7 +55,7 @@ class Order extends Backend protected $items = null; protected $itemsformattedTree = null; - protected $noNeedRight = ['smart','export']; + protected $noNeedRight = ['smart','export','orderRemark']; public function _initialize() { @@ -170,6 +170,7 @@ class Order extends Backend 'source', 'source_shop', 'source_uid', 'source', 'item_title', 'item_id', 'work_tel_id', 'detail', 'remark', 'images', 'create_time', 'update_time', 'admin_id', 'dispatch_type', 'receive_type', + 'order_remark', 'plan_time', 'coupon_id', 'is_overtime', @@ -556,6 +557,18 @@ class Order extends Backend } + public function orderRemark($ids = null) + { + + $order = $this->model->where('id', $ids)->find(); + $params = $this->request->post(); + $remark = $params['remark'] ?? ''; + $order->order_remark = $remark; + $order->save(); + $this->success($order['order_no']); + } + + public function warning($ids = null) { diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php index 1fa9bdf..845b480 100644 --- a/application/admin/controller/orders/Auditorder.php +++ b/application/admin/controller/orders/Auditorder.php @@ -87,7 +87,7 @@ class Auditorder extends Backend ->where($where) ->order($sort, $order); - + $performance = 0; if ($getArray) { $list = $build->paginate([ 'list_rows' => $input_limit, @@ -95,6 +95,13 @@ class Auditorder extends Backend ]); } else { $list = $build->paginate($limit); + + // ✅ 新增：汇总总金额 + $sum = $this->model + ->where($where) + ->field('SUM(performance) as performance') + ->find(); + $performance = $sum->performance ?? 0; } foreach ($list as $item) { @@ -105,7 +112,7 @@ class Auditorder extends Backend } unset($item->source); } - $result = array("total" => $list->total(), "rows" => $list->items()); + $result = array("total" => $list->total(), "rows" => $list->items(),'sum' => $performance); return json($result); diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index 009c996..f212b30 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -282,7 +282,7 @@ class Dispatch2 extends Backend $params = $this->request->post('row/a'); - + dd($params); $orderParsms = $this->request->post('order/a'); if (empty($params) || empty($orderParsms)) { $this->error(__('Parameter %s can not be empty', '')); diff --git a/application/admin/controller/orders/Review.php b/application/admin/controller/orders/Review.php index 63278af..e9e92b3 100644 --- a/application/admin/controller/orders/Review.php +++ b/application/admin/controller/orders/Review.php @@ -29,6 +29,9 @@ class Review extends Backend { parent::_initialize(); $this->model = new \app\admin\model\OrderReview; + $order = new Order(); + $this->view->assign("statusList", $order->getStatusList()); + $this->view->assign("offlineTotalTypeList", $order->getOfflineTotalTypeList()); } diff --git a/application/admin/lang/zh-cn/orders/review.php b/application/admin/lang/zh-cn/orders/review.php index 75523a7..e8060ba 100644 --- a/application/admin/lang/zh-cn/orders/review.php +++ b/application/admin/lang/zh-cn/orders/review.php @@ -7,5 +7,10 @@ return [ 'Worker_star' => '师傅评分', 'Remark' => '备注', 'Admin_id' => '回访人', - 'Admin_user' => '回访人' + 'Admin_user' => '回访人', + 'Coupons' => '优惠', + 'Offline_amount_type' => '线下尾款类型', + 'Offline_amount_type 0' => '无', + 'Offline_amount_type 1' => '师傅收', + 'Offline_amount_type 2' => '公司收', ]; diff --git a/application/admin/model/Item.php b/application/admin/model/Item.php index 075962b..54b75d5 100644 --- a/application/admin/model/Item.php +++ b/application/admin/model/Item.php @@ -98,7 +98,6 @@ class Item extends Model foreach ($data as $item) { $index[$item['pid']][] = $item; } - // 递归函数，闭包形式避免污染全局 $collect = function($pid) use (&$collect, &$index) { $ids = []; diff --git a/application/admin/view/common/meta.html b/application/admin/view/common/meta.html index 12b3c0e..bf6972f 100755 --- a/application/admin/view/common/meta.html +++ b/application/admin/view/common/meta.html @@ -8,6 +8,7 @@ + {if $Think.config.fastadmin.adminskin} diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html index dee9247..cf7a65b 100644 --- a/application/admin/view/orders/dispatch2/edit.html +++ b/application/admin/view/orders/dispatch2/edit.html @@ -1,12 +1,5 @@
- - - - - - -
@@ -15,42 +8,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {notempty name ='action'} @@ -78,38 +35,26 @@ - - - - - - - {if $row['is_receipt']==0 } -
- +
- +
- +
- {/if} - {if $row['is_receipt']==1 } -
- -
- -
-
+
@@ -117,25 +62,20 @@
- -
- -
+
+ +
- {:build_select('row[offline_total_type]',$offlineTotalTypeList,$row['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])} + {:build_select('row[offline_total_type]',$offlineTotalTypeList,$row['offline_total_type'],['class'=>'form-control selectpicker','data-rule'=>'required'])} +
-
- - -
+
- -
@@ -150,9 +90,7 @@
    - - {/if} - +