From 07e2bd3f442dff46c2bcc59704fffe06ad0fcffb Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 18 Sep 2020 18:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E7=AB=A0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/controller/NewsItem.php | 2 +- app/data/controller/NewsMark.php | 2 +- app/data/controller/api/News.php | 4 ++-- app/data/data.sql | 25 +++++++++++++++-------- app/data/view/news_item/form.html | 10 ++++----- app/data/view/news_item/index.html | 2 +- app/data/view/news_item/index_search.html | 2 +- app/data/view/news_mark/form.html | 2 +- app/data/view/news_mark/index.html | 2 +- app/data/view/news_mark/index_search.html | 2 +- 10 files changed, 30 insertions(+), 23 deletions(-) diff --git a/app/data/controller/NewsItem.php b/app/data/controller/NewsItem.php index c70d1ebc6..0ed9061cf 100644 --- a/app/data/controller/NewsItem.php +++ b/app/data/controller/NewsItem.php @@ -29,7 +29,7 @@ class NewsItem extends Controller { $this->title = '文章内容管理'; $query = $this->_query($this->table); - $query->like('mark,title')->dateBetween('create_at'); + $query->like('mark,name')->dateBetween('create_at'); $query->where(['deleted' => 0])->order('sort desc,id desc')->page(); } diff --git a/app/data/controller/NewsMark.php b/app/data/controller/NewsMark.php index 39ae9902b..617696890 100644 --- a/app/data/controller/NewsMark.php +++ b/app/data/controller/NewsMark.php @@ -29,7 +29,7 @@ class NewsMark extends Controller { $this->title = '文章标签管理'; $query = $this->_query($this->table); - $query->like('title')->equal('status')->dateBetween('create_at'); + $query->like('name')->equal('status')->dateBetween('create_at'); $query->where(['deleted' => 0])->order('sort desc,id desc')->page(); } diff --git a/app/data/controller/api/News.php b/app/data/controller/api/News.php index d57f2f2de..324676fcd 100644 --- a/app/data/controller/api/News.php +++ b/app/data/controller/api/News.php @@ -20,7 +20,7 @@ class News extends Controller */ public function getMark() { - $query = $this->_query('DataNewsMark')->like('title'); + $query = $this->_query('DataNewsMark')->like('name'); $query->where(['deleted' => 0, 'status' => 1])->withoutField('sort,status,deleted'); $this->success('获取文章标签列表', $query->order('sort desc,id desc')->page(false, false)); } @@ -43,7 +43,7 @@ class News extends Controller $this->app->db->name('DataNewsXHistory')->insert($history); } } - $query = $this->_query('DataNewsItem')->like('title,mark')->equal('id'); + $query = $this->_query('DataNewsItem')->like('name,mark')->equal('id'); $query->where(['deleted' => 0, 'status' => 1])->withoutField('sort,status,deleted'); $result = $query->order('sort desc,id desc')->page(true, false, false, 15); NewsService::instance()->buildListState($result['list'], input('mid')); diff --git a/app/data/data.sql b/app/data/data.sql index b9d80e817..312ac41ae 100644 --- a/app/data/data.sql +++ b/app/data/data.sql @@ -11,7 +11,7 @@ Target Server Version : 50562 File Encoding : 65001 - Date: 18/09/2020 15:24:40 + Date: 18/09/2020 18:59:03 */ SET NAMES utf8mb4; @@ -146,7 +146,7 @@ CREATE TABLE `data_member_coin_used` ( DROP TABLE IF EXISTS `data_news_item`; CREATE TABLE `data_news_item` ( `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, - `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章标题', + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章标题', `mark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章标签', `cover` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '文章封面', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注说明', @@ -167,7 +167,7 @@ CREATE TABLE `data_news_item` ( -- ---------------------------- -- Records of data_news_item -- ---------------------------- -INSERT INTO `data_news_item` VALUES (1, '32612', ',,', '231623', '36126', '

12612

', 0, 0, 0, 0, 0, 1, 0, '2020-09-14 10:11:27'); +INSERT INTO `data_news_item` VALUES (1, '32612', ',测试标签,', '231623', '36126', '

12612

', 0, 0, 0, 0, 0, 1, 0, '2020-09-14 10:11:27'); -- ---------------------------- -- Table structure for data_news_mark @@ -175,7 +175,7 @@ INSERT INTO `data_news_item` VALUES (1, '32612', ',,', '231623', '36126', '

12 DROP TABLE IF EXISTS `data_news_mark`; CREATE TABLE `data_news_mark` ( `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, - `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '标签名称', + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '标签名称', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '标签说明', `sort` bigint(20) UNSIGNED NULL DEFAULT 0 COMMENT '排序权重', `status` tinyint(1) UNSIGNED NULL DEFAULT 1 COMMENT '权限状态(1使用,0禁用)', @@ -184,11 +184,12 @@ CREATE TABLE `data_news_mark` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_mark_status`(`status`) USING BTREE, INDEX `idx_data_news_mark_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-标签' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据-文章-标签' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of data_news_mark -- ---------------------------- +INSERT INTO `data_news_mark` VALUES (1, '测试标签', '', 0, 1, 0, '2020-09-18 10:30:51'); -- ---------------------------- -- Table structure for data_news_x_collect @@ -281,7 +282,7 @@ CREATE TABLE `shop_goods` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_data_news_item_status`(`status`) USING BTREE, INDEX `idx_data_news_item_deleted`(`deleted`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-内容' ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '商城-商品-内容' ROW_FORMAT = Compact; -- ---------------------------- -- Records of shop_goods @@ -291,7 +292,10 @@ INSERT INTO `shop_goods` VALUES (2, 1, 'G69962122974', '34563242', '', 'http://1 INSERT INTO `shop_goods` VALUES (3, 6, 'G69962280234', '36152365213', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg|http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '

2365123

', '[{\"name\":\"默认分组\",\"list\":[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\"}]}]', '[[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\",\"key\":\"默认分组::默认规格\",\"sku\":\"S159962280311732\",\"status\":true,\"market\":\"111.00\",\"selling\":\"44.00\",\"express\":1,\"virtual\":44}]]', '', 234, 41, 44, 0.00, 111.00, 17, 0, 0, 0, 0, 0, '2020-09-09 03:23:18'); INSERT INTO `shop_goods` VALUES (4, 7, 'G69971817078', '商品名称', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '', '[{\"name\":\"默认分组1\",\"list\":[{\"name\":\"默认规格2\",\"check\":true,\"show\":true,\"group\":\"默认分组1\"}]},{\"name\":\"规格分组111\",\"list\":[{\"name\":\"规格属性22231\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性11235\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性221\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"}]},{\"name\":\"规格分组21325\",\"list\":[{\"name\":\"规格属性32151\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"},{\"name\":\"规格属性1235123\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"}]}]', '[[{\"name\":\"默认规格2\",\"check\":true,\"show\":true,\"group\":\"默认分组1\",\"key\":\"默认分组1::默认规格2;;规格分组111::规格属性22231;;规格分组21325::规格属性32151\",\"sku\":\"S159971819422415\",\"status\":true,\"market\":\"111.00\",\"selling\":\"315123.00\",\"express\":15123,\"virtual\":235123},{\"name\":\"规格属性22231\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性32151\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"}],[{\"name\":\"默认规格2\",\"check\":true,\"show\":true,\"group\":\"默认分组1\",\"key\":\"默认分组1::默认规格2;;规格分组111::规格属性22231;;规格分组21325::规格属性1235123\",\"sku\":\"S159971819649657\",\"status\":true,\"market\":\"222.00\",\"selling\":\"5123.00\",\"express\":5123,\"virtual\":32151},{\"name\":\"规格属性22231\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性1235123\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"}],[{\"name\":\"默认规格2\",\"check\":true,\"show\":true,\"group\":\"默认分组1\",\"key\":\"默认分组1::默认规格2;;规格分组111::规格属性11235;;规格分组21325::规格属性32151\",\"sku\":\"S159971819422444\",\"status\":false,\"market\":\"333.00\",\"selling\":\"123.00\",\"express\":1531,\"virtual\":2342},{\"name\":\"规格属性11235\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性32151\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"}],[{\"name\":\"默认规格2\",\"check\":true,\"show\":true,\"group\":\"默认分组1\",\"key\":\"默认分组1::默认规格2;;规格分组111::规格属性11235;;规格分组21325::规格属性1235123\",\"sku\":\"S159971819649628\",\"status\":true,\"market\":\"444.00\",\"selling\":\"231.00\",\"express\":113,\"virtual\":13651},{\"name\":\"规格属性11235\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性1235123\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"}],[{\"name\":\"默认规格2\",\"check\":true,\"show\":true,\"group\":\"默认分组1\",\"key\":\"默认分组1::默认规格2;;规格分组111::规格属性221;;规格分组21325::规格属性32151\",\"sku\":\"S159971819422496\",\"status\":false,\"market\":\"111.00\",\"selling\":\"123.00\",\"express\":132561,\"virtual\":24},{\"name\":\"规格属性221\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性32151\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"}],[{\"name\":\"默认规格2\",\"check\":true,\"show\":true,\"group\":\"默认分组1\",\"key\":\"默认分组1::默认规格2;;规格分组111::规格属性221;;规格分组21325::规格属性1235123\",\"sku\":\"S159971819649676\",\"status\":true,\"market\":\"1231.00\",\"selling\":\"112.00\",\"express\":1113,\"virtual\":16512},{\"name\":\"规格属性221\",\"check\":true,\"show\":true,\"group\":\"规格分组111\"},{\"name\":\"规格属性1235123\",\"check\":true,\"show\":true,\"group\":\"规格分组21325\"}]]', '', 15, 0, 299803, 0.00, 111.00, 0, 0, 0, 0, 0, 0, '2020-09-10 05:53:17'); INSERT INTO `shop_goods` VALUES (5, 0, 'G70015845347', '36152365213', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg|http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '

2365123

', '[{\"name\":\"默认分组\",\"list\":[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\"}]}]', '[[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\",\"key\":\"默认分组::默认规格\",\"sku\":\"S159962280311732\",\"status\":true,\"market\":\"111.00\",\"selling\":\"44.00\",\"express\":1,\"virtual\":44}]]', '', 0, 0, 44, 0.00, 111.00, 0, 0, 0, 0, 0, 0, '2020-09-15 08:10:22'); -INSERT INTO `shop_goods` VALUES (6, 6, 'G70015891349', '复制商品的名称', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg|http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '

2365123

', '[{\"name\":\"默认分组\",\"list\":[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\"}]}]', '[[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\",\"key\":\"默认分组::默认规格\",\"sku\":\"S159962280311732\",\"status\":true,\"market\":\"111.00\",\"selling\":\"44.00\",\"express\":2,\"virtual\":44}]]', 'T2020091731249', 10, 0, 44, 0.00, 111.00, 0, 0, 0, 0, 1, 0, '2020-09-15 08:18:02'); +INSERT INTO `shop_goods` VALUES (6, 6, 'G70015891349', '复制商品的名称', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg|http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '

2365123

', '[{\"name\":\"默认分组\",\"list\":[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\"}]}]', '[[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\",\"key\":\"默认分组::默认规格\",\"sku\":\"S159962280311732\",\"status\":true,\"market\":\"111.00\",\"selling\":\"44.00\",\"express\":2,\"virtual\":44}]]', 'T2020091731249', 10, 1, 44, 0.00, 111.00, 0, 0, 0, 0, 1, 0, '2020-09-15 08:18:02'); +INSERT INTO `shop_goods` VALUES (7, 6, 'G70042017345', '复制商品的名称', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg|http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '

2365123

', '[{\"name\":\"默认分组\",\"list\":[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\"}]}]', '[[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\",\"key\":\"默认分组::默认规格\",\"sku\":\"S159962280311732\",\"status\":true,\"market\":\"111.00\",\"selling\":\"44.00\",\"express\":2,\"virtual\":44}]]', 'T2020091731249', 0, 0, 44, 0.00, 111.00, 0, 0, 0, 0, 1, 0, '2020-09-18 08:52:16'); +INSERT INTO `shop_goods` VALUES (8, 6, 'G70042017792', '复制商品的名称', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg|http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '

2365123

', '[{\"name\":\"默认分组\",\"list\":[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\"}]}]', '[[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\",\"key\":\"默认分组::默认规格\",\"sku\":\"S159962280311732\",\"status\":true,\"market\":\"111.00\",\"selling\":\"44.00\",\"express\":2,\"virtual\":44}]]', 'T2020091731249', 0, 0, 44, 0.00, 111.00, 0, 0, 0, 0, 1, 0, '2020-09-18 08:52:20'); +INSERT INTO `shop_goods` VALUES (9, 6, 'G70042018118', '复制商品的名称', ',商品标签1,商品标签2,', 'http://127.0.0.1:8000/upload/25/e9c92266d3b7ab86d3221b0c9305fe.jpg', 'http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg|http://127.0.0.1:8000/upload/b4/e34bf60203f28f15a63b2af1c32dcb.jpg', '', '

2365123

', '[{\"name\":\"默认分组\",\"list\":[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\"}]}]', '[[{\"name\":\"默认规格\",\"check\":true,\"span\":1,\"show\":true,\"group\":\"默认分组\",\"key\":\"默认分组::默认规格\",\"sku\":\"S159962280311732\",\"status\":true,\"market\":\"111.00\",\"selling\":\"44.00\",\"express\":2,\"virtual\":44}]]', 'T2020091731249', 0, 0, 0, 0.00, 111.00, 0, 0, 0, 0, 1, 0, '2020-09-18 08:52:25'); -- ---------------------------- -- Table structure for shop_goods_cate @@ -345,7 +349,7 @@ CREATE TABLE `shop_goods_item` ( INDEX `index_store_goods_list_id`(`goods_code`) USING BTREE, INDEX `index_store_goods_list_spec`(`goods_spec`) USING BTREE, INDEX `index_store_goods_list_status`(`status`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-商品-规格' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '商城-商品-规格' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of shop_goods_item @@ -361,7 +365,10 @@ INSERT INTO `shop_goods_item` VALUES (8, 'S159971819649628', 'G69971817078', ' INSERT INTO `shop_goods_item` VALUES (9, 'S159971819422496', 'G69971817078', '默认分组1::默认规格2;;规格分组111::规格属性221;;规格分组21325::规格属性32151', 0, 0, 123.00, 111.00, 24, 132561, 0, '2020-09-10 05:53:17'); INSERT INTO `shop_goods_item` VALUES (10, 'S159971819649676', 'G69971817078', '默认分组1::默认规格2;;规格分组111::规格属性221;;规格分组21325::规格属性1235123', 0, 5, 112.00, 1231.00, 16512, 1113, 1, '2020-09-10 05:53:17'); INSERT INTO `shop_goods_item` VALUES (11, 'S159962280311732', 'G70015845347', '默认分组::默认规格', 0, 0, 44.00, 111.00, 44, 1, 1, '2020-09-15 08:10:22'); -INSERT INTO `shop_goods_item` VALUES (12, 'S159962280311732', 'G70015891349', '默认分组::默认规格', 0, 10, 44.00, 111.00, 44, 2, 1, '2020-09-15 08:18:02'); +INSERT INTO `shop_goods_item` VALUES (12, 'S159962280311732', 'G70015891349', '默认分组::默认规格', 1, 10, 44.00, 111.00, 44, 2, 1, '2020-09-15 08:18:02'); +INSERT INTO `shop_goods_item` VALUES (13, 'S159962280311732', 'G70042017345', '默认分组::默认规格', 0, 0, 44.00, 111.00, 44, 2, 1, '2020-09-18 08:52:16'); +INSERT INTO `shop_goods_item` VALUES (14, 'S159962280311732', 'G70042017792', '默认分组::默认规格', 0, 0, 44.00, 111.00, 44, 2, 1, '2020-09-18 08:52:20'); +INSERT INTO `shop_goods_item` VALUES (15, 'S159962280311732', 'G70042018118', '默认分组::默认规格', 0, 0, 44.00, 111.00, 44, 2, 1, '2020-09-18 08:52:25'); -- ---------------------------- -- Table structure for shop_goods_mark diff --git a/app/data/view/news_item/form.html b/app/data/view/news_item/form.html index 68bd25f43..bf7c29b53 100644 --- a/app/data/view/news_item/form.html +++ b/app/data/view/news_item/form.html @@ -7,10 +7,10 @@ 文章标签 Mark Name
- {foreach $mark as $tag}{if isset($vo.mark) && is_array($vo.mark) && in_array($tag.title, $vo.mark)} - + {foreach $mark as $tag}{if isset($vo.mark) && is_array($vo.mark) && in_array($tag.name, $vo.mark)} + {else} - + {/if}{/foreach}
@@ -25,8 +25,8 @@