diff --git a/application/admin/form/Goods.php b/application/admin/form/Goods.php
index 7a9967c5a..cfb892408 100644
--- a/application/admin/form/Goods.php
+++ b/application/admin/form/Goods.php
@@ -166,22 +166,6 @@ class Goods
'is_multiple' => 1,
],
],
- [
- 'label' => '首页推荐',
- 'view_type' => 'status',
- 'view_key' => 'is_home_recommended',
- 'post_url' => MyUrl('admin/goods/statusupdate'),
- 'align' => 'center',
- 'is_sort' => 1,
- 'search_config' => [
- 'form_type' => 'select',
- 'where_type' => 'in',
- 'data' => lang('common_is_text_list'),
- 'data_key' => 'id',
- 'data_name' => 'name',
- 'is_multiple' => 1,
- ],
- ],
[
'label' => '扣减库存',
'view_type' => 'status',
diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index 745bc87ce..c71c86267 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -174,10 +174,6 @@
-
-
-
-
diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php
index 48ece68d3..5acfbb19c 100755
--- a/application/index/controller/Goods.php
+++ b/application/index/controller/Goods.php
@@ -126,9 +126,8 @@ class Goods extends Common
// 详情tab商品 猜你喜欢
$params = [
'where' => [
- 'is_delete_time'=>0,
- 'is_shelves'=>1,
- 'is_home_recommended'=>1,
+ 'is_delete_time' => 0,
+ 'is_shelves' => 1,
],
'order_by' => 'sales_count desc',
'field' => 'id,title,title_color,price,images',
diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php
index 51fe0f062..3549f8652 100755
--- a/application/index/controller/Index.php
+++ b/application/index/controller/Index.php
@@ -58,7 +58,7 @@ class Index extends Common
// 楼层数据
$this->assign('goods_floor_list', GoodsService::HomeFloorList());
- // 新闻
+ // 文章
$params = [
'where' => ['is_enable'=>1, 'is_home_recommended'=>1],
'field' => 'id,title,title_color,article_category_id',
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index 75236b88f..c8218a1fe 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -264,9 +264,8 @@ class GoodsService
// 获取商品ids
$where = [
- 'gci.category_id' => $category_ids,
- 'g.is_home_recommended' => 1,
- 'g.is_shelves' => 1,
+ 'gci.category_id' => $category_ids,
+ 'g.is_shelves' => 1,
];
$v['goods_ids'] = Db::name('Goods')->alias('g')->join(['__GOODS_CATEGORY_JOIN__'=>'gci'], 'g.id=gci.goods_id')->where($where)->group('g.id')->order($order_by)->limit($goods_count)->column('g.id');
}
@@ -1090,7 +1089,6 @@ class GoodsService
'is_shelves' => isset($params['is_shelves']) ? intval($params['is_shelves']) : 0,
'content_web' => $content_web,
'photo_count' => count($photo['data']),
- 'is_home_recommended' => isset($params['is_home_recommended']) ? intval($params['is_home_recommended']) : 0,
'images' => $images,
'brand_id' => isset($params['brand_id']) ? intval($params['brand_id']) : 0,
'video' => $attachment['data']['video'],
diff --git a/config/shopxo.sql b/config/shopxo.sql
index ea1a4ae66..b963e77ba 100644
--- a/config/shopxo.sql
+++ b/config/shopxo.sql
@@ -11,7 +11,7 @@
Target Server Version : 50728
File Encoding : 65001
- Date: 11/01/2021 13:17:06
+ Date: 12/01/2021 21:50:36
*/
SET NAMES utf8mb4;
@@ -41,7 +41,7 @@ CREATE TABLE `s_admin` (
-- Records of s_admin
-- ----------------------------
BEGIN;
-INSERT INTO `s_admin` VALUES (1, 'admin', '1a41c4919a5eb2e9ba27dfbf7ee92757', '913125', '17688888888', 0, 0, 664, 1609990552, 1, 1481350313, 1593747210);
+INSERT INTO `s_admin` VALUES (1, 'admin', 'ac55c9d60fce2bc4eda9b335a42a2ab4', '720975', '17688888888', 0, 0, 665, 1610345533, 1, 1481350313, 1593747210);
INSERT INTO `s_admin` VALUES (4, 'shopxo', 'c547c7fdfc244cef6747b306d390cc12', '898429', '', 0, 0, 7, 1600938931, 13, 1580807200, 1598279043);
COMMIT;
@@ -772,9 +772,9 @@ CREATE TABLE `s_brand` (
-- Records of s_brand
-- ----------------------------
BEGIN;
-INSERT INTO `s_brand` VALUES (1, '/static/upload/images/brand/2019/02/25/1551064260180298.jpeg', '强生', '强生公司一直注重在中国的发展,强生(中国)有限公司1992年1月在上海闵行经济技术开发区注册成立,注册资本超过一亿美元,是强生公司在中国大陆设立的首家独资企业', 'https://www.johnsonsbaby.com.cn/', 1, 0, '', '', '', 1551064263, 1610283672);
-INSERT INTO `s_brand` VALUES (2, '/static/upload/images/brand/2019/02/25/1551064277207182.jpeg', '佳洁士', '', '', 1, 0, '', '', '', 1551064299, 1610283696);
-INSERT INTO `s_brand` VALUES (3, '', '阿迪达斯', '', '', 1, 0, '', '', '', 1610019864, 1610282006);
+INSERT INTO `s_brand` VALUES (1, '/static/upload/images/brand/2019/02/25/1551064260180298.jpeg', '强生', '强生公司一直注重在中国的发展,强生(中国)有限公司1992年1月在上海闵行经济技术开发区注册成立,注册资本超过一亿美元,是强生公司在中国大陆设立的首家独资企业。', 'https://www.johnsonsbaby.com.cn/', 1, 0, '', '', '', 1551064263, 1610346871);
+INSERT INTO `s_brand` VALUES (2, '/static/upload/images/brand/2019/02/25/1551064277207182.jpeg', '佳洁士', '佳洁士是享誉全球的口腔护理品牌,旗下有牙膏,牙刷,牙贴和漱口水等多种产品。上佳洁士官网,了解更多佳洁士产品和口腔保健的资讯。', 'https://www.crest.com.cn/', 1, 0, '', '', '', 1551064299, 1610346851);
+INSERT INTO `s_brand` VALUES (3, '', '阿迪达斯', '阿迪达斯一般指adidas。adidas(阿迪达斯)创办于1949年,是德国运动用品制造商阿迪达斯AG成员公司。以其创办人阿道夫·阿迪·达斯勒(Adolf Adi Dassler)。', 'https://www.adidas.com.cn/', 1, 0, '', '', '', 1610019864, 1610351690);
COMMIT;
-- ----------------------------
@@ -823,7 +823,7 @@ CREATE TABLE `s_brand_category_join` (
PRIMARY KEY (`id`),
KEY `brand_id` (`brand_id`),
KEY `brand_category_id` (`brand_category_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='品牌分类关联';
+) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='品牌分类关联';
-- ----------------------------
-- Records of s_brand_category_join
@@ -831,11 +831,11 @@ CREATE TABLE `s_brand_category_join` (
BEGIN;
INSERT INTO `s_brand_category_join` VALUES (19, 4, 16, 1598276011);
INSERT INTO `s_brand_category_join` VALUES (29, 5, 10, 1598276166);
-INSERT INTO `s_brand_category_join` VALUES (39, 3, 10, 1610019864);
-INSERT INTO `s_brand_category_join` VALUES (46, 1, 7, 1610283672);
-INSERT INTO `s_brand_category_join` VALUES (47, 1, 18, 1610283672);
-INSERT INTO `s_brand_category_join` VALUES (48, 1, 27, 1610283672);
-INSERT INTO `s_brand_category_join` VALUES (49, 2, 18, 1610283696);
+INSERT INTO `s_brand_category_join` VALUES (51, 2, 18, 1610346851);
+INSERT INTO `s_brand_category_join` VALUES (52, 1, 7, 1610346871);
+INSERT INTO `s_brand_category_join` VALUES (53, 1, 18, 1610346871);
+INSERT INTO `s_brand_category_join` VALUES (54, 1, 27, 1610346871);
+INSERT INTO `s_brand_category_join` VALUES (55, 3, 10, 1610351690);
COMMIT;
-- ----------------------------
@@ -1192,7 +1192,6 @@ CREATE TABLE `s_goods` (
`buy_max_number` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '最大购买数量(最大数值 100000000, 小于等于0或空则不限)',
`is_deduction_inventory` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT '是否扣减库存(0否, 1是)',
`is_shelves` tinyint(2) unsigned NOT NULL DEFAULT '1' COMMENT '是否上架(下架后用户不可见, 0否, 1是)',
- `is_home_recommended` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '是否首页推荐(0否, 1是)',
`content_web` mediumtext COMMENT '电脑端详情内容',
`photo_count` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '相册图片数量',
`sales_count` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '销量',
@@ -1219,18 +1218,18 @@ CREATE TABLE `s_goods` (
-- Records of s_goods
-- ----------------------------
BEGIN;
-INSERT INTO `s_goods` VALUES (1, 1, -1, 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE(4G)/TD-SCD', '', '', '', 0, 8, '步', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '3200.00', 3200.00, 3200.00, '2100.00', 2100.00, 2100.00, 10, 1, 0, 1, 1, 1, '


', 2, 10, 756, '', 0, '', 'https://pan.baidu.com/s/18xyUNruvohr5JCdorvaz5w 提取码 v3y4
', NULL, '', '', '', 0, 1547450921, 1605345053);
-INSERT INTO `s_goods` VALUES (2, 2, -1, '苹果(Apple)iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', '', 'iPhone 6 Plus', 0, 1995, '步', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6000.00-7600.00', 6000.00, 7600.00, '4500.00-6800.00', 4500.00, 6800.00, 30, 1, 0, 1, 1, 1, '


', 2, 38, 1912, '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', 1, '', '', NULL, '', '', '', 0, 1547451624, 1609742277);
-INSERT INTO `s_goods` VALUES (3, 2, -1, 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '', 0, 332, '步', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '6866.00', 6866.00, 6866.00, '3888.00', 3888.00, 3888.00, 20, 1, 0, 1, 1, 1, '



', 2, 5, 315, '', 0, '', '', NULL, '', '', '', 0, 1547452007, 1606704142);
-INSERT INTO `s_goods` VALUES (4, 1, -1, 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '', 0, 331, '步', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', 2300.00, 2300.00, '1999.00', 1999.00, 1999.00, 19, 1, 0, 1, 1, 1, '


', 2, 5, 301, '', 0, '', '', NULL, '', '', '', 0, 1547452553, 1605432758);
-INSERT INTO `s_goods` VALUES (5, 2, -1, 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '', 0, 554, '步', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', 3200.00, 3200.00, '2499.00', 2499.00, 2499.00, 56, 1, 0, 1, 1, 1, '


', 2, 10, 564, '', 0, NULL, NULL, NULL, '', '', '', 0, 1547452798, 1605432763);
-INSERT INTO `s_goods` VALUES (6, 1, -1, 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '', 0, 664, '步', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', 3200.00, 3200.00, '2998.90', 2998.90, 2998.90, 65, 1, 0, 1, 1, 1, ' X5L/SL/V/M (5.0寸) X5max钢化膜(5.5寸) X5pro钢化膜(5.2寸)



', 2, 4, 413, '', 0, '', '', NULL, '', '', '', 0, 1547453135, 1605432769);
-INSERT INTO `s_goods` VALUES (7, 1, -1, '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '', 0, 217, '件', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '760.00', 760.00, 760.00, '168.00', 168.00, 168.00, 11, 1, 0, 1, 1, 1, '


', 2, 12, 1240, '', 0, NULL, NULL, NULL, '', '', '', 0, 1547453967, 1602428921);
-INSERT INTO `s_goods` VALUES (8, 1, -1, 'MARNI Trunk 女士 中号拼色十字纹小牛皮 斜挎风琴包', '', '', '', 0, 5, '件', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0.00', 0.00, 0.00, '356.00', 356.00, 356.00, 8, 1, 6, 1, 1, 1, '



', 2, 4, 955, '', 0, '', '', '{\"1\":{\"min_price\":\"100.00\",\"max_price\":\"100.00\",\"price\":\"100.00\"}}', '', '', '', 0, 1547454269, 1609744193);
-INSERT INTO `s_goods` VALUES (9, 2, 2, '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '', 0, 932, '件', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '160.00-216.00', 160.00, 216.00, '120.00-158.00', 120.00, 158.00, 2, 1, 0, 1, 1, 1, '



', 3, 30, 1040, '', 1, '', '', NULL, '', '', '', 0, 1547454786, 1608886265);
-INSERT INTO `s_goods` VALUES (10, 0, 1, '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '', 0, 8, '件', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '568.00', 568.00, 568.00, '228.00', 228.00, 228.00, 28, 1, 1, 1, 1, 1, '【品牌】欧单 学媛风 猫咪良品
【吊牌】xueyuanfeng 猫咪良品
【面料质地】涤棉拼接蕾丝 后中拉链 有内衬(非专业机构鉴定,介意请慎拍)
好的衣服需要好好呵护,务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~
【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦
【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦
XS码尺寸: 悬挂衣长81CM.胸围80内合适.腰围63CM.臀围86CM
S码尺寸: 悬挂衣长82CM.胸围84内合适.腰围67CM.臀围90CM
M码尺寸: 悬挂衣长83CM.胸围88内合适.腰围71CM.臀围94CM
L码尺寸: 悬挂衣长84CM.胸围92内合适.腰围75CM.臀围98CM
(测量单位是CM,每个人的测量方式不一样,测量的尺寸数据可能会有1~3厘米的差异,请MM们谅解哦)
PS:常规码数,可按平时号选择哦。修身版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~
蕾丝花是手工修剪出来的,每件都有不同和不规则的哦,有小线头和节点是正常现象哦~请亲们谅解哦~


', 2, 8, 699, '', 0, '', 'https://pan.baidu.com/s/1XTSM-EJZwEgLmGx3ZyFMGQ 提取码:dcs4
', NULL, '', '', '', 0, 1547455375, 1606792889);
-INSERT INTO `s_goods` VALUES (11, 3, 3, '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '', 0, 1398, '件', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '268.00-422.00', 268.00, 422.00, '160.00-258.00', 160.00, 258.00, 0, 1, 0, 1, 1, 1, '【品牌】欧单 学媛风 猫咪良品
【吊牌】xueyuanfeng 猫咪良品
【面料质地】网纱绣花钉珠拼接蕾丝 有拉链有内衬(非专业机构鉴定,介意请慎拍)
好的衣服需要好好呵护,务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~
【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦
【商品尺寸】XS/S/M/L 小高腰设计 胸那考虑撑开因素哦 微弹的哦
XS码尺寸: 衣长82CM.胸围80内合适.腰围63CM.臀围86CM
S码尺寸: 衣长83CM.胸围84内合适.腰围67CM.臀围90CM
M码尺寸: 衣长84CM.胸围88内合适.腰围71CM.臀围94CM
L码尺寸: 衣长85CM.胸围92内合适.腰围75CM.臀围98CM
(测量单位是CM,每个人的测量方式不一样,测量的尺寸数据可能会有1~3厘米的差异,请MM们谅解哦)
PS:常规码数,可按平时号选择哦。修身版型,如果腰粗可以适当考虑大1号哦~
大圆领,每个人的身材曲线不同,领口不会很平的哦,请谅解~
肩膀那有暗扣哦,可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~




', 4, 4, 509, '', 1, '', '', '', '', '', '', 0, 1547455700, 1610109196);
-INSERT INTO `s_goods` VALUES (12, 2, 4, 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', '轻奢醋酸面料,高标准的生产要求,品质保证', 'hello', 2, 120, '箱', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0.00', 0.00, 0.00, '0.01-5.00', 0.01, 5.00, 50, 1, 0, 1, 1, 1, '
| 11 | 22 | 33 | 44 | 55 | 66 |
| q | w | e | r | t | y |
| a | s | d | f | g | h |
| z | x | c | v | b | n |




', 3, 18, 1721, '', 1, '[{\"title\":\"颜色\",\"value\":[\"粉色\",\"白色\"]},{\"title\":\"尺码\",\"value\":[\"S+S\",\"M+M\",\"L+L\"]}]', '', NULL, 'ZK爆款连衣裙', '连衣裙,裙子', '夏季连衣裙,瘦身裙子', 0, 1547456230, 1609335571);
+INSERT INTO `s_goods` VALUES (1, 1, -1, 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE(4G)/TD-SCD', '', '', '', 0, 8, '步', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '3200.00', 3200.00, 3200.00, '2100.00', 2100.00, 2100.00, 10, 1, 0, 1, 1, '


', 2, 10, 805, '', 0, '', 'https://pan.baidu.com/s/18xyUNruvohr5JCdorvaz5w 提取码 v3y4
', NULL, '', '', '', 0, 1547450921, 1605345053);
+INSERT INTO `s_goods` VALUES (2, 2, -1, '苹果(Apple)iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', '', 'iPhone 6 Plus', 0, 1995, '步', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6000.00-7600.00', 6000.00, 7600.00, '4500.00-6800.00', 4500.00, 6800.00, 30, 1, 0, 1, 1, '


', 2, 38, 1914, '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', 1, '', '', NULL, '', '', '', 0, 1547451624, 1609742277);
+INSERT INTO `s_goods` VALUES (3, 2, -1, 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '', 0, 332, '步', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '6866.00', 6866.00, 6866.00, '3888.00', 3888.00, 3888.00, 20, 1, 0, 1, 1, '



', 2, 5, 320, '', 0, '', '', NULL, '', '', '', 0, 1547452007, 1606704142);
+INSERT INTO `s_goods` VALUES (4, 1, -1, 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '', 0, 331, '步', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', 2300.00, 2300.00, '1999.00', 1999.00, 1999.00, 19, 1, 0, 1, 1, '


', 2, 5, 302, '', 0, '', '', NULL, '', '', '', 0, 1547452553, 1605432758);
+INSERT INTO `s_goods` VALUES (5, 2, -1, 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '', 0, 554, '步', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', 3200.00, 3200.00, '2499.00', 2499.00, 2499.00, 56, 1, 0, 1, 1, '


', 2, 10, 566, '', 0, NULL, NULL, NULL, '', '', '', 0, 1547452798, 1605432763);
+INSERT INTO `s_goods` VALUES (6, 1, -1, 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '', 0, 664, '步', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', 3200.00, 3200.00, '2998.90', 2998.90, 2998.90, 65, 1, 0, 1, 1, ' X5L/SL/V/M (5.0寸) X5max钢化膜(5.5寸) X5pro钢化膜(5.2寸)



', 2, 4, 415, '', 0, '', '', NULL, '', '', '', 0, 1547453135, 1605432769);
+INSERT INTO `s_goods` VALUES (7, 1, -1, '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '', 0, 217, '件', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '760.00', 760.00, 760.00, '168.00', 168.00, 168.00, 11, 1, 0, 1, 1, '


', 2, 12, 1243, '', 0, NULL, NULL, NULL, '', '', '', 0, 1547453967, 1602428921);
+INSERT INTO `s_goods` VALUES (8, 1, -1, 'MARNI Trunk 女士 中号拼色十字纹小牛皮 斜挎风琴包', '', '', '', 0, 5, '件', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0.00', 0.00, 0.00, '356.00', 356.00, 356.00, 8, 1, 6, 1, 1, '



', 2, 4, 957, '', 0, '', '', '{\"1\":{\"min_price\":\"100.00\",\"max_price\":\"100.00\",\"price\":\"100.00\"}}', '', '', '', 0, 1547454269, 1609744193);
+INSERT INTO `s_goods` VALUES (9, 2, 2, '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '', 0, 932, '件', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '160.00-216.00', 160.00, 216.00, '120.00-158.00', 120.00, 158.00, 2, 1, 0, 1, 1, '



', 3, 30, 1046, '', 1, '', '', NULL, '', '', '', 0, 1547454786, 1608886265);
+INSERT INTO `s_goods` VALUES (10, 0, 1, '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '', 0, 8, '件', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '568.00', 568.00, 568.00, '228.00', 228.00, 228.00, 28, 1, 1, 1, 1, '【品牌】欧单 学媛风 猫咪良品
【吊牌】xueyuanfeng 猫咪良品
【面料质地】涤棉拼接蕾丝 后中拉链 有内衬(非专业机构鉴定,介意请慎拍)
好的衣服需要好好呵护,务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~
【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦
【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦
XS码尺寸: 悬挂衣长81CM.胸围80内合适.腰围63CM.臀围86CM
S码尺寸: 悬挂衣长82CM.胸围84内合适.腰围67CM.臀围90CM
M码尺寸: 悬挂衣长83CM.胸围88内合适.腰围71CM.臀围94CM
L码尺寸: 悬挂衣长84CM.胸围92内合适.腰围75CM.臀围98CM
(测量单位是CM,每个人的测量方式不一样,测量的尺寸数据可能会有1~3厘米的差异,请MM们谅解哦)
PS:常规码数,可按平时号选择哦。修身版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~
蕾丝花是手工修剪出来的,每件都有不同和不规则的哦,有小线头和节点是正常现象哦~请亲们谅解哦~


', 2, 8, 702, '', 0, '', 'https://pan.baidu.com/s/1XTSM-EJZwEgLmGx3ZyFMGQ 提取码:dcs4
', NULL, '', '', '', 0, 1547455375, 1606792889);
+INSERT INTO `s_goods` VALUES (11, 3, 3, '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '', 0, 1398, '件', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '268.00-422.00', 268.00, 422.00, '160.00-258.00', 160.00, 258.00, 0, 1, 0, 1, 1, '【品牌】欧单 学媛风 猫咪良品
【吊牌】xueyuanfeng 猫咪良品
【面料质地】网纱绣花钉珠拼接蕾丝 有拉链有内衬(非专业机构鉴定,介意请慎拍)
好的衣服需要好好呵护,务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~
【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦
【商品尺寸】XS/S/M/L 小高腰设计 胸那考虑撑开因素哦 微弹的哦
XS码尺寸: 衣长82CM.胸围80内合适.腰围63CM.臀围86CM
S码尺寸: 衣长83CM.胸围84内合适.腰围67CM.臀围90CM
M码尺寸: 衣长84CM.胸围88内合适.腰围71CM.臀围94CM
L码尺寸: 衣长85CM.胸围92内合适.腰围75CM.臀围98CM
(测量单位是CM,每个人的测量方式不一样,测量的尺寸数据可能会有1~3厘米的差异,请MM们谅解哦)
PS:常规码数,可按平时号选择哦。修身版型,如果腰粗可以适当考虑大1号哦~
大圆领,每个人的身材曲线不同,领口不会很平的哦,请谅解~
肩膀那有暗扣哦,可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~




', 4, 4, 524, '', 1, '', '', '', '', '', '', 0, 1547455700, 1610109196);
+INSERT INTO `s_goods` VALUES (12, 2, 4, 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', '轻奢醋酸面料,高标准的生产要求,品质保证', 'hello', 2, 120, '箱', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0.00', 0.00, 0.00, '0.01-5.00', 0.01, 5.00, 50, 1, 0, 1, 1, '
| 11 | 22 | 33 | 44 | 55 | 66 |
| q | w | e | r | t | y |
| a | s | d | f | g | h |
| z | x | c | v | b | n |




', 3, 18, 1739, '', 1, '[{\"title\":\"颜色\",\"value\":[\"粉色\",\"白色\"]},{\"title\":\"尺码\",\"value\":[\"S+S\",\"M+M\",\"L+L\"]}]', '', NULL, 'ZK爆款连衣裙', '连衣裙,裙子', '夏季连衣裙,瘦身裙子', 0, 1547456230, 1610459232);
COMMIT;
-- ----------------------------
@@ -1254,7 +1253,7 @@ INSERT INTO `s_goods_browse` VALUES (1, 7, 1, 1607515417, 1609764259);
INSERT INTO `s_goods_browse` VALUES (2, 3, 1, 1607515704, 1608986854);
INSERT INTO `s_goods_browse` VALUES (3, 9, 1, 1608030887, 1608986623);
INSERT INTO `s_goods_browse` VALUES (4, 10, 1, 1608030888, 1609846425);
-INSERT INTO `s_goods_browse` VALUES (5, 11, 1, 1608031491, 1609846429);
+INSERT INTO `s_goods_browse` VALUES (5, 11, 1, 1608031491, 1610343524);
INSERT INTO `s_goods_browse` VALUES (6, 12, 1, 1608031493, 1610258135);
INSERT INTO `s_goods_browse` VALUES (7, 6, 1, 1608031544, 1608977647);
INSERT INTO `s_goods_browse` VALUES (8, 8, 1, 1608189713, 1610287505);
@@ -2188,6 +2187,13 @@ INSERT INTO `s_goods_category_join` VALUES (765, 2, 68, 1609742103);
INSERT INTO `s_goods_category_join` VALUES (766, 2, 69, 1609742103);
INSERT INTO `s_goods_category_join` VALUES (767, 2, 304, 1609742103);
INSERT INTO `s_goods_category_join` VALUES (768, 8, 58, 1609744193);
+INSERT INTO `s_goods_category_join` VALUES (769, 8, 195, 1609744193);
+INSERT INTO `s_goods_category_join` VALUES (770, 8, 198, 1609744193);
+INSERT INTO `s_goods_category_join` VALUES (771, 13, 53, 1610100137);
+INSERT INTO `s_goods_category_join` VALUES (772, 13, 611, 1610100137);
+INSERT INTO `s_goods_category_join` VALUES (773, 13, 612, 1610100137);
+INSERT INTO `s_goods_category_join` VALUES (774, 11, 304, 1610109196);
+INSERT INTO `s_goods_category_join` VALUES (775, 11, 318, 1610109196);
COMMIT;
-- ----------------------------
@@ -2268,19 +2274,6 @@ INSERT INTO `s_goods_content_app` VALUES (853, 4, '/static/upload/images/goods/2
INSERT INTO `s_goods_content_app` VALUES (1023, 10, '/static/upload/images/goods/2019/01/14/1547455266527628.jpg', '【品牌】欧单 学媛风 猫咪良品\n\n【吊牌】xueyuanfeng 猫咪良品\n\n【面料质地】涤棉拼接蕾丝 后中拉链 有内衬(非专业机构鉴定,介意请慎拍)\n\n好的衣服需要好好呵护,务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~\n\n【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦\n\n【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦\n\n\nXS码尺寸: 悬挂衣长81CM.胸围80内合适.腰围63CM.臀围86CM\n\nS码尺寸: 悬挂衣长82CM.胸围84内合适.腰围67CM.臀围90CM\n\nM码尺寸: 悬挂衣长83CM.胸围88内合适.腰围71CM.臀围94CM\n\nL码尺寸: 悬挂衣长84CM.胸围92内合适.腰围75CM.臀围98CM\n\n\n(测量单位是CM,每个人的测量方式不一样,测量的尺寸数据可能会有1~3厘米的差异,请MM们谅解哦)\n\n\nPS:常规码数,可按平时号选择哦。修身版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~\n\n蕾丝花是手工修剪出来的,每件都有不同和不规则的哦,有小线头和节点是正常现象哦~请亲们谅解哦~', 0, 1606792889);
INSERT INTO `s_goods_content_app` VALUES (1024, 10, '/static/upload/images/goods/2019/01/14/1547455266234658.jpg', '', 1, 1606792889);
INSERT INTO `s_goods_content_app` VALUES (1069, 12, '/static/upload/images/goods/2019/01/14/1547456214155362.jpg', '每个人都有一个死角, 自己走不出来,别人也闯不进去。\n我把最深沉的秘密放在那里。\n你不懂我,我不怪你。\n每个人都有一道伤口, 或深或浅,盖上布,以为不存在。', 0, 1609307674);
-INSERT INTO `s_goods_content_app` VALUES (1070, 12, '/static/upload/images/goods/2019/01/14/1547455907486857.jpg', '', 1, 1609307674);
-INSERT INTO `s_goods_content_app` VALUES (1071, 12, '/static/upload/images/goods/2019/01/14/1547455907256518.jpg', '', 2, 1609307674);
-INSERT INTO `s_goods_content_app` VALUES (1072, 12, '/static/upload/images/goods/2019/01/14/1547456228913731.jpg', '', 3, 1609307674);
-INSERT INTO `s_goods_content_app` VALUES (1073, 2, '/static/upload/images/goods/2019/01/14/1547451595700972.jpg', '', 0, 1609742104);
-INSERT INTO `s_goods_content_app` VALUES (1074, 2, '/static/upload/images/goods/2019/01/14/1547451595528800.jpg', '', 1, 1609742104);
-INSERT INTO `s_goods_content_app` VALUES (1075, 2, '/static/upload/images/goods/2019/01/14/1547451595616298.jpg', '', 2, 1609742104);
-INSERT INTO `s_goods_content_app` VALUES (1076, 8, '/static/upload/images/goods/2019/01/14/1547454192301566.jpg', '', 0, 1609744193);
-INSERT INTO `s_goods_content_app` VALUES (1077, 8, '/static/upload/images/goods/2019/01/14/1547454192448116.jpg', '', 1, 1609744193);
-INSERT INTO `s_goods_content_app` VALUES (1078, 8, '/static/upload/images/goods/2019/01/14/1547454192474638.jpg', '', 2, 1609744193);
-INSERT INTO `s_goods_content_app` VALUES (1079, 11, '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '【品牌】欧单 学媛风 猫咪良品\n\n【吊牌】xueyuanfeng 猫咪良品\n\n【面料质地】网纱绣花钉珠拼接蕾丝 有拉链有内衬(非专业机构鉴定,介意请慎拍)\n\n好的衣服需要好好呵护,务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~\n\n【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦\n\n【商品尺寸】XS/S/M/L 小高腰设计 胸那考虑撑开因素哦 微弹的哦\n\n\nXS码尺寸: 衣长82CM.胸围80内合适.腰围63CM.臀围86CM\n\nS码尺寸: 衣长83CM.胸围84内合适.腰围67CM.臀围90CM\n\nM码尺寸: 衣长84CM.胸围88内合适.腰围71CM.臀围94CM\n\nL码尺寸: 衣长85CM.胸围92内合适.腰围75CM.臀围98CM\n\n\n(测量单位是CM,每个人的测量方式不一样,测量的尺寸数据可能会有1~3厘米的差异,请MM们谅解哦)\n\n\nPS:常规码数,可按平时号选择哦。修身版型,如果腰粗可以适当考虑大1号哦~\n\n大圆领,每个人的身材曲线不同,领口不会很平的哦,请谅解~\n\n肩膀那有暗扣哦,可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~', 0, 1610109196);
-INSERT INTO `s_goods_content_app` VALUES (1080, 11, '/static/upload/images/goods/2019/01/14/1547455601168384.jpg', '', 1, 1610109196);
-INSERT INTO `s_goods_content_app` VALUES (1081, 11, '/static/upload/images/goods/2019/01/14/1547455601898622.jpg', '', 2, 1610109196);
-INSERT INTO `s_goods_content_app` VALUES (1082, 11, '/static/upload/images/goods/2019/01/14/1547455601528614.jpg', '', 3, 1610109196);
COMMIT;
-- ----------------------------
@@ -3397,13 +3390,6 @@ CREATE TABLE `s_payment` (
KEY `is_enable` (`is_enable`)
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式';
--- ----------------------------
--- Records of s_payment
--- ----------------------------
-BEGIN;
-INSERT INTO `s_payment` VALUES (1, '现金支付', 'CashPayment', '', '1.0.0', '不限', '现金方式支付货款', 'Devil', 'http://shopxo.net/', '', '', '[\"pc\",\"h5\",\"ios\",\"android\",\"weixin\",\"alipay\",\"baidu\",\"toutiao\",\"qq\"]', '[\"pc\",\"h5\",\"ios\",\"android\",\"weixin\",\"alipay\",\"baidu\",\"toutiao\",\"qq\"]', 1, 1, 0, 1607515647, 1607515652);
-COMMIT;
-
-- ----------------------------
-- Table structure for s_plugins
-- ----------------------------
@@ -3434,12 +3420,12 @@ INSERT INTO `s_plugins` VALUES (6, '', 'share', '{\"title\":\"\",\"url\":\"\",\"
INSERT INTO `s_plugins` VALUES (7, '', 'distribution', '{\"user_poster_top_desc\":\"\",\"user_poster_share_title\":\"\",\"user_poster_share_desc\":\"\",\"is_upper_return\":\"0\",\"level\":\"2\",\"self_buy\":\"0\",\"auto_level_type\":\"0\",\"is_down_return\":\"0\",\"down_return_number\":\"\",\"is_upper_return_integral\":\"0\",\"upper_return_integral\":\"\",\"is_down_return_integral\":\"0\",\"down_return_integral\":\"\",\"down_return_integral_people\":\"\",\"is_appoint_goods\":\"0\",\"appoint_goods_profit_number\":\"\",\"appoint_goods_sale_number\":\"\",\"appoint_goods_sale_rate\":\"\",\"appoint_goods_repurchase_discount\":\"\",\"goods_detail_icon\":\"\",\"is_enable_self_extraction\":\"0\",\"is_buy_default_extraction_address\":\"0\",\"is_self_extraction\":\"0\",\"is_self_extraction_close_upper\":\"0\",\"extraction_profit_level\":\"0\",\"self_extraction_apply_desc\":\"\",\"self_extraction_common_notice\":\"\",\"profit_type\":\"0\",\"profit_settlement_limit_time\":\"43200\",\"is_show_introduce\":\"1\",\"user_center_level_desc\":\"\",\"non_conformity_desc\":\"\",\"user_center_notice\":\"\",\"is_admin_user_level_show\":\"1\",\"poster_data\":[],\"default_level_images\":\"\",\"default_qrcode_logo\":\"\"}', 1, 4, 1610276765, 1609908482);
INSERT INTO `s_plugins` VALUES (8, '', 'points', '{\"application_name\":\"\\u79ef\\u5206\\u5546\\u57ce\",\"goods_detail_panel\":\"\\u8be5\\u5546\\u54c1\\u652f\\u6301\\u79ef\\u5206\\u5168\\u989d\\u5151\\u6362\\u3001\\u4ec5\\u9700{$integral}\\u79ef\\u5206\",\"goods_detail_title_icon\":\"\\u79ef\\u5206\\u5151\\u6362\",\"points_desc\":\"\\u554a\\u53d1\\u751f\\u7684\\u53d1\\u65af\\u8482\\u82ac\\u68ee\\u7684\\u7761\\u6c99\\u53d1\\n\\u4f3c\\u61c2\\u975e\\u61c2\\u8c01\\u662f\\u8c01\\u7684\\u8c01\\u53d1\\n\\u6c34\\u7535\\u8d39\\u7b2c\\u4e09\\u65b9\\u662f\\u5426\\u65af\\u8482\\u82ac\\u68ee\\u7684\\u6c34\\u7535\\u8d39\\u7b2c\\u4e09\\n\\u7b2c\\u4e09\\u65b9\\u6c34\\u7535\\u8d39\\u662f\\u5426\",\"footer_code\":\"\",\"deduction_price\":\"1\",\"order_max_integral\":\"\",\"order_total_price\":\"\",\"goods_exchange\":{\"10\":{\"gid\":\"10\",\"integral\":\"12\"},\"11\":{\"gid\":\"11\",\"integral\":\"34\"},\"12\":{\"gid\":\"12\",\"integral\":\"56\"},\"7\":{\"gid\":\"7\",\"integral\":\"3\"},\"6\":{\"gid\":\"6\",\"integral\":\"31\"},\"5\":{\"gid\":\"5\",\"integral\":\"13\"},\"4\":{\"gid\":\"4\",\"integral\":\"8\"}},\"right_images\":\"http:\\/\\/shopxo.com\\/static\\/plugins\\/images\\/points\\/default-right-images.jpg\",\"right_images_url_rules\":{\"pc\":\"\",\"h5\":\"\",\"ios\":\"\",\"android\":\"\",\"weixin\":\"\\/pages\\/goods-detail\\/goods-detail?id=4\",\"alipay\":\"\",\"baidu\":\"\",\"toutiao\":\"\",\"qq\":\"\"},\"seo_title\":\"\",\"seo_keywords\":\"\",\"seo_desc\":\"\",\"is_user_quick\":\"1\",\"is_integral_deduction\":\"1\"}', 1, 0, 1610276765, 1609843548);
INSERT INTO `s_plugins` VALUES (9, '', 'signin', '{\"reward_master\":\"\",\"reward_invitee\":\"\",\"signin_desc\":\"\\u554a\\u987a\\u4e30\\u901f\\u9012\\u53d1\\u6492\\u65e6\\u53d1\\u6c34\\u7535\\u8d39\\u6c34\\u7535\\u8d39\\n\\u6c34\\u7535\\u8d39\\u6c34\\u7535\\u8d39\\u82cf\\u6253\\u7c89\\u6492\\u65e6\\u6cd5\\u6492\\u65e6\\u6cd5\\n\\u6c34\\u7535\\u8d39\\u6c34\\u7535\\u8d39\\u4f3c\\u61c2\\u975e\\u61c2\",\"is_user_quick\":\"1\",\"is_user_menu\":\"1\",\"is_qrcode_limit\":\"1\",\"is_team\":\"1\",\"is_share\":\"1\",\"is_qrcode_must_userinfo\":\"1\",\"is_team_show_coming_user\":\"1\"}', 1, 8, 1610276765, 1609812429);
-INSERT INTO `s_plugins` VALUES (10, '', 'limitedtimediscount', '{\"application_name\":\"\",\"goods_list_title\":\"\",\"goods_detail_icon\":\"\",\"goods_detail_title\":\"\",\"content_notice\":\"\",\"time_start\":\"2020-12-23 20:33:18\",\"time_end\":\"2021-01-10 20:33:22\",\"is_actas_price_original\":\"1\",\"is_home_show\":\"1\"}', 1, 10, 1610276765, 1609988279);
+INSERT INTO `s_plugins` VALUES (10, '', 'limitedtimediscount', '{\"application_name\":\"\",\"goods_list_title\":\"\",\"goods_detail_icon\":\"\",\"goods_detail_title\":\"\",\"content_notice\":\"\",\"time_start\":\"2020-12-23 20:33:18\",\"time_end\":\"2021-01-30 20:33:22\",\"is_actas_price_original\":\"1\",\"is_home_show\":\"1\"}', 1, 10, 1610276765, 1610352597);
INSERT INTO `s_plugins` VALUES (11, '', 'exchangerate', '{\"is_user_quick_select\":\"1\",\"is_user_header_top_right_select\":\"1\",\"is_goods_to_rate\":\"1\",\"is_use_default_currency_buy\":\"1\"}', 1, 9, 1610276765, 1609745000);
INSERT INTO `s_plugins` VALUES (12, '', 'membershiplevelvip', '{\"application_name\":\"\\u4f1a\\u5458\\u4ff1\\u4e50\\u90e8\",\"level_rules\":\"0\",\"order_close_time\":\"30\",\"profit_order_create_time\":\"5\",\"profit_order_settlement_time\":\"10800\",\"user_poster_share_title\":\"\",\"user_poster_share_desc\":\"\",\"banner_top_title\":\"\",\"banner_middle_name\":\"\",\"banner_bottom_content\":\"\",\"not_opening_vip_desc\":\"\",\"user_vip_center_notice\":\"\",\"is_admin_user_level_show\":\"1\",\"is_user_buy\":\"1\"}', 1, 7, 1610276765, 1609908405);
INSERT INTO `s_plugins` VALUES (17, '新用户立减', 'newuserreduction', '', 0, 6, 1610276765, 1609828752);
INSERT INTO `s_plugins` VALUES (18, '优惠券', 'coupon', '', 1, 3, 1610276765, 1609987257);
-INSERT INTO `s_plugins` VALUES (19, '品牌', 'brand', '', 1, 1, 1610276765, 1610281759);
+INSERT INTO `s_plugins` VALUES (19, '品牌', 'brand', '{\"application_name\":\"\\u54c1\\u724c\",\"seo_title\":\"\\u54c1\\u724c2\",\"seo_keywords\":\"22\",\"seo_desc\":\"333\",\"is_user_quick\":\"1\",\"is_goods_detail\":\"1\"}', 1, 1, 1610276765, 1610358391);
COMMIT;
-- ----------------------------
@@ -49972,7 +49958,7 @@ CREATE TABLE `s_search_history` (
`ymd` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '日期 ymd',
`add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1753 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志';
+) ENGINE=InnoDB AUTO_INCREMENT=2183 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志';
-- ----------------------------
-- Records of s_search_history
@@ -51730,6 +51716,436 @@ INSERT INTO `s_search_history` VALUES (1749, 1, '', '', '', '', '', '', 'default
INSERT INTO `s_search_history` VALUES (1750, 1, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610338071);
INSERT INTO `s_search_history` VALUES (1751, 1, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610338079);
INSERT INTO `s_search_history` VALUES (1752, 1, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610338451);
+INSERT INTO `s_search_history` VALUES (1753, 1, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610343252);
+INSERT INTO `s_search_history` VALUES (1754, 1, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610344495);
+INSERT INTO `s_search_history` VALUES (1755, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610345562);
+INSERT INTO `s_search_history` VALUES (1756, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610345566);
+INSERT INTO `s_search_history` VALUES (1757, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610345569);
+INSERT INTO `s_search_history` VALUES (1758, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610345571);
+INSERT INTO `s_search_history` VALUES (1759, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610345573);
+INSERT INTO `s_search_history` VALUES (1760, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610345577);
+INSERT INTO `s_search_history` VALUES (1761, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610345581);
+INSERT INTO `s_search_history` VALUES (1762, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610345582);
+INSERT INTO `s_search_history` VALUES (1763, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610345671);
+INSERT INTO `s_search_history` VALUES (1764, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610345741);
+INSERT INTO `s_search_history` VALUES (1765, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610345742);
+INSERT INTO `s_search_history` VALUES (1766, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346102);
+INSERT INTO `s_search_history` VALUES (1767, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346103);
+INSERT INTO `s_search_history` VALUES (1768, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346105);
+INSERT INTO `s_search_history` VALUES (1769, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346164);
+INSERT INTO `s_search_history` VALUES (1770, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346166);
+INSERT INTO `s_search_history` VALUES (1771, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346240);
+INSERT INTO `s_search_history` VALUES (1772, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346770);
+INSERT INTO `s_search_history` VALUES (1773, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346775);
+INSERT INTO `s_search_history` VALUES (1774, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346779);
+INSERT INTO `s_search_history` VALUES (1775, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346782);
+INSERT INTO `s_search_history` VALUES (1776, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346785);
+INSERT INTO `s_search_history` VALUES (1777, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346792);
+INSERT INTO `s_search_history` VALUES (1778, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346882);
+INSERT INTO `s_search_history` VALUES (1779, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346886);
+INSERT INTO `s_search_history` VALUES (1780, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346888);
+INSERT INTO `s_search_history` VALUES (1781, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346936);
+INSERT INTO `s_search_history` VALUES (1782, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346944);
+INSERT INTO `s_search_history` VALUES (1783, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610346945);
+INSERT INTO `s_search_history` VALUES (1784, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610346951);
+INSERT INTO `s_search_history` VALUES (1785, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610349548);
+INSERT INTO `s_search_history` VALUES (1786, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610350251);
+INSERT INTO `s_search_history` VALUES (1787, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351373);
+INSERT INTO `s_search_history` VALUES (1788, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351376);
+INSERT INTO `s_search_history` VALUES (1789, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351384);
+INSERT INTO `s_search_history` VALUES (1790, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351386);
+INSERT INTO `s_search_history` VALUES (1791, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351493);
+INSERT INTO `s_search_history` VALUES (1792, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351527);
+INSERT INTO `s_search_history` VALUES (1793, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351618);
+INSERT INTO `s_search_history` VALUES (1794, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351619);
+INSERT INTO `s_search_history` VALUES (1795, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351620);
+INSERT INTO `s_search_history` VALUES (1796, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351621);
+INSERT INTO `s_search_history` VALUES (1797, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351622);
+INSERT INTO `s_search_history` VALUES (1798, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351700);
+INSERT INTO `s_search_history` VALUES (1799, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351705);
+INSERT INTO `s_search_history` VALUES (1800, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351706);
+INSERT INTO `s_search_history` VALUES (1801, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351709);
+INSERT INTO `s_search_history` VALUES (1802, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351710);
+INSERT INTO `s_search_history` VALUES (1803, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351810);
+INSERT INTO `s_search_history` VALUES (1804, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351831);
+INSERT INTO `s_search_history` VALUES (1805, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351867);
+INSERT INTO `s_search_history` VALUES (1806, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610351917);
+INSERT INTO `s_search_history` VALUES (1807, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351919);
+INSERT INTO `s_search_history` VALUES (1808, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610351967);
+INSERT INTO `s_search_history` VALUES (1809, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610352018);
+INSERT INTO `s_search_history` VALUES (1810, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610352029);
+INSERT INTO `s_search_history` VALUES (1811, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610352046);
+INSERT INTO `s_search_history` VALUES (1812, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610352059);
+INSERT INTO `s_search_history` VALUES (1813, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610352067);
+INSERT INTO `s_search_history` VALUES (1814, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610352538);
+INSERT INTO `s_search_history` VALUES (1815, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610352541);
+INSERT INTO `s_search_history` VALUES (1816, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610352543);
+INSERT INTO `s_search_history` VALUES (1817, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610352549);
+INSERT INTO `s_search_history` VALUES (1818, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610352565);
+INSERT INTO `s_search_history` VALUES (1819, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610353905);
+INSERT INTO `s_search_history` VALUES (1820, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356262);
+INSERT INTO `s_search_history` VALUES (1821, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356273);
+INSERT INTO `s_search_history` VALUES (1822, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356363);
+INSERT INTO `s_search_history` VALUES (1823, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356369);
+INSERT INTO `s_search_history` VALUES (1824, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356388);
+INSERT INTO `s_search_history` VALUES (1825, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356392);
+INSERT INTO `s_search_history` VALUES (1826, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610356474);
+INSERT INTO `s_search_history` VALUES (1827, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610356616);
+INSERT INTO `s_search_history` VALUES (1828, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610356717);
+INSERT INTO `s_search_history` VALUES (1829, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610356721);
+INSERT INTO `s_search_history` VALUES (1830, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356912);
+INSERT INTO `s_search_history` VALUES (1831, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610356957);
+INSERT INTO `s_search_history` VALUES (1832, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357195);
+INSERT INTO `s_search_history` VALUES (1833, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357338);
+INSERT INTO `s_search_history` VALUES (1834, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357340);
+INSERT INTO `s_search_history` VALUES (1835, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610357354);
+INSERT INTO `s_search_history` VALUES (1836, 0, '', '[\"52\"]', '', '', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210111, 1610357359);
+INSERT INTO `s_search_history` VALUES (1837, 0, '[\"3\"]', '[\"52\"]', '', '', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210111, 1610357360);
+INSERT INTO `s_search_history` VALUES (1838, 0, '[\"2\",\"3\"]', '[\"52\"]', '', '', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210111, 1610357361);
+INSERT INTO `s_search_history` VALUES (1839, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610357373);
+INSERT INTO `s_search_history` VALUES (1840, 0, '[\"2\"]', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357374);
+INSERT INTO `s_search_history` VALUES (1841, 0, '[\"2\",\"3\"]', '', '', '', '', '', 'default', 'asc', '{\"total\":6,\"data_count\":6,\"page\":1,\"page_total\":1}', 20210111, 1610357375);
+INSERT INTO `s_search_history` VALUES (1842, 0, '[\"3\"]', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357376);
+INSERT INTO `s_search_history` VALUES (1843, 0, '[\"1\",\"3\"]', '', '', '', '', '', 'default', 'asc', '{\"total\":6,\"data_count\":6,\"page\":1,\"page_total\":1}', 20210111, 1610357377);
+INSERT INTO `s_search_history` VALUES (1844, 0, '[\"1\"]', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357378);
+INSERT INTO `s_search_history` VALUES (1845, 0, '[\"1\",\"2\"]', '', '', '', '', '', 'default', 'asc', '{\"total\":10,\"data_count\":10,\"page\":1,\"page_total\":1}', 20210111, 1610357379);
+INSERT INTO `s_search_history` VALUES (1846, 0, '[\"1\"]', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357380);
+INSERT INTO `s_search_history` VALUES (1847, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610357380);
+INSERT INTO `s_search_history` VALUES (1848, 0, '', '', '帐篷', '', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210111, 1610357386);
+INSERT INTO `s_search_history` VALUES (1849, 0, '', '', '帐篷', '', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210111, 1610357389);
+INSERT INTO `s_search_history` VALUES (1850, 0, '', '', 'iphone', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357392);
+INSERT INTO `s_search_history` VALUES (1851, 0, '', '', '包包', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357394);
+INSERT INTO `s_search_history` VALUES (1852, 0, '', '', '连衣裙', '', '', '', 'default', 'asc', '{\"total\":3,\"data_count\":3,\"page\":1,\"page_total\":1}', 20210111, 1610357397);
+INSERT INTO `s_search_history` VALUES (1853, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357435);
+INSERT INTO `s_search_history` VALUES (1854, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357441);
+INSERT INTO `s_search_history` VALUES (1855, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357445);
+INSERT INTO `s_search_history` VALUES (1856, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357532);
+INSERT INTO `s_search_history` VALUES (1857, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357534);
+INSERT INTO `s_search_history` VALUES (1858, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357536);
+INSERT INTO `s_search_history` VALUES (1859, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610357549);
+INSERT INTO `s_search_history` VALUES (1860, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357655);
+INSERT INTO `s_search_history` VALUES (1861, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610357741);
+INSERT INTO `s_search_history` VALUES (1862, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610357784);
+INSERT INTO `s_search_history` VALUES (1863, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357889);
+INSERT INTO `s_search_history` VALUES (1864, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357892);
+INSERT INTO `s_search_history` VALUES (1865, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357894);
+INSERT INTO `s_search_history` VALUES (1866, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357968);
+INSERT INTO `s_search_history` VALUES (1867, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357973);
+INSERT INTO `s_search_history` VALUES (1868, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610357976);
+INSERT INTO `s_search_history` VALUES (1869, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610357979);
+INSERT INTO `s_search_history` VALUES (1870, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610358084);
+INSERT INTO `s_search_history` VALUES (1871, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610358316);
+INSERT INTO `s_search_history` VALUES (1872, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610358319);
+INSERT INTO `s_search_history` VALUES (1873, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610358629);
+INSERT INTO `s_search_history` VALUES (1874, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210111, 1610358631);
+INSERT INTO `s_search_history` VALUES (1875, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610358634);
+INSERT INTO `s_search_history` VALUES (1876, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610358637);
+INSERT INTO `s_search_history` VALUES (1877, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210111, 1610365931);
+INSERT INTO `s_search_history` VALUES (1878, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610365940);
+INSERT INTO `s_search_history` VALUES (1879, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610365942);
+INSERT INTO `s_search_history` VALUES (1880, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610365979);
+INSERT INTO `s_search_history` VALUES (1881, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610365981);
+INSERT INTO `s_search_history` VALUES (1882, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210111, 1610365988);
+INSERT INTO `s_search_history` VALUES (1883, 0, '', '', '', '', '', '', '', '', '', 20210111, 1610368162);
+INSERT INTO `s_search_history` VALUES (1884, 0, '', '', '', '', '', '', '', '', '', 20210111, 1610368260);
+INSERT INTO `s_search_history` VALUES (1885, 0, '', '', '', '', '', '', '', '', '', 20210111, 1610371054);
+INSERT INTO `s_search_history` VALUES (1886, 0, '', '', '', '', '', '', '', '', '', 20210111, 1610372409);
+INSERT INTO `s_search_history` VALUES (1887, 0, '', '', '', '', '', '', '', '', '', 20210111, 1610375588);
+INSERT INTO `s_search_history` VALUES (1888, 0, '', '', '', '', '', '', '', '', '', 20210111, 1610375596);
+INSERT INTO `s_search_history` VALUES (1889, 0, '', '', '', '', '', '', 'access_count', 'desc', '', 20210111, 1610375599);
+INSERT INTO `s_search_history` VALUES (1890, 0, '', '', '', '', '', '', 'access_count', 'asc', '', 20210111, 1610375599);
+INSERT INTO `s_search_history` VALUES (1891, 0, '', '', '', '', '', '', 'access_count', 'desc', '', 20210111, 1610375600);
+INSERT INTO `s_search_history` VALUES (1892, 0, '', '', '', '', '', '', 'access_count', 'asc', '', 20210111, 1610375601);
+INSERT INTO `s_search_history` VALUES (1893, 0, '', '', '', '', '', '', 'access_count', 'desc', '', 20210111, 1610375602);
+INSERT INTO `s_search_history` VALUES (1894, 0, '', '', '', '', '', '', 'access_count', 'asc', '', 20210111, 1610375603);
+INSERT INTO `s_search_history` VALUES (1895, 0, '', '', '', '', '', '', 'min_price', 'asc', '', 20210111, 1610375609);
+INSERT INTO `s_search_history` VALUES (1896, 0, '', '', '', '', '', '', 'min_price', 'desc', '', 20210111, 1610375610);
+INSERT INTO `s_search_history` VALUES (1897, 0, '', '', '', '', '', '', 'id', 'asc', '', 20210111, 1610375611);
+INSERT INTO `s_search_history` VALUES (1898, 0, '', '', '', '', '', '', 'id', 'desc', '', 20210111, 1610375612);
+INSERT INTO `s_search_history` VALUES (1899, 0, '', '', '', '', '', '', 'sales_count', 'asc', '', 20210111, 1610375613);
+INSERT INTO `s_search_history` VALUES (1900, 0, '', '', '', '', '', '', 'sales_count', 'desc', '', 20210111, 1610375613);
+INSERT INTO `s_search_history` VALUES (1901, 0, '', '', '', '', '', '', 'default', 'asc', '', 20210111, 1610375614);
+INSERT INTO `s_search_history` VALUES (1902, 0, '', '', '', '', '', '', 'default', 'desc', '', 20210111, 1610375615);
+INSERT INTO `s_search_history` VALUES (1903, 0, '', '', '', '', '', '', 'default', 'asc', '', 20210111, 1610375617);
+INSERT INTO `s_search_history` VALUES (1904, 0, '', '', '', '', '', '', '', '', '', 20210111, 1610375619);
+INSERT INTO `s_search_history` VALUES (1905, 0, '', '', '', '', '', '', 'id', 'desc', '', 20210111, 1610375623);
+INSERT INTO `s_search_history` VALUES (1906, 0, '', '', '', '', '', '', 'id', 'asc', '', 20210111, 1610375623);
+INSERT INTO `s_search_history` VALUES (1907, 0, '', '', '', '', '', '', 'id', 'desc', '', 20210111, 1610375625);
+INSERT INTO `s_search_history` VALUES (1908, 0, '', '', '', '', '', '', 'id', 'asc', '', 20210111, 1610375625);
+INSERT INTO `s_search_history` VALUES (1909, 0, '', '', '', '', '', '', 'min_price', 'asc', '', 20210111, 1610375628);
+INSERT INTO `s_search_history` VALUES (1910, 0, '', '', '', '', '', '', 'min_price', 'desc', '', 20210111, 1610375629);
+INSERT INTO `s_search_history` VALUES (1911, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610415601);
+INSERT INTO `s_search_history` VALUES (1912, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210112, 1610415603);
+INSERT INTO `s_search_history` VALUES (1913, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610415742);
+INSERT INTO `s_search_history` VALUES (1914, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610415748);
+INSERT INTO `s_search_history` VALUES (1915, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610415886);
+INSERT INTO `s_search_history` VALUES (1916, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610415998);
+INSERT INTO `s_search_history` VALUES (1917, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610416105);
+INSERT INTO `s_search_history` VALUES (1918, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610416124);
+INSERT INTO `s_search_history` VALUES (1919, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610416343);
+INSERT INTO `s_search_history` VALUES (1920, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210112, 1610416442);
+INSERT INTO `s_search_history` VALUES (1921, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610416454);
+INSERT INTO `s_search_history` VALUES (1922, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610416679);
+INSERT INTO `s_search_history` VALUES (1923, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610416796);
+INSERT INTO `s_search_history` VALUES (1924, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610417960);
+INSERT INTO `s_search_history` VALUES (1925, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610417996);
+INSERT INTO `s_search_history` VALUES (1926, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610418846);
+INSERT INTO `s_search_history` VALUES (1927, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610418903);
+INSERT INTO `s_search_history` VALUES (1928, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419000);
+INSERT INTO `s_search_history` VALUES (1929, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419040);
+INSERT INTO `s_search_history` VALUES (1930, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419066);
+INSERT INTO `s_search_history` VALUES (1931, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419455);
+INSERT INTO `s_search_history` VALUES (1932, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419521);
+INSERT INTO `s_search_history` VALUES (1933, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419702);
+INSERT INTO `s_search_history` VALUES (1934, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419759);
+INSERT INTO `s_search_history` VALUES (1935, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610419830);
+INSERT INTO `s_search_history` VALUES (1936, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610420100);
+INSERT INTO `s_search_history` VALUES (1937, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610420357);
+INSERT INTO `s_search_history` VALUES (1938, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610420461);
+INSERT INTO `s_search_history` VALUES (1939, 0, '', '[\"2\"]', '', '', '', '', 'default', 'asc', '{\"total\":9,\"data_count\":9,\"page\":1,\"page_total\":1}', 20210112, 1610420712);
+INSERT INTO `s_search_history` VALUES (1940, 0, '', '[\"2\"]', '', '[\"600-1000\"]', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210112, 1610420716);
+INSERT INTO `s_search_history` VALUES (1941, 0, '', '[\"2\"]', '', '[\"600-1000\",\"1500-2000\"]', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210112, 1610420716);
+INSERT INTO `s_search_history` VALUES (1942, 0, '', '[\"2\"]', '', '[\"100-300\",\"600-1000\",\"1500-2000\"]', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610420717);
+INSERT INTO `s_search_history` VALUES (1943, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610421697);
+INSERT INTO `s_search_history` VALUES (1944, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610421852);
+INSERT INTO `s_search_history` VALUES (1945, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610421873);
+INSERT INTO `s_search_history` VALUES (1946, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610422041);
+INSERT INTO `s_search_history` VALUES (1947, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610422674);
+INSERT INTO `s_search_history` VALUES (1948, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610422843);
+INSERT INTO `s_search_history` VALUES (1949, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610422900);
+INSERT INTO `s_search_history` VALUES (1950, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610425119);
+INSERT INTO `s_search_history` VALUES (1951, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610426295);
+INSERT INTO `s_search_history` VALUES (1952, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610426555);
+INSERT INTO `s_search_history` VALUES (1953, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610426716);
+INSERT INTO `s_search_history` VALUES (1954, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610426802);
+INSERT INTO `s_search_history` VALUES (1955, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610426819);
+INSERT INTO `s_search_history` VALUES (1956, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610427301);
+INSERT INTO `s_search_history` VALUES (1957, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610427357);
+INSERT INTO `s_search_history` VALUES (1958, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610427408);
+INSERT INTO `s_search_history` VALUES (1959, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610427480);
+INSERT INTO `s_search_history` VALUES (1960, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610428475);
+INSERT INTO `s_search_history` VALUES (1961, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610428555);
+INSERT INTO `s_search_history` VALUES (1962, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610428785);
+INSERT INTO `s_search_history` VALUES (1963, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610428810);
+INSERT INTO `s_search_history` VALUES (1964, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610429664);
+INSERT INTO `s_search_history` VALUES (1965, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610429770);
+INSERT INTO `s_search_history` VALUES (1966, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610429813);
+INSERT INTO `s_search_history` VALUES (1967, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610429853);
+INSERT INTO `s_search_history` VALUES (1968, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610429922);
+INSERT INTO `s_search_history` VALUES (1969, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610429942);
+INSERT INTO `s_search_history` VALUES (1970, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610430448);
+INSERT INTO `s_search_history` VALUES (1971, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610430540);
+INSERT INTO `s_search_history` VALUES (1972, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610430690);
+INSERT INTO `s_search_history` VALUES (1973, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610430728);
+INSERT INTO `s_search_history` VALUES (1974, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610430878);
+INSERT INTO `s_search_history` VALUES (1975, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610430970);
+INSERT INTO `s_search_history` VALUES (1976, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431016);
+INSERT INTO `s_search_history` VALUES (1977, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431052);
+INSERT INTO `s_search_history` VALUES (1978, 0, '', '[\"1\",\"2\"]', '', '[\"100-300\",\"600-1000\",\"1500-2000\"]', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610431073);
+INSERT INTO `s_search_history` VALUES (1979, 0, '', '[\"1\",\"2\"]', '', '[\"0-100\",\"100-300\",\"600-1000\",\"1500-2000\"]', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610431074);
+INSERT INTO `s_search_history` VALUES (1980, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431141);
+INSERT INTO `s_search_history` VALUES (1981, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431377);
+INSERT INTO `s_search_history` VALUES (1982, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431512);
+INSERT INTO `s_search_history` VALUES (1983, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210112, 1610431571);
+INSERT INTO `s_search_history` VALUES (1984, 0, '', '', '', '', '[\"图案花纹\"]', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210112, 1610431574);
+INSERT INTO `s_search_history` VALUES (1985, 0, '', '', '', '', '[\"图案花纹\"]', '[\"64G\"]', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210112, 1610431578);
+INSERT INTO `s_search_history` VALUES (1986, 0, '', '', '', '', '[\"图案花纹\"]', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210112, 1610431582);
+INSERT INTO `s_search_history` VALUES (1987, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210112, 1610431583);
+INSERT INTO `s_search_history` VALUES (1988, 0, '', '[\"2\"]', '', '', '', '', 'default', 'asc', '{\"total\":9,\"data_count\":9,\"page\":1,\"page_total\":1}', 20210112, 1610431587);
+INSERT INTO `s_search_history` VALUES (1989, 0, '', '[\"1\",\"2\"]', '', '', '', '', 'default', 'asc', '{\"total\":11,\"data_count\":11,\"page\":1,\"page_total\":1}', 20210112, 1610431588);
+INSERT INTO `s_search_history` VALUES (1990, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431640);
+INSERT INTO `s_search_history` VALUES (1991, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431663);
+INSERT INTO `s_search_history` VALUES (1992, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431726);
+INSERT INTO `s_search_history` VALUES (1993, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431764);
+INSERT INTO `s_search_history` VALUES (1994, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610431933);
+INSERT INTO `s_search_history` VALUES (1995, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432050);
+INSERT INTO `s_search_history` VALUES (1996, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432238);
+INSERT INTO `s_search_history` VALUES (1997, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432367);
+INSERT INTO `s_search_history` VALUES (1998, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432475);
+INSERT INTO `s_search_history` VALUES (1999, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432571);
+INSERT INTO `s_search_history` VALUES (2000, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432588);
+INSERT INTO `s_search_history` VALUES (2001, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432666);
+INSERT INTO `s_search_history` VALUES (2002, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432759);
+INSERT INTO `s_search_history` VALUES (2003, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432821);
+INSERT INTO `s_search_history` VALUES (2004, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432885);
+INSERT INTO `s_search_history` VALUES (2005, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610432979);
+INSERT INTO `s_search_history` VALUES (2006, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433064);
+INSERT INTO `s_search_history` VALUES (2007, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433153);
+INSERT INTO `s_search_history` VALUES (2008, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433259);
+INSERT INTO `s_search_history` VALUES (2009, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433279);
+INSERT INTO `s_search_history` VALUES (2010, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433378);
+INSERT INTO `s_search_history` VALUES (2011, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433494);
+INSERT INTO `s_search_history` VALUES (2012, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433590);
+INSERT INTO `s_search_history` VALUES (2013, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433679);
+INSERT INTO `s_search_history` VALUES (2014, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433697);
+INSERT INTO `s_search_history` VALUES (2015, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433768);
+INSERT INTO `s_search_history` VALUES (2016, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433863);
+INSERT INTO `s_search_history` VALUES (2017, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610433992);
+INSERT INTO `s_search_history` VALUES (2018, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434067);
+INSERT INTO `s_search_history` VALUES (2019, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434113);
+INSERT INTO `s_search_history` VALUES (2020, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434156);
+INSERT INTO `s_search_history` VALUES (2021, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434239);
+INSERT INTO `s_search_history` VALUES (2022, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434273);
+INSERT INTO `s_search_history` VALUES (2023, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434291);
+INSERT INTO `s_search_history` VALUES (2024, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434364);
+INSERT INTO `s_search_history` VALUES (2025, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434431);
+INSERT INTO `s_search_history` VALUES (2026, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434494);
+INSERT INTO `s_search_history` VALUES (2027, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434587);
+INSERT INTO `s_search_history` VALUES (2028, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434654);
+INSERT INTO `s_search_history` VALUES (2029, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434676);
+INSERT INTO `s_search_history` VALUES (2030, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610434736);
+INSERT INTO `s_search_history` VALUES (2031, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610435493);
+INSERT INTO `s_search_history` VALUES (2032, 0, '[object Object]', '[object Object]', '', '[object Object]', '[object Object]', '[object Object]', '', '', '', 20210112, 1610435510);
+INSERT INTO `s_search_history` VALUES (2033, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610435682);
+INSERT INTO `s_search_history` VALUES (2034, 0, '[object Object]', '[object Object]', '', '[object Object]', '[object Object]', '', '', '', '', 20210112, 1610435727);
+INSERT INTO `s_search_history` VALUES (2035, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610435802);
+INSERT INTO `s_search_history` VALUES (2036, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610435859);
+INSERT INTO `s_search_history` VALUES (2037, 0, '[object Object]', '', '', '', '', '', '', '', '', 20210112, 1610435907);
+INSERT INTO `s_search_history` VALUES (2038, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610436047);
+INSERT INTO `s_search_history` VALUES (2039, 0, '2,3', '2,3', '', '', '', '', '', '', '', 20210112, 1610436056);
+INSERT INTO `s_search_history` VALUES (2040, 0, '2,3', '2,3', '', '0-100,100-300,300-600,1500-2000,2000-3000,3000-5000', '', '32G,64G,L', '', '', '', 20210112, 1610436090);
+INSERT INTO `s_search_history` VALUES (2041, 0, '2,3', '2,3', '', '0-100,100-300,300-600,1500-2000,2000-3000,3000-5000', '', '32G,64G,L', '', '', '', 20210112, 1610436193);
+INSERT INTO `s_search_history` VALUES (2042, 0, '2,3', '2,3', '', '0-100,100-300,300-600,1500-2000,2000-3000,3000-5000', '', '32G,64G,L', '', '', '', 20210112, 1610436402);
+INSERT INTO `s_search_history` VALUES (2043, 0, '2,3', '2,3', '', '0-100,100-300,300-600,1500-2000,2000-3000,3000-5000', '', '32G,64G,L', '', '', '', 20210112, 1610436576);
+INSERT INTO `s_search_history` VALUES (2044, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610436672);
+INSERT INTO `s_search_history` VALUES (2045, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610436702);
+INSERT INTO `s_search_history` VALUES (2046, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610436759);
+INSERT INTO `s_search_history` VALUES (2047, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610436784);
+INSERT INTO `s_search_history` VALUES (2048, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610436833);
+INSERT INTO `s_search_history` VALUES (2049, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610436865);
+INSERT INTO `s_search_history` VALUES (2050, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610437049);
+INSERT INTO `s_search_history` VALUES (2051, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610437068);
+INSERT INTO `s_search_history` VALUES (2052, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610437129);
+INSERT INTO `s_search_history` VALUES (2053, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610437188);
+INSERT INTO `s_search_history` VALUES (2054, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2","2":"3"}', '', '{"0":"0-100","1":"100-300"}', '{"0":"单件","1":"图案花纹"}', '{"0":"64G","1":"L","2":"L+L"}', '', '', '', 20210112, 1610437222);
+INSERT INTO `s_search_history` VALUES (2055, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437245);
+INSERT INTO `s_search_history` VALUES (2056, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437250);
+INSERT INTO `s_search_history` VALUES (2057, 0, '', '{"0":"2"}', '', '', '', '', '', '', '', 20210112, 1610437255);
+INSERT INTO `s_search_history` VALUES (2058, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437261);
+INSERT INTO `s_search_history` VALUES (2059, 0, '', '{"0":"2","1":"3"}', '', '', '', '', '', '', '', 20210112, 1610437265);
+INSERT INTO `s_search_history` VALUES (2060, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437278);
+INSERT INTO `s_search_history` VALUES (2061, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610437679);
+INSERT INTO `s_search_history` VALUES (2062, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437688);
+INSERT INTO `s_search_history` VALUES (2063, 0, '', '{"0":"1","1":"2"}', '', '', '', '', '', '', '', 20210112, 1610437696);
+INSERT INTO `s_search_history` VALUES (2064, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610437730);
+INSERT INTO `s_search_history` VALUES (2065, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437740);
+INSERT INTO `s_search_history` VALUES (2066, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437759);
+INSERT INTO `s_search_history` VALUES (2067, 0, '', '{"0":"2"}', '', '', '', '', '', '', '', 20210112, 1610437762);
+INSERT INTO `s_search_history` VALUES (2068, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437806);
+INSERT INTO `s_search_history` VALUES (2069, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437827);
+INSERT INTO `s_search_history` VALUES (2070, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610437893);
+INSERT INTO `s_search_history` VALUES (2071, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610437898);
+INSERT INTO `s_search_history` VALUES (2072, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437902);
+INSERT INTO `s_search_history` VALUES (2073, 0, '{"0":"2","1":"3"}', '', '', '', '', '', '', '', '', 20210112, 1610437906);
+INSERT INTO `s_search_history` VALUES (2074, 0, '{"0":"1","1":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610437910);
+INSERT INTO `s_search_history` VALUES (2075, 0, '{"0":"1","1":"2"}', '{"0":"2"}', '', '', '', '', '', '', '', 20210112, 1610437913);
+INSERT INTO `s_search_history` VALUES (2076, 0, '{"0":"1","1":"2"}', '{"0":"2","1":"56"}', '', '', '', '', '', '', '', 20210112, 1610437921);
+INSERT INTO `s_search_history` VALUES (2077, 0, '{"0":"1","1":"2"}', '{"0":"56"}', '', '', '', '', '', '', '', 20210112, 1610437925);
+INSERT INTO `s_search_history` VALUES (2078, 0, '{"0":"1","1":"2"}', '{"0":"56"}', '', '', '', '', '', '', '', 20210112, 1610437928);
+INSERT INTO `s_search_history` VALUES (2079, 0, '{"0":"1","1":"2"}', '{"0":"56"}', '', '', '', '', '', '', '', 20210112, 1610437933);
+INSERT INTO `s_search_history` VALUES (2080, 0, '{"0":"1","1":"2"}', '{"0":"56"}', '', '', '', '', '', '', '', 20210112, 1610437939);
+INSERT INTO `s_search_history` VALUES (2081, 0, '{"0":"1","1":"2"}', '{"0":"56"}', '', '', '', '', '', '', '', 20210112, 1610437943);
+INSERT INTO `s_search_history` VALUES (2082, 0, '{"0":"1","1":"2"}', '{"0":"56"}', '', '', '', '', '', '', '', 20210112, 1610437948);
+INSERT INTO `s_search_history` VALUES (2083, 0, '{"0":"1","1":"2"}', '{"0":"2","1":"56"}', '', '', '', '', '', '', '', 20210112, 1610437954);
+INSERT INTO `s_search_history` VALUES (2084, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610437979);
+INSERT INTO `s_search_history` VALUES (2085, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610438065);
+INSERT INTO `s_search_history` VALUES (2086, 0, '{"0":"2"}', '{"0":"3"}', '', '', '', '', '', '', '', 20210112, 1610438070);
+INSERT INTO `s_search_history` VALUES (2087, 0, '{"0":"2"}', '{"0":"2","1":"3"}', '', '', '', '', '', '', '', 20210112, 1610438073);
+INSERT INTO `s_search_history` VALUES (2088, 0, '{"0":"2"}', '{"0":"3"}', '', '', '', '', '', '', '', 20210112, 1610438077);
+INSERT INTO `s_search_history` VALUES (2089, 0, '{"0":"2"}', '{"0":"3"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438089);
+INSERT INTO `s_search_history` VALUES (2090, 0, '{"0":"2"}', '{"0":"2","1":"3"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438092);
+INSERT INTO `s_search_history` VALUES (2091, 0, '{"0":"2"}', '{"0":"2"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438096);
+INSERT INTO `s_search_history` VALUES (2092, 0, '{"0":"1","1":"2"}', '{"0":"2"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438101);
+INSERT INTO `s_search_history` VALUES (2093, 0, '{"0":"1","1":"2"}', '{"0":"1","1":"2"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438105);
+INSERT INTO `s_search_history` VALUES (2094, 0, '{"0":"1","1":"2"}', '{"0":"1"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438115);
+INSERT INTO `s_search_history` VALUES (2095, 0, '{"0":"1","1":"2"}', '', '连衣裙', '', '', '', '', '', '', 20210112, 1610438119);
+INSERT INTO `s_search_history` VALUES (2096, 0, '{"0":"1","1":"2"}', '{"0":"54"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438127);
+INSERT INTO `s_search_history` VALUES (2097, 0, '{"0":"1","1":"2"}', '{"0":"52","1":"54"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438131);
+INSERT INTO `s_search_history` VALUES (2098, 0, '{"0":"1","1":"2"}', '{"0":"52","1":"53","2":"54"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438134);
+INSERT INTO `s_search_history` VALUES (2099, 0, '{"0":"1","1":"2"}', '{"0":"53"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438142);
+INSERT INTO `s_search_history` VALUES (2100, 0, '{"0":"1","1":"2","2":"3"}', '{"0":"53"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438146);
+INSERT INTO `s_search_history` VALUES (2101, 0, '{"0":"3"}', '{"0":"53"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438150);
+INSERT INTO `s_search_history` VALUES (2102, 0, '', '{"0":"53"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438153);
+INSERT INTO `s_search_history` VALUES (2103, 0, '', '{"0":"53"}', '连衣裙', '', '', '', '', '', '', 20210112, 1610438157);
+INSERT INTO `s_search_history` VALUES (2104, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610438492);
+INSERT INTO `s_search_history` VALUES (2105, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610439771);
+INSERT INTO `s_search_history` VALUES (2106, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610439777);
+INSERT INTO `s_search_history` VALUES (2107, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610439939);
+INSERT INTO `s_search_history` VALUES (2108, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610440098);
+INSERT INTO `s_search_history` VALUES (2109, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610440487);
+INSERT INTO `s_search_history` VALUES (2110, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210112, 1610440675);
+INSERT INTO `s_search_history` VALUES (2111, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610440771);
+INSERT INTO `s_search_history` VALUES (2112, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441012);
+INSERT INTO `s_search_history` VALUES (2113, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441066);
+INSERT INTO `s_search_history` VALUES (2114, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":1,\"data_count\":1,\"page\":1,\"page_total\":1}', 20210112, 1610441107);
+INSERT INTO `s_search_history` VALUES (2115, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610441144);
+INSERT INTO `s_search_history` VALUES (2116, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610441175);
+INSERT INTO `s_search_history` VALUES (2117, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441235);
+INSERT INTO `s_search_history` VALUES (2118, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441253);
+INSERT INTO `s_search_history` VALUES (2119, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441314);
+INSERT INTO `s_search_history` VALUES (2120, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441365);
+INSERT INTO `s_search_history` VALUES (2121, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441431);
+INSERT INTO `s_search_history` VALUES (2122, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610441468);
+INSERT INTO `s_search_history` VALUES (2123, 0, '', '', 'i', '', '', '', '', '', '', 20210112, 1610441960);
+INSERT INTO `s_search_history` VALUES (2124, 0, '', '{"0":"3"}', 'i', '', '', '', '', '', '', 20210112, 1610441978);
+INSERT INTO `s_search_history` VALUES (2125, 0, '', '{"0":"2","1":"3"}', 'i', '', '', '', '', '', '', 20210112, 1610441985);
+INSERT INTO `s_search_history` VALUES (2126, 0, '', '[\"1\"]', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610442032);
+INSERT INTO `s_search_history` VALUES (2127, 0, '', '[\"1\",\"2\"]', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610442034);
+INSERT INTO `s_search_history` VALUES (2128, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610442127);
+INSERT INTO `s_search_history` VALUES (2129, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610442525);
+INSERT INTO `s_search_history` VALUES (2130, 0, '{"0":"2","1":"3"}', '', '', '', '', '', '', '', '', 20210112, 1610442535);
+INSERT INTO `s_search_history` VALUES (2131, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610442668);
+INSERT INTO `s_search_history` VALUES (2132, 0, '{"0":"1","1":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610442726);
+INSERT INTO `s_search_history` VALUES (2133, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442731);
+INSERT INTO `s_search_history` VALUES (2134, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442733);
+INSERT INTO `s_search_history` VALUES (2135, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442736);
+INSERT INTO `s_search_history` VALUES (2136, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442737);
+INSERT INTO `s_search_history` VALUES (2137, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442740);
+INSERT INTO `s_search_history` VALUES (2138, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442749);
+INSERT INTO `s_search_history` VALUES (2139, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610442753);
+INSERT INTO `s_search_history` VALUES (2140, 0, '{"0":"1","1":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610442757);
+INSERT INTO `s_search_history` VALUES (2141, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442761);
+INSERT INTO `s_search_history` VALUES (2142, 0, '{"0":"1"}', '', '', '', '', '', '', '', '', 20210112, 1610442768);
+INSERT INTO `s_search_history` VALUES (2143, 0, '{"0":"2"}', '{"0":"2"}', '', '', '', '', '', '', '', 20210112, 1610442899);
+INSERT INTO `s_search_history` VALUES (2144, 0, '{"0":"2"}', '{"0":"2"}', '', '', '', '', '', '', '', 20210112, 1610442902);
+INSERT INTO `s_search_history` VALUES (2145, 0, '{"0":"2","1":"3"}', '', '', '', '', '', '', '', '', 20210112, 1610443007);
+INSERT INTO `s_search_history` VALUES (2146, 0, '{"0":"2","1":"3"}', '', '', '', '', '', '', '', '', 20210112, 1610443009);
+INSERT INTO `s_search_history` VALUES (2147, 0, '', '', '', '{"0":"300-600"}', '', '', '', '', '', 20210112, 1610443014);
+INSERT INTO `s_search_history` VALUES (2148, 0, '', '', '', '{"0":"300-600"}', '', '', '', '', '', 20210112, 1610443016);
+INSERT INTO `s_search_history` VALUES (2149, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443049);
+INSERT INTO `s_search_history` VALUES (2150, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610443059);
+INSERT INTO `s_search_history` VALUES (2151, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610443075);
+INSERT INTO `s_search_history` VALUES (2152, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443136);
+INSERT INTO `s_search_history` VALUES (2153, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610443146);
+INSERT INTO `s_search_history` VALUES (2154, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610443150);
+INSERT INTO `s_search_history` VALUES (2155, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443217);
+INSERT INTO `s_search_history` VALUES (2156, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610443228);
+INSERT INTO `s_search_history` VALUES (2157, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443237);
+INSERT INTO `s_search_history` VALUES (2158, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443309);
+INSERT INTO `s_search_history` VALUES (2159, 0, '{"0":"2"}', '', '', '', '', '', '', '', '', 20210112, 1610443313);
+INSERT INTO `s_search_history` VALUES (2160, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443318);
+INSERT INTO `s_search_history` VALUES (2161, 0, '', '', '', '', '', '', 'id', 'desc', '', 20210112, 1610443320);
+INSERT INTO `s_search_history` VALUES (2162, 0, '{"0":"3"}', '', '', '', '', '', '', '', '', 20210112, 1610443325);
+INSERT INTO `s_search_history` VALUES (2163, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443329);
+INSERT INTO `s_search_history` VALUES (2164, 0, '', '', '', '', '', '{"0":"L+L"}', '', '', '', 20210112, 1610443336);
+INSERT INTO `s_search_history` VALUES (2165, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443339);
+INSERT INTO `s_search_history` VALUES (2166, 0, '', '', '', '{"0":"300-600"}', '', '', '', '', '', 20210112, 1610443343);
+INSERT INTO `s_search_history` VALUES (2167, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443345);
+INSERT INTO `s_search_history` VALUES (2168, 0, '', '', '', '', '{"0":"图案花纹"}', '', '', '', '', 20210112, 1610443349);
+INSERT INTO `s_search_history` VALUES (2169, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443351);
+INSERT INTO `s_search_history` VALUES (2170, 0, '', '', 'iphone', '', '', '', '', '', '', 20210112, 1610443359);
+INSERT INTO `s_search_history` VALUES (2171, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610443362);
+INSERT INTO `s_search_history` VALUES (2172, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":12,\"data_count\":12,\"page\":1,\"page_total\":1}', 20210112, 1610445275);
+INSERT INTO `s_search_history` VALUES (2173, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210112, 1610445279);
+INSERT INTO `s_search_history` VALUES (2174, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":0,\"data_count\":0,\"page\":1,\"page_total\":0}', 20210112, 1610445284);
+INSERT INTO `s_search_history` VALUES (2175, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":8,\"data_count\":8,\"page\":1,\"page_total\":1}', 20210112, 1610445287);
+INSERT INTO `s_search_history` VALUES (2176, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610447381);
+INSERT INTO `s_search_history` VALUES (2177, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610447395);
+INSERT INTO `s_search_history` VALUES (2178, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610447831);
+INSERT INTO `s_search_history` VALUES (2179, 0, '', '', '', '', '', '', '', '', '', 20210112, 1610448008);
+INSERT INTO `s_search_history` VALUES (2180, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610459405);
+INSERT INTO `s_search_history` VALUES (2181, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610459408);
+INSERT INTO `s_search_history` VALUES (2182, 0, '', '', '', '', '', '', 'default', 'asc', '{\"total\":5,\"data_count\":5,\"page\":1,\"page_total\":1}', 20210112, 1610459413);
COMMIT;
-- ----------------------------
diff --git a/sourcecode/alipay/default/app.acss b/sourcecode/alipay/default/app.acss
index 456dc084e..0e9658d9b 100644
--- a/sourcecode/alipay/default/app.acss
+++ b/sourcecode/alipay/default/app.acss
@@ -138,6 +138,7 @@ textarea {
min-height: 104rpx;
line-height: 52rpx;
font-size: 32rpx;
+ white-space: initial;
}
diff --git a/sourcecode/alipay/default/app.json b/sourcecode/alipay/default/app.json
index eed14eb52..bd7ccdfd7 100644
--- a/sourcecode/alipay/default/app.json
+++ b/sourcecode/alipay/default/app.json
@@ -76,7 +76,8 @@
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail",
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo",
"pages/plugins/signin/user-coming-list/user-coming-list",
- "pages/plugins/points/index/index"
+ "pages/plugins/points/index/index",
+ "pages/plugins/brand/index/index"
],
"window": {
"defaultTitle": "{{application_title}}",
diff --git a/sourcecode/alipay/default/pages/goods-search/goods-search.acss b/sourcecode/alipay/default/pages/goods-search/goods-search.acss
index 04e3a4408..6495e3e54 100644
--- a/sourcecode/alipay/default/pages/goods-search/goods-search.acss
+++ b/sourcecode/alipay/default/pages/goods-search/goods-search.acss
@@ -13,6 +13,9 @@
width: 30rpx;
height: 30rpx;
}
+.nav-sort-content .item text, .nav-sort-content .item image {
+ vertical-align:middle;
+}
.screening-submit {
width: 50rpx;
height: 50rpx;
@@ -55,46 +58,106 @@
margin-top: 15rpx;
}
+
/**
* 条件
*/
-.popup-form {
- height: calc(100vh - 20rpx);
- padding: 20rpx 20rpx 0 20rpx;
+.search-map {
+ height: calc(100vh - 80rpx);
+ width: 680rpx;
+ overflow-y: scroll;
+ overflow-x: hidden;
}
-.popup-form input {
+.map-keywords {
+ border-radius: 0 !important;
+ padding: 0 10rpx;
+ line-height: 66rpx;
+ height: 66rpx;
font-size: 26rpx;
- height: 60rpx;
+ box-sizing: border-box;
+}
+.map-nav {
+ position: relative;
+}
+.map-nav .arrow-bottom {
+ position: absolute;
+ top: 0;
+ right: 10rpx;
+ padding-right: 46rpx;
+ color: #999;
+}
+.map-item {
+ background: #f0f0f0;
+ line-height: 76rpx;
+}
+.map-base,
+.map-nav {
+ padding: 0 10rpx;
+}
+.map-content {
+ padding: 15rpx;
line-height: 60rpx;
- background: #fbfbfb;
- border-radius: 6rpx;
}
-.screening-price input {
- width: calc(50% - 20px);
+.map-text-items view,
+.map-images-text-items view {
+ padding: 0 15rpx;
+ border-radius: 2px;
+ margin: 15rpx;
+ border: 1px solid transparent;
}
-.screening-price .separator {
- line-height: 50rpx;
+.map-images-text-items view {
+ vertical-align: middle;
+ border: 1px solid #eee;
+ width: 150rpx;
+ height: 72rpx;
+ line-height: 72rpx;
}
-.popup-form .item {
- width: 480rpx;
- padding: 0 20rpx;
- margin-top: 20rpx;
+.map-images-text-items view image {
+ width: 150rpx;
+ height: calc(100% - 8rpx);
+ display: block;
+ margin: 0 auto;
+ margin-top: 4rpx;
}
-.popup-form .keywords input {
- width: calc(100% - 30rpx);
+.map-text-items view.active,
+.map-images-text-items view.active {
+ border: 1px solid #e23f36;
+ color: #e23f36;
+ font-weight: bold;
}
-.popup-form .item:not(:last-child) {
- margin-bottom: 50rpx;
-}
-.popup-form .item .title {
- margin-bottom: 10rpx;
- font-size: 28rpx;
-}
-.popup-form .form-submit {
+.search-map .search-submit {
height: 80rpx;
line-height: 80rpx;
position: absolute;
left: 0;
bottom: 0;
border-radius: 0;
+}
+.map-remove-submit {
+ color: #e23f36;
+}
+
+/**
+ * 品牌基础信息
+ */
+.brand-info {
+ padding: 35rpx 15rpx;
+}
+.brand-info image,
+.brand-info .info-logo-empty {
+ width: 300rpx;
+ height: 130rpx;
+ border: 1px solid #eee;
+}
+.brand-info .info-logo-empty {
+ line-height: 130rpx;
+}
+.brand-info .info-right {
+ width: calc(100% - 330rpx);
+}
+.brand-info .info-desc {
+ color: #999;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
}
\ No newline at end of file
diff --git a/sourcecode/alipay/default/pages/goods-search/goods-search.axml b/sourcecode/alipay/default/pages/goods-search/goods-search.axml
index 5f508abed..cab841b16 100755
--- a/sourcecode/alipay/default/pages/goods-search/goods-search.axml
+++ b/sourcecode/alipay/default/pages/goods-search/goods-search.axml
@@ -38,21 +38,97 @@
-
+
diff --git a/sourcecode/alipay/default/pages/goods-search/goods-search.js b/sourcecode/alipay/default/pages/goods-search/goods-search.js
index 0d4735b13..a4665c531 100755
--- a/sourcecode/alipay/default/pages/goods-search/goods-search.js
+++ b/sourcecode/alipay/default/pages/goods-search/goods-search.js
@@ -4,6 +4,7 @@ Page({
data_list_loding_status: 1,
data_bottom_line_status: false,
data_list: [],
+ data_total: 0,
data_page_total: 0,
data_page: 1,
params: null,
@@ -20,6 +21,21 @@ Page({
// 基础配置
currency_symbol: app.data.currency_symbol,
+
+ // 搜素条件
+ search_map_info: [],
+ brand_list: [],
+ category_list: [],
+ screening_price_list: [],
+ goods_params_list: [],
+ goods_spec_list: [],
+ map_fields_list: {
+ "brand_list": {"height":"100rpx", "default":"100rpx", "form_key":"brand_ids"},
+ "category_list": {"height":"82rpx", "default":"82rpx", "form_key":"category_ids"},
+ "screening_price_list": {"height":"82rpx", "default":"82rpx", "form_key":"screening_price_values"},
+ "goods_params_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_params_values"},
+ "goods_spec_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_spec_values"}
+ },
},
onLoad(params) {
@@ -82,16 +98,9 @@ Page({
// 加载loding
my.showLoading({ content: "加载中..." });
- this.setData({
- data_list_loding_status: 1
- });
// 参数
- var params = this.data.params;
- var post_data = this.data.post_data;
- post_data['page'] = this.data.data_page;
- post_data['category_id'] = params['category_id'] || 0;
- post_data['brand_id'] = params['brand_id'] || 0;
+ var post_data = this.request_map_handle();
// 获取数据
my.request({
@@ -104,20 +113,36 @@ Page({
my.hideLoading();
my.stopPullDownRefresh();
if (res.data.code == 0) {
- if (res.data.data.data.length > 0) {
+ var data = res.data.data;
+
+ // 仅首次请求赋值条件数据
+ if(this.data.data_list_loding_status == 1)
+ {
+ this.setData({
+ search_map_info: data.search_map_info || [],
+ brand_list: data.brand_list || [],
+ category_list: data.category_list || [],
+ screening_price_list: data.screening_price_list || [],
+ goods_params_list: data.goods_params_list || [],
+ goods_spec_list: data.goods_spec_list || [],
+ });
+ }
+
+ // 列表数据处理
+ if (data.data.length > 0) {
if (this.data.data_page <= 1) {
- var temp_data_list = res.data.data.data;
+ var temp_data_list = data.data;
} else {
var temp_data_list = this.data.data_list;
- var temp_data = res.data.data.data;
+ var temp_data = data.data;
for (var i in temp_data) {
temp_data_list.push(temp_data[i]);
}
}
this.setData({
data_list: temp_data_list,
- data_total: res.data.data.total,
- data_page_total: res.data.data.page_total,
+ data_total: data.total,
+ data_page_total: data.page_total,
data_list_loding_status: 3,
data_page: this.data.data_page + 1
});
@@ -159,6 +184,55 @@ Page({
});
},
+ // 搜索条件处理
+ request_map_handle() {
+ var params = this.data.params;
+ var post_data = this.data.post_data;
+ post_data['page'] = this.data.data_page;
+
+ // 指定分类、品牌
+ post_data['category_id'] = params['category_id'] || 0;
+ post_data['brand_id'] = params['brand_id'] || 0;
+
+ // 搜索条件
+ var data = this.data;
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ var temp = {};
+ var index = 0;
+ for(var k in data[i])
+ {
+ if((data[i][k]['active'] || 0) == 1)
+ {
+ switch(i)
+ {
+ // 价格
+ case 'screening_price_list' :
+ temp[index] = data[i][k]['min_price']+'-'+data[i][k]['max_price'];
+ break;
+
+ // 属性、规格
+ case 'goods_params_list' :
+ case 'goods_spec_list' :
+ temp[index] = data[i][k]['value'];
+ break;
+
+ // 默认取值id
+ default :
+ temp[index] = data[i][k]['id'];
+ }
+ index++;
+ }
+ }
+ post_data[data.map_fields_list[i]['form_key']] = (app.get_length(temp) > 0) ? JSON.stringify(temp) : '';
+ }
+ }
+
+ return post_data;
+ },
+
// 下拉刷新
onPullDownRefresh() {
this.setData({
@@ -189,7 +263,7 @@ Page({
this.setData({ is_show_popup_form: true });
},
- // 筛选
+ // 排序事件
nav_sort_event(e) {
var index = e.target.dataset.index || 0;
var temp_post_data = this.data.post_data;
@@ -220,15 +294,66 @@ Page({
this.get_data_list(1);
},
+ // 条件-更多数据展示事件
+ more_event(e) {
+ var value = e.currentTarget.dataset.value || null;
+ var temp_more = this.data.map_fields_list;
+ if(value != null && (temp_more[value] || null) != null)
+ {
+ temp_more[value]['height'] = (temp_more[value]['height'] == 'auto') ? temp_more[value]['default'] : 'auto';
+ this.setData({map_fields_list: temp_more});
+ }
+ },
+
+ // 条件-选择事件
+ map_item_event(e) {
+ var index = e.currentTarget.dataset.index;
+ var field = e.currentTarget.dataset.field;
+ var data = this.data;
+ if((data[field] || null) != null && (data[field][index] || null) != null)
+ {
+ data[field][index]['active'] = ((data[field][index]['active'] || 0) == 0) ? 1 : 0;
+ this.setData(data);
+ }
+ },
+
+ // 条件-清空
+ map_remove_event(e) {
+ var data = this.data;
+ // 关键字
+ data['post_data']['wd'] = '';
+
+ // 品牌、分类、价格、属性、规格
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ for(var k in data[i])
+ {
+ data[i][k]['active'] = 0;
+ }
+ }
+ }
+
+ // 关闭条件弹层
+ data['is_show_popup_form'] = false;
+
+ // 分页恢复1页、重新获取数据
+ data['data_page'] = 1;
+ this.setData(data);
+ this.get_data_list(1);
+ },
+
// 自定义分享
onShareAppMessage() {
var user_id = app.get_user_cache_info('id', 0) || 0;
var category_id = this.data.params['category_id'] || 0;
+ var brand_id = this.data.params['brand_id'] || 0;
var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&brand_id='+brand_id+'&keywords='+keywords
};
},
});
diff --git a/sourcecode/alipay/default/pages/index/index.acss b/sourcecode/alipay/default/pages/index/index.acss
index 4209c75c8..7874e073a 100644
--- a/sourcecode/alipay/default/pages/index/index.acss
+++ b/sourcecode/alipay/default/pages/index/index.acss
@@ -157,7 +157,7 @@
}
.limitedtimediscount .goods-list .item {
width: 460rpx;
- height: 605rpx;
+ height: 670rpx;
border: 1px solid #f5f5f5;
background: white;
display: inline-block;
diff --git a/sourcecode/alipay/default/pages/plugins/brand/index/index.acss b/sourcecode/alipay/default/pages/plugins/brand/index/index.acss
new file mode 100644
index 000000000..e30ba875f
--- /dev/null
+++ b/sourcecode/alipay/default/pages/plugins/brand/index/index.acss
@@ -0,0 +1,48 @@
+/**
+ * 分类导航
+ */
+.nav-list {
+ width: 100%;
+ height: 80rpx;
+ white-space: nowrap;
+ box-sizing: border-box;
+}
+.nav-list .item {
+ padding: 20rpx 30rpx;
+ border-bottom: 3px solid #f0f0f0;
+ display: inline-block;
+ position: relative;
+}
+.nav-list .active {
+ border-bottom: 3px solid #d2364c;
+ color: #d2364c;
+}
+
+/**
+ * 数据列表
+ */
+.data-list .items {
+ width: calc(50% - 5rpx);
+ margin-bottom: 10rpx;
+}
+.data-list .items:nth-child(2n) {
+ float: right;
+}
+.data-list .items:nth-child(2n+1) {
+ float: left;
+}
+.data-list .items image {
+ width: 100%;
+ height: 160rpx !important;
+}
+.data-list .items .base {
+ padding-top: 20rpx;
+ margin: 20rpx;
+}
+.data-list .items .desc {
+ color: #999;
+ margin-top: 10rpx;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
+}
\ No newline at end of file
diff --git a/sourcecode/alipay/default/pages/plugins/brand/index/index.axml b/sourcecode/alipay/default/pages/plugins/brand/index/index.axml
new file mode 100644
index 000000000..688dd3a67
--- /dev/null
+++ b/sourcecode/alipay/default/pages/plugins/brand/index/index.axml
@@ -0,0 +1,32 @@
+
+
+
+ 全部
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.describe}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sourcecode/alipay/default/pages/plugins/brand/index/index.js b/sourcecode/alipay/default/pages/plugins/brand/index/index.js
new file mode 100644
index 000000000..5bd39d618
--- /dev/null
+++ b/sourcecode/alipay/default/pages/plugins/brand/index/index.js
@@ -0,0 +1,129 @@
+const app = getApp();
+Page({
+ data: {
+ data_bottom_line_status: false,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
+ params: null,
+ data_base: null,
+ brand_list: [],
+ brand_category_list: [],
+ nav_active_value: 0,
+ },
+
+ onLoad(params) {
+ this.setData({
+ params: params,
+ });
+ },
+
+ onShow() {
+ this.get_data();
+
+ // 显示分享菜单
+ app.show_share_menu();
+ },
+
+ // 获取数据
+ get_data() {
+ var self = this;
+ my.request({
+ url: app.get_request_url("index", "index", "brand"),
+ method: "POST",
+ data: {},
+ dataType: "json",
+ success: res => {
+ my.stopPullDownRefresh();
+ if (res.data.code == 0) {
+ var data = res.data.data;
+ self.setData({
+ data_base: data.base || null,
+ brand_list: data.brand_list || [],
+ brand_category_list: data.brand_category_list || [],
+ data_list_loding_msg: '',
+ data_list_loding_status: ((data.brand_list || []).length > 0) ? 3 : 0,
+ data_bottom_line_status: ((data.brand_list || []).length > 0),
+ });
+
+ // 选中处理
+ self.nav_active_handle();
+ } else {
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: res.data.msg,
+ });
+ }
+ },
+ fail: () => {
+ my.stopPullDownRefresh();
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: '服务器请求出错',
+ });
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.get_data();
+ },
+
+ // 导航事件
+ nav_event(e) {
+ this.setData({
+ nav_active_value: e.currentTarget.dataset.value || 0,
+ });
+ this.nav_active_handle();
+ },
+
+ // 导航选中处理
+ nav_active_handle() {
+ var value = this.data.nav_active_value;
+ var temp_brand_list = this.data.brand_list;
+ var count = 0;
+ for(var i in temp_brand_list)
+ {
+ if(value == 0)
+ {
+ temp_brand_list[i]['is_not_show'] = 0;
+ count++;
+ } else {
+ var is_not_show = (temp_brand_list[i]['brand_category_ids'].indexOf(value) == -1) ? 1 : 0;
+ temp_brand_list[i]['is_not_show'] = is_not_show;
+ if(is_not_show == 0)
+ {
+ count++;
+ }
+ }
+ }
+ this.setData({
+ brand_list: temp_brand_list,
+ data_list_loding_status: (count > 0) ? 3 : 0,
+ data_bottom_line_status: (count > 0),
+ });
+ },
+
+ // 自定义分享
+ onShareAppMessage() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
+ desc: this.data.data_base.seo_desc || app.data.application_describe,
+ path: '/pages/plugins/brand/index/index?referrer=' + user_id
+ };
+ },
+
+ // 分享朋友圈
+ onShareTimeline() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
+ query: 'referrer=' + user_id,
+ imageUrl: this.data.data_base.right_images || ''
+ };
+ },
+});
\ No newline at end of file
diff --git a/sourcecode/alipay/default/pages/plugins/brand/index/index.json b/sourcecode/alipay/default/pages/plugins/brand/index/index.json
new file mode 100644
index 000000000..5dc4faf67
--- /dev/null
+++ b/sourcecode/alipay/default/pages/plugins/brand/index/index.json
@@ -0,0 +1,4 @@
+{
+ "pullRefresh": true,
+ "defaultTitle": "品牌"
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/default/app.css b/sourcecode/baidu/default/app.css
index 8592f77b0..e82e10792 100755
--- a/sourcecode/baidu/default/app.css
+++ b/sourcecode/baidu/default/app.css
@@ -145,6 +145,7 @@ textarea {
min-height: 104rpx;
line-height: 52rpx;
font-size: 32rpx;
+ white-space: initial;
}
diff --git a/sourcecode/baidu/default/app.json b/sourcecode/baidu/default/app.json
index 999946bf4..7df74f719 100755
--- a/sourcecode/baidu/default/app.json
+++ b/sourcecode/baidu/default/app.json
@@ -54,7 +54,8 @@
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail",
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo",
"pages/plugins/signin/user-coming-list/user-coming-list",
- "pages/plugins/points/index/index"
+ "pages/plugins/points/index/index",
+ "pages/plugins/brand/index/index"
],
"window": {
"navigationBarTitleText": "{{application_title}}",
diff --git a/sourcecode/baidu/default/pages/goods-search/goods-search.css b/sourcecode/baidu/default/pages/goods-search/goods-search.css
index ab366edb2..13b24464c 100755
--- a/sourcecode/baidu/default/pages/goods-search/goods-search.css
+++ b/sourcecode/baidu/default/pages/goods-search/goods-search.css
@@ -61,40 +61,102 @@
/**
* 条件
*/
-.popup-form {
- height: 100vh;
+.search-map {
+ height: calc(100vh - 80rpx);
+ width: 680rpx;
+ overflow-y: scroll;
+ overflow-x: hidden;
}
-.popup-form input {
+.map-keywords {
+ border-radius: 0 !important;
+ padding: 0 10rpx;
+ line-height: 66rpx;
+ height: 66rpx;
font-size: 26rpx;
- height: 60rpx;
+ box-sizing: border-box;
+}
+.map-nav {
+ position: relative;
+}
+.map-nav .arrow-bottom {
+ position: absolute;
+ top: 0;
+ right: 10rpx;
+ padding-right: 46rpx;
+ color: #999;
+}
+.map-item {
+ background: #f0f0f0;
+ line-height: 76rpx;
+}
+.map-base,
+.map-nav {
+ padding: 0 10rpx;
+}
+.map-content {
+ padding: 15rpx;
line-height: 60rpx;
- background: #fbfbfb;
- border-radius: 6rpx;
- padding: 0 6rpx;
}
-.screening-price input {
- width: calc(50% - 20px);
+.map-text-items view,
+.map-images-text-items view {
+ padding: 0 15rpx;
+ border-radius: 2px;
+ margin: 15rpx;
+ border: 1px solid transparent;
}
-.screening-price .separator {
- line-height: 50rpx;
+.map-images-text-items view {
+ vertical-align: middle;
+ border: 1px solid #eee;
+ width: 150rpx;
+ height: 72rpx;
+ line-height: 72rpx;
}
-.popup-form .item {
- width: 480rpx;
- padding: 0 20rpx;
- margin-top: 20rpx;
+.map-images-text-items view image {
+ width: 150rpx;
+ height: calc(100% - 8rpx);
+ display: block;
+ margin: 0 auto;
+ margin-top: 4rpx;
}
-.popup-form .item:not(:last-child) {
- margin-bottom: 30rpx;
+.map-text-items view.active,
+.map-images-text-items view.active {
+ border: 1px solid #e23f36;
+ color: #e23f36;
+ font-weight: bold;
}
-.popup-form .item .title {
- margin-bottom: 10rpx;
- font-size: 28rpx;
-}
-.popup-form .form-submit {
+.search-map .search-submit {
height: 80rpx;
line-height: 80rpx;
position: absolute;
left: 0;
bottom: 0;
border-radius: 0;
+}
+.map-remove-submit {
+ color: #e23f36;
+}
+
+/**
+ * 品牌基础信息
+ */
+.brand-info {
+ padding: 35rpx 15rpx;
+}
+.brand-info image,
+.brand-info .info-logo-empty {
+ width: 300rpx;
+ height: 130rpx;
+ border: 1px solid #eee;
+}
+.brand-info .info-logo-empty {
+ line-height: 130rpx;
+}
+.brand-info .info-right {
+ width: calc(100% - 330rpx);
+}
+.brand-info .info-desc {
+ color: #999;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
}
\ No newline at end of file
diff --git a/sourcecode/baidu/default/pages/goods-search/goods-search.js b/sourcecode/baidu/default/pages/goods-search/goods-search.js
index 7cb46ee48..7aab19f40 100755
--- a/sourcecode/baidu/default/pages/goods-search/goods-search.js
+++ b/sourcecode/baidu/default/pages/goods-search/goods-search.js
@@ -20,6 +20,21 @@ Page({
// 基础配置
currency_symbol: app.data.currency_symbol,
+
+ // 搜素条件
+ search_map_info: [],
+ brand_list: [],
+ category_list: [],
+ screening_price_list: [],
+ goods_params_list: [],
+ goods_spec_list: [],
+ map_fields_list: {
+ "brand_list": {"height":"100rpx", "default":"100rpx", "form_key":"brand_ids"},
+ "category_list": {"height":"82rpx", "default":"82rpx", "form_key":"category_ids"},
+ "screening_price_list": {"height":"82rpx", "default":"82rpx", "form_key":"screening_price_values"},
+ "goods_params_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_params_values"},
+ "goods_spec_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_spec_values"}
+ },
},
onLoad(params) {
@@ -82,16 +97,9 @@ Page({
// 加载loding
swan.showLoading({ title: "加载中..." });
- this.setData({
- data_list_loding_status: 1
- });
// 参数
- var params = this.data.params;
- var post_data = this.data.post_data;
- post_data['page'] = this.data.data_page;
- post_data['category_id'] = params['category_id'] || 0;
- post_data['brand_id'] = params['brand_id'] || 0;
+ var post_data = this.request_map_handle();
// 获取数据
swan.request({
@@ -104,52 +112,63 @@ Page({
swan.hideLoading();
swan.stopPullDownRefresh();
if (res.data.code == 0) {
- if (res.data.data.data.length > 0) {
- if (this.data.data_page <= 1) {
- var temp_data_list = res.data.data.data;
- } else {
- var temp_data_list = this.data.data_list;
- var temp_data = res.data.data.data;
- for (var i in temp_data) {
- temp_data_list.push(temp_data[i]);
- }
- }
- this.setData({
- data_list: temp_data_list,
- data_total: res.data.data.total,
- data_page_total: res.data.data.page_total,
- data_list_loding_status: 3,
- data_page: this.data.data_page + 1
- });
+ var data = res.data.data;
- // 是否还有数据
- if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total) {
- this.setData({ data_bottom_line_status: true });
- } else {
- this.setData({ data_bottom_line_status: false });
- }
- } else {
- this.setData({
- data_list_loding_status: 0
- });
- if (this.data.data_page <= 1) {
- this.setData({
- data_list: [],
- data_bottom_line_status: false
- });
- }
- }
-
- // 页面信息设置
- if(post_data['page'] == 1) {
- this.set_page_info();
- }
- } else {
+ // 仅首次请求赋值条件数据
+ if(this.data.data_list_loding_status == 1)
+ {
this.setData({
- data_list_loding_status: 0
+ search_map_info: data.search_map_info || [],
+ brand_list: data.brand_list || [],
+ category_list: data.category_list || [],
+ screening_price_list: data.screening_price_list || [],
+ goods_params_list: data.goods_params_list || [],
+ goods_spec_list: data.goods_spec_list || [],
+ });
+ }
+
+ // 列表数据处理
+ if (data.data.length > 0) {
+ if (this.data.data_page <= 1) {
+ var temp_data_list = data.data;
+ } else {
+ var temp_data_list = this.data.data_list;
+ var temp_data = data.data;
+ for (var i in temp_data) {
+ temp_data_list.push(temp_data[i]);
+ }
+ }
+ this.setData({
+ data_list: temp_data_list,
+ data_total: data.total,
+ data_page_total: data.page_total,
+ data_list_loding_status: 3,
+ data_page: this.data.data_page + 1
});
- app.showToast(res.data.msg);
+ // 是否还有数据
+ if (this.data.data_page > 1 && this.data.data_page > this.data.data_page_total)
+ {
+ this.setData({ data_bottom_line_status: true });
+ } else {
+ this.setData({data_bottom_line_status: false});
+ }
+ } else {
+ this.setData({
+ data_list_loding_status: 0,
+ });
+ if (this.data.data_page <= 1) {
+ this.setData({
+ data_list: [],
+ data_bottom_line_status: false,
+ });
+ }
+ }
+ } else {
+ this.setData({
+ data_list_loding_status: 0
+ });
+ app.showToast(res.data.msg);
}
},
fail: () => {
@@ -164,6 +183,55 @@ Page({
});
},
+ // 搜索条件处理
+ request_map_handle() {
+ var params = this.data.params;
+ var post_data = this.data.post_data;
+ post_data['page'] = this.data.data_page;
+
+ // 指定分类、品牌
+ post_data['category_id'] = params['category_id'] || 0;
+ post_data['brand_id'] = params['brand_id'] || 0;
+
+ // 搜索条件
+ var data = this.data;
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ var temp = {};
+ var index = 0;
+ for(var k in data[i])
+ {
+ if((data[i][k]['active'] || 0) == 1)
+ {
+ switch(i)
+ {
+ // 价格
+ case 'screening_price_list' :
+ temp[index] = data[i][k]['min_price']+'-'+data[i][k]['max_price'];
+ break;
+
+ // 属性、规格
+ case 'goods_params_list' :
+ case 'goods_spec_list' :
+ temp[index] = data[i][k]['value'];
+ break;
+
+ // 默认取值id
+ default :
+ temp[index] = data[i][k]['id'];
+ }
+ index++;
+ }
+ }
+ post_data[data.map_fields_list[i]['form_key']] = (app.get_length(temp) > 0) ? JSON.stringify(temp) : '';
+ }
+ }
+
+ return post_data;
+ },
+
// 下拉刷新
onPullDownRefresh() {
this.setData({
@@ -194,7 +262,7 @@ Page({
this.setData({ is_show_popup_form: true });
},
- // 筛选
+ // 排序事件
nav_sort_event(e) {
var index = e.currentTarget.dataset.index || 0;
var temp_post_data = this.data.post_data;
@@ -225,6 +293,56 @@ Page({
this.get_data_list(1);
},
+ // 条件-更多数据展示事件
+ more_event(e) {
+ var value = e.currentTarget.dataset.value || null;
+ var temp_more = this.data.map_fields_list;
+ if(value != null && (temp_more[value] || null) != null)
+ {
+ temp_more[value]['height'] = (temp_more[value]['height'] == 'auto') ? temp_more[value]['default'] : 'auto';
+ this.setData({map_fields_list: temp_more});
+ }
+ },
+
+ // 条件-选择事件
+ map_item_event(e) {
+ var index = e.currentTarget.dataset.index;
+ var field = e.currentTarget.dataset.field;
+ var data = this.data;
+ if((data[field] || null) != null && (data[field][index] || null) != null)
+ {
+ data[field][index]['active'] = ((data[field][index]['active'] || 0) == 0) ? 1 : 0;
+ this.setData(data);
+ }
+ },
+
+ // 条件-清空
+ map_remove_event(e) {
+ var data = this.data;
+ // 关键字
+ data['post_data']['wd'] = '';
+
+ // 品牌、分类、价格、属性、规格
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ for(var k in data[i])
+ {
+ data[i][k]['active'] = 0;
+ }
+ }
+ }
+
+ // 关闭条件弹层
+ data['is_show_popup_form'] = false;
+
+ // 分页恢复1页、重新获取数据
+ data['data_page'] = 1;
+ this.setData(data);
+ this.get_data_list(1);
+ },
+
// web页面信息设置
set_page_info() {
swan.setPageInfo({
@@ -239,11 +357,12 @@ Page({
onShareAppMessage() {
var user_id = app.get_user_cache_info('id', 0) || 0;
var category_id = this.data.params['category_id'] || 0;
+ var brand_id = this.data.params['brand_id'] || 0;
var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&brand_id='+brand_id+'&keywords='+keywords
};
},
diff --git a/sourcecode/baidu/default/pages/goods-search/goods-search.swan b/sourcecode/baidu/default/pages/goods-search/goods-search.swan
index 2b6b42d25..cfefc124c 100755
--- a/sourcecode/baidu/default/pages/goods-search/goods-search.swan
+++ b/sourcecode/baidu/default/pages/goods-search/goods-search.swan
@@ -37,21 +37,97 @@
-
+
diff --git a/sourcecode/baidu/default/pages/index/index.css b/sourcecode/baidu/default/pages/index/index.css
index 6ab77d593..a95eb50c0 100755
--- a/sourcecode/baidu/default/pages/index/index.css
+++ b/sourcecode/baidu/default/pages/index/index.css
@@ -4,7 +4,7 @@
.search {
left: 0;
top: 20rpx;
- box-sizing: border-box;
+ box-sizing: border-box;
padding: 20rpx;
background: #d2364c;
}
@@ -157,7 +157,7 @@
}
.limitedtimediscount .goods-list .item {
width: 460rpx;
- height: 610rpx;
+ height: 670rpx;
border: 1px solid #f5f5f5;
background: white;
display: inline-block;
diff --git a/sourcecode/baidu/default/pages/plugins/brand/index/index.css b/sourcecode/baidu/default/pages/plugins/brand/index/index.css
new file mode 100644
index 000000000..e30ba875f
--- /dev/null
+++ b/sourcecode/baidu/default/pages/plugins/brand/index/index.css
@@ -0,0 +1,48 @@
+/**
+ * 分类导航
+ */
+.nav-list {
+ width: 100%;
+ height: 80rpx;
+ white-space: nowrap;
+ box-sizing: border-box;
+}
+.nav-list .item {
+ padding: 20rpx 30rpx;
+ border-bottom: 3px solid #f0f0f0;
+ display: inline-block;
+ position: relative;
+}
+.nav-list .active {
+ border-bottom: 3px solid #d2364c;
+ color: #d2364c;
+}
+
+/**
+ * 数据列表
+ */
+.data-list .items {
+ width: calc(50% - 5rpx);
+ margin-bottom: 10rpx;
+}
+.data-list .items:nth-child(2n) {
+ float: right;
+}
+.data-list .items:nth-child(2n+1) {
+ float: left;
+}
+.data-list .items image {
+ width: 100%;
+ height: 160rpx !important;
+}
+.data-list .items .base {
+ padding-top: 20rpx;
+ margin: 20rpx;
+}
+.data-list .items .desc {
+ color: #999;
+ margin-top: 10rpx;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/default/pages/plugins/brand/index/index.js b/sourcecode/baidu/default/pages/plugins/brand/index/index.js
new file mode 100644
index 000000000..e1989c86f
--- /dev/null
+++ b/sourcecode/baidu/default/pages/plugins/brand/index/index.js
@@ -0,0 +1,131 @@
+const app = getApp();
+Page({
+ data: {
+ data_bottom_line_status: false,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
+ params: null,
+ data_base: null,
+ brand_list: [],
+ brand_category_list: [],
+ nav_active_value: 0
+ },
+
+ onReady() {},
+
+ onLoad(params) {
+ this.setData({
+ params: params
+ });
+ },
+
+ onShow() {
+ this.get_data(); // 显示分享菜单
+
+ app.show_share_menu();
+ },
+
+ // 获取数据
+ get_data() {
+ var self = this;
+ swan.request({
+ url: app.get_request_url("index", "index", "brand"),
+ method: "POST",
+ data: {},
+ dataType: "json",
+ success: res => {
+ swan.stopPullDownRefresh();
+
+ if (res.data.code == 0) {
+ var data = res.data.data;
+ self.setData({
+ data_base: data.base || null,
+ brand_list: data.brand_list || [],
+ brand_category_list: data.brand_category_list || [],
+ data_list_loding_msg: '',
+ data_list_loding_status: (data.brand_list || []).length > 0 ? 3 : 0,
+ data_bottom_line_status: (data.brand_list || []).length > 0
+ }); // 选中处理
+
+ self.nav_active_handle();
+ } else {
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: res.data.msg
+ });
+ }
+ },
+ fail: () => {
+ swan.stopPullDownRefresh();
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: '服务器请求出错'
+ });
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.get_data();
+ },
+
+ // 导航事件
+ nav_event(e) {
+ this.setData({
+ nav_active_value: e.currentTarget.dataset.value || 0
+ });
+ this.nav_active_handle();
+ },
+
+ // 导航选中处理
+ nav_active_handle() {
+ var value = this.data.nav_active_value;
+ var temp_brand_list = this.data.brand_list;
+ var count = 0;
+
+ for (var i in temp_brand_list) {
+ if (value == 0) {
+ temp_brand_list[i]['is_not_show'] = 0;
+ count++;
+ } else {
+ var is_not_show = temp_brand_list[i]['brand_category_ids'].indexOf(value) == -1 ? 1 : 0;
+ temp_brand_list[i]['is_not_show'] = is_not_show;
+
+ if (is_not_show == 0) {
+ count++;
+ }
+ }
+ }
+
+ this.setData({
+ brand_list: temp_brand_list,
+ data_list_loding_status: count > 0 ? 3 : 0,
+ data_bottom_line_status: count > 0
+ });
+ },
+
+ // 自定义分享
+ onShareAppMessage() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - ' + app.data.application_title,
+ desc: this.data.data_base.seo_desc || app.data.application_describe,
+ path: '/pages/plugins/brand/index/index?referrer=' + user_id
+ };
+ },
+
+ // 分享朋友圈
+ onShareTimeline() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - ' + app.data.application_title,
+ query: 'referrer=' + user_id,
+ imageUrl: this.data.data_base.right_images || ''
+ };
+ }
+
+});
\ No newline at end of file
diff --git a/sourcecode/baidu/default/pages/plugins/brand/index/index.json b/sourcecode/baidu/default/pages/plugins/brand/index/index.json
new file mode 100644
index 000000000..31c9fe3d6
--- /dev/null
+++ b/sourcecode/baidu/default/pages/plugins/brand/index/index.json
@@ -0,0 +1,4 @@
+{
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "品牌"
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/default/pages/plugins/brand/index/index.swan b/sourcecode/baidu/default/pages/plugins/brand/index/index.swan
new file mode 100644
index 000000000..18851d3f2
--- /dev/null
+++ b/sourcecode/baidu/default/pages/plugins/brand/index/index.swan
@@ -0,0 +1,32 @@
+
+
+
+ 全部
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.describe}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sourcecode/qq/default/app.json b/sourcecode/qq/default/app.json
index 5e6ded909..61f55cc8e 100755
--- a/sourcecode/qq/default/app.json
+++ b/sourcecode/qq/default/app.json
@@ -54,7 +54,8 @@
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail",
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo",
"pages/plugins/signin/user-coming-list/user-coming-list",
- "pages/plugins/points/index/index"
+ "pages/plugins/points/index/index",
+ "pages/plugins/brand/index/index"
],
"window": {
"navigationBarTitleText": "{{application_title}}",
diff --git a/sourcecode/qq/default/app.qss b/sourcecode/qq/default/app.qss
index 1b11aed82..d3477a601 100755
--- a/sourcecode/qq/default/app.qss
+++ b/sourcecode/qq/default/app.qss
@@ -145,6 +145,7 @@ textarea {
min-height: 104rpx;
line-height: 52rpx;
font-size: 32rpx;
+ white-space: initial;
}
diff --git a/sourcecode/qq/default/pages/goods-search/goods-search.js b/sourcecode/qq/default/pages/goods-search/goods-search.js
index abdb5c304..78237aadb 100755
--- a/sourcecode/qq/default/pages/goods-search/goods-search.js
+++ b/sourcecode/qq/default/pages/goods-search/goods-search.js
@@ -4,6 +4,7 @@ Page({
data_list_loding_status: 1,
data_bottom_line_status: false,
data_list: [],
+ data_total: 0,
data_page_total: 0,
data_page: 1,
params: null,
@@ -20,6 +21,21 @@ Page({
// 基础配置
currency_symbol: app.data.currency_symbol,
+
+ // 搜素条件
+ search_map_info: [],
+ brand_list: [],
+ category_list: [],
+ screening_price_list: [],
+ goods_params_list: [],
+ goods_spec_list: [],
+ map_fields_list: {
+ "brand_list": {"height":"100rpx", "default":"100rpx", "form_key":"brand_ids"},
+ "category_list": {"height":"82rpx", "default":"82rpx", "form_key":"category_ids"},
+ "screening_price_list": {"height":"82rpx", "default":"82rpx", "form_key":"screening_price_values"},
+ "goods_params_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_params_values"},
+ "goods_spec_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_spec_values"}
+ },
},
onLoad(params) {
@@ -82,16 +98,9 @@ Page({
// 加载loding
qq.showLoading({title: "加载中..." });
- this.setData({
- data_list_loding_status: 1
- });
// 参数
- var params = this.data.params;
- var post_data = this.data.post_data;
- post_data['page'] = this.data.data_page;
- post_data['category_id'] = params['category_id'] || 0;
- post_data['brand_id'] = params['brand_id'] || 0;
+ var post_data = this.request_map_handle();
// 获取数据
qq.request({
@@ -104,20 +113,36 @@ Page({
qq.hideLoading();
qq.stopPullDownRefresh();
if (res.data.code == 0) {
- if (res.data.data.data.length > 0) {
+ var data = res.data.data;
+
+ // 仅首次请求赋值条件数据
+ if(this.data.data_list_loding_status == 1)
+ {
+ this.setData({
+ search_map_info: data.search_map_info || [],
+ brand_list: data.brand_list || [],
+ category_list: data.category_list || [],
+ screening_price_list: data.screening_price_list || [],
+ goods_params_list: data.goods_params_list || [],
+ goods_spec_list: data.goods_spec_list || [],
+ });
+ }
+
+ // 列表数据处理
+ if (data.data.length > 0) {
if (this.data.data_page <= 1) {
- var temp_data_list = res.data.data.data;
+ var temp_data_list = data.data;
} else {
var temp_data_list = this.data.data_list;
- var temp_data = res.data.data.data;
+ var temp_data = data.data;
for (var i in temp_data) {
temp_data_list.push(temp_data[i]);
}
}
this.setData({
data_list: temp_data_list,
- data_total: res.data.data.total,
- data_page_total: res.data.data.page_total,
+ data_total: data.total,
+ data_page_total: data.page_total,
data_list_loding_status: 3,
data_page: this.data.data_page + 1
});
@@ -144,7 +169,6 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
app.showToast(res.data.msg);
}
},
@@ -160,6 +184,55 @@ Page({
});
},
+ // 搜索条件处理
+ request_map_handle() {
+ var params = this.data.params;
+ var post_data = this.data.post_data;
+ post_data['page'] = this.data.data_page;
+
+ // 指定分类、品牌
+ post_data['category_id'] = params['category_id'] || 0;
+ post_data['brand_id'] = params['brand_id'] || 0;
+
+ // 搜索条件
+ var data = this.data;
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ var temp = {};
+ var index = 0;
+ for(var k in data[i])
+ {
+ if((data[i][k]['active'] || 0) == 1)
+ {
+ switch(i)
+ {
+ // 价格
+ case 'screening_price_list' :
+ temp[index] = data[i][k]['min_price']+'-'+data[i][k]['max_price'];
+ break;
+
+ // 属性、规格
+ case 'goods_params_list' :
+ case 'goods_spec_list' :
+ temp[index] = data[i][k]['value'];
+ break;
+
+ // 默认取值id
+ default :
+ temp[index] = data[i][k]['id'];
+ }
+ index++;
+ }
+ }
+ post_data[data.map_fields_list[i]['form_key']] = (app.get_length(temp) > 0) ? JSON.stringify(temp) : '';
+ }
+ }
+
+ return post_data;
+ },
+
// 下拉刷新
onPullDownRefresh() {
this.setData({
@@ -190,7 +263,7 @@ Page({
this.setData({ is_show_popup_form: true });
},
- // 筛选
+ // 排序事件
nav_sort_event(e) {
var index = e.currentTarget.dataset.index || 0;
var temp_post_data = this.data.post_data;
@@ -221,15 +294,66 @@ Page({
this.get_data_list(1);
},
+ // 条件-更多数据展示事件
+ more_event(e) {
+ var value = e.currentTarget.dataset.value || null;
+ var temp_more = this.data.map_fields_list;
+ if(value != null && (temp_more[value] || null) != null)
+ {
+ temp_more[value]['height'] = (temp_more[value]['height'] == 'auto') ? temp_more[value]['default'] : 'auto';
+ this.setData({map_fields_list: temp_more});
+ }
+ },
+
+ // 条件-选择事件
+ map_item_event(e) {
+ var index = e.currentTarget.dataset.index;
+ var field = e.currentTarget.dataset.field;
+ var data = this.data;
+ if((data[field] || null) != null && (data[field][index] || null) != null)
+ {
+ data[field][index]['active'] = ((data[field][index]['active'] || 0) == 0) ? 1 : 0;
+ this.setData(data);
+ }
+ },
+
+ // 条件-清空
+ map_remove_event(e) {
+ var data = this.data;
+ // 关键字
+ data['post_data']['wd'] = '';
+
+ // 品牌、分类、价格、属性、规格
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ for(var k in data[i])
+ {
+ data[i][k]['active'] = 0;
+ }
+ }
+ }
+
+ // 关闭条件弹层
+ data['is_show_popup_form'] = false;
+
+ // 分页恢复1页、重新获取数据
+ data['data_page'] = 1;
+ this.setData(data);
+ this.get_data_list(1);
+ },
+
// 自定义分享
onShareAppMessage() {
var user_id = app.get_user_cache_info('id', 0) || 0;
var category_id = this.data.params['category_id'] || 0;
+ var brand_id = this.data.params['brand_id'] || 0;
var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&brand_id='+brand_id+'&keywords='+keywords
};
},
});
diff --git a/sourcecode/qq/default/pages/goods-search/goods-search.qml b/sourcecode/qq/default/pages/goods-search/goods-search.qml
index 82adbdf58..13fe7708a 100755
--- a/sourcecode/qq/default/pages/goods-search/goods-search.qml
+++ b/sourcecode/qq/default/pages/goods-search/goods-search.qml
@@ -37,21 +37,97 @@
-
+
diff --git a/sourcecode/qq/default/pages/goods-search/goods-search.qss b/sourcecode/qq/default/pages/goods-search/goods-search.qss
index ab366edb2..13b24464c 100755
--- a/sourcecode/qq/default/pages/goods-search/goods-search.qss
+++ b/sourcecode/qq/default/pages/goods-search/goods-search.qss
@@ -61,40 +61,102 @@
/**
* 条件
*/
-.popup-form {
- height: 100vh;
+.search-map {
+ height: calc(100vh - 80rpx);
+ width: 680rpx;
+ overflow-y: scroll;
+ overflow-x: hidden;
}
-.popup-form input {
+.map-keywords {
+ border-radius: 0 !important;
+ padding: 0 10rpx;
+ line-height: 66rpx;
+ height: 66rpx;
font-size: 26rpx;
- height: 60rpx;
+ box-sizing: border-box;
+}
+.map-nav {
+ position: relative;
+}
+.map-nav .arrow-bottom {
+ position: absolute;
+ top: 0;
+ right: 10rpx;
+ padding-right: 46rpx;
+ color: #999;
+}
+.map-item {
+ background: #f0f0f0;
+ line-height: 76rpx;
+}
+.map-base,
+.map-nav {
+ padding: 0 10rpx;
+}
+.map-content {
+ padding: 15rpx;
line-height: 60rpx;
- background: #fbfbfb;
- border-radius: 6rpx;
- padding: 0 6rpx;
}
-.screening-price input {
- width: calc(50% - 20px);
+.map-text-items view,
+.map-images-text-items view {
+ padding: 0 15rpx;
+ border-radius: 2px;
+ margin: 15rpx;
+ border: 1px solid transparent;
}
-.screening-price .separator {
- line-height: 50rpx;
+.map-images-text-items view {
+ vertical-align: middle;
+ border: 1px solid #eee;
+ width: 150rpx;
+ height: 72rpx;
+ line-height: 72rpx;
}
-.popup-form .item {
- width: 480rpx;
- padding: 0 20rpx;
- margin-top: 20rpx;
+.map-images-text-items view image {
+ width: 150rpx;
+ height: calc(100% - 8rpx);
+ display: block;
+ margin: 0 auto;
+ margin-top: 4rpx;
}
-.popup-form .item:not(:last-child) {
- margin-bottom: 30rpx;
+.map-text-items view.active,
+.map-images-text-items view.active {
+ border: 1px solid #e23f36;
+ color: #e23f36;
+ font-weight: bold;
}
-.popup-form .item .title {
- margin-bottom: 10rpx;
- font-size: 28rpx;
-}
-.popup-form .form-submit {
+.search-map .search-submit {
height: 80rpx;
line-height: 80rpx;
position: absolute;
left: 0;
bottom: 0;
border-radius: 0;
+}
+.map-remove-submit {
+ color: #e23f36;
+}
+
+/**
+ * 品牌基础信息
+ */
+.brand-info {
+ padding: 35rpx 15rpx;
+}
+.brand-info image,
+.brand-info .info-logo-empty {
+ width: 300rpx;
+ height: 130rpx;
+ border: 1px solid #eee;
+}
+.brand-info .info-logo-empty {
+ line-height: 130rpx;
+}
+.brand-info .info-right {
+ width: calc(100% - 330rpx);
+}
+.brand-info .info-desc {
+ color: #999;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
}
\ No newline at end of file
diff --git a/sourcecode/qq/default/pages/index/index.qss b/sourcecode/qq/default/pages/index/index.qss
index d4a57858a..629602236 100755
--- a/sourcecode/qq/default/pages/index/index.qss
+++ b/sourcecode/qq/default/pages/index/index.qss
@@ -157,7 +157,7 @@
}
.limitedtimediscount .goods-list .item {
width: 460rpx;
- height: 605rpx;
+ height: 670rpx;
border: 1px solid #f5f5f5;
background: white;
display: inline-block;
diff --git a/sourcecode/qq/default/pages/plugins/brand/index/index.js b/sourcecode/qq/default/pages/plugins/brand/index/index.js
new file mode 100644
index 000000000..e28273c7c
--- /dev/null
+++ b/sourcecode/qq/default/pages/plugins/brand/index/index.js
@@ -0,0 +1,129 @@
+const app = getApp();
+Page({
+ data: {
+ data_bottom_line_status: false,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
+ params: null,
+ data_base: null,
+ brand_list: [],
+ brand_category_list: [],
+ nav_active_value: 0,
+ },
+
+ onLoad(params) {
+ this.setData({
+ params: params,
+ });
+ },
+
+ onShow() {
+ this.get_data();
+
+ // 显示分享菜单
+ app.show_share_menu();
+ },
+
+ // 获取数据
+ get_data() {
+ var self = this;
+ qq.request({
+ url: app.get_request_url("index", "index", "brand"),
+ method: "POST",
+ data: {},
+ dataType: "json",
+ success: res => {
+ qq.stopPullDownRefresh();
+ if (res.data.code == 0) {
+ var data = res.data.data;
+ self.setData({
+ data_base: data.base || null,
+ brand_list: data.brand_list || [],
+ brand_category_list: data.brand_category_list || [],
+ data_list_loding_msg: '',
+ data_list_loding_status: ((data.brand_list || []).length > 0) ? 3 : 0,
+ data_bottom_line_status: ((data.brand_list || []).length > 0),
+ });
+
+ // 选中处理
+ self.nav_active_handle();
+ } else {
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: res.data.msg,
+ });
+ }
+ },
+ fail: () => {
+ qq.stopPullDownRefresh();
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: '服务器请求出错',
+ });
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.get_data();
+ },
+
+ // 导航事件
+ nav_event(e) {
+ this.setData({
+ nav_active_value: e.currentTarget.dataset.value || 0,
+ });
+ this.nav_active_handle();
+ },
+
+ // 导航选中处理
+ nav_active_handle() {
+ var value = this.data.nav_active_value;
+ var temp_brand_list = this.data.brand_list;
+ var count = 0;
+ for(var i in temp_brand_list)
+ {
+ if(value == 0)
+ {
+ temp_brand_list[i]['is_not_show'] = 0;
+ count++;
+ } else {
+ var is_not_show = (temp_brand_list[i]['brand_category_ids'].indexOf(value) == -1) ? 1 : 0;
+ temp_brand_list[i]['is_not_show'] = is_not_show;
+ if(is_not_show == 0)
+ {
+ count++;
+ }
+ }
+ }
+ this.setData({
+ brand_list: temp_brand_list,
+ data_list_loding_status: (count > 0) ? 3 : 0,
+ data_bottom_line_status: (count > 0),
+ });
+ },
+
+ // 自定义分享
+ onShareAppMessage() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
+ desc: this.data.data_base.seo_desc || app.data.application_describe,
+ path: '/pages/plugins/brand/index/index?referrer=' + user_id
+ };
+ },
+
+ // 分享朋友圈
+ onShareTimeline() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
+ query: 'referrer=' + user_id,
+ imageUrl: this.data.data_base.right_images || ''
+ };
+ },
+});
\ No newline at end of file
diff --git a/sourcecode/qq/default/pages/plugins/brand/index/index.json b/sourcecode/qq/default/pages/plugins/brand/index/index.json
new file mode 100644
index 000000000..65c420392
--- /dev/null
+++ b/sourcecode/qq/default/pages/plugins/brand/index/index.json
@@ -0,0 +1,4 @@
+{
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "品牌"
+}
\ No newline at end of file
diff --git a/sourcecode/qq/default/pages/plugins/brand/index/index.qml b/sourcecode/qq/default/pages/plugins/brand/index/index.qml
new file mode 100644
index 000000000..1c1f36882
--- /dev/null
+++ b/sourcecode/qq/default/pages/plugins/brand/index/index.qml
@@ -0,0 +1,32 @@
+
+
+
+ 全部
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.describe}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sourcecode/qq/default/pages/plugins/brand/index/index.qss b/sourcecode/qq/default/pages/plugins/brand/index/index.qss
new file mode 100644
index 000000000..e30ba875f
--- /dev/null
+++ b/sourcecode/qq/default/pages/plugins/brand/index/index.qss
@@ -0,0 +1,48 @@
+/**
+ * 分类导航
+ */
+.nav-list {
+ width: 100%;
+ height: 80rpx;
+ white-space: nowrap;
+ box-sizing: border-box;
+}
+.nav-list .item {
+ padding: 20rpx 30rpx;
+ border-bottom: 3px solid #f0f0f0;
+ display: inline-block;
+ position: relative;
+}
+.nav-list .active {
+ border-bottom: 3px solid #d2364c;
+ color: #d2364c;
+}
+
+/**
+ * 数据列表
+ */
+.data-list .items {
+ width: calc(50% - 5rpx);
+ margin-bottom: 10rpx;
+}
+.data-list .items:nth-child(2n) {
+ float: right;
+}
+.data-list .items:nth-child(2n+1) {
+ float: left;
+}
+.data-list .items image {
+ width: 100%;
+ height: 160rpx !important;
+}
+.data-list .items .base {
+ padding-top: 20rpx;
+ margin: 20rpx;
+}
+.data-list .items .desc {
+ color: #999;
+ margin-top: 10rpx;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
+}
\ No newline at end of file
diff --git a/sourcecode/toutiao/default/app.json b/sourcecode/toutiao/default/app.json
index 010aa6860..50a6f42b8 100755
--- a/sourcecode/toutiao/default/app.json
+++ b/sourcecode/toutiao/default/app.json
@@ -73,7 +73,8 @@
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail",
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo",
"pages/plugins/signin/user-coming-list/user-coming-list",
- "pages/plugins/points/index/index"
+ "pages/plugins/points/index/index",
+ "pages/plugins/brand/index/index"
],
"window": {
"navigationBarTitleText": "{{application_title}}",
diff --git a/sourcecode/toutiao/default/app.ttss b/sourcecode/toutiao/default/app.ttss
index 16008af46..b1d8b396e 100755
--- a/sourcecode/toutiao/default/app.ttss
+++ b/sourcecode/toutiao/default/app.ttss
@@ -146,6 +146,7 @@ textarea {
min-height: 104rpx;
line-height: 52rpx;
font-size: 32rpx;
+ white-space: initial;
}
diff --git a/sourcecode/toutiao/default/pages/goods-search/goods-search.js b/sourcecode/toutiao/default/pages/goods-search/goods-search.js
index 280895ec1..d3ce2a5d3 100755
--- a/sourcecode/toutiao/default/pages/goods-search/goods-search.js
+++ b/sourcecode/toutiao/default/pages/goods-search/goods-search.js
@@ -20,6 +20,21 @@ Page({
// 基础配置
currency_symbol: app.data.currency_symbol,
+
+ // 搜素条件
+ search_map_info: [],
+ brand_list: [],
+ category_list: [],
+ screening_price_list: [],
+ goods_params_list: [],
+ goods_spec_list: [],
+ map_fields_list: {
+ "brand_list": {"height":"100rpx", "default":"100rpx", "form_key":"brand_ids"},
+ "category_list": {"height":"82rpx", "default":"82rpx", "form_key":"category_ids"},
+ "screening_price_list": {"height":"82rpx", "default":"82rpx", "form_key":"screening_price_values"},
+ "goods_params_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_params_values"},
+ "goods_spec_list": {"height":"82rpx", "default":"82rpx", "form_key":"goods_spec_values"}
+ },
},
onLoad(params) {
@@ -82,16 +97,9 @@ Page({
// 加载loding
tt.showLoading({title: "加载中..." });
- this.setData({
- data_list_loding_status: 1
- });
// 参数
- var params = this.data.params;
- var post_data = this.data.post_data;
- post_data['page'] = this.data.data_page;
- post_data['category_id'] = params['category_id'] || 0;
- post_data['brand_id'] = params['brand_id'] || 0;
+ var post_data = this.request_map_handle();
// 获取数据
tt.request({
@@ -104,20 +112,36 @@ Page({
tt.hideLoading();
tt.stopPullDownRefresh();
if (res.data.code == 0) {
- if (res.data.data.data.length > 0) {
+ var data = res.data.data;
+
+ // 仅首次请求赋值条件数据
+ if(this.data.data_list_loding_status == 1)
+ {
+ this.setData({
+ search_map_info: data.search_map_info || [],
+ brand_list: data.brand_list || [],
+ category_list: data.category_list || [],
+ screening_price_list: data.screening_price_list || [],
+ goods_params_list: data.goods_params_list || [],
+ goods_spec_list: data.goods_spec_list || [],
+ });
+ }
+
+ // 列表数据处理
+ if (data.data.length > 0) {
if (this.data.data_page <= 1) {
- var temp_data_list = res.data.data.data;
+ var temp_data_list = data.data;
} else {
var temp_data_list = this.data.data_list;
- var temp_data = res.data.data.data;
+ var temp_data = data.data;
for (var i in temp_data) {
temp_data_list.push(temp_data[i]);
}
}
this.setData({
data_list: temp_data_list,
- data_total: res.data.data.total,
- data_page_total: res.data.data.page_total,
+ data_total: data.total,
+ data_page_total: data.page_total,
data_list_loding_status: 3,
data_page: this.data.data_page + 1
});
@@ -144,7 +168,6 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
app.showToast(res.data.msg);
}
},
@@ -160,6 +183,55 @@ Page({
});
},
+ // 搜索条件处理
+ request_map_handle() {
+ var params = this.data.params;
+ var post_data = this.data.post_data;
+ post_data['page'] = this.data.data_page;
+
+ // 指定分类、品牌
+ post_data['category_id'] = params['category_id'] || 0;
+ post_data['brand_id'] = params['brand_id'] || 0;
+
+ // 搜索条件
+ var data = this.data;
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ var temp = {};
+ var index = 0;
+ for(var k in data[i])
+ {
+ if((data[i][k]['active'] || 0) == 1)
+ {
+ switch(i)
+ {
+ // 价格
+ case 'screening_price_list' :
+ temp[index] = data[i][k]['min_price']+'-'+data[i][k]['max_price'];
+ break;
+
+ // 属性、规格
+ case 'goods_params_list' :
+ case 'goods_spec_list' :
+ temp[index] = data[i][k]['value'];
+ break;
+
+ // 默认取值id
+ default :
+ temp[index] = data[i][k]['id'];
+ }
+ index++;
+ }
+ }
+ post_data[data.map_fields_list[i]['form_key']] = (app.get_length(temp) > 0) ? JSON.stringify(temp) : '';
+ }
+ }
+
+ return post_data;
+ },
+
// 下拉刷新
onPullDownRefresh() {
this.setData({
@@ -190,7 +262,7 @@ Page({
this.setData({ is_show_popup_form: true });
},
- // 筛选
+ // 排序事件
nav_sort_event(e) {
var index = e.currentTarget.dataset.index || 0;
var temp_post_data = this.data.post_data;
@@ -221,15 +293,66 @@ Page({
this.get_data_list(1);
},
+ // 条件-更多数据展示事件
+ more_event(e) {
+ var value = e.currentTarget.dataset.value || null;
+ var temp_more = this.data.map_fields_list;
+ if(value != null && (temp_more[value] || null) != null)
+ {
+ temp_more[value]['height'] = (temp_more[value]['height'] == 'auto') ? temp_more[value]['default'] : 'auto';
+ this.setData({map_fields_list: temp_more});
+ }
+ },
+
+ // 条件-选择事件
+ map_item_event(e) {
+ var index = e.currentTarget.dataset.index;
+ var field = e.currentTarget.dataset.field;
+ var data = this.data;
+ if((data[field] || null) != null && (data[field][index] || null) != null)
+ {
+ data[field][index]['active'] = ((data[field][index]['active'] || 0) == 0) ? 1 : 0;
+ this.setData(data);
+ }
+ },
+
+ // 条件-清空
+ map_remove_event(e) {
+ var data = this.data;
+ // 关键字
+ data['post_data']['wd'] = '';
+
+ // 品牌、分类、价格、属性、规格
+ for(var i in data.map_fields_list)
+ {
+ if((data[i] != null) != null && data[i].length > 0)
+ {
+ for(var k in data[i])
+ {
+ data[i][k]['active'] = 0;
+ }
+ }
+ }
+
+ // 关闭条件弹层
+ data['is_show_popup_form'] = false;
+
+ // 分页恢复1页、重新获取数据
+ data['data_page'] = 1;
+ this.setData(data);
+ this.get_data_list(1);
+ },
+
// 自定义分享
onShareAppMessage() {
var user_id = app.get_user_cache_info('id', 0) || 0;
var category_id = this.data.params['category_id'] || 0;
+ var brand_id = this.data.params['brand_id'] || 0;
var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&brand_id='+brand_id+'&keywords='+keywords
};
},
});
diff --git a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
index d5e5626c2..d89933914 100755
--- a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
+++ b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
@@ -37,21 +37,97 @@
-
+
diff --git a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttss b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttss
index ab366edb2..13b24464c 100755
--- a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttss
+++ b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttss
@@ -61,40 +61,102 @@
/**
* 条件
*/
-.popup-form {
- height: 100vh;
+.search-map {
+ height: calc(100vh - 80rpx);
+ width: 680rpx;
+ overflow-y: scroll;
+ overflow-x: hidden;
}
-.popup-form input {
+.map-keywords {
+ border-radius: 0 !important;
+ padding: 0 10rpx;
+ line-height: 66rpx;
+ height: 66rpx;
font-size: 26rpx;
- height: 60rpx;
+ box-sizing: border-box;
+}
+.map-nav {
+ position: relative;
+}
+.map-nav .arrow-bottom {
+ position: absolute;
+ top: 0;
+ right: 10rpx;
+ padding-right: 46rpx;
+ color: #999;
+}
+.map-item {
+ background: #f0f0f0;
+ line-height: 76rpx;
+}
+.map-base,
+.map-nav {
+ padding: 0 10rpx;
+}
+.map-content {
+ padding: 15rpx;
line-height: 60rpx;
- background: #fbfbfb;
- border-radius: 6rpx;
- padding: 0 6rpx;
}
-.screening-price input {
- width: calc(50% - 20px);
+.map-text-items view,
+.map-images-text-items view {
+ padding: 0 15rpx;
+ border-radius: 2px;
+ margin: 15rpx;
+ border: 1px solid transparent;
}
-.screening-price .separator {
- line-height: 50rpx;
+.map-images-text-items view {
+ vertical-align: middle;
+ border: 1px solid #eee;
+ width: 150rpx;
+ height: 72rpx;
+ line-height: 72rpx;
}
-.popup-form .item {
- width: 480rpx;
- padding: 0 20rpx;
- margin-top: 20rpx;
+.map-images-text-items view image {
+ width: 150rpx;
+ height: calc(100% - 8rpx);
+ display: block;
+ margin: 0 auto;
+ margin-top: 4rpx;
}
-.popup-form .item:not(:last-child) {
- margin-bottom: 30rpx;
+.map-text-items view.active,
+.map-images-text-items view.active {
+ border: 1px solid #e23f36;
+ color: #e23f36;
+ font-weight: bold;
}
-.popup-form .item .title {
- margin-bottom: 10rpx;
- font-size: 28rpx;
-}
-.popup-form .form-submit {
+.search-map .search-submit {
height: 80rpx;
line-height: 80rpx;
position: absolute;
left: 0;
bottom: 0;
border-radius: 0;
+}
+.map-remove-submit {
+ color: #e23f36;
+}
+
+/**
+ * 品牌基础信息
+ */
+.brand-info {
+ padding: 35rpx 15rpx;
+}
+.brand-info image,
+.brand-info .info-logo-empty {
+ width: 300rpx;
+ height: 130rpx;
+ border: 1px solid #eee;
+}
+.brand-info .info-logo-empty {
+ line-height: 130rpx;
+}
+.brand-info .info-right {
+ width: calc(100% - 330rpx);
+}
+.brand-info .info-desc {
+ color: #999;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
}
\ No newline at end of file
diff --git a/sourcecode/toutiao/default/pages/index/index.ttss b/sourcecode/toutiao/default/pages/index/index.ttss
index d4a57858a..629602236 100755
--- a/sourcecode/toutiao/default/pages/index/index.ttss
+++ b/sourcecode/toutiao/default/pages/index/index.ttss
@@ -157,7 +157,7 @@
}
.limitedtimediscount .goods-list .item {
width: 460rpx;
- height: 605rpx;
+ height: 670rpx;
border: 1px solid #f5f5f5;
background: white;
display: inline-block;
diff --git a/sourcecode/toutiao/default/pages/plugins/brand/index/index.js b/sourcecode/toutiao/default/pages/plugins/brand/index/index.js
new file mode 100644
index 000000000..e7241a209
--- /dev/null
+++ b/sourcecode/toutiao/default/pages/plugins/brand/index/index.js
@@ -0,0 +1,129 @@
+const app = getApp();
+Page({
+ data: {
+ data_bottom_line_status: false,
+ data_list_loding_status: 1,
+ data_list_loding_msg: '',
+ params: null,
+ data_base: null,
+ brand_list: [],
+ brand_category_list: [],
+ nav_active_value: 0,
+ },
+
+ onLoad(params) {
+ this.setData({
+ params: params,
+ });
+ },
+
+ onShow() {
+ this.get_data();
+
+ // 显示分享菜单
+ app.show_share_menu();
+ },
+
+ // 获取数据
+ get_data() {
+ var self = this;
+ tt.request({
+ url: app.get_request_url("index", "index", "brand"),
+ method: "POST",
+ data: {},
+ dataType: "json",
+ success: res => {
+ tt.stopPullDownRefresh();
+ if (res.data.code == 0) {
+ var data = res.data.data;
+ self.setData({
+ data_base: data.base || null,
+ brand_list: data.brand_list || [],
+ brand_category_list: data.brand_category_list || [],
+ data_list_loding_msg: '',
+ data_list_loding_status: ((data.brand_list || []).length > 0) ? 3 : 0,
+ data_bottom_line_status: ((data.brand_list || []).length > 0),
+ });
+
+ // 选中处理
+ self.nav_active_handle();
+ } else {
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: res.data.msg,
+ });
+ }
+ },
+ fail: () => {
+ tt.stopPullDownRefresh();
+ self.setData({
+ data_bottom_line_status: false,
+ data_list_loding_status: 2,
+ data_list_loding_msg: '服务器请求出错',
+ });
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
+
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.get_data();
+ },
+
+ // 导航事件
+ nav_event(e) {
+ this.setData({
+ nav_active_value: e.currentTarget.dataset.value || 0,
+ });
+ this.nav_active_handle();
+ },
+
+ // 导航选中处理
+ nav_active_handle() {
+ var value = this.data.nav_active_value;
+ var temp_brand_list = this.data.brand_list;
+ var count = 0;
+ for(var i in temp_brand_list)
+ {
+ if(value == 0)
+ {
+ temp_brand_list[i]['is_not_show'] = 0;
+ count++;
+ } else {
+ var is_not_show = (temp_brand_list[i]['brand_category_ids'].indexOf(value) == -1) ? 1 : 0;
+ temp_brand_list[i]['is_not_show'] = is_not_show;
+ if(is_not_show == 0)
+ {
+ count++;
+ }
+ }
+ }
+ this.setData({
+ brand_list: temp_brand_list,
+ data_list_loding_status: (count > 0) ? 3 : 0,
+ data_bottom_line_status: (count > 0),
+ });
+ },
+
+ // 自定义分享
+ onShareAppMessage() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
+ desc: this.data.data_base.seo_desc || app.data.application_describe,
+ path: '/pages/plugins/brand/index/index?referrer=' + user_id
+ };
+ },
+
+ // 分享朋友圈
+ onShareTimeline() {
+ var user_id = app.get_user_cache_info('id', 0) || 0;
+ return {
+ title: this.data.data_base.seo_title || '品牌 - '+app.data.application_title,
+ query: 'referrer=' + user_id,
+ imageUrl: this.data.data_base.right_images || ''
+ };
+ },
+});
\ No newline at end of file
diff --git a/sourcecode/toutiao/default/pages/plugins/brand/index/index.json b/sourcecode/toutiao/default/pages/plugins/brand/index/index.json
new file mode 100644
index 000000000..65c420392
--- /dev/null
+++ b/sourcecode/toutiao/default/pages/plugins/brand/index/index.json
@@ -0,0 +1,4 @@
+{
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "品牌"
+}
\ No newline at end of file
diff --git a/sourcecode/toutiao/default/pages/plugins/brand/index/index.ttml b/sourcecode/toutiao/default/pages/plugins/brand/index/index.ttml
new file mode 100644
index 000000000..d2a8cb59f
--- /dev/null
+++ b/sourcecode/toutiao/default/pages/plugins/brand/index/index.ttml
@@ -0,0 +1,32 @@
+
+
+
+ 全部
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.describe}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sourcecode/toutiao/default/pages/plugins/brand/index/index.ttss b/sourcecode/toutiao/default/pages/plugins/brand/index/index.ttss
new file mode 100644
index 000000000..e30ba875f
--- /dev/null
+++ b/sourcecode/toutiao/default/pages/plugins/brand/index/index.ttss
@@ -0,0 +1,48 @@
+/**
+ * 分类导航
+ */
+.nav-list {
+ width: 100%;
+ height: 80rpx;
+ white-space: nowrap;
+ box-sizing: border-box;
+}
+.nav-list .item {
+ padding: 20rpx 30rpx;
+ border-bottom: 3px solid #f0f0f0;
+ display: inline-block;
+ position: relative;
+}
+.nav-list .active {
+ border-bottom: 3px solid #d2364c;
+ color: #d2364c;
+}
+
+/**
+ * 数据列表
+ */
+.data-list .items {
+ width: calc(50% - 5rpx);
+ margin-bottom: 10rpx;
+}
+.data-list .items:nth-child(2n) {
+ float: right;
+}
+.data-list .items:nth-child(2n+1) {
+ float: left;
+}
+.data-list .items image {
+ width: 100%;
+ height: 160rpx !important;
+}
+.data-list .items .base {
+ padding-top: 20rpx;
+ margin: 20rpx;
+}
+.data-list .items .desc {
+ color: #999;
+ margin-top: 10rpx;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 80rpx;
+}
\ No newline at end of file
diff --git a/sourcecode/weixin/default/app.wxss b/sourcecode/weixin/default/app.wxss
index 1b11aed82..d3477a601 100755
--- a/sourcecode/weixin/default/app.wxss
+++ b/sourcecode/weixin/default/app.wxss
@@ -145,6 +145,7 @@ textarea {
min-height: 104rpx;
line-height: 52rpx;
font-size: 32rpx;
+ white-space: initial;
}
diff --git a/sourcecode/weixin/default/pages/goods-search/goods-search.js b/sourcecode/weixin/default/pages/goods-search/goods-search.js
index ec48dc908..3521e733a 100755
--- a/sourcecode/weixin/default/pages/goods-search/goods-search.js
+++ b/sourcecode/weixin/default/pages/goods-search/goods-search.js
@@ -117,6 +117,21 @@ Page({
wx.stopPullDownRefresh();
if (res.data.code == 0) {
var data = res.data.data;
+
+ // 仅首次请求赋值条件数据
+ if(this.data.data_list_loding_status == 1)
+ {
+ this.setData({
+ search_map_info: data.search_map_info || [],
+ brand_list: data.brand_list || [],
+ category_list: data.category_list || [],
+ screening_price_list: data.screening_price_list || [],
+ goods_params_list: data.goods_params_list || [],
+ goods_spec_list: data.goods_spec_list || [],
+ });
+ }
+
+ // 列表数据处理
if (data.data.length > 0) {
if (this.data.data_page <= 1) {
var temp_data_list = data.data;
@@ -127,21 +142,6 @@ Page({
temp_data_list.push(temp_data[i]);
}
}
-
- // 仅首次请求赋值条件数据
- if(this.data.data_list_loding_status == 1)
- {
- this.setData({
- search_map_info: data.search_map_info || [],
- brand_list: data.brand_list || [],
- category_list: data.category_list || [],
- screening_price_list: data.screening_price_list || [],
- goods_params_list: data.goods_params_list || [],
- goods_spec_list: data.goods_spec_list || [],
- });
- }
-
- // 公共基础数据
this.setData({
data_list: temp_data_list,
data_total: data.total,
@@ -172,14 +172,12 @@ Page({
this.setData({
data_list_loding_status: 0
});
-
app.showToast(res.data.msg);
}
},
fail: () => {
wx.hideLoading();
wx.stopPullDownRefresh();
-
this.setData({
data_list_loding_status: 2
});
@@ -340,7 +338,7 @@ Page({
}
// 关闭条件弹层
- this.popup_form_event_close();
+ data['is_show_popup_form'] = false;
// 分页恢复1页、重新获取数据
data['data_page'] = 1;
@@ -352,11 +350,12 @@ Page({
onShareAppMessage() {
var user_id = app.get_user_cache_info('id', 0) || 0;
var category_id = this.data.params['category_id'] || 0;
+ var brand_id = this.data.params['brand_id'] || 0;
var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
desc: app.data.application_describe,
- path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
+ path: '/pages/goods-search/goods-search?referrer=' + user_id+'&category_id='+category_id+'&brand_id='+brand_id+'&keywords='+keywords
};
},
@@ -364,10 +363,11 @@ Page({
onShareTimeline() {
var user_id = app.get_user_cache_info('id', 0) || 0;
var category_id = this.data.params['category_id'] || 0;
+ var brand_id = this.data.params['brand_id'] || 0;
var keywords = this.data.params['keywords'] || '';
return {
title: app.data.application_title,
- query: 'referrer=' + user_id+'&category_id='+category_id+'&keywords='+keywords
+ query: 'referrer=' + user_id+'&category_id='+category_id+'&brand_id='+brand_id+'&keywords='+keywords
};
},
});
diff --git a/sourcecode/weixin/default/pages/goods-search/goods-search.wxml b/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
index be1fb1ee3..41bdc6c2d 100755
--- a/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
+++ b/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
@@ -48,10 +48,10 @@
-
+
-
+
品牌
更多
@@ -128,8 +128,6 @@
-
-
diff --git a/sourcecode/weixin/default/pages/goods-search/goods-search.wxss b/sourcecode/weixin/default/pages/goods-search/goods-search.wxss
index cb06e52a4..13b24464c 100755
--- a/sourcecode/weixin/default/pages/goods-search/goods-search.wxss
+++ b/sourcecode/weixin/default/pages/goods-search/goods-search.wxss
@@ -72,9 +72,8 @@
padding: 0 10rpx;
line-height: 66rpx;
height: 66rpx;
- border-color: #e8e8e8;
- border-width: 1px 0;
- border-style: solid;
+ font-size: 26rpx;
+ box-sizing: border-box;
}
.map-nav {
position: relative;
@@ -135,7 +134,6 @@
}
.map-remove-submit {
color: #e23f36;
- cursor: pointer;
}
/**
diff --git a/sourcecode/weixin/default/pages/index/index.wxss b/sourcecode/weixin/default/pages/index/index.wxss
index d4a57858a..629602236 100755
--- a/sourcecode/weixin/default/pages/index/index.wxss
+++ b/sourcecode/weixin/default/pages/index/index.wxss
@@ -157,7 +157,7 @@
}
.limitedtimediscount .goods-list .item {
width: 460rpx;
- height: 605rpx;
+ height: 670rpx;
border: 1px solid #f5f5f5;
background: white;
display: inline-block;