From 2d3995ca19b6be3ee33ce4aa600f1a8a53bd5478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 27 Mar 2021 14:30:51 +0800 Subject: [PATCH] ComposerUpdate --- SQL01-数据表结构.sql | 20 +-- SQL02-数据初始化.sql | 43 +++--- app/data/controller/ShopOrderService.php | 40 ------ .../{BaseConfig.php => base/Config.php} | 8 +- .../{BaseDiscount.php => base/Discount.php} | 8 +- .../{BaseMessage.php => base/Message.php} | 8 +- .../{BasePayment.php => base/Payment.php} | 8 +- .../{BaseUpgrade.php => base/Upgrade.php} | 8 +- .../postage/Company.php} | 10 +- .../postage/Template.php} | 8 +- .../{NewsItem.php => news/Item.php} | 8 +- .../{NewsMark.php => news/Mark.php} | 8 +- .../{ShopGoodsCate.php => shop/Cate.php} | 8 +- .../{ShopGoods.php => shop/Goods.php} | 8 +- .../{ShopGoodsMark.php => shop/Mark.php} | 8 +- .../{ShopOrder.php => shop/Order.php} | 8 +- .../{ShopOrderSend.php => shop/Send.php} | 8 +- .../controller/{User.php => user/Admin.php} | 8 +- .../{UserBalance.php => user/Balance.php} | 8 +- .../{UserMessage.php => user/Message.php} | 8 +- .../{UserRebate.php => user/Rebate.php} | 8 +- .../{UserTransfer.php => user/Transfer.php} | 8 +- .../{base_config => base/config}/cropper.html | 0 .../config}/page_form.html | 0 .../config}/page_home.html | 0 .../{base_config => base/config}/slider.html | 4 +- .../{base_config => base/config}/wxapp.html | 0 .../discount}/form.html | 0 .../discount}/index.html | 0 .../{base_message => base/message}/form.html | 0 .../{base_message => base/message}/index.html | 2 +- .../message}/index_search.html | 0 .../{base_payment => base/payment}/form.html | 0 .../payment}/form_alipay.html | 0 .../payment}/form_joinpay.html | 0 .../payment}/form_wechat.html | 0 .../{base_payment => base/payment}/index.html | 2 +- .../payment}/index_search.html | 0 .../postage/company}/form.html | 0 .../postage/company}/index.html | 6 +- .../postage/company}/index_search.html | 0 .../postage/template}/form.html | 0 .../postage/template}/form_region.html | 0 .../postage/template}/index.html | 2 +- .../postage/template}/index_search.html | 0 .../{base_upgrade => base/upgrade}/form.html | 0 .../{base_upgrade => base/upgrade}/index.html | 0 .../view/{news_item => news/item}/form.html | 0 .../view/{news_item => news/item}/index.html | 2 +- .../item}/index_search.html | 0 .../view/{news_item => news/item}/select.html | 2 +- .../item}/select_search.html | 0 .../view/{news_mark => news/mark}/form.html | 0 .../view/{news_mark => news/mark}/index.html | 2 +- .../mark}/index_search.html | 0 .../{shop_goods_cate => shop/cate}/form.html | 0 .../{shop_goods_cate => shop/cate}/index.html | 0 .../view/{shop_goods => shop/goods}/form.html | 0 .../{shop_goods => shop/goods}/formstyle.html | 0 .../{shop_goods => shop/goods}/index.html | 2 +- .../goods}/index_search.html | 0 .../{shop_goods => shop/goods}/select.html | 2 +- .../goods}/select_search.html | 0 .../{shop_goods => shop/goods}/stock.html | 0 .../{shop_goods_mark => shop/mark}/form.html | 0 .../{shop_goods_mark => shop/mark}/index.html | 2 +- .../mark}/index_search.html | 0 .../mark}/select.html | 0 .../{shop_order => shop/order}/audit.html | 0 .../{shop_order => shop/order}/index.html | 2 +- .../order}/index_search.html | 0 .../{shop_order => shop/order}/truck.html | 0 .../order}/truck_query.html | 0 .../send}/config.html | 0 .../{shop_order_send => shop/send}/index.html | 2 +- .../send}/index_search.html | 0 app/data/view/shop_order_service/index.html | 130 ----------------- .../view/shop_order_service/index_search.html | 136 ------------------ app/data/view/user/{ => admin}/index.html | 2 +- .../view/user/{ => admin}/index_search.html | 0 app/data/view/user/{ => admin}/parent.html | 0 .../{user_balance => user/balance}/form.html | 0 .../{user_balance => user/balance}/index.html | 2 +- .../balance}/index_search.html | 0 .../message}/config.html | 0 .../{user_message => user/message}/index.html | 2 +- .../message}/index_search.html | 0 .../{user_rebate => user/rebate}/config.html | 0 .../{user_rebate => user/rebate}/index.html | 2 +- .../rebate}/index_search.html | 0 .../transfer}/audit.html | 0 .../transfer}/config.html | 0 .../transfer}/index.html | 2 +- .../transfer}/index_search.html | 0 .../transfer}/payment.html | 0 vendor/composer/autoload_classmap.php | 39 +++-- vendor/composer/autoload_static.php | 39 +++-- vendor/services.php | 2 +- 98 files changed, 168 insertions(+), 477 deletions(-) delete mode 100644 app/data/controller/ShopOrderService.php rename app/data/controller/{BaseConfig.php => base/Config.php} (97%) rename app/data/controller/{BaseDiscount.php => base/Discount.php} (95%) rename app/data/controller/{BaseMessage.php => base/Message.php} (94%) rename app/data/controller/{BasePayment.php => base/Payment.php} (96%) rename app/data/controller/{BaseUpgrade.php => base/Upgrade.php} (97%) rename app/data/controller/{BasePostageCompany.php => base/postage/Company.php} (94%) rename app/data/controller/{BasePostageTemplate.php => base/postage/Template.php} (96%) rename app/data/controller/{NewsItem.php => news/Item.php} (96%) rename app/data/controller/{NewsMark.php => news/Mark.php} (93%) rename app/data/controller/{ShopGoodsCate.php => shop/Cate.php} (96%) rename app/data/controller/{ShopGoods.php => shop/Goods.php} (98%) rename app/data/controller/{ShopGoodsMark.php => shop/Mark.php} (94%) rename app/data/controller/{ShopOrder.php => shop/Order.php} (98%) rename app/data/controller/{ShopOrderSend.php => shop/Send.php} (96%) rename app/data/controller/{User.php => user/Admin.php} (97%) rename app/data/controller/{UserBalance.php => user/Balance.php} (97%) rename app/data/controller/{UserMessage.php => user/Message.php} (92%) rename app/data/controller/{UserRebate.php => user/Rebate.php} (96%) rename app/data/controller/{UserTransfer.php => user/Transfer.php} (97%) rename app/data/view/{base_config => base/config}/cropper.html (100%) rename app/data/view/{base_config => base/config}/page_form.html (100%) rename app/data/view/{base_config => base/config}/page_home.html (100%) rename app/data/view/{base_config => base/config}/slider.html (97%) rename app/data/view/{base_config => base/config}/wxapp.html (100%) rename app/data/view/{base_discount => base/discount}/form.html (100%) rename app/data/view/{base_discount => base/discount}/index.html (100%) rename app/data/view/{base_message => base/message}/form.html (100%) rename app/data/view/{base_message => base/message}/index.html (98%) rename app/data/view/{base_message => base/message}/index_search.html (100%) rename app/data/view/{base_payment => base/payment}/form.html (100%) rename app/data/view/{base_payment => base/payment}/form_alipay.html (100%) rename app/data/view/{base_payment => base/payment}/form_joinpay.html (100%) rename app/data/view/{base_payment => base/payment}/form_wechat.html (100%) rename app/data/view/{base_payment => base/payment}/index.html (98%) rename app/data/view/{base_payment => base/payment}/index_search.html (100%) rename app/data/view/{base_postage_company => base/postage/company}/form.html (100%) rename app/data/view/{base_postage_company => base/postage/company}/index.html (96%) rename app/data/view/{base_postage_company => base/postage/company}/index_search.html (100%) rename app/data/view/{base_postage_template => base/postage/template}/form.html (100%) rename app/data/view/{base_postage_template => base/postage/template}/form_region.html (100%) rename app/data/view/{base_postage_template => base/postage/template}/index.html (98%) rename app/data/view/{base_postage_template => base/postage/template}/index_search.html (100%) rename app/data/view/{base_upgrade => base/upgrade}/form.html (100%) rename app/data/view/{base_upgrade => base/upgrade}/index.html (100%) rename app/data/view/{news_item => news/item}/form.html (100%) rename app/data/view/{news_item => news/item}/index.html (98%) rename app/data/view/{news_item => news/item}/index_search.html (100%) rename app/data/view/{news_item => news/item}/select.html (96%) rename app/data/view/{news_item => news/item}/select_search.html (100%) rename app/data/view/{news_mark => news/mark}/form.html (100%) rename app/data/view/{news_mark => news/mark}/index.html (98%) rename app/data/view/{news_mark => news/mark}/index_search.html (100%) rename app/data/view/{shop_goods_cate => shop/cate}/form.html (100%) rename app/data/view/{shop_goods_cate => shop/cate}/index.html (100%) rename app/data/view/{shop_goods => shop/goods}/form.html (100%) rename app/data/view/{shop_goods => shop/goods}/formstyle.html (100%) rename app/data/view/{shop_goods => shop/goods}/index.html (99%) rename app/data/view/{shop_goods => shop/goods}/index_search.html (100%) rename app/data/view/{shop_goods => shop/goods}/select.html (97%) rename app/data/view/{shop_goods => shop/goods}/select_search.html (100%) rename app/data/view/{shop_goods => shop/goods}/stock.html (100%) rename app/data/view/{shop_goods_mark => shop/mark}/form.html (100%) rename app/data/view/{shop_goods_mark => shop/mark}/index.html (98%) rename app/data/view/{shop_goods_mark => shop/mark}/index_search.html (100%) rename app/data/view/{shop_goods_mark => shop/mark}/select.html (100%) rename app/data/view/{shop_order => shop/order}/audit.html (100%) rename app/data/view/{shop_order => shop/order}/index.html (99%) rename app/data/view/{shop_order => shop/order}/index_search.html (100%) rename app/data/view/{shop_order => shop/order}/truck.html (100%) rename app/data/view/{shop_order => shop/order}/truck_query.html (100%) rename app/data/view/{shop_order_send => shop/send}/config.html (100%) rename app/data/view/{shop_order_send => shop/send}/index.html (98%) rename app/data/view/{shop_order_send => shop/send}/index_search.html (100%) delete mode 100644 app/data/view/shop_order_service/index.html delete mode 100644 app/data/view/shop_order_service/index_search.html rename app/data/view/user/{ => admin}/index.html (99%) rename app/data/view/user/{ => admin}/index_search.html (100%) rename app/data/view/user/{ => admin}/parent.html (100%) rename app/data/view/{user_balance => user/balance}/form.html (100%) rename app/data/view/{user_balance => user/balance}/index.html (98%) rename app/data/view/{user_balance => user/balance}/index_search.html (100%) rename app/data/view/{user_message => user/message}/config.html (100%) rename app/data/view/{user_message => user/message}/index.html (97%) rename app/data/view/{user_message => user/message}/index_search.html (100%) rename app/data/view/{user_rebate => user/rebate}/config.html (100%) rename app/data/view/{user_rebate => user/rebate}/index.html (99%) rename app/data/view/{user_rebate => user/rebate}/index_search.html (100%) rename app/data/view/{user_transfer => user/transfer}/audit.html (100%) rename app/data/view/{user_transfer => user/transfer}/config.html (100%) rename app/data/view/{user_transfer => user/transfer}/index.html (99%) rename app/data/view/{user_transfer => user/transfer}/index_search.html (100%) rename app/data/view/{user_transfer => user/transfer}/payment.html (100%) diff --git a/SQL01-数据表结构.sql b/SQL01-数据表结构.sql index 51f3c3096..c555ac31e 100644 --- a/SQL01-数据表结构.sql +++ b/SQL01-数据表结构.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 26/03/2021 18:33:53 + Date: 27/03/2021 14:30:02 */ SET NAMES utf8mb4; @@ -380,11 +380,11 @@ CREATE TABLE `data_user_payment` ( `payment_datatime` datetime NULL DEFAULT NULL COMMENT '支付时间', `create_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, - INDEX `idx_data_base_payment_record_order_no`(`order_no`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_code`(`payment_code`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_type`(`payment_type`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_trade`(`payment_trade`) USING BTREE, - INDEX `idx_data_base_payment_record_payment_status`(`payment_status`) USING BTREE + INDEX `idx_data_user_payment_order_no`(`order_no`) USING BTREE, + INDEX `idx_data_user_payment_payment_code`(`payment_code`) USING BTREE, + INDEX `idx_data_user_payment_payment_type`(`payment_type`) USING BTREE, + INDEX `idx_data_user_payment_payment_trade`(`payment_trade`) USING BTREE, + INDEX `idx_data_user_payment_payment_status`(`payment_status`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-基础-支付' ROW_FORMAT = COMPACT; -- ---------------------------- @@ -615,8 +615,6 @@ CREATE TABLE `shop_order` ( `amount_reduct` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '随机减免金额', `amount_express` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '快递费用金额', `amount_discount` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '折扣后的金额', - `rebate_amount` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '参与返利金额', - `reward_balance` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '奖励账户余额', `payment_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '实际支付平台', `payment_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '实际通道编号', `payment_allow` varchar(999) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '允许支付通道', @@ -630,6 +628,8 @@ CREATE TABLE `shop_order` ( `number_goods` bigint(20) NULL DEFAULT 0 COMMENT '订单商品数量', `number_express` bigint(20) NULL DEFAULT 0 COMMENT '订单快递计数', `truck_type` tinyint(1) NULL DEFAULT 0 COMMENT '物流配送类型(0无需配送,1需要配送)', + `rebate_amount` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '参与返利金额', + `reward_balance` decimal(20, 2) NULL DEFAULT 0.00 COMMENT '奖励账户余额', `order_remark` varchar(999) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '订单用户备注', `cancel_status` tinyint(1) NULL DEFAULT 0 COMMENT '订单取消状态', `cancel_remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '订单取消描述', @@ -821,7 +821,7 @@ CREATE TABLE `system_oplog` ( `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '操作人用户名', `create_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 158 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 198 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-日志' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_queue @@ -850,7 +850,7 @@ CREATE TABLE `system_queue` ( INDEX `idx_system_queue_rscript`(`rscript`) USING BTREE, INDEX `idx_system_queue_create_at`(`create_at`) USING BTREE, INDEX `idx_system_queue_exec_time`(`exec_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-任务' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 34 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统-任务' ROW_FORMAT = COMPACT; -- ---------------------------- -- Table structure for system_user diff --git a/SQL02-数据初始化.sql b/SQL02-数据初始化.sql index e7b0800f4..35e7b8c07 100644 --- a/SQL02-数据初始化.sql +++ b/SQL02-数据初始化.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 26/03/2021 18:36:50 + Date: 27/03/2021 14:30:25 */ SET NAMES utf8mb4; @@ -3831,28 +3831,27 @@ INSERT INTO `system_menu` VALUES (65, 60, '关注回复配置', 'layui-icon layu INSERT INTO `system_menu` VALUES (66, 60, '默认回复配置', 'layui-icon layui-icon-util', '', 'wechat/keys/defaults', '', '_self', 0, 1, '2019-12-14 14:11:18'); INSERT INTO `system_menu` VALUES (67, 0, '控制台', '', '', '#', '', '_self', 300, 1, '2020-07-13 06:51:46'); INSERT INTO `system_menu` VALUES (68, 67, '数据管理', '', '', '#', '', '_self', 301, 1, '2020-07-13 06:51:54'); -INSERT INTO `system_menu` VALUES (70, 68, '文章内容管理', 'layui-icon layui-icon-template', '', 'data/news_item/index', '', '_self', 10, 1, '2020-07-13 06:52:26'); -INSERT INTO `system_menu` VALUES (71, 68, '轮播图片管理', 'layui-icon layui-icon-carousel', 'data/base_config/sliderhome', 'data/base_config/sliderhome', '', '_self', 30, 1, '2020-07-14 01:17:02'); +INSERT INTO `system_menu` VALUES (70, 68, '文章内容管理', 'layui-icon layui-icon-template', 'data/news.item/index', 'data/news.item/index', '', '_self', 10, 0, '2020-07-13 06:52:26'); +INSERT INTO `system_menu` VALUES (71, 68, '轮播图片管理', 'layui-icon layui-icon-carousel', 'data/base.config/sliderhome', 'data/base.config/sliderhome', '', '_self', 30, 1, '2020-07-14 01:17:02'); INSERT INTO `system_menu` VALUES (73, 67, '商城管理', '', '', '#', '', '_self', 303, 1, '2020-09-08 02:51:30'); -INSERT INTO `system_menu` VALUES (75, 73, '商品分类管理', 'layui-icon layui-icon-tabs', 'data/shop_goods_cate/index', 'data/shop_goods_cate/index', '', '_self', 70, 1, '2020-09-08 03:35:58'); -INSERT INTO `system_menu` VALUES (76, 73, '商品数据管理', 'layui-icon layui-icon-star', 'data/shop_goods/index', 'data/shop_goods/index', '', '_self', 90, 1, '2020-09-08 07:13:19'); -INSERT INTO `system_menu` VALUES (77, 90, '会员用户管理', 'layui-icon layui-icon-user', 'data/user/index', 'data/user/index', '', '_self', 900, 1, '2020-09-10 01:48:02'); -INSERT INTO `system_menu` VALUES (78, 73, '订单数据管理', 'layui-icon layui-icon-template', 'data/shop_order/index', 'data/shop_order/index', '', '_self', 60, 1, '2020-09-10 01:48:41'); -INSERT INTO `system_menu` VALUES (79, 73, '订单发货管理', 'layui-icon layui-icon-transfer', 'data/shop_order_send/index', 'data/shop_order_send/index', '', '_self', 50, 1, '2020-09-10 01:50:12'); -INSERT INTO `system_menu` VALUES (81, 73, '快递公司管理', 'layui-icon layui-icon-website', 'data/base_postage_company/index', 'data/base_postage_company/index', '', '_self', 0, 1, '2020-09-15 08:47:46'); -INSERT INTO `system_menu` VALUES (82, 73, '邮费模板管理', 'layui-icon layui-icon-template-1', 'data/base_postage_template/index', 'data/base_postage_template/index', '', '_self', 0, 1, '2020-09-15 09:14:46'); -INSERT INTO `system_menu` VALUES (83, 73, '配送区域管理', 'layui-icon layui-icon-location', 'data/base_postage_template/region', 'data/base_postage_template/region', '', '_self', 0, 1, '2020-09-17 09:13:35'); -INSERT INTO `system_menu` VALUES (84, 68, '微信小程序配置', 'layui-icon layui-icon-set', 'data/base_config/wxapp', 'data/base_config/wxapp', '', '_self', 5, 1, '2020-09-21 16:34:08'); -INSERT INTO `system_menu` VALUES (87, 68, '支付参数管理', 'layui-icon layui-icon-rmb', 'data/base_payment/index', 'data/base_payment/index', '', '_self', 6, 1, '2020-12-12 09:08:09'); -INSERT INTO `system_menu` VALUES (88, 68, '系统通知管理', 'layui-icon layui-icon-notice', 'data/base_message/index', 'data/base_message/index', '', '_self', 6, 1, '2021-01-20 10:07:32'); -INSERT INTO `system_menu` VALUES (89, 90, '余额充值管理', 'layui-icon layui-icon-rmb', 'data/user_balance/index', 'data/user_balance/index', '', '_self', 800, 1, '2021-01-20 10:09:49'); +INSERT INTO `system_menu` VALUES (75, 73, '商品分类管理', 'layui-icon layui-icon-tabs', 'data/shop.cate/index', 'data/shop.cate/index', '', '_self', 70, 1, '2020-09-08 03:35:58'); +INSERT INTO `system_menu` VALUES (76, 73, '商品数据管理', 'layui-icon layui-icon-star', 'data/shop.goods/index', 'data/shop.goods/index', '', '_self', 90, 1, '2020-09-08 07:13:19'); +INSERT INTO `system_menu` VALUES (77, 90, '会员用户管理', 'layui-icon layui-icon-user', 'data/user.admin/index', 'data/user.admin/index', '', '_self', 900, 1, '2020-09-10 01:48:02'); +INSERT INTO `system_menu` VALUES (78, 73, '订单数据管理', 'layui-icon layui-icon-template', 'data/shop.order/index', 'data/shop.order/index', '', '_self', 60, 1, '2020-09-10 01:48:41'); +INSERT INTO `system_menu` VALUES (79, 73, '订单发货管理', 'layui-icon layui-icon-transfer', 'data/shop.send/index', 'data/shop.send/index', '', '_self', 50, 1, '2020-09-10 01:50:12'); +INSERT INTO `system_menu` VALUES (81, 73, '快递公司管理', 'layui-icon layui-icon-website', 'data/base.postage.company/index', 'data/base.postage.company/index', '', '_self', 0, 1, '2020-09-15 08:47:46'); +INSERT INTO `system_menu` VALUES (82, 73, '邮费模板管理', 'layui-icon layui-icon-template-1', 'data/base.postage.template/index', 'data/base.postage.template/index', '', '_self', 0, 1, '2020-09-15 09:14:46'); +INSERT INTO `system_menu` VALUES (84, 68, '微信小程序配置', 'layui-icon layui-icon-set', 'data/base.config/wxapp', 'data/base.config/wxapp', '', '_self', 5, 1, '2020-09-21 16:34:08'); +INSERT INTO `system_menu` VALUES (87, 68, '支付参数管理', 'layui-icon layui-icon-rmb', 'data/base.payment/index', 'data/base.payment/index', '', '_self', 6, 1, '2020-12-12 09:08:09'); +INSERT INTO `system_menu` VALUES (88, 68, '系统通知管理', 'layui-icon layui-icon-notice', 'data/base.message/index', 'data/base.message/index', '', '_self', 6, 1, '2021-01-20 10:07:32'); +INSERT INTO `system_menu` VALUES (89, 90, '余额充值管理', 'layui-icon layui-icon-rmb', 'data/user.balance/index', 'data/user.balance/index', '', '_self', 800, 1, '2021-01-20 10:09:49'); INSERT INTO `system_menu` VALUES (90, 67, '用户管理', '', '', '#', '', '_self', 302, 1, '2021-01-22 05:43:01'); -INSERT INTO `system_menu` VALUES (91, 90, '用户等级管理', 'layui-icon layui-icon-senior', 'data/base_upgrade/index', 'data/base_upgrade/index', '', '_self', 300, 1, '2021-01-22 05:43:27'); -INSERT INTO `system_menu` VALUES (92, 90, '用户折扣方案', 'layui-icon layui-icon-set', 'data/base_discount/index', 'data/base_discount/index', '', '_self', 200, 1, '2021-01-27 05:44:51'); -INSERT INTO `system_menu` VALUES (93, 90, '用户提现管理', 'layui-icon layui-icon-component', 'data/user_transfer/index', 'data/user_transfer/index', '', '_self', 500, 1, '2021-01-28 06:48:34'); -INSERT INTO `system_menu` VALUES (94, 68, '页面内容管理', 'layui-icon layui-icon-read', 'data/base_config/pagehome', 'data/base_config/pagehome', '', '_self', 20, 1, '2021-02-24 08:49:16'); -INSERT INTO `system_menu` VALUES (95, 68, '邀请二维码设置', 'layui-icon layui-icon-cols', 'data/config/cropper', 'data/base_config/cropper', '', '_self', 0, 1, '2021-03-01 09:53:59'); -INSERT INTO `system_menu` VALUES (97, 90, '用户返利管理', 'layui-icon layui-icon-transfer', 'data/user_rebate/index', 'data/user_rebate/index', '', '_self', 600, 1, '2021-03-12 10:06:49'); +INSERT INTO `system_menu` VALUES (91, 90, '用户等级管理', 'layui-icon layui-icon-senior', 'data/base.upgrade/index', 'data/base.upgrade/index', '', '_self', 300, 1, '2021-01-22 05:43:27'); +INSERT INTO `system_menu` VALUES (92, 90, '用户折扣方案', 'layui-icon layui-icon-set', 'data/base.discount/index', 'data/base.discount/index', '', '_self', 200, 1, '2021-01-27 05:44:51'); +INSERT INTO `system_menu` VALUES (93, 90, '用户提现管理', 'layui-icon layui-icon-component', 'data/user.transfer/index', 'data/user.transfer/index', '', '_self', 500, 1, '2021-01-28 06:48:34'); +INSERT INTO `system_menu` VALUES (94, 68, '页面内容管理', 'layui-icon layui-icon-read', 'data/base.config/pagehome', 'data/base.config/pagehome', '', '_self', 20, 0, '2021-02-24 08:49:16'); +INSERT INTO `system_menu` VALUES (95, 68, '邀请二维码设置', 'layui-icon layui-icon-cols', 'data/base.config/cropper', 'data/base.config/cropper', '', '_self', 0, 1, '2021-03-01 09:53:59'); +INSERT INTO `system_menu` VALUES (97, 90, '用户返利管理', 'layui-icon layui-icon-transfer', 'data/user.rebate/index', 'data/user.rebate/index', '', '_self', 600, 1, '2021-03-12 10:06:49'); -- ---------------------------- -- Table structure for system_user @@ -3885,6 +3884,6 @@ CREATE TABLE `system_user` ( -- ---------------------------- -- Records of system_user -- ---------------------------- -INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '系统管理员', 'https://xhtwxapp.cdn.xiaoding.shop/cf/23526f451784ff137f161b8fe18d5a.png', ',,', '', '', '', '61.140.234.218', '2021-03-26 18:20:44', 139, '', 1, 0, 0, '2015-11-13 15:14:22'); +INSERT INTO `system_user` VALUES (10000, 'admin', '21232f297a57a5a743894a0e4a801fc3', '系统管理员', 'https://xhtwxapp.cdn.xiaoding.shop/cf/23526f451784ff137f161b8fe18d5a.png', ',,', '', '', '', '127.0.0.1', '2021-03-27 13:55:45', 140, '', 1, 0, 0, '2015-11-13 15:14:22'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/app/data/controller/ShopOrderService.php b/app/data/controller/ShopOrderService.php deleted file mode 100644 index 28f9293b4..000000000 --- a/app/data/controller/ShopOrderService.php +++ /dev/null @@ -1,40 +0,0 @@ -title = '售后申请管理'; - $this->type = input('type', 'all'); - - $query = $this->_query($this->table); - if (is_numeric($this->type = input('type', 'all'))) { - $query->equal('status#type'); - } - $query->order('id desc')->page(); - } - -} \ No newline at end of file diff --git a/app/data/controller/BaseConfig.php b/app/data/controller/base/Config.php similarity index 97% rename from app/data/controller/BaseConfig.php rename to app/data/controller/base/Config.php index 3e775fa53..708fc4cbf 100644 --- a/app/data/controller/BaseConfig.php +++ b/app/data/controller/base/Config.php @@ -1,15 +1,15 @@ company(); diff --git a/app/data/controller/BasePostageTemplate.php b/app/data/controller/base/postage/Template.php similarity index 96% rename from app/data/controller/BasePostageTemplate.php rename to app/data/controller/base/postage/Template.php index 09105bd12..7c1d21d29 100644 --- a/app/data/controller/BasePostageTemplate.php +++ b/app/data/controller/base/postage/Template.php @@ -1,6 +1,6 @@ 跳转规则 - 选择文章 - 选择商品 + 选择文章 + 选择商品 若要跳转页面，请选择对应的数据或填写跳转的 URL 地址，不跳转请填写 “#” 号占位。 diff --git a/app/data/view/base_config/wxapp.html b/app/data/view/base/config/wxapp.html similarity index 100% rename from app/data/view/base_config/wxapp.html rename to app/data/view/base/config/wxapp.html diff --git a/app/data/view/base_discount/form.html b/app/data/view/base/discount/form.html similarity index 100% rename from app/data/view/base_discount/form.html rename to app/data/view/base/discount/form.html diff --git a/app/data/view/base_discount/index.html b/app/data/view/base/discount/index.html similarity index 100% rename from app/data/view/base_discount/index.html rename to app/data/view/base/discount/index.html diff --git a/app/data/view/base_message/form.html b/app/data/view/base/message/form.html similarity index 100% rename from app/data/view/base_message/form.html rename to app/data/view/base/message/form.html diff --git a/app/data/view/base_message/index.html b/app/data/view/base/message/index.html similarity index 98% rename from app/data/view/base_message/index.html rename to app/data/view/base/message/index.html index 89eee05da..d5b7b9335 100644 --- a/app/data/view/base_message/index.html +++ b/app/data/view/base/message/index.html @@ -13,7 +13,7 @@ {block name='content'}
- {include file='base_message/index_search'} + {include file='base/message/index_search'} {notempty name='list'} diff --git a/app/data/view/base_message/index_search.html b/app/data/view/base/message/index_search.html similarity index 100% rename from app/data/view/base_message/index_search.html rename to app/data/view/base/message/index_search.html diff --git a/app/data/view/base_payment/form.html b/app/data/view/base/payment/form.html similarity index 100% rename from app/data/view/base_payment/form.html rename to app/data/view/base/payment/form.html diff --git a/app/data/view/base_payment/form_alipay.html b/app/data/view/base/payment/form_alipay.html similarity index 100% rename from app/data/view/base_payment/form_alipay.html rename to app/data/view/base/payment/form_alipay.html diff --git a/app/data/view/base_payment/form_joinpay.html b/app/data/view/base/payment/form_joinpay.html similarity index 100% rename from app/data/view/base_payment/form_joinpay.html rename to app/data/view/base/payment/form_joinpay.html diff --git a/app/data/view/base_payment/form_wechat.html b/app/data/view/base/payment/form_wechat.html similarity index 100% rename from app/data/view/base_payment/form_wechat.html rename to app/data/view/base/payment/form_wechat.html diff --git a/app/data/view/base_payment/index.html b/app/data/view/base/payment/index.html similarity index 98% rename from app/data/view/base_payment/index.html rename to app/data/view/base/payment/index.html index 0152757d4..31db6d1c8 100644 --- a/app/data/view/base_payment/index.html +++ b/app/data/view/base/payment/index.html @@ -12,7 +12,7 @@ {block name='content'}
- {include file='base_payment/index_search'} + {include file='base/payment/index_search'}
{notempty name='list'} diff --git a/app/data/view/base_payment/index_search.html b/app/data/view/base/payment/index_search.html similarity index 100% rename from app/data/view/base_payment/index_search.html rename to app/data/view/base/payment/index_search.html diff --git a/app/data/view/base_postage_company/form.html b/app/data/view/base/postage/company/form.html similarity index 100% rename from app/data/view/base_postage_company/form.html rename to app/data/view/base/postage/company/form.html diff --git a/app/data/view/base_postage_company/index.html b/app/data/view/base/postage/company/index.html similarity index 96% rename from app/data/view/base_postage_company/index.html rename to app/data/view/base/postage/company/index.html index 9ebfed7d3..b0c998214 100644 --- a/app/data/view/base_postage_company/index.html +++ b/app/data/view/base/postage/company/index.html @@ -1,8 +1,8 @@ {extend name="../../admin/view/main"} {block name="button"} - - + + @@ -33,7 +33,7 @@ {/if}{/foreach}
- {include file='base_postage_company/index_search'} + {include file='base/postage/company/index_search'}
{notempty name='list'} diff --git a/app/data/view/base_postage_company/index_search.html b/app/data/view/base/postage/company/index_search.html similarity index 100% rename from app/data/view/base_postage_company/index_search.html rename to app/data/view/base/postage/company/index_search.html diff --git a/app/data/view/base_postage_template/form.html b/app/data/view/base/postage/template/form.html similarity index 100% rename from app/data/view/base_postage_template/form.html rename to app/data/view/base/postage/template/form.html diff --git a/app/data/view/base_postage_template/form_region.html b/app/data/view/base/postage/template/form_region.html similarity index 100% rename from app/data/view/base_postage_template/form_region.html rename to app/data/view/base/postage/template/form_region.html diff --git a/app/data/view/base_postage_template/index.html b/app/data/view/base/postage/template/index.html similarity index 98% rename from app/data/view/base_postage_template/index.html rename to app/data/view/base/postage/template/index.html index 08c5cbe19..505045cbb 100644 --- a/app/data/view/base_postage_template/index.html +++ b/app/data/view/base/postage/template/index.html @@ -13,7 +13,7 @@ {block name="content"}
- {include file='base_postage_template/index_search'} + {include file='base/postage/template/index_search'}
{notempty name='list'} diff --git a/app/data/view/base_postage_template/index_search.html b/app/data/view/base/postage/template/index_search.html similarity index 100% rename from app/data/view/base_postage_template/index_search.html rename to app/data/view/base/postage/template/index_search.html diff --git a/app/data/view/base_upgrade/form.html b/app/data/view/base/upgrade/form.html similarity index 100% rename from app/data/view/base_upgrade/form.html rename to app/data/view/base/upgrade/form.html diff --git a/app/data/view/base_upgrade/index.html b/app/data/view/base/upgrade/index.html similarity index 100% rename from app/data/view/base_upgrade/index.html rename to app/data/view/base/upgrade/index.html diff --git a/app/data/view/news_item/form.html b/app/data/view/news/item/form.html similarity index 100% rename from app/data/view/news_item/form.html rename to app/data/view/news/item/form.html diff --git a/app/data/view/news_item/index.html b/app/data/view/news/item/index.html similarity index 98% rename from app/data/view/news_item/index.html rename to app/data/view/news/item/index.html index 7daca71d0..482095450 100644 --- a/app/data/view/news_item/index.html +++ b/app/data/view/news/item/index.html @@ -16,7 +16,7 @@ {block name='content'}
- {include file='news_item/index_search'} + {include file='news/item/index_search'}
{notempty name='list'} diff --git a/app/data/view/news_item/index_search.html b/app/data/view/news/item/index_search.html similarity index 100% rename from app/data/view/news_item/index_search.html rename to app/data/view/news/item/index_search.html diff --git a/app/data/view/news_item/select.html b/app/data/view/news/item/select.html similarity index 96% rename from app/data/view/news_item/select.html rename to app/data/view/news/item/select.html index 7b6f01fe8..b7863d227 100644 --- a/app/data/view/news_item/select.html +++ b/app/data/view/news/item/select.html @@ -2,7 +2,7 @@ {block name='content'}
- {include file='news_item/select_search'} + {include file='news/item/select_search'}
{notempty name='list'} diff --git a/app/data/view/news_item/select_search.html b/app/data/view/news/item/select_search.html similarity index 100% rename from app/data/view/news_item/select_search.html rename to app/data/view/news/item/select_search.html diff --git a/app/data/view/news_mark/form.html b/app/data/view/news/mark/form.html similarity index 100% rename from app/data/view/news_mark/form.html rename to app/data/view/news/mark/form.html diff --git a/app/data/view/news_mark/index.html b/app/data/view/news/mark/index.html similarity index 98% rename from app/data/view/news_mark/index.html rename to app/data/view/news/mark/index.html index 4adc3a372..c1e4717f9 100644 --- a/app/data/view/news_mark/index.html +++ b/app/data/view/news/mark/index.html @@ -2,7 +2,7 @@ {block name='content'}
- {include file='news_mark/index_search'} + {include file='news/mark/index_search'}
{notempty name='list'} diff --git a/app/data/view/news_mark/index_search.html b/app/data/view/news/mark/index_search.html similarity index 100% rename from app/data/view/news_mark/index_search.html rename to app/data/view/news/mark/index_search.html diff --git a/app/data/view/shop_goods_cate/form.html b/app/data/view/shop/cate/form.html similarity index 100% rename from app/data/view/shop_goods_cate/form.html rename to app/data/view/shop/cate/form.html diff --git a/app/data/view/shop_goods_cate/index.html b/app/data/view/shop/cate/index.html similarity index 100% rename from app/data/view/shop_goods_cate/index.html rename to app/data/view/shop/cate/index.html diff --git a/app/data/view/shop_goods/form.html b/app/data/view/shop/goods/form.html similarity index 100% rename from app/data/view/shop_goods/form.html rename to app/data/view/shop/goods/form.html diff --git a/app/data/view/shop_goods/formstyle.html b/app/data/view/shop/goods/formstyle.html similarity index 100% rename from app/data/view/shop_goods/formstyle.html rename to app/data/view/shop/goods/formstyle.html diff --git a/app/data/view/shop_goods/index.html b/app/data/view/shop/goods/index.html similarity index 99% rename from app/data/view/shop_goods/index.html rename to app/data/view/shop/goods/index.html index 6b70009cd..2341d925b 100644 --- a/app/data/view/shop_goods/index.html +++ b/app/data/view/shop/goods/index.html @@ -31,7 +31,7 @@ {/if}{/foreach}
- {include file='shop_goods/index_search'} + {include file='shop/goods/index_search'}
{notempty name='list'} diff --git a/app/data/view/shop_goods/index_search.html b/app/data/view/shop/goods/index_search.html similarity index 100% rename from app/data/view/shop_goods/index_search.html rename to app/data/view/shop/goods/index_search.html diff --git a/app/data/view/shop_goods/select.html b/app/data/view/shop/goods/select.html similarity index 97% rename from app/data/view/shop_goods/select.html rename to app/data/view/shop/goods/select.html index ac15a4916..c0c4656a3 100644 --- a/app/data/view/shop_goods/select.html +++ b/app/data/view/shop/goods/select.html @@ -2,7 +2,7 @@ {block name="content"}
- {include file='shop_goods/select_search'} + {include file='shop/goods/select_search'}
{notempty name='list'} diff --git a/app/data/view/shop_goods/select_search.html b/app/data/view/shop/goods/select_search.html similarity index 100% rename from app/data/view/shop_goods/select_search.html rename to app/data/view/shop/goods/select_search.html diff --git a/app/data/view/shop_goods/stock.html b/app/data/view/shop/goods/stock.html similarity index 100% rename from app/data/view/shop_goods/stock.html rename to app/data/view/shop/goods/stock.html diff --git a/app/data/view/shop_goods_mark/form.html b/app/data/view/shop/mark/form.html similarity index 100% rename from app/data/view/shop_goods_mark/form.html rename to app/data/view/shop/mark/form.html diff --git a/app/data/view/shop_goods_mark/index.html b/app/data/view/shop/mark/index.html similarity index 98% rename from app/data/view/shop_goods_mark/index.html rename to app/data/view/shop/mark/index.html index 7bf6e6a2d..ccd00da63 100644 --- a/app/data/view/shop_goods_mark/index.html +++ b/app/data/view/shop/mark/index.html @@ -2,7 +2,7 @@ {block name='content'}
- {include file='shop_goods_mark/index_search'} + {include file='shop/mark/index_search'}
{notempty name='list'} diff --git a/app/data/view/shop_goods_mark/index_search.html b/app/data/view/shop/mark/index_search.html similarity index 100% rename from app/data/view/shop_goods_mark/index_search.html rename to app/data/view/shop/mark/index_search.html diff --git a/app/data/view/shop_goods_mark/select.html b/app/data/view/shop/mark/select.html similarity index 100% rename from app/data/view/shop_goods_mark/select.html rename to app/data/view/shop/mark/select.html diff --git a/app/data/view/shop_order/audit.html b/app/data/view/shop/order/audit.html similarity index 100% rename from app/data/view/shop_order/audit.html rename to app/data/view/shop/order/audit.html diff --git a/app/data/view/shop_order/index.html b/app/data/view/shop/order/index.html similarity index 99% rename from app/data/view/shop_order/index.html rename to app/data/view/shop/order/index.html index 94c1d7998..c9bd39800 100644 --- a/app/data/view/shop_order/index.html +++ b/app/data/view/shop/order/index.html @@ -17,7 +17,7 @@ {/if}{/foreach}
- {include file='shop_order/index_search'} + {include file='shop/order/index_search'}
{notempty name='list'} diff --git a/app/data/view/shop_order/index_search.html b/app/data/view/shop/order/index_search.html similarity index 100% rename from app/data/view/shop_order/index_search.html rename to app/data/view/shop/order/index_search.html diff --git a/app/data/view/shop_order/truck.html b/app/data/view/shop/order/truck.html similarity index 100% rename from app/data/view/shop_order/truck.html rename to app/data/view/shop/order/truck.html diff --git a/app/data/view/shop_order/truck_query.html b/app/data/view/shop/order/truck_query.html similarity index 100% rename from app/data/view/shop_order/truck_query.html rename to app/data/view/shop/order/truck_query.html diff --git a/app/data/view/shop_order_send/config.html b/app/data/view/shop/send/config.html similarity index 100% rename from app/data/view/shop_order_send/config.html rename to app/data/view/shop/send/config.html diff --git a/app/data/view/shop_order_send/index.html b/app/data/view/shop/send/index.html similarity index 98% rename from app/data/view/shop_order_send/index.html rename to app/data/view/shop/send/index.html index 70e6853f2..2bed4e642 100644 --- a/app/data/view/shop_order_send/index.html +++ b/app/data/view/shop/send/index.html @@ -17,7 +17,7 @@ {/if}{/foreach}
- {include file='shop_order_send/index_search'} + {include file='shop/send/index_search'}
{notempty name='list'} diff --git a/app/data/view/shop_order_send/index_search.html b/app/data/view/shop/send/index_search.html similarity index 100% rename from app/data/view/shop_order_send/index_search.html rename to app/data/view/shop/send/index_search.html diff --git a/app/data/view/shop_order_service/index.html b/app/data/view/shop_order_service/index.html deleted file mode 100644 index 2cfb82846..000000000 --- a/app/data/view/shop_order_service/index.html +++ /dev/null @@ -1,130 +0,0 @@ -{extend name="../../admin/view/main"} - -{block name="content"} -
-
    - {foreach ['all'=>'全部订单','2'=>'待支付的订单','3'=>'待发货的订单','4'=>'待收货的订单','5'=>'已完成的订单','0'=>'已取消的订单'] as $k=>$v} - {if isset($type) and $type eq $k} -
  • {$v}{$total[$k]??0}
    • - {else} -
  • {$v}{$total[$k]??0}
    • - {/if}{/foreach} -
-
- {include file='shop_order_service/index_search'} -
- {notempty name='list'} - - - - - - - - - - {/notempty} - - {foreach $list as $key=>$vo} - - - - - - - - {/foreach} - -
- - 用户信息订单信息发货信息商品信息
- - -
- img -
- 推荐用户：{$vo.from.nickname|default='--'}
- 推荐手机：{$vo.from.phone|default='--'}{notempty name='vo.from.vip_level'} [ VIP{$vo.from.vip_level} ] {$vo.from.vip_title}{/notempty}
-
-
-
- img -
- 用户昵称：{$vo.member.nickname|default='--'}
- 用户手机：{$vo.member.phone|default='--'}{notempty name='vo.member.vip_level'} [ VIP{$vo.member.vip_level} ] {$vo.member.vip_title}{/notempty}
-
-
- 		-
- {eq name='vo.status' value='0'}已取消{/eq} - {eq name='vo.status' value='1'}预订单{/eq} - {eq name='vo.status' value='2'}待付款{/eq} - {eq name='vo.status' value='3'}待发货{/eq} - {eq name='vo.status' value='4'}已发货{/eq} - {eq name='vo.status' value='5'}已完成{/eq} -
-
- 订单单号：{$vo.order_no|default=''}
- 订单金额：{$vo.price_total+0} 元{if $vo.price_express>0}（含{$vo.price_express+0}元）{else}（包邮）{/if}已支付 {$vo.pay_price+0} 元
- 下单时间：{$vo.create_at|format_datetime}
- 支付时间：{$vo.pay_datetime|format_datetime}{if $vo.pay_datetime} ({$vo.pay_type|default='-'}){/if}
-
- 		- 收货信息：{$vo.express_name|default='--'}{$vo.express_phone}
- 收货地址：{$vo.express_province|default='--'}{$vo.express_city}{$vo.express_area}{$vo.express_address}
- 发货状态：{eq name='vo.express_state' value='0'} - 未发货 - {else} - {$vo.express_company_title|default='--'} - {$vo.express_send_no|default='--'} - {/eq} - {if $vo.status eq 3} - 填写发货 - - 提交仓库 - - - 取消并退款 - - {elseif $vo.status eq 4} - 修改发货 - {/if} -
- 发货时间：{$vo.express_send_at|format_datetime}
- 		- {foreach $vo.list as $g} -
- {if $g.vip_mod > 0 and $g.vip_level > $g.discount_vip} - [ VIP{$g.discount_vip} VIP{$g.vip_level} ] - {else} - [ VIP{$g.discount_vip} ] - {/if} - {if $g.discount_rate<100.00} - 享{$g.discount_rate+0}%折扣 - x - {/if} - {$g.number_goods|default=0}件 - x - {$g.goods_price_market+0}元 - {$g.goods_title|default=''} ( {$g.goods_spec|show_goods_spec}) -
- {/foreach} -
- - {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} - -
- - -{/block} diff --git a/app/data/view/shop_order_service/index_search.html b/app/data/view/shop_order_service/index_search.html deleted file mode 100644 index 11eb3041d..000000000 --- a/app/data/view/shop_order_service/index_search.html +++ /dev/null @@ -1,136 +0,0 @@ -
- 条件搜索 -
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
-
-
\ No newline at end of file diff --git a/app/data/view/user/index.html b/app/data/view/user/admin/index.html similarity index 99% rename from app/data/view/user/index.html rename to app/data/view/user/admin/index.html index 86b8372c1..86f093daf 100644 --- a/app/data/view/user/index.html +++ b/app/data/view/user/admin/index.html @@ -8,7 +8,7 @@ {block name="content"}
- {include file='user/index_search'} + {include file='user/admin/index_search'} {notempty name='list'} diff --git a/app/data/view/user/index_search.html b/app/data/view/user/admin/index_search.html similarity index 100% rename from app/data/view/user/index_search.html rename to app/data/view/user/admin/index_search.html diff --git a/app/data/view/user/parent.html b/app/data/view/user/admin/parent.html similarity index 100% rename from app/data/view/user/parent.html rename to app/data/view/user/admin/parent.html diff --git a/app/data/view/user_balance/form.html b/app/data/view/user/balance/form.html similarity index 100% rename from app/data/view/user_balance/form.html rename to app/data/view/user/balance/form.html diff --git a/app/data/view/user_balance/index.html b/app/data/view/user/balance/index.html similarity index 98% rename from app/data/view/user_balance/index.html rename to app/data/view/user/balance/index.html index 6850990e4..e0e57b211 100644 --- a/app/data/view/user_balance/index.html +++ b/app/data/view/user/balance/index.html @@ -11,7 +11,7 @@ 余额统计：累计已充值余额 {$balance.0|default=0.00} 元，已使用 {$balance.1|default=0.00} 元，剩余可使用 {$balance.0-$balance.1} 元。
- {include file='user_balance/index_search'} + {include file='user/balance/index_search'}
{notempty name='list'} diff --git a/app/data/view/user_balance/index_search.html b/app/data/view/user/balance/index_search.html similarity index 100% rename from app/data/view/user_balance/index_search.html rename to app/data/view/user/balance/index_search.html diff --git a/app/data/view/user_message/config.html b/app/data/view/user/message/config.html similarity index 100% rename from app/data/view/user_message/config.html rename to app/data/view/user/message/config.html diff --git a/app/data/view/user_message/index.html b/app/data/view/user/message/index.html similarity index 97% rename from app/data/view/user_message/index.html rename to app/data/view/user/message/index.html index 356c03a86..3d6954316 100644 --- a/app/data/view/user_message/index.html +++ b/app/data/view/user/message/index.html @@ -8,7 +8,7 @@ {block name="content"}
- {include file='user_message/index_search'} + {include file='user/message/index_search'}
{notempty name='list'} diff --git a/app/data/view/user_message/index_search.html b/app/data/view/user/message/index_search.html similarity index 100% rename from app/data/view/user_message/index_search.html rename to app/data/view/user/message/index_search.html diff --git a/app/data/view/user_rebate/config.html b/app/data/view/user/rebate/config.html similarity index 100% rename from app/data/view/user_rebate/config.html rename to app/data/view/user/rebate/config.html diff --git a/app/data/view/user_rebate/index.html b/app/data/view/user/rebate/index.html similarity index 99% rename from app/data/view/user_rebate/index.html rename to app/data/view/user/rebate/index.html index 85c5b406d..afb51cad5 100644 --- a/app/data/view/user_rebate/index.html +++ b/app/data/view/user/rebate/index.html @@ -11,7 +11,7 @@ 返利统计：累计已产生返利 {$rebate.0+$rebate.2} 元 ( 含未到账 {$rebate.2|default='0.00'} 元 )，累计已提现 {$total.1|default=0.00} 元。
- {include file='user_rebate/index_search'} + {include file='user/rebate/index_search'}
{notempty name='list'} diff --git a/app/data/view/user_rebate/index_search.html b/app/data/view/user/rebate/index_search.html similarity index 100% rename from app/data/view/user_rebate/index_search.html rename to app/data/view/user/rebate/index_search.html diff --git a/app/data/view/user_transfer/audit.html b/app/data/view/user/transfer/audit.html similarity index 100% rename from app/data/view/user_transfer/audit.html rename to app/data/view/user/transfer/audit.html diff --git a/app/data/view/user_transfer/config.html b/app/data/view/user/transfer/config.html similarity index 100% rename from app/data/view/user_transfer/config.html rename to app/data/view/user/transfer/config.html diff --git a/app/data/view/user_transfer/index.html b/app/data/view/user/transfer/index.html similarity index 99% rename from app/data/view/user_transfer/index.html rename to app/data/view/user/transfer/index.html index fee180be4..732c20af9 100644 --- a/app/data/view/user_transfer/index.html +++ b/app/data/view/user/transfer/index.html @@ -20,7 +20,7 @@ 提现统计：已产生提现累计 {$transfer.0|default=0.00} 元（ 含待转账 {$transfer.3|default='0.00'} 元，含待审核 {$transfer.2|default='0.00'} 元 ），累计已提现 {$transfer.1|default=0.00} 元。
- {include file='user_transfer/index_search'} + {include file='user/transfer/index_search'}
{notempty name='list'} diff --git a/app/data/view/user_transfer/index_search.html b/app/data/view/user/transfer/index_search.html similarity index 100% rename from app/data/view/user_transfer/index_search.html rename to app/data/view/user/transfer/index_search.html diff --git a/app/data/view/user_transfer/payment.html b/app/data/view/user/transfer/payment.html similarity index 100% rename from app/data/view/user_transfer/payment.html rename to app/data/view/user/transfer/payment.html diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index efde6acb6..e47f70b1e 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -203,26 +203,6 @@ return array( 'app\\data\\command\\UserAmount' => $baseDir . '/app/data/command/UserAmount.php', 'app\\data\\command\\UserTransfer' => $baseDir . '/app/data/command/UserTransfer.php', 'app\\data\\command\\UserUpgrade' => $baseDir . '/app/data/command/UserUpgrade.php', - 'app\\data\\controller\\BaseConfig' => $baseDir . '/app/data/controller/BaseConfig.php', - 'app\\data\\controller\\BaseDiscount' => $baseDir . '/app/data/controller/BaseDiscount.php', - 'app\\data\\controller\\BaseMessage' => $baseDir . '/app/data/controller/BaseMessage.php', - 'app\\data\\controller\\BasePayment' => $baseDir . '/app/data/controller/BasePayment.php', - 'app\\data\\controller\\BasePostageCompany' => $baseDir . '/app/data/controller/BasePostageCompany.php', - 'app\\data\\controller\\BasePostageTemplate' => $baseDir . '/app/data/controller/BasePostageTemplate.php', - 'app\\data\\controller\\BaseUpgrade' => $baseDir . '/app/data/controller/BaseUpgrade.php', - 'app\\data\\controller\\NewsItem' => $baseDir . '/app/data/controller/NewsItem.php', - 'app\\data\\controller\\NewsMark' => $baseDir . '/app/data/controller/NewsMark.php', - 'app\\data\\controller\\ShopGoods' => $baseDir . '/app/data/controller/ShopGoods.php', - 'app\\data\\controller\\ShopGoodsCate' => $baseDir . '/app/data/controller/ShopGoodsCate.php', - 'app\\data\\controller\\ShopGoodsMark' => $baseDir . '/app/data/controller/ShopGoodsMark.php', - 'app\\data\\controller\\ShopOrder' => $baseDir . '/app/data/controller/ShopOrder.php', - 'app\\data\\controller\\ShopOrderSend' => $baseDir . '/app/data/controller/ShopOrderSend.php', - 'app\\data\\controller\\ShopOrderService' => $baseDir . '/app/data/controller/ShopOrderService.php', - 'app\\data\\controller\\User' => $baseDir . '/app/data/controller/User.php', - 'app\\data\\controller\\UserBalance' => $baseDir . '/app/data/controller/UserBalance.php', - 'app\\data\\controller\\UserMessage' => $baseDir . '/app/data/controller/UserMessage.php', - 'app\\data\\controller\\UserRebate' => $baseDir . '/app/data/controller/UserRebate.php', - 'app\\data\\controller\\UserTransfer' => $baseDir . '/app/data/controller/UserTransfer.php', 'app\\data\\controller\\api\\Auth' => $baseDir . '/app/data/controller/api/Auth.php', 'app\\data\\controller\\api\\Data' => $baseDir . '/app/data/controller/api/Data.php', 'app\\data\\controller\\api\\Goods' => $baseDir . '/app/data/controller/api/Goods.php', @@ -238,6 +218,25 @@ return array( 'app\\data\\controller\\api\\auth\\Order' => $baseDir . '/app/data/controller/api/auth/Order.php', 'app\\data\\controller\\api\\auth\\Rebate' => $baseDir . '/app/data/controller/api/auth/Rebate.php', 'app\\data\\controller\\api\\auth\\Transfer' => $baseDir . '/app/data/controller/api/auth/Transfer.php', + 'app\\data\\controller\\base\\Config' => $baseDir . '/app/data/controller/base/Config.php', + 'app\\data\\controller\\base\\Discount' => $baseDir . '/app/data/controller/base/Discount.php', + 'app\\data\\controller\\base\\Message' => $baseDir . '/app/data/controller/base/Message.php', + 'app\\data\\controller\\base\\Payment' => $baseDir . '/app/data/controller/base/Payment.php', + 'app\\data\\controller\\base\\Upgrade' => $baseDir . '/app/data/controller/base/Upgrade.php', + 'app\\data\\controller\\base\\postage\\Company' => $baseDir . '/app/data/controller/base/postage/Company.php', + 'app\\data\\controller\\base\\postage\\Template' => $baseDir . '/app/data/controller/base/postage/Template.php', + 'app\\data\\controller\\news\\Item' => $baseDir . '/app/data/controller/news/Item.php', + 'app\\data\\controller\\news\\Mark' => $baseDir . '/app/data/controller/news/Mark.php', + 'app\\data\\controller\\shop\\Cate' => $baseDir . '/app/data/controller/shop/Cate.php', + 'app\\data\\controller\\shop\\Goods' => $baseDir . '/app/data/controller/shop/Goods.php', + 'app\\data\\controller\\shop\\Mark' => $baseDir . '/app/data/controller/shop/Mark.php', + 'app\\data\\controller\\shop\\Order' => $baseDir . '/app/data/controller/shop/Order.php', + 'app\\data\\controller\\shop\\Send' => $baseDir . '/app/data/controller/shop/Send.php', + 'app\\data\\controller\\user\\Admin' => $baseDir . '/app/data/controller/user/Admin.php', + 'app\\data\\controller\\user\\Balance' => $baseDir . '/app/data/controller/user/Balance.php', + 'app\\data\\controller\\user\\Message' => $baseDir . '/app/data/controller/user/Message.php', + 'app\\data\\controller\\user\\Rebate' => $baseDir . '/app/data/controller/user/Rebate.php', + 'app\\data\\controller\\user\\Transfer' => $baseDir . '/app/data/controller/user/Transfer.php', 'app\\data\\service\\ExpressService' => $baseDir . '/app/data/service/ExpressService.php', 'app\\data\\service\\GoodsService' => $baseDir . '/app/data/service/GoodsService.php', 'app\\data\\service\\MessageService' => $baseDir . '/app/data/service/MessageService.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 5df80f0b5..138a25abf 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -332,26 +332,6 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53 'app\\data\\command\\UserAmount' => __DIR__ . '/../..' . '/app/data/command/UserAmount.php', 'app\\data\\command\\UserTransfer' => __DIR__ . '/../..' . '/app/data/command/UserTransfer.php', 'app\\data\\command\\UserUpgrade' => __DIR__ . '/../..' . '/app/data/command/UserUpgrade.php', - 'app\\data\\controller\\BaseConfig' => __DIR__ . '/../..' . '/app/data/controller/BaseConfig.php', - 'app\\data\\controller\\BaseDiscount' => __DIR__ . '/../..' . '/app/data/controller/BaseDiscount.php', - 'app\\data\\controller\\BaseMessage' => __DIR__ . '/../..' . '/app/data/controller/BaseMessage.php', - 'app\\data\\controller\\BasePayment' => __DIR__ . '/../..' . '/app/data/controller/BasePayment.php', - 'app\\data\\controller\\BasePostageCompany' => __DIR__ . '/../..' . '/app/data/controller/BasePostageCompany.php', - 'app\\data\\controller\\BasePostageTemplate' => __DIR__ . '/../..' . '/app/data/controller/BasePostageTemplate.php', - 'app\\data\\controller\\BaseUpgrade' => __DIR__ . '/../..' . '/app/data/controller/BaseUpgrade.php', - 'app\\data\\controller\\NewsItem' => __DIR__ . '/../..' . '/app/data/controller/NewsItem.php', - 'app\\data\\controller\\NewsMark' => __DIR__ . '/../..' . '/app/data/controller/NewsMark.php', - 'app\\data\\controller\\ShopGoods' => __DIR__ . '/../..' . '/app/data/controller/ShopGoods.php', - 'app\\data\\controller\\ShopGoodsCate' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsCate.php', - 'app\\data\\controller\\ShopGoodsMark' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsMark.php', - 'app\\data\\controller\\ShopOrder' => __DIR__ . '/../..' . '/app/data/controller/ShopOrder.php', - 'app\\data\\controller\\ShopOrderSend' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderSend.php', - 'app\\data\\controller\\ShopOrderService' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderService.php', - 'app\\data\\controller\\User' => __DIR__ . '/../..' . '/app/data/controller/User.php', - 'app\\data\\controller\\UserBalance' => __DIR__ . '/../..' . '/app/data/controller/UserBalance.php', - 'app\\data\\controller\\UserMessage' => __DIR__ . '/../..' . '/app/data/controller/UserMessage.php', - 'app\\data\\controller\\UserRebate' => __DIR__ . '/../..' . '/app/data/controller/UserRebate.php', - 'app\\data\\controller\\UserTransfer' => __DIR__ . '/../..' . '/app/data/controller/UserTransfer.php', 'app\\data\\controller\\api\\Auth' => __DIR__ . '/../..' . '/app/data/controller/api/Auth.php', 'app\\data\\controller\\api\\Data' => __DIR__ . '/../..' . '/app/data/controller/api/Data.php', 'app\\data\\controller\\api\\Goods' => __DIR__ . '/../..' . '/app/data/controller/api/Goods.php', @@ -367,6 +347,25 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53 'app\\data\\controller\\api\\auth\\Order' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Order.php', 'app\\data\\controller\\api\\auth\\Rebate' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Rebate.php', 'app\\data\\controller\\api\\auth\\Transfer' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Transfer.php', + 'app\\data\\controller\\base\\Config' => __DIR__ . '/../..' . '/app/data/controller/base/Config.php', + 'app\\data\\controller\\base\\Discount' => __DIR__ . '/../..' . '/app/data/controller/base/Discount.php', + 'app\\data\\controller\\base\\Message' => __DIR__ . '/../..' . '/app/data/controller/base/Message.php', + 'app\\data\\controller\\base\\Payment' => __DIR__ . '/../..' . '/app/data/controller/base/Payment.php', + 'app\\data\\controller\\base\\Upgrade' => __DIR__ . '/../..' . '/app/data/controller/base/Upgrade.php', + 'app\\data\\controller\\base\\postage\\Company' => __DIR__ . '/../..' . '/app/data/controller/base/postage/Company.php', + 'app\\data\\controller\\base\\postage\\Template' => __DIR__ . '/../..' . '/app/data/controller/base/postage/Template.php', + 'app\\data\\controller\\news\\Item' => __DIR__ . '/../..' . '/app/data/controller/news/Item.php', + 'app\\data\\controller\\news\\Mark' => __DIR__ . '/../..' . '/app/data/controller/news/Mark.php', + 'app\\data\\controller\\shop\\Cate' => __DIR__ . '/../..' . '/app/data/controller/shop/Cate.php', + 'app\\data\\controller\\shop\\Goods' => __DIR__ . '/../..' . '/app/data/controller/shop/Goods.php', + 'app\\data\\controller\\shop\\Mark' => __DIR__ . '/../..' . '/app/data/controller/shop/Mark.php', + 'app\\data\\controller\\shop\\Order' => __DIR__ . '/../..' . '/app/data/controller/shop/Order.php', + 'app\\data\\controller\\shop\\Send' => __DIR__ . '/../..' . '/app/data/controller/shop/Send.php', + 'app\\data\\controller\\user\\Admin' => __DIR__ . '/../..' . '/app/data/controller/user/Admin.php', + 'app\\data\\controller\\user\\Balance' => __DIR__ . '/../..' . '/app/data/controller/user/Balance.php', + 'app\\data\\controller\\user\\Message' => __DIR__ . '/../..' . '/app/data/controller/user/Message.php', + 'app\\data\\controller\\user\\Rebate' => __DIR__ . '/../..' . '/app/data/controller/user/Rebate.php', + 'app\\data\\controller\\user\\Transfer' => __DIR__ . '/../..' . '/app/data/controller/user/Transfer.php', 'app\\data\\service\\ExpressService' => __DIR__ . '/../..' . '/app/data/service/ExpressService.php', 'app\\data\\service\\GoodsService' => __DIR__ . '/../..' . '/app/data/service/GoodsService.php', 'app\\data\\service\\MessageService' => __DIR__ . '/../..' . '/app/data/service/MessageService.php', diff --git a/vendor/services.php b/vendor/services.php index 645bf90e1..522e47427 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library',