From 361dffc7d815c2fb5ee987bebd478d7d3ede7a15 Mon Sep 17 00:00:00 2001 From: YuanWen Date: Tue, 3 Nov 2026 15:45:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=B8=88=E5=82=85?= =?UTF-8?q?=E7=AB=AF=E5=8A=9F=E8=83=BD=E5=8F=8A=E6=9C=8D=E5=8A=A1=E5=A2=9E?= =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增师傅端路由和页面配置，切换登录后默认跳转到师傅大厅 - 新增服务分类图标上传功能和增项服务管理模块 - 新增订单、申诉、结算等模型关联关系及后台控制器 - 新增师傅端TabBar组件和消息页面跳转逻辑 - 新增文件上传接口和服务计算逻辑 - 新增各类SVG图标和空状态提示 --- .../application/admin/controller/Appeal.php | 21 + .../application/admin/controller/Invoice.php | 21 + .../application/admin/controller/Master.php | 21 + .../application/admin/controller/Merchant.php | 21 + server/application/admin/controller/Order.php | 21 + .../application/admin/controller/Review.php | 21 + .../application/admin/controller/Service.php | 206 +++- .../application/admin/controller/Settle.php | 21 + .../application/admin/controller/Withdraw.php | 21 + .../admin/controller/service/Addon.php | 51 + server/application/admin/model/Appeal.php | 10 + server/application/admin/model/Invoice.php | 10 + server/application/admin/model/Master.php | 5 + server/application/admin/model/Merchant.php | 5 + server/application/admin/model/Order.php | 10 + server/application/admin/model/Review.php | 15 + server/application/admin/model/Service.php | 5 + server/application/admin/model/Settle.php | 10 + server/application/admin/model/Withdraw.php | 5 + .../application/admin/model/service/Addon.php | 41 + .../application/admin/model/service/Cat.php | 36 + .../application/admin/view/common/script.html | 2 +- .../admin/view/service/addon/add.html | 49 + .../admin/view/service/addon/edit.html | 49 + .../admin/view/service/addon/index.html | 24 + .../admin/view/service/cat/add.html | 14 +- .../admin/view/service/cat/edit.html | 14 +- .../admin/view/service/cat/index.html | 12 +- .../application/admin/view/service/edit.html | 422 +++++-- server/application/api/controller/Auth.php | 2 +- server/application/api/controller/Home.php | 63 +- server/application/api/controller/Master.php | 125 +- server/application/extra/site.php | 2 +- server/application/route.php | 8 + yjyf-app/components/GoodsPickerDrawer.vue | 14 +- yjyf-app/components/YjyfMasterTabBar.vue | 120 ++ yjyf-app/pages.json | 8 + yjyf-app/pages/category/category.vue | 23 +- yjyf-app/pages/master/credit.vue | 209 +++- yjyf-app/pages/master/detail.vue | 1074 +++++++++++++++++ yjyf-app/pages/master/hall.vue | 748 ++++++++++-- yjyf-app/pages/master/orders.vue | 317 ++++- yjyf-app/pages/master/quote.vue | 127 +- yjyf-app/pages/master/success.vue | 428 +++++++ yjyf-app/pages/master/wallet.vue | 178 ++- yjyf-app/pages/master/workbench.vue | 320 +++-- yjyf-app/pages/merchant/workbench.vue | 1 + yjyf-app/pages/message/message.vue | 22 +- yjyf-app/pages/mine/mine.vue | 17 +- yjyf-app/pages/order/quick.vue | 123 +- yjyf-app/static/icons/master/empty-orders.svg | 11 + yjyf-app/static/icons/master/grab-success.svg | 44 + yjyf-app/static/icons/master/menu-credit.svg | 4 + yjyf-app/static/icons/master/menu-hall.svg | 6 + yjyf-app/static/icons/master/menu-orders.svg | 5 + yjyf-app/static/icons/master/menu-quote.svg | 4 + yjyf-app/static/icons/master/menu-service.svg | 4 + yjyf-app/static/icons/master/menu-wallet.svg | 6 + yjyf-app/static/icons/master/nav-arrow.svg | 3 + yjyf-app/static/icons/master/order-loc.svg | 4 + yjyf-app/static/icons/master/order-time.svg | 4 + .../static/icons/master/service-action.svg | 4 + yjyf-app/static/icons/master/share-action.svg | 5 + .../static/icons/master/user-avatar-small.svg | 4 + yjyf-app/static/tabbar/master/hall-active.svg | 6 + yjyf-app/static/tabbar/master/hall.svg | 6 + yjyf-app/static/tabbar/master/home-active.svg | 4 + yjyf-app/static/tabbar/master/home.svg | 4 + .../static/tabbar/master/message-active.svg | 6 + yjyf-app/static/tabbar/master/message.svg | 3 + yjyf-app/static/tabbar/master/mine-active.svg | 4 + yjyf-app/static/tabbar/master/mine.svg | 4 + .../static/tabbar/master/order-active.svg | 4 + yjyf-app/static/tabbar/master/order.svg | 4 + .../static/tabbar/master/orders-active.svg | 5 + yjyf-app/static/tabbar/master/orders.svg | 5 + .../static/tabbar/master/wallet-active.svg | 5 + yjyf-app/static/tabbar/master/wallet.svg | 5 + yjyf-app/static/tabbar/master/work-active.svg | 7 + yjyf-app/static/tabbar/master/work.svg | 6 + yjyf-app/utils/api.js | 6 +- yjyf-app/utils/request.js | 34 + 82 files changed, 4787 insertions(+), 531 deletions(-) create mode 100644 server/application/admin/controller/service/Addon.php create mode 100644 server/application/admin/model/service/Addon.php create mode 100644 server/application/admin/model/service/Cat.php create mode 100644 server/application/admin/view/service/addon/add.html create mode 100644 server/application/admin/view/service/addon/edit.html create mode 100644 server/application/admin/view/service/addon/index.html create mode 100644 yjyf-app/components/YjyfMasterTabBar.vue create mode 100644 yjyf-app/pages/master/detail.vue create mode 100644 yjyf-app/pages/master/success.vue create mode 100644 yjyf-app/static/icons/master/empty-orders.svg create mode 100644 yjyf-app/static/icons/master/grab-success.svg create mode 100644 yjyf-app/static/icons/master/menu-credit.svg create mode 100644 yjyf-app/static/icons/master/menu-hall.svg create mode 100644 yjyf-app/static/icons/master/menu-orders.svg create mode 100644 yjyf-app/static/icons/master/menu-quote.svg create mode 100644 yjyf-app/static/icons/master/menu-service.svg create mode 100644 yjyf-app/static/icons/master/menu-wallet.svg create mode 100644 yjyf-app/static/icons/master/nav-arrow.svg create mode 100644 yjyf-app/static/icons/master/order-loc.svg create mode 100644 yjyf-app/static/icons/master/order-time.svg create mode 100644 yjyf-app/static/icons/master/service-action.svg create mode 100644 yjyf-app/static/icons/master/share-action.svg create mode 100644 yjyf-app/static/icons/master/user-avatar-small.svg create mode 100644 yjyf-app/static/tabbar/master/hall-active.svg create mode 100644 yjyf-app/static/tabbar/master/hall.svg create mode 100644 yjyf-app/static/tabbar/master/home-active.svg create mode 100644 yjyf-app/static/tabbar/master/home.svg create mode 100644 yjyf-app/static/tabbar/master/message-active.svg create mode 100644 yjyf-app/static/tabbar/master/message.svg create mode 100644 yjyf-app/static/tabbar/master/mine-active.svg create mode 100644 yjyf-app/static/tabbar/master/mine.svg create mode 100644 yjyf-app/static/tabbar/master/order-active.svg create mode 100644 yjyf-app/static/tabbar/master/order.svg create mode 100644 yjyf-app/static/tabbar/master/orders-active.svg create mode 100644 yjyf-app/static/tabbar/master/orders.svg create mode 100644 yjyf-app/static/tabbar/master/wallet-active.svg create mode 100644 yjyf-app/static/tabbar/master/wallet.svg create mode 100644 yjyf-app/static/tabbar/master/work-active.svg create mode 100644 yjyf-app/static/tabbar/master/work.svg diff --git a/server/application/admin/controller/Appeal.php b/server/application/admin/controller/Appeal.php index 9605ede..e50ed55 100644 --- a/server/application/admin/controller/Appeal.php +++ b/server/application/admin/controller/Appeal.php @@ -35,4 +35,25 @@ class Appeal extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['order', 'master']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/Invoice.php b/server/application/admin/controller/Invoice.php index 8eb8286..3d27f5d 100644 --- a/server/application/admin/controller/Invoice.php +++ b/server/application/admin/controller/Invoice.php @@ -35,4 +35,25 @@ class Invoice extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['user', 'merchant']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/Master.php b/server/application/admin/controller/Master.php index 388dd57..854d636 100644 --- a/server/application/admin/controller/Master.php +++ b/server/application/admin/controller/Master.php @@ -35,4 +35,25 @@ class Master extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['user']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/Merchant.php b/server/application/admin/controller/Merchant.php index 5cad79b..296e01e 100644 --- a/server/application/admin/controller/Merchant.php +++ b/server/application/admin/controller/Merchant.php @@ -35,4 +35,25 @@ class Merchant extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['user']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/Order.php b/server/application/admin/controller/Order.php index 68e443b..32c2791 100644 --- a/server/application/admin/controller/Order.php +++ b/server/application/admin/controller/Order.php @@ -40,4 +40,25 @@ class Order extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['user', 'master']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/Review.php b/server/application/admin/controller/Review.php index 1326b04..44685e1 100644 --- a/server/application/admin/controller/Review.php +++ b/server/application/admin/controller/Review.php @@ -34,4 +34,25 @@ class Review extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['user', 'master', 'order']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/Service.php b/server/application/admin/controller/Service.php index 06c2c3a..9f8f71b 100644 --- a/server/application/admin/controller/Service.php +++ b/server/application/admin/controller/Service.php @@ -3,20 +3,24 @@ namespace app\admin\controller; use app\common\controller\Backend; +use think\Db; +use think\exception\PDOException; +use think\exception\ValidateException; +use Exception; /** - * 服务项目 + * 服务项目与商品管理 * * @icon fa fa-circle-o */ class Service extends Backend { - /** * Service模型对象 * @var \app\admin\model\Service */ protected $model = null; + protected $relationSearch = true; public function _initialize() { @@ -24,15 +28,205 @@ class Service extends Backend $this->model = new \app\admin\model\Service; $this->view->assign("priceTypeList", $this->model->getPriceTypeList()); $this->view->assign("statusList", $this->model->getStatusList()); + + // 获取全部可用的公共增项服务列表 + $addonsPool = Db::name('service_addon') + ->where('status', 'normal') + ->order('weigh desc, id asc') + ->select(); + $this->view->assign("addonsPool", $addonsPool); } - + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['cat']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + * 添加服务商品 */ + public function add() + { + if ($this->request->isPost()) { + $params = $this->request->post("row/a"); + if ($params) { + $params = $this->preExcludeFields($params); + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + // 处理工项类型与增项配置 + $params = $this->formatServiceConfig($params); + + $result = false; + Db::startTrans(); + try { + $result = $this->model->allowField(true)->save($params); + $serviceId = $this->model->id; + + // 处理规格列表 + $this->syncSpecs($serviceId, $this->request->post('specs/a', [])); + + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result !== false) { + $this->success(); + } else { + $this->error(__('No rows were inserted')); + } + } + $this->error(__('Parameter %s can not be empty', '')); + } + return $this->view->fetch(); + } + + /** + * 编辑服务商品（工项价格、规格价格、增项服务绑定） + */ + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) { + $this->error(__('You have no permission')); + } + if ($this->request->isPost()) { + $params = $this->request->post("row/a"); + if ($params) { + $params = $this->preExcludeFields($params); + + // 处理工项类型与增项配置 + $params = $this->formatServiceConfig($params); + + $result = false; + Db::startTrans(); + try { + $result = $row->allowField(true)->save($params); + + // 同步处理规格列表 + $this->syncSpecs($row->id, $this->request->post('specs/a', [])); + + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result !== false) { + $this->success(); + } else { + $this->error(__('No rows were updated')); + } + } + $this->error(__('Parameter %s can not be empty', '')); + } + + // 解析工项与增项配置以供视图回显 + $serviceTypes = []; + if (!empty($row->service_types)) { + $serviceTypes = is_array($row->service_types) ? $row->service_types : json_decode($row->service_types, true); + } + $addons = []; + if (!empty($row->addons)) { + $addons = is_array($row->addons) ? $row->addons : json_decode($row->addons, true); + } + + // 获取已有规格 + $specs = Db::name('service_spec') + ->where('service_id', $row->id) + ->where('status', 'normal') + ->order('weigh desc, id asc') + ->select(); + + $this->view->assign("row", $row); + $this->view->assign("serviceTypes", $serviceTypes ?: []); + $this->view->assign("assignedAddons", $addons ?: []); + $this->view->assign("specs", $specs ?: []); + return $this->view->fetch(); + } + + /** + * 格式化工项与增项输入数据 + */ + protected function formatServiceConfig($params) + { + // 工项类型 JSON + if (isset($params['service_types_raw'])) { + $params['service_types'] = is_string($params['service_types_raw']) ? $params['service_types_raw'] : json_encode($params['service_types_raw'], JSON_UNESCAPED_UNICODE); + unset($params['service_types_raw']); + } + // 增项服务 JSON + if (isset($params['addons_raw'])) { + $params['addons'] = is_string($params['addons_raw']) ? $params['addons_raw'] : json_encode($params['addons_raw'], JSON_UNESCAPED_UNICODE); + unset($params['addons_raw']); + } + return $params; + } + + /** + * 同步商品规格表 + */ + protected function syncSpecs($serviceId, $specsInput) + { + if (empty($serviceId)) return; + $now = time(); + $keepIds = []; + if (!empty($specsInput) && is_array($specsInput)) { + foreach ($specsInput as $item) { + $name = trim(isset($item['name']) ? $item['name'] : ''); + if ($name === '') continue; + $specPrice = isset($item['base_price']) ? (float)$item['base_price'] : 0.00; + $specDesc = isset($item['description']) ? trim($item['description']) : ''; + $specId = isset($item['id']) ? (int)$item['id'] : 0; + + if ($specId > 0) { + Db::name('service_spec')->where('id', $specId)->where('service_id', $serviceId)->update([ + 'name' => $name, + 'base_price' => $specPrice, + 'description' => $specDesc, + 'updatetime' => $now, + ]); + $keepIds[] = $specId; + } else { + $newId = Db::name('service_spec')->insertGetId([ + 'service_id' => $serviceId, + 'name' => $name, + 'base_price' => $specPrice, + 'description' => $specDesc, + 'weigh' => 0, + 'status' => 'normal', + 'createtime' => $now, + 'updatetime' => $now, + ]); + $keepIds[] = $newId; + } + } + } + // 将未在列表中的历史规格软下架或删除 + $delQuery = Db::name('service_spec')->where('service_id', $serviceId); + if (!empty($keepIds)) { + $delQuery->whereNotIn('id', $keepIds); + } + $delQuery->delete(); + } } diff --git a/server/application/admin/controller/Settle.php b/server/application/admin/controller/Settle.php index e470101..207cf11 100644 --- a/server/application/admin/controller/Settle.php +++ b/server/application/admin/controller/Settle.php @@ -34,4 +34,25 @@ class Settle extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['order', 'master']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/Withdraw.php b/server/application/admin/controller/Withdraw.php index dd93771..d2ffebe 100644 --- a/server/application/admin/controller/Withdraw.php +++ b/server/application/admin/controller/Withdraw.php @@ -35,4 +35,25 @@ class Withdraw extends Backend */ + + protected $relationSearch = true; + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['master']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } } diff --git a/server/application/admin/controller/service/Addon.php b/server/application/admin/controller/service/Addon.php new file mode 100644 index 0000000..c1692d5 --- /dev/null +++ b/server/application/admin/controller/service/Addon.php @@ -0,0 +1,51 @@ +model = new \app\admin\model\service\Addon; + $this->view->assign("statusList", $this->model->getStatusList()); + + // 获取分类列表 + $cats = Db::name('service_cat')->where('status', 'normal')->column('id,name'); + $this->view->assign("catList", [0 => '通用全部类目'] + $cats); + } + + public function index() + { + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->with(['cat']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } +} diff --git a/server/application/admin/model/Appeal.php b/server/application/admin/model/Appeal.php index 3994738..d333244 100644 --- a/server/application/admin/model/Appeal.php +++ b/server/application/admin/model/Appeal.php @@ -60,4 +60,14 @@ class Appeal extends Model + + public function order() + { + return $this->belongsTo('Order', 'order_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function master() + { + return $this->belongsTo('Master', 'master_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Invoice.php b/server/application/admin/model/Invoice.php index 072e4fc..eb78ef5 100644 --- a/server/application/admin/model/Invoice.php +++ b/server/application/admin/model/Invoice.php @@ -60,4 +60,14 @@ class Invoice extends Model + + public function user() + { + return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function merchant() + { + return $this->belongsTo('Merchant', 'merchant_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Master.php b/server/application/admin/model/Master.php index 41cdf5d..68ad37c 100644 --- a/server/application/admin/model/Master.php +++ b/server/application/admin/model/Master.php @@ -60,4 +60,9 @@ class Master extends Model + + public function user() + { + return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Merchant.php b/server/application/admin/model/Merchant.php index 2c24780..7655c3f 100644 --- a/server/application/admin/model/Merchant.php +++ b/server/application/admin/model/Merchant.php @@ -60,4 +60,9 @@ class Merchant extends Model + + public function user() + { + return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Order.php b/server/application/admin/model/Order.php index 6eefe4e..4f56137 100644 --- a/server/application/admin/model/Order.php +++ b/server/application/admin/model/Order.php @@ -223,4 +223,14 @@ class Order extends Model } + + public function user() + { + return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function master() + { + return $this->belongsTo('Master', 'master_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Review.php b/server/application/admin/model/Review.php index 87da356..d4d5aa5 100644 --- a/server/application/admin/model/Review.php +++ b/server/application/admin/model/Review.php @@ -46,4 +46,19 @@ class Review extends Model + + public function user() + { + return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function master() + { + return $this->belongsTo('Master', 'master_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function order() + { + return $this->belongsTo('Order', 'order_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Service.php b/server/application/admin/model/Service.php index 6e6424b..968c7b1 100644 --- a/server/application/admin/model/Service.php +++ b/server/application/admin/model/Service.php @@ -70,4 +70,9 @@ class Service extends Model + + public function cat() + { + return $this->belongsTo('app\\admin\\model\\service\\Cat', 'cat_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Settle.php b/server/application/admin/model/Settle.php index 1779d8e..605bbdc 100644 --- a/server/application/admin/model/Settle.php +++ b/server/application/admin/model/Settle.php @@ -57,4 +57,14 @@ class Settle extends Model } + + public function order() + { + return $this->belongsTo('Order', 'order_id', 'id', [], 'LEFT')->setEagerlyType(0); + } + + public function master() + { + return $this->belongsTo('Master', 'master_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/Withdraw.php b/server/application/admin/model/Withdraw.php index 094781b..72866bb 100644 --- a/server/application/admin/model/Withdraw.php +++ b/server/application/admin/model/Withdraw.php @@ -60,4 +60,9 @@ class Withdraw extends Model + + public function master() + { + return $this->belongsTo('Master', 'master_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/server/application/admin/model/service/Addon.php b/server/application/admin/model/service/Addon.php new file mode 100644 index 0000000..22063f6 --- /dev/null +++ b/server/application/admin/model/service/Addon.php @@ -0,0 +1,41 @@ + __('Normal'), 'hidden' => __('Hidden')]; + } + + public function getStatusTextAttr($value, $data) + { + $value = $value ? $value : (isset($data['status']) ? $data['status'] : ''); + $list = $this->getStatusList(); + return isset($list[$value]) ? $list[$value] : ''; + } + + public function cat() + { + return $this->belongsTo('app\admin\model\service\Cat', 'cat_id', 'id', [], 'LEFT')->setEagerlyType(0); + } +} diff --git a/server/application/admin/model/service/Cat.php b/server/application/admin/model/service/Cat.php new file mode 100644 index 0000000..8d04353 --- /dev/null +++ b/server/application/admin/model/service/Cat.php @@ -0,0 +1,36 @@ + __('Normal'), 'hidden' => __('Hidden')]; + } + + public function getStatusTextAttr($value, $data) + { + $value = $value ?: ($data['status'] ?? ''); + $list = $this->getStatusList(); + return $list[$value] ?? ''; + } +} diff --git a/server/application/admin/view/common/script.html b/server/application/admin/view/common/script.html index 04d1e80..e239639 100755 --- a/server/application/admin/view/common/script.html +++ b/server/application/admin/view/common/script.html @@ -1 +1 @@ - + diff --git a/server/application/admin/view/service/addon/add.html b/server/application/admin/view/service/addon/add.html new file mode 100644 index 0000000..266b2dc --- /dev/null +++ b/server/application/admin/view/service/addon/add.html @@ -0,0 +1,49 @@ +
+ +
+ +
+ {:build_select('row[cat_id]', $catList, 0, ['class'=>'form-control selectpicker', 'data-rule'=>'required'])} +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+
+
+
+ +
+ +
+
+
diff --git a/server/application/admin/view/service/addon/edit.html b/server/application/admin/view/service/addon/edit.html new file mode 100644 index 0000000..859c731 --- /dev/null +++ b/server/application/admin/view/service/addon/edit.html @@ -0,0 +1,49 @@ +
+ +
+ +
+ {:build_select('row[cat_id]', $catList, $row.cat_id, ['class'=>'form-control selectpicker', 'data-rule'=>'required'])} +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+
+
+
+ +
+ +
+
+
diff --git a/server/application/admin/view/service/addon/index.html b/server/application/admin/view/service/addon/index.html new file mode 100644 index 0000000..6745585 --- /dev/null +++ b/server/application/admin/view/service/addon/index.html @@ -0,0 +1,24 @@ +
+ {:build_heading()} + +
+
+ + +
+
+
diff --git a/server/application/admin/view/service/cat/add.html b/server/application/admin/view/service/cat/add.html index 9c28555..d287d01 100644 --- a/server/application/admin/view/service/cat/add.html +++ b/server/application/admin/view/service/cat/add.html @@ -13,9 +13,17 @@
- +
- +
+ +
+ + +
+ +
+
    @@ -27,13 +35,11 @@
    -
    {foreach name="statusList" item="vo"} {/foreach}
    -
    diff --git a/server/application/admin/view/service/cat/edit.html b/server/application/admin/view/service/cat/edit.html index 8367cd9..33c4d8d 100644 --- a/server/application/admin/view/service/cat/edit.html +++ b/server/application/admin/view/service/cat/edit.html @@ -13,9 +13,17 @@
    - +
    - +
    + +
    + + +
    + +
    +
      @@ -27,13 +35,11 @@
      -
      {foreach name="statusList" item="vo"} {/foreach}
      -
      diff --git a/server/application/admin/view/service/cat/index.html b/server/application/admin/view/service/cat/index.html index 7014dd3..bf3c4af 100644 --- a/server/application/admin/view/service/cat/index.html +++ b/server/application/admin/view/service/cat/index.html @@ -17,12 +17,12 @@
      - {:__('Add')} - {:__('Edit')} - {:__('Delete')} + {:__('Add')} + {:__('Edit')} + {:__('Delete')} -
      +
      {:__('More')}
      diff --git a/server/application/admin/view/service/edit.html b/server/application/admin/view/service/edit.html index 098dc16..fb72cbc 100644 --- a/server/application/admin/view/service/edit.html +++ b/server/application/admin/view/service/edit.html @@ -1,113 +1,335 @@
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      -
      - -
      - - +
      + + +
      + +
      +
      + +
      + +
      +
      +
      + +
      + +
      +
      +
      + +
      +
      + +
      + + +
      + +
      +
        +
        +
        +
        + +
        + +
        +
        +
        + +
        + + 作为该商品的通用基准价（若各工项未单独定价时默认采用此价） +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        + +
        +
        +
        + +
        +
        + {foreach name="statusList" item="vo"} + + {/foreach} +
        +
        - -
        -
          -
          -
          -
          - -
          - - - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          - {foreach name="statusList" item="vo"} - - {/foreach}
          + +
          +
          + 勾选此商品支持的服务工项（如安装、维修、拆旧等），并可为每个工项设定独立一口价。 +
          + + + + + + + + + + + + ['name' => '安装', 'price' => $row['base_price'], 'default' => 1], + 'repair' => ['name' => '维修', 'price' => round($row['base_price'] * 0.7, 2), 'default' => 0], + 'remove' => ['name' => '拆旧', 'price' => round($row['base_price'] * 0.5, 2), 'default' => 0], + 'deliver' => ['name' => '送货到家', 'price' => 50.00, 'default' => 0], + 'deliver_install' => ['name' => '送货到家并安装', 'price' => $row['base_price'] + 50.00, 'default' => 0], + 'measure' => ['name' => '坑距测量（含拆旧）', 'price' => 40.00, 'default' => 0], + 'maintain' => ['name' => '保养', 'price' => 60.00, 'default' => 0], + ]; + $savedMap = []; + foreach ($serviceTypes as $st) { + if (isset($st['code'])) { + $savedMap[$st['code']] = $st; + } + } + ?> + {foreach name="defaultTypes" item="cfg" key="code"} + + + + + + + + + {/foreach} + +
          启用工项标识工项显示名称工项一口价(元)默认勾选
          + + {$code} + + +
          + ¥ + +
          +           		+ +
          + +
          + + +
          +
          + 为该商品增设不同规格（如：单眼灶/双眼灶、普通坐便器/智能马桶），并分别设置规格基准一口价。 +
          + + + + + + + + + + + {foreach name="specs" item="sp" key="idx"} + + + + + + + {/foreach} + +
          规格名称规格独立一口价(元)规格施工描述操作
          + + + +
          + ¥ + +
          +           		+ + + +
          + +
          + + +
          +
          + 从系统增项库中勾选该商品允许加选的增项服务（如马桶勾选拆旧/改坑距，油烟机勾选打孔），并可为该商品定制专属单价（留空则默认按全局价）。 +
          + + + + + + + + + + + + + {foreach name="addonsPool" item="ad"} + + + + + + + + + {/foreach} + +
          绑定增项名称单位平台全局指导价针对本商品专属单价(元)
          + + + {$ad.name} + + {$ad.unit} + + ¥{$ad.default_price} + +
          + ¥ + +
          +
          + +
          +
          - + +
          + + diff --git a/server/application/api/controller/Auth.php b/server/application/api/controller/Auth.php index db9e418..99c23d2 100644 --- a/server/application/api/controller/Auth.php +++ b/server/application/api/controller/Auth.php @@ -309,7 +309,7 @@ class Auth extends Base $redirect = '/pages/index/index'; if ($role === 'master') { - $redirect = '/pages/master/workbench'; + $redirect = '/pages/master/hall'; } elseif ($role === 'merchant') { $redirect = '/pages/merchant/workbench'; } diff --git a/server/application/api/controller/Home.php b/server/application/api/controller/Home.php index f7ebaa8..7c4b439 100644 --- a/server/application/api/controller/Home.php +++ b/server/application/api/controller/Home.php @@ -9,7 +9,7 @@ use think\Db; */ class Home extends Base { - protected $noNeedLogin = ['index', 'cats', 'services', 'detail']; + protected $noNeedLogin = ['index', 'cats', 'services', 'detail', 'calc', 'specs', 'masterCount']; /** * 首页聚合：类目 + 热门服务 + 我的角标 @@ -57,6 +57,23 @@ class Home extends Base ->where('status', 'normal') ->order('weigh desc,id asc') ->select(); + + foreach ($cats as &$c) { + $icon = (string)$c['icon']; + if ($icon !== '') { + if (strpos($icon, 'http') === 0) { + $c['icon_url'] = $icon; + } elseif (strpos($icon, '/') !== false || strpos($icon, '.') !== false) { + $c['icon_url'] = cdnurl($icon, true); + } else { + $c['icon_url'] = ''; + } + } else { + $c['icon_url'] = ''; + } + } + unset($c); + $this->success('', ['list' => $cats]); } @@ -166,7 +183,7 @@ class Home extends Base public function calc() { $serviceId = (int)$this->request->param('service_id'); - $goodsListRaw = $this->request->param('goods_list'); + $goodsListRaw = $this->request->param('goods_list/a'); $goodsList = []; if (!empty($goodsListRaw)) { $goodsList = is_array($goodsListRaw) ? $goodsListRaw : json_decode((string)$goodsListRaw, true); @@ -472,12 +489,52 @@ class Home extends Base } elseif ($type === 'quote') { $priceText = '¥' . (float)$row['base_price'] . ' · 师傅报价'; } + // 解析工项 + $serviceTypes = []; + if (!empty($row['service_types'])) { + $serviceTypes = is_array($row['service_types']) ? $row['service_types'] : json_decode($row['service_types'], true); + } + if (empty($serviceTypes)) { + $serviceTypes = [ + ['code' => 'install', 'name' => '安装', 'price' => (float)$row['base_price'], 'is_default' => 1], + ['code' => 'repair', 'name' => '维修', 'price' => round((float)$row['base_price'] * 0.7, 2), 'is_default' => 0], + ['code' => 'remove', 'name' => '拆旧', 'price' => round((float)$row['base_price'] * 0.5, 2), 'is_default' => 0], + ['code' => 'deliver', 'name' => '送货到家', 'price' => 50.00, 'is_default' => 0], + ]; + } + + // 解析增项 + $addons = []; + if (!empty($row['addons'])) { + $addons = is_array($row['addons']) ? $row['addons'] : json_decode($row['addons'], true); + } + if (empty($addons)) { + // 获取类目通用增项 + $catAddons = Db::name('service_addon') + ->where('status', 'normal') + ->where(function($q) use ($row) { + $q->where('cat_id', $row['cat_id'])->whereOr('cat_id', 0); + }) + ->order('weigh desc, id asc') + ->limit(8) + ->select(); + foreach ($catAddons as $ca) { + $addons[] = [ + 'id' => (int)$ca['id'], + 'name' => $ca['name'], + 'unit' => $ca['unit'], + 'price' => (float)$ca['default_price'] + ]; + } + } + return [ 'id' => (int)$row['id'], 'cat_id' => (int)$row['cat_id'], 'name' => $row['name'], 'cat_name' => isset($row['cat_name']) ? $row['cat_name'] : '', 'image' => $row['image'], + 'image_url' => $row['image'] ? cdnurl($row['image'], true) : '', 'price_type' => $type, 'price_type_text' => $type === 'fixed' ? '一口价' : ($type === 'quote' ? '师傅报价' : '按面积计价'), 'base_price' => (float)$row['base_price'], @@ -489,6 +546,8 @@ class Home extends Base 'free_floor' => isset($row['free_floor']) ? (int)$row['free_floor'] : 0, 'need_model' => isset($row['need_model']) ? (int)$row['need_model'] : 1, 'description' => isset($row['description']) ? $row['description'] : '', + 'service_types' => $serviceTypes, + 'addons' => $addons, ]; } } diff --git a/server/application/api/controller/Master.php b/server/application/api/controller/Master.php index 0b15ef3..2bb6e2a 100644 --- a/server/application/api/controller/Master.php +++ b/server/application/api/controller/Master.php @@ -661,5 +661,128 @@ class Master extends Base unset($row); $this->success('', ['list' => $list]); } -} +/** + * 计算两点间距离 (km) + */ + protected function calculateDistance($lat1, $lon1, $lat2, $lon2) + { + if (empty($lat1) || empty($lon1) || empty($lat2) || empty($lon2)) { + return 14.40; + } + $earthRadius = 6371; + $dLat = deg2rad((float)$lat2 - (float)$lat1); + $dLon = deg2rad((float)$lon2 - (float)$lon1); + $a = sin($dLat / 2) * sin($dLat / 2) + + cos(deg2rad((float)$lat1)) * cos(deg2rad((float)$lat2)) * + sin($dLon / 2) * sin($dLon / 2); + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); + return round($earthRadius * $c, 2); + } + /** + * 师傅端订单抢单详情 + * @ApiMethod (GET) + */ + public function orderDetail() + { + $master = $this->requireMaster(); + $orderId = (int)$this->request->param('id'); + if ($orderId <= 0) { + $this->error('参数错误'); + } + $order = Db::name('order')->where('id', $orderId)->find(); + if (!$order) { + $this->error('订单不存在'); + } + + $isMyOrder = ((int)$order['master_id'] === (int)$master['id']); + $inHall = in_array((int)$order['status'], [OrderStatus::PENDING_ACCEPT, OrderStatus::QUOTING], true); + if (!$isMyOrder && !$inHall) { + $this->error('该订单已被其他师傅接单或已结束'); + } + + $now = time(); + $quoteCount = (int)Db::name('order_quote')->where('order_id', $orderId)->count(); + $myQuote = Db::name('order_quote') + ->where('order_id', $orderId) + ->where('master_id', $master['id']) + ->find(); + + $maxQuotes = 4; + $remainingQuoteSlots = max(0, $maxQuotes - $quoteCount); + $viewCount = 2 + ($orderId % 3); + $deadline = (int)$order['createtime'] + 3 * 86400; + $countdownSeconds = max(0, $deadline - $now); + + $mobile = $order['mobile']; + $address = $order['address']; + if (!$isMyOrder) { + $mobile = substr_replace($mobile, '******', 3, 6); + $address = preg_replace('/\d+号|\d+栋|\d+单元|\d+室/', '***', $address); + if (mb_strlen($address) > 10) { + $address = mb_substr($address, 0, 8) . '****号'; + } + } + + $userLat = (float)$this->request->param('lat', 0); + $userLng = (float)$this->request->param('lng', 0); + $dist = $this->calculateDistance($userLat, $userLng, (float)$order['lat'], (float)$order['lng']); + + $service = Db::name('service')->where('id', $order['service_id'])->find(); + $category = Db::name('service_cat')->where('id', $order['cat_id'])->find(); + + $goodsImages = []; + if (!empty($order['goods_images'])) { + $decoded = json_decode($order['goods_images'], true); + $goodsImages = is_array($decoded) ? $decoded : [$order['goods_images']]; + } + + $data = [ + 'id' => (int)$order['id'], + 'order_no' => $order['order_no'], + 'price_type' => $order['price_type'], + 'price_type_text' => $order['price_type'] === 'fixed' ? '一口价' : ($order['price_type'] === 'quote' ? '师傅竞价' : ($order['price_type'] === 'custom' ? '用户定价' : '标准价')), + 'status' => (int)$order['status'], + 'status_text' => OrderStatus::label($order['status']), + 'total_amount' => (float)$order['total_amount'], + 'base_amount' => (float)$order['base_amount'], + 'user_price' => $order['price_type'] === 'custom' ? (float)$order['base_amount'] : (float)$order['total_amount'], + 'service_name' => $order['service_name'] ?: ($service ? $service['name'] : '家庭维修服务'), + 'service_image' => $order['service_image'] ?: ($service ? $service['image'] : ''), + 'goods_images' => $goodsImages, + 'goods_model' => $order['goods_model'] ?: '标准规格', + 'goods_num' => (int)$order['goods_num'] ?: 1, + 'cat_name' => $category ? $category['name'] : '通用', + 'service_type_tag' => $order['price_type'] === 'fixed' ? '一口价' : ($order['price_type'] === 'custom' ? '用户定价' : '维修'), + 'remark' => $order['remark'] ?: '无特殊备注', + 'contact' => $order['contact'] ? mb_substr($order['contact'], 0, 1) . '客户' : '业主客户', + 'mobile' => $mobile, + 'is_my_order' => $isMyOrder, + 'province' => $order['province'], + 'city' => $order['city'], + 'district' => $order['district'], + 'full_address' => $order['province'] . $order['city'] . $order['district'] . $address, + 'lng' => $order['lng'], + 'lat' => $order['lat'], + 'distance_km' => $dist, + 'appoint_time' => $order['appoint_time'], + 'appoint_time_text' => $order['appoint_time'] ? date('Y-m-d H:i', (int)$order['appoint_time']) : '接单后与业主预约', + 'createtime' => (int)$order['createtime'], + 'createtime_text' => date('Y-m-d H:i', (int)$order['createtime']), + 'view_count' => $viewCount, + 'quote_count' => $quoteCount, + 'remaining_quote_slots' => $remainingQuoteSlots, + 'countdown_seconds' => $countdownSeconds, + 'my_quote' => $myQuote ? [ + 'id' => (int)$myQuote['id'], + 'amount' => (float)$myQuote['amount'], + 'description' => $myQuote['description'], + 'status' => $myQuote['status'], + ] : null, + 'can_grab' => ($order['price_type'] !== 'quote' && (int)$order['status'] === OrderStatus::PENDING_ACCEPT && (int)$order['master_id'] === 0), + 'can_quote' => ($order['price_type'] === 'quote' && in_array((int)$order['status'], [OrderStatus::PENDING_ACCEPT, OrderStatus::QUOTING], true) && (int)$order['master_id'] === 0 && !$myQuote), + ]; + + $this->success('', $data); + } +} diff --git a/server/application/extra/site.php b/server/application/extra/site.php index 544c15f..8d39c60 100755 --- a/server/application/extra/site.php +++ b/server/application/extra/site.php @@ -4,7 +4,7 @@ return array ( 'name' => '优匠优服', 'beian' => '', 'cdnurl' => '', - 'version' => '1.0.3', + 'version' => '1.0.9', 'timezone' => 'Asia/Shanghai', 'forbiddenip' => '', 'languages' => diff --git a/server/application/route.php b/server/application/route.php index 8d93637..c98bad5 100755 --- a/server/application/route.php +++ b/server/application/route.php @@ -10,6 +10,14 @@ // | Author: liu21st // +---------------------------------------------------------------------- +use think\Route; + +Route::rule('service/cat/:action', 'admin/service.cat/:action'); +Route::rule('service/cat', 'admin/service.cat/index'); + +Route::rule('service.cat/:action', 'admin/service.cat/:action'); +Route::rule('service.cat', 'admin/service.cat/index'); + return [ //别名配置,别名只能是映射到控制器且访问时必须加上请求的方法 '__alias__' => [ diff --git a/yjyf-app/components/GoodsPickerDrawer.vue b/yjyf-app/components/GoodsPickerDrawer.vue index 537fd18..ba88d42 100644 --- a/yjyf-app/components/GoodsPickerDrawer.vue +++ b/yjyf-app/components/GoodsPickerDrawer.vue @@ -216,6 +216,7 @@ function onChooseSpec(spec) { const goods = currentGoods.value; if (!goods) return; + const defType = (goods.service_types && goods.service_types.find(st => st.is_default)) || (goods.service_types && goods.service_types[0]) || { code: 'install', name: '安装' }; emit('select', { service_id: goods.id, item_name: goods.name, @@ -226,13 +227,18 @@ unit: goods.unit || '件', base_price: Number(spec.base_price) || Number(goods.base_price) || 0, price_type: goods.price_type || 'fixed', - description: spec.description || goods.description || '' + description: spec.description || goods.description || '', + service_types: goods.service_types || [], + addons: goods.addons || [], + default_service_type: defType.code, + default_service_name: defType.name }); close(); } function onChooseDefault(goods) { if (!goods) return; + const defType = (goods.service_types && goods.service_types.find(st => st.is_default)) || (goods.service_types && goods.service_types[0]) || { code: 'install', name: '安装' }; emit('select', { service_id: goods.id, item_name: goods.name, @@ -243,7 +249,11 @@ unit: goods.unit || '件', base_price: Number(goods.base_price) || 0, price_type: goods.price_type || 'fixed', - description: goods.description || '' + description: goods.description || '', + service_types: goods.service_types || [], + addons: goods.addons || [], + default_service_type: defType.code, + default_service_name: defType.name }); close(); } diff --git a/yjyf-app/components/YjyfMasterTabBar.vue b/yjyf-app/components/YjyfMasterTabBar.vue new file mode 100644 index 0000000..43f9671 --- /dev/null +++ b/yjyf-app/components/YjyfMasterTabBar.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/yjyf-app/pages.json b/yjyf-app/pages.json index a797a8c..a836b51 100644 --- a/yjyf-app/pages.json +++ b/yjyf-app/pages.json @@ -118,6 +118,14 @@ "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } + }, + { + "path": "pages/master/detail", + "style": { "navigationStyle": "custom", "backgroundColor": "#F4F5F7" } + }, + { + "path": "pages/master/success", + "style": { "navigationStyle": "custom", "backgroundColor": "#FFFFFF" } } ], "easycom": { diff --git a/yjyf-app/pages/category/category.vue b/yjyf-app/pages/category/category.vue index 88a1c8f..2747e24 100644 --- a/yjyf-app/pages/category/category.vue +++ b/yjyf-app/pages/category/category.vue @@ -53,7 +53,7 @@ @tap="selectCategory(item)" > - + {{ item.name }} @@ -132,21 +132,31 @@ function onSpecSelected(spec) { showDrawer.value = false; + const rawAddons = spec.addons && spec.addons.length ? spec.addons : []; + const extras = rawAddons.map(ad => ({ + id: ad.id, + key: 'addon_' + ad.id, + name: ad.name, + unit: ad.unit || '个', + price: Number(ad.price) || 0, + num: 0 + })); + const firstGoods = { service_id: spec.service_id, item_name: spec.item_name, + spec_id: spec.spec_id || 0, spec_name: spec.spec_name, cat_id: spec.cat_id || currentDrawerCatId.value, cat_name: spec.cat_name || currentDrawerCatName.value, unit: spec.unit || '件', base_price: Number(spec.base_price) || 0, num: 1, - service_type: 'install', + service_type: spec.default_service_type || 'install', + service_type_name: spec.default_service_name || '安装', + service_types: spec.service_types || [], images: [], - extras: [ - { key: 'tear', name: '拆旧', price: 50, num: 0 }, - { key: 'cut', name: '切割打孔', price: 20, num: 0 } - ] + extras: extras }; uni.setStorageSync('yjyf_first_goods', firstGoods); try { @@ -193,6 +203,7 @@ allCats.value = res.list.map(c => ({ id: c.id, name: c.name, + icon_url: c.icon_url || '', iconKey: c.icon || 'sofa' })); } diff --git a/yjyf-app/pages/master/credit.vue b/yjyf-app/pages/master/credit.vue index 3f77c86..92aa997 100644 --- a/yjyf-app/pages/master/credit.vue +++ b/yjyf-app/pages/master/credit.vue @@ -1,44 +1,91 @@