diff --git a/application/tags.php b/application/tags.php
index d4eede6bc..1b47de904 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -73,7 +73,6 @@ return array (
0 => 'app\\plugins\\expressforkdn\\Hook',
1 => 'app\\plugins\\touristbuy\\Hook',
2 => 'app\\plugins\\homemiddleadv\\Hook',
- 3 => 'app\\plugins\\footercustomerservice\\Hook',
),
'plugins_admin_common_header' =>
array (
@@ -103,11 +102,21 @@ return array (
array (
0 => 'app\\plugins\\touristbuy\\Hook',
),
+ 'plugins_css' =>
+ array (
+ 0 => 'app\\plugins\\freightfee\\Hook',
+ 1 => 'app\\plugins\\share\\Hook',
+ 2 => 'app\\plugins\\footercustomerservice\\Hook',
+ ),
'plugins_service_buy_handle' =>
array (
0 => 'app\\plugins\\freightfee\\Hook',
1 => 'app\\plugins\\newuserreduction\\Hook',
),
+ 'plugins_view_goods_detail_title' =>
+ array (
+ 0 => 'app\\plugins\\freightfee\\Hook',
+ ),
'plugins_service_users_center_left_menu_handle' =>
array (
0 => 'app\\plugins\\petscms\\Hook',
@@ -116,10 +125,6 @@ return array (
array (
0 => 'app\\plugins\\petscms\\Hook',
),
- 'plugins_css' =>
- array (
- 0 => 'app\\plugins\\share\\Hook',
- ),
'plugins_js' =>
array (
0 => 'app\\plugins\\share\\Hook',
diff --git a/config/shopxo.sql b/config/shopxo.sql
index 2d3a5dc6d..7a1650b33 100644
--- a/config/shopxo.sql
+++ b/config/shopxo.sql
@@ -11,7 +11,7 @@
Target Server Version : 50722
File Encoding : utf-8
- Date: 04/25/2019 18:17:50 PM
+ Date: 04/26/2019 15:21:37 PM
*/
SET NAMES utf8mb4;
@@ -232,13 +232,13 @@ CREATE TABLE `s_cart` (
KEY `goods_id` (`goods_id`),
KEY `title` (`title`),
KEY `stock` (`stock`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='购物车';
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='购物车';
-- ----------------------------
-- Records of `s_cart`
-- ----------------------------
BEGIN;
-INSERT INTO `s_cart` VALUES ('2', '99', '4', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '1999.00', '1', '', '1553225477', '0'), ('3', '90', '7', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '168.00', '1', '', '1555406987', '0');
+INSERT INTO `s_cart` VALUES ('2', '99', '4', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '1999.00', '1', '', '1553225477', '0'), ('7', '90', '2', '苹果(Apple)iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6800.00', '4500.00', '1', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e8c\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"32G\"}]', '1556258591', '0'), ('8', '90', '5', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '2499.00', '1', '', '1556258595', '0'), ('9', '90', '4', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '1999.00', '1', '', '1556258602', '0');
COMMIT;
-- ----------------------------
@@ -366,7 +366,7 @@ CREATE TABLE `s_goods` (
-- Records of `s_goods`
-- ----------------------------
BEGIN;
-INSERT INTO `s_goods` VALUES ('1', '1', 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE(4G)/TD-SCD', '', '', '0', '125', '步', '/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', '0', '27', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1554556830'), ('2', '2', '苹果(Apple)iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1701', '步', '/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', '0', '121', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1554555460'), ('3', '2', 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '0', '235', '步', '/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', '0', '30', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '537', '步', '/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', '0', '75', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '435', '步', '/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', '1', '218', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '319', '步', '/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', '0', '239', '', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '0', '1547453135', '1547453157'), ('7', '1', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '0', '320', '件', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '760.00', '760.00', '168.00', '168.00', '168.00', '11', '1', '0', '1', '1', '1', '



', '2', '0', '49', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1554485498'), ('8', '1', 'MARNI Trunk 女士 中号拼色十字纹小牛皮 斜挎风琴包', '', '', '0', '35', '件', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '672.00', '672.00', '672.00', '356.00', '356.00', '356.00', '8', '1', '0', '1', '1', '1', '



', '2', '0', '25', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1554485486'), ('9', '2', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '0', '596', '件', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '160.00-216.00', '160.00', '216.00', '120.00-158.00', '120.00', '158.00', '2', '1', '0', '1', '1', '1', '




', '3', '0', '107', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1554555420'), ('10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '0', '36', '件', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '568.00', '568.00', '228.00', '228.00', '228.00', '28', '1', '0', '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', '0', '141', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1554555406'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '36665979', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '0.00-268.00', '0.00', '268.00', '160.00-258.00', '160.00', '258.00', '1', '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', '1', '74', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1556157100'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '117', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '0.01-128.00', '0.01', '128.00', '3', '1', '0', '1', '1', '1', '




', '3', '0', '293', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1556156928');
+INSERT INTO `s_goods` VALUES ('1', '1', 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE(4G)/TD-SCD', '', '', '0', '125', '步', '/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', '0', '27', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1554556830'), ('2', '2', '苹果(Apple)iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1699', '步', '/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', '0', '154', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1554555460'), ('3', '2', 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '0', '235', '步', '/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', '0', '32', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '537', '步', '/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', '0', '78', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '435', '步', '/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', '1', '233', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '318', '步', '/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', '0', '242', '', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '0', '1547453135', '1547453157'), ('7', '1', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '0', '319', '件', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '760.00', '760.00', '168.00', '168.00', '168.00', '11', '1', '0', '1', '1', '1', '



', '2', '0', '49', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1554485498'), ('8', '1', 'MARNI Trunk 女士 中号拼色十字纹小牛皮 斜挎风琴包', '', '', '0', '35', '件', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '672.00', '672.00', '672.00', '356.00', '356.00', '356.00', '8', '1', '0', '1', '1', '1', '



', '2', '0', '25', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1554485486'), ('9', '2', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '0', '596', '件', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '160.00-216.00', '160.00', '216.00', '120.00-158.00', '120.00', '158.00', '2', '1', '0', '1', '1', '1', '




', '3', '0', '107', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1554555420'), ('10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '0', '33', '件', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '568.00', '568.00', '228.00', '228.00', '228.00', '28', '1', '0', '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', '0', '144', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1554555406'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '36665977', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '0.00-268.00', '0.00', '268.00', '160.00-258.00', '160.00', '258.00', '1', '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', '1', '76', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1556157100'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '117', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '0.01-128.00', '0.01', '128.00', '3', '1', '0', '1', '1', '1', '




', '3', '0', '294', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1556156928');
COMMIT;
-- ----------------------------
@@ -386,7 +386,7 @@ CREATE TABLE `s_goods_browse` (
-- Records of `s_goods_browse`
-- ----------------------------
BEGIN;
-INSERT INTO `s_goods_browse` VALUES ('1', '7', '91', '1554803230', '1554805470'), ('2', '11', '90', '1554966398', '1556157248'), ('3', '10', '90', '1555048568', '1555911155'), ('4', '9', '90', '1555058265', '1556156966'), ('5', '2', '90', '1555157678', '1555997391'), ('6', '12', '90', '1555159096', '1556157294'), ('7', '5', '90', '1555402359', '1555402359'), ('8', '7', '90', '1555406985', '1556016166'), ('9', '4', '90', '1555491079', '1556016646'), ('10', '6', '90', '1555494278', '1555911840'), ('11', '8', '91', '1556075952', '1556075952'), ('12', '3', '90', '1556077528', '1556077528');
+INSERT INTO `s_goods_browse` VALUES ('1', '7', '91', '1554803230', '1554805470'), ('2', '11', '90', '1554966398', '1556258740'), ('3', '10', '90', '1555048568', '1556260776'), ('4', '9', '90', '1555058265', '1556156966'), ('5', '2', '90', '1555157678', '1556262782'), ('6', '12', '90', '1555159096', '1556258744'), ('7', '5', '90', '1555402359', '1556262794'), ('8', '7', '90', '1555406985', '1556016166'), ('9', '4', '90', '1555491079', '1556258601'), ('10', '6', '90', '1555494278', '1556262780'), ('11', '8', '91', '1556075952', '1556075952'), ('12', '3', '90', '1556077528', '1556250529');
COMMIT;
-- ----------------------------
@@ -530,7 +530,7 @@ CREATE TABLE `s_goods_spec_base` (
-- Records of `s_goods_spec_base`
-- ----------------------------
BEGIN;
-INSERT INTO `s_goods_spec_base` VALUES ('21', '3', '3888.00', '235', '0.00', '', '', '6866.00', '1547452007'), ('22', '4', '1999.00', '537', '0.00', '', '', '2300.00', '1547452553'), ('23', '5', '2499.00', '435', '0.00', '', '', '3200.00', '1547452798'), ('25', '6', '2998.90', '319', '0.00', '', '', '3200.00', '1547453157'), ('154', '8', '356.00', '35', '0.00', '', '', '672.00', '1554485486'), ('155', '7', '168.00', '320', '0.00', '', '', '760.00', '1554485498'), ('162', '10', '228.00', '36', '0.00', '', '', '568.00', '1554555406'), ('163', '9', '120.00', '12', '0.30', '', '', '160.00', '1554555420'), ('164', '9', '120.00', '87', '0.30', '', '', '160.00', '1554555420'), ('165', '9', '120.00', '13', '0.30', '', '', '160.00', '1554555420'), ('166', '9', '120.00', '76', '0.30', '', '', '160.00', '1554555420'), ('167', '9', '136.00', '43', '0.30', '', '', '188.00', '1554555420'), ('168', '9', '136.00', '56', '0.30', '', '', '188.00', '1554555420'), ('169', '9', '136.00', '21', '0.30', '', '', '188.00', '1554555420'), ('170', '9', '158.00', '243', '0.30', '', '', '216.00', '1554555420'), ('171', '9', '158.00', '45', '0.30', '', '', '216.00', '1554555420'), ('172', '2', '6050.00', '100', '0.00', '', '', '6800.00', '1554555460'), ('173', '2', '6600.00', '200', '0.00', '', '', '7200.00', '1554555460'), ('174', '2', '6800.00', '299', '0.00', '', '', '7600.00', '1554555460'), ('175', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1554555460'), ('176', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1554555460'), ('177', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1554555460'), ('178', '2', '4500.00', '97', '0.00', '', '', '6800.00', '1554555460'), ('179', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1554555460'), ('180', '2', '5500.00', '55', '0.00', '', '', '6000.00', '1554555460'), ('181', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1554556830'), ('202', '12', '0.01', '10', '0.50', 'gg11', 'txm11', '188.00', '1556156928'), ('203', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1556156928'), ('204', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1556156928'), ('205', '12', '118.00', '0', '457.60', 'gg44', 'txm44', '150.00', '1556156928'), ('206', '12', '118.00', '0', '37.00', 'gg55', 'txm55', '150.00', '1556156928'), ('207', '11', '258.00', '36665655', '0.00', '', '', '268.00', '1556157100'), ('208', '11', '238.00', '324', '0.00', '', '', '0.00', '1556157100'), ('209', '11', '160.00', '0', '0.00', '', '', '0.00', '1556157100');
+INSERT INTO `s_goods_spec_base` VALUES ('21', '3', '3888.00', '235', '0.00', '', '', '6866.00', '1547452007'), ('22', '4', '1999.00', '537', '0.00', '', '', '2300.00', '1547452553'), ('23', '5', '2499.00', '435', '0.00', '', '', '3200.00', '1547452798'), ('25', '6', '2998.90', '318', '0.00', '', '', '3200.00', '1547453157'), ('154', '8', '356.00', '35', '0.00', '', '', '672.00', '1554485486'), ('155', '7', '168.00', '319', '0.00', '', '', '760.00', '1554485498'), ('162', '10', '228.00', '33', '0.00', '', '', '568.00', '1554555406'), ('163', '9', '120.00', '12', '0.30', '', '', '160.00', '1554555420'), ('164', '9', '120.00', '87', '0.30', '', '', '160.00', '1554555420'), ('165', '9', '120.00', '13', '0.30', '', '', '160.00', '1554555420'), ('166', '9', '120.00', '76', '0.30', '', '', '160.00', '1554555420'), ('167', '9', '136.00', '43', '0.30', '', '', '188.00', '1554555420'), ('168', '9', '136.00', '56', '0.30', '', '', '188.00', '1554555420'), ('169', '9', '136.00', '21', '0.30', '', '', '188.00', '1554555420'), ('170', '9', '158.00', '243', '0.30', '', '', '216.00', '1554555420'), ('171', '9', '158.00', '45', '0.30', '', '', '216.00', '1554555420'), ('172', '2', '6050.00', '99', '0.00', '', '', '6800.00', '1554555460'), ('173', '2', '6600.00', '199', '0.00', '', '', '7200.00', '1554555460'), ('174', '2', '6800.00', '299', '0.00', '', '', '7600.00', '1554555460'), ('175', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1554555460'), ('176', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1554555460'), ('177', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1554555460'), ('178', '2', '4500.00', '97', '0.00', '', '', '6800.00', '1554555460'), ('179', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1554555460'), ('180', '2', '5500.00', '55', '0.00', '', '', '6000.00', '1554555460'), ('181', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1554556830'), ('202', '12', '0.01', '10', '0.50', 'gg11', 'txm11', '188.00', '1556156928'), ('203', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1556156928'), ('204', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1556156928'), ('205', '12', '118.00', '0', '457.60', 'gg44', 'txm44', '150.00', '1556156928'), ('206', '12', '118.00', '0', '37.00', 'gg55', 'txm55', '150.00', '1556156928'), ('207', '11', '258.00', '36665655', '0.00', '', '', '268.00', '1556157100'), ('208', '11', '238.00', '322', '0.00', '', '', '0.00', '1556157100'), ('209', '11', '160.00', '0', '0.00', '', '', '0.00', '1556157100');
COMMIT;
-- ----------------------------
@@ -620,13 +620,13 @@ CREATE TABLE `s_message` (
`add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间',
PRIMARY KEY (`id`),
KEY `user_id` (`user_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息';
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息';
-- ----------------------------
-- Records of `s_message`
-- ----------------------------
BEGIN;
-INSERT INTO `s_message` VALUES ('1', '100', '订单支付', '订单支付成功,金额7.02元', '2', '1', '0', '0', '0', '0', '1553826950'), ('2', '100', '订单支付', '订单支付成功,金额10.01元', '3', '1', '0', '0', '0', '0', '1553827061'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554188629'), ('4', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554195345'), ('5', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554256553'), ('6', '108', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554270624'), ('7', '114', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554343971'), ('8', '115', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554344687'), ('9', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554962882'), ('10', '90', '订单支付', '订单支付成功,金额267.74元', '1', '1', '0', '1', '0', '0', '1554966442'), ('11', '90', '订单发货', '订单已发货', '1', '1', '0', '1', '0', '0', '1554966457'), ('12', '90', '积分变动', '订单商品完成赠送积分增加1', '0', '0', '0', '1', '0', '0', '1554966464'), ('13', '90', '订单收货', '订单收货成功', '1', '1', '0', '1', '0', '0', '1554966464'), ('14', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555244676'), ('15', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555903059');
+INSERT INTO `s_message` VALUES ('1', '100', '订单支付', '订单支付成功,金额7.02元', '2', '1', '0', '0', '0', '0', '1553826950'), ('2', '100', '订单支付', '订单支付成功,金额10.01元', '3', '1', '0', '0', '0', '0', '1553827061'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554188629'), ('4', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554195345'), ('5', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554256553'), ('6', '108', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554270624'), ('7', '114', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554343971'), ('8', '115', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554344687'), ('9', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554962882'), ('10', '90', '订单支付', '订单支付成功,金额267.74元', '1', '1', '0', '1', '0', '0', '1554966442'), ('11', '90', '订单发货', '订单已发货', '1', '1', '0', '1', '0', '0', '1554966457'), ('12', '90', '积分变动', '订单商品完成赠送积分增加1', '0', '0', '0', '1', '0', '0', '1554966464'), ('13', '90', '订单收货', '订单收货成功', '1', '1', '0', '1', '0', '0', '1554966464'), ('14', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555244676'), ('15', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555903059'), ('16', '90', '订单支付', '订单支付成功,金额9231.9元', '3', '1', '0', '0', '0', '0', '1556258500'), ('17', '90', '订单支付', '订单支付成功,金额6600元', '4', '1', '0', '0', '0', '0', '1556258528'), ('18', '90', '订单支付', '订单支付成功,金额248元', '5', '1', '0', '0', '0', '0', '1556258552'), ('19', '90', '订单支付', '订单支付成功,金额466元', '6', '1', '0', '0', '0', '0', '1556259546'), ('20', '90', '订单支付', '订单支付成功,金额238元', '7', '1', '0', '0', '0', '0', '1556260768'), ('21', '90', '订单支付', '订单支付成功,金额228元', '8', '1', '0', '0', '0', '0', '1556260794');
COMMIT;
-- ----------------------------
@@ -707,13 +707,13 @@ CREATE TABLE `s_order` (
KEY `shop_id` (`shop_id`),
KEY `status` (`status`),
KEY `pay_status` (`pay_status`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单';
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单';
-- ----------------------------
-- Records of `s_order`
-- ----------------------------
BEGIN;
-INSERT INTO `s_order` VALUES ('1', '20190411150720949337', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '2', '967878', '1', '4', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":\"10\",\"type\":1,\"tips\":\"+\\uffe510\\u5143\"},{\"name\":\"\\u65b0\\u7528\\u6237\\u7acb\\u51cf\",\"price\":\"0.26\",\"type\":0,\"tips\":\"-\\uffe50.26\\u5143\"}]', '9.74', '0.00', '258.00', '267.74', '267.74', '1554966442', '1554966440', '1554966457', '0', '1554966464', '0', '0', '0', '0', '0', '0', '1554966440', '1554966464'), ('2', '20190417165125800884', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '2', '1', '0', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":\"10\",\"type\":1,\"tips\":\"+\\uffe510\\u5143\"}]', '10.00', '0.00', '1999.00', '2009.00', '0.00', '0', '1555491085', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1555491085', '0');
+INSERT INTO `s_order` VALUES ('1', '20190411150720949337', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '2', '967878', '1', '4', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":\"10\",\"type\":1,\"tips\":\"+\\uffe510\\u5143\"},{\"name\":\"\\u65b0\\u7528\\u6237\\u7acb\\u51cf\",\"price\":\"0.26\",\"type\":0,\"tips\":\"-\\uffe50.26\\u5143\"}]', '9.74', '0.00', '258.00', '267.74', '267.74', '1554966442', '1554966440', '1554966457', '0', '1554966464', '0', '0', '0', '0', '0', '0', '1554966440', '1554966464'), ('2', '20190417165125800884', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '2', '1', '0', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":\"10\",\"type\":1,\"tips\":\"+\\uffe510\\u5143\"}]', '10.00', '0.00', '1999.00', '2009.00', '0.00', '0', '1555491085', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1555491085', '0'), ('3', '20190426140139615638', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '1', '2', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":15,\"type\":1,\"tips\":\"+\\uffe515\\u5143\"}]', '15.00', '0.00', '9216.90', '9231.90', '9231.90', '1556258500', '1556258499', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1556258499', '1556258500'), ('4', '20190426140206863246', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '1', '2', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":0,\"type\":1,\"tips\":\"+\\uffe50\\u5143\"}]', '0.00', '0.00', '6600.00', '6600.00', '6600.00', '1556258528', '1556258526', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1556258526', '1556258528'), ('5', '20190426140230346651', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '1', '2', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":\"10\",\"type\":1,\"tips\":\"+\\uffe510\\u5143\"}]', '10.00', '0.00', '238.00', '248.00', '248.00', '1556258552', '1556258550', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1556258550', '1556258552'), ('6', '20190426141904654958', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '1', '2', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":0,\"type\":1,\"tips\":\"+\\uffe50\\u5143\"}]', '0.00', '0.00', '466.00', '466.00', '466.00', '1556259546', '1556259544', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1556259544', '1556259546'), ('7', '20190426143927024033', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '1', '2', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":\"10\",\"type\":1,\"tips\":\"+\\uffe510\\u5143\"}]', '10.00', '0.00', '228.00', '238.00', '238.00', '1556260768', '1556260767', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1556260767', '1556260768'), ('8', '20190426143952260370', '90', '0', '1', 'test', '13222333333', '3', '74', '1149', '23232323', '', '0', '', '1', '2', '1', '[{\"name\":\"\\u8fd0\\u8d39\",\"price\":0,\"type\":1,\"tips\":\"+\\uffe50\\u5143\"}]', '0.00', '0.00', '228.00', '228.00', '228.00', '1556260794', '1556260792', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1556260792', '1556260794');
COMMIT;
-- ----------------------------
@@ -762,13 +762,13 @@ CREATE TABLE `s_order_detail` (
KEY `order_id` (`order_id`),
KEY `goods_id` (`goods_id`),
KEY `shop_id` (`shop_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单详情';
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单详情';
-- ----------------------------
-- Records of `s_order_detail`
-- ----------------------------
BEGIN;
-INSERT INTO `s_order_detail` VALUES ('1', '90', '1', '11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '258.00', '', '1', '0.00', '', '', '1554966440', '0'), ('2', '90', '2', '4', '0', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '1999.00', '', '1', '0.00', '', '', '1555491085', '0');
+INSERT INTO `s_order_detail` VALUES ('1', '90', '1', '11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '258.00', '', '1', '0.00', '', '', '1554966440', '0'), ('2', '90', '2', '4', '0', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '1999.00', '', '1', '0.00', '', '', '1555491085', '0'), ('3', '90', '3', '7', '0', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '168.00', '', '1', '0.00', '', '', '1556258499', '0'), ('4', '90', '3', '2', '0', '苹果(Apple)iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6800.00', '6050.00', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e00\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"32G\"}]', '1', '0.00', '', '', '1556258499', '0'), ('5', '90', '3', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0.00', '', '', '1556258499', '0'), ('6', '90', '4', '2', '0', '苹果(Apple)iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '7200.00', '6600.00', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e00\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"64G\"}]', '1', '0.00', '', '', '1556258526', '0'), ('7', '90', '5', '11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '0.00', '238.00', '[{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '1', '0.00', '', '', '1556258550', '0'), ('8', '90', '6', '11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '0.00', '238.00', '[{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '1', '0.00', '', '', '1556259544', '0'), ('9', '90', '6', '10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '228.00', '', '1', '0.00', '', '', '1556259544', '0'), ('10', '90', '7', '10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '228.00', '', '1', '0.00', '', '', '1556260767', '0'), ('11', '90', '8', '10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '228.00', '', '1', '0.00', '', '', '1556260792', '0');
COMMIT;
-- ----------------------------
@@ -789,13 +789,13 @@ CREATE TABLE `s_order_goods_inventory_log` (
KEY `order_id` (`order_id`),
KEY `goods_id` (`goods_id`),
KEY `order_status` (`order_status`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单商品库存变更日志';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单商品库存变更日志';
-- ----------------------------
-- Records of `s_order_goods_inventory_log`
-- ----------------------------
BEGIN;
-INSERT INTO `s_order_goods_inventory_log` VALUES ('1', '1', '11', '2', '36665656', '36665655', '0', '0', '1554966442');
+INSERT INTO `s_order_goods_inventory_log` VALUES ('1', '1', '11', '2', '36665656', '36665655', '0', '0', '1554966442'), ('2', '3', '7', '2', '320', '319', '0', '0', '1556258500'), ('3', '3', '2', '2', '1701', '1700', '0', '0', '1556258500'), ('4', '3', '6', '2', '319', '318', '0', '0', '1556258500'), ('5', '4', '2', '2', '1700', '1699', '0', '0', '1556258528'), ('6', '5', '11', '2', '36665979', '36665978', '0', '0', '1556258552'), ('7', '6', '11', '2', '36665978', '36665977', '0', '0', '1556259546'), ('8', '6', '10', '2', '36', '35', '0', '0', '1556259546'), ('9', '7', '10', '2', '35', '34', '0', '0', '1556260768'), ('10', '8', '10', '2', '34', '33', '0', '0', '1556260794');
COMMIT;
-- ----------------------------
@@ -815,13 +815,13 @@ CREATE TABLE `s_order_status_history` (
KEY `order_id` (`order_id`),
KEY `original_status` (`original_status`),
KEY `new_status` (`new_status`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单状态历史纪录';
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单状态历史纪录';
-- ----------------------------
-- Records of `s_order_status_history`
-- ----------------------------
BEGIN;
-INSERT INTO `s_order_status_history` VALUES ('1', '1', '1', '2', '支付[待付款-待发货]', '0', '系统', '1554966442'), ('2', '1', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1554966457'), ('3', '1', '3', '4', '收货[待收货-已完成]', '90', '魔鬼', '1554966464');
+INSERT INTO `s_order_status_history` VALUES ('1', '1', '1', '2', '支付[待付款-待发货]', '0', '系统', '1554966442'), ('2', '1', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1554966457'), ('3', '1', '3', '4', '收货[待收货-已完成]', '90', '魔鬼', '1554966464'), ('4', '3', '1', '2', '支付[待付款-待发货]', '0', '系统', '1556258500'), ('5', '4', '1', '2', '支付[待付款-待发货]', '0', '系统', '1556258528'), ('6', '5', '1', '2', '支付[待付款-待发货]', '0', '系统', '1556258552'), ('7', '6', '1', '2', '支付[待付款-待发货]', '0', '系统', '1556259546'), ('8', '7', '1', '2', '支付[待付款-待发货]', '0', '系统', '1556260768'), ('9', '8', '1', '2', '支付[待付款-待发货]', '0', '系统', '1556260794');
COMMIT;
-- ----------------------------
@@ -844,13 +844,13 @@ CREATE TABLE `s_pay_log` (
PRIMARY KEY (`id`),
KEY `pay_type` (`payment`),
KEY `order_id` (`order_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付日志';
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付日志';
-- ----------------------------
-- Records of `s_pay_log`
-- ----------------------------
BEGIN;
-INSERT INTO `s_pay_log` VALUES ('1', '90', '1', '', '用户-魔鬼', '267.74', '267.74', '订单支付', 'CashPayment', '现金支付', '1', '1554966442');
+INSERT INTO `s_pay_log` VALUES ('1', '90', '1', '', '用户-魔鬼', '267.74', '267.74', '订单支付', 'CashPayment', '现金支付', '1', '1554966442'), ('2', '90', '3', '', '用户-魔鬼', '9231.90', '9231.90', '订单支付', 'CashPayment', '现金支付', '1', '1556258500'), ('3', '90', '4', '', '用户-魔鬼', '6600.00', '6600.00', '订单支付', 'CashPayment', '现金支付', '1', '1556258528'), ('4', '90', '5', '', '用户-魔鬼', '248.00', '248.00', '订单支付', 'CashPayment', '现金支付', '1', '1556258552'), ('5', '90', '6', '', '用户-魔鬼', '466.00', '466.00', '订单支付', 'CashPayment', '现金支付', '1', '1556259546'), ('6', '90', '7', '', '用户-魔鬼', '238.00', '238.00', '订单支付', 'CashPayment', '现金支付', '1', '1556260768'), ('7', '90', '8', '', '用户-魔鬼', '228.00', '228.00', '订单支付', 'CashPayment', '现金支付', '1', '1556260794');
COMMIT;
-- ----------------------------
@@ -907,7 +907,7 @@ CREATE TABLE `s_plugins` (
-- Records of `s_plugins`
-- ----------------------------
BEGIN;
-INSERT INTO `s_plugins` VALUES ('1', 'commontopmaxpicture', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commontopmaxpicture\\/2019\\/02\\/09\\/1549671733978860.jpg\",\"bg_color\":\"#ce0000\",\"url\":\"https:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopmaxpicture\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550145321', '1551345727'), ('2', 'commontopnotice', '{\"content\":\"\\u6b22\\u8fce\\u6765\\u5230ShopXO\\u4f01\\u4e1a\\u7ea7B2C\\u5f00\\u6e90\\u7535\\u5546\\u7cfb\\u7edf\\u3001\\u6f14\\u793a\\u7ad9\\u70b9\\u8bf7\\u52ff\\u53d1\\u8d77\\u652f\\u4ed8\\u3001\\u4ee5\\u514d\\u7ed9\\u60a8\\u5e26\\u6765\\u4e0d\\u5fc5\\u8981\\u7684\\u8d22\\u4ea7\\u635f\\u5931\\u3002\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550156571', '1551345882'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550157860', '1551191932'), ('14', 'userloginrewardintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userloginrewardintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1551191930'), ('15', 'commongobacktop', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commongobacktop\\/2019\\/02\\/15\\/1550210425433304.png\",\"is_overall\":\"1\",\"pluginsname\":\"commongobacktop\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550200998', '1551191928'), ('16', 'commonrightnavigation', '{\"weixin_mini_qrcode_images\":\"\\/static\\/upload\\/images\\/plugins_commonrightnavigation\\/2019\\/02\\/17\\/1550375588899802.jpeg\",\"is_new_window_open\":\"0\",\"is_overall\":\"1\",\"is_goods_page_show_cart\":\"1\",\"pluginsname\":\"commonrightnavigation\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"alipay_mini_qrcode_images\":\"\",\"alipay_fuwu_qrcode_images\":\"\",\"weixin_fuwu_qrcode_images\":\"\"}', '0', '1550222925', '1556007360'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|12345678\\n\\u552e\\u540e|12345678\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550393304', '1556007348'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1551184852', '1553591863'), ('21', 'answers', '{\"application_name\":\"\\u95ee\\u7b54\",\"images\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/07\\/1551942704326624.jpg\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"images_bottom\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/13\\/1552463137211834.png\",\"url_bottom\":\"https:\\/\\/test.shopxo.net\",\"is_new_window_open_bottom\":\"1\",\"right_top_rec_name\":\"\",\"middle_new_name\":\"\",\"right_top_goods_name\":\"\",\"middle_new_page_number\":\"15\",\"search_page_number\":\"28\",\"home_new_goods_number\":\"12\",\"category_ids\":\"12,7,6,4,3,2,1\",\"pluginsname\":\"answers\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"basesave\"}', '1', '1551853705', '1552724209'), ('23', 'expressforkdn', '{\"ebid\":\"\",\"appkey\":\"\",\"express_ids\":{\"1\":\"\",\"2\":\"\",\"3\":\"\",\"4\":\"ZTO\",\"5\":\"\",\"6\":\"\",\"7\":\"\",\"8\":\"\",\"9\":\"\",\"10\":\"\",\"11\":\"\",\"12\":\"\",\"13\":\"\",\"14\":\"\"},\"pluginsname\":\"expressforkdn\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552358826', '1553161103'), ('25', 'touristbuy', '{\"application_name\":\"\\u8ba2\\u5355\\u67e5\\u8be2\",\"login_name\":\"\\u6e38\\u5ba2\\u767b\\u5f55\",\"nickname\":\"\\u6e38\\u5ba2\",\"query_tips\":\"\\u8bf7\\u8f93\\u5165\\u8ba2\\u5355\\u53f7\\uff0c\\u6536\\u4ef6\\u4eba\\u59d3\\u540d\\uff0c\\u6536\\u4ef6\\u4eba\\u7535\\u8bdd\\u5373\\u53ef\\u67e5\\u770b\\u8ba2\\u5355\\u8be6\\u60c5\",\"is_default_tourist\":\"0\",\"pluginsname\":\"touristbuy\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552656743', '1553486026'), ('26', 'freightfee', '{\"show_name\":\"\\u8fd0\\u8d39\",\"valuation\":\"0\",\"data\":{\"0\":{\"region\":\"default\",\"region_show\":\"default\",\"first\":\"1\",\"first_price\":\"10\",\"continue\":\"1\",\"continue_price\":\"5\"},\"403611\":{\"region\":\"55-56-57-58-59-60-61-62-63-64-65-66-67-68-69-70-71-72\",\"region_show\":\"2\",\"first\":\"1\",\"first_price\":\"6\",\"continue\":\"1\",\"continue_price\":\"3\"}},\"pluginsname\":\"freightfee\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552894438', '1553225909'), ('27', 'newuserreduction', '{\"show_name\":\"\\u65b0\\u7528\\u6237\\u7acb\\u51cf\",\"full_amount\":\"\",\"price\":\"3\",\"is_random\":\"1\",\"pluginsname\":\"newuserreduction\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1553483809', '1553593711'), ('30', 'ucenter', '{\"login_sync_url\":\"\",\"login_async_url\":\"\",\"register_sync_url\":\"\",\"register_async_url\":\"\",\"logout_sync_url\":\"\",\"logout_async_url\":\"\",\"loginpwdupdate_async_url\":\"\",\"accounts_async_url\":\"\",\"pluginsname\":\"ucenter\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1554186010', '1554349799'), ('31', 'petscms', '{\"not_bind_desc\":\"\\u8be5\\u5ba0\\u7269\\u8fd8\\u6ca1\\u6709\\u4e3b\\u4eba\\u9886\\u53d6\\uff0c\\u7acb\\u5373\\u9886\\u53d6\\u53ef\\u7231\\u7684\\u5ba0\\u7269\\u5b9d\\u5b9d\\u54e6\\uff01\\uff01\\uff01\",\"pets_take\":\"\\u6211\\u8981\\u9886\\u53d6\",\"lose_provide\":\"\\u6211\\u8981\\u63d0\\u4f9b\\u4fe1\\u606f\",\"alipay_qrcode_name\":\"\",\"weixin_qrcode_name\":\"\",\"pluginsname\":\"petscms\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1554186010', '1555662725'), ('33', 'share', null, '1', '1555667312', '1555668223'), ('34', 'homemiddleadv', '{\"time_start\":\"2019-04-22 23:34:00\",\"time_end\":\"\",\"pluginsname\":\"homemiddleadv\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190422180652622612\":{\"name\":\"\\u667a\\u80fdPad\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400479636.jpg\",\"is_enable\":1,\"is_new_window_open\":1,\"operation_time\":1556182596,\"id\":\"20190422180652622612\"},\"20190422183713735111\":{\"name\":\"\\u667a\\u80fd\\u624b\\u673a\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400237551.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555988047,\"id\":\"20190422183713735111\"},\"20190422183742153442\":{\"name\":\"\\u667a\\u80fd\\u7535\\u8f6c\\u63a5\\u5934\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400780646.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948369,\"id\":\"20190422183742153442\"},\"20190422183756326575\":{\"name\":\"\\u65b0\\u4e00\\u4ee3\\u667a\\u80fd\\u5e73\\u677f\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400647560.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948385,\"id\":\"20190422183756326575\"}}}', '1', '1555917493', '1556182596'), ('35', 'footercustomerservice', '{\"is_only_home\":\"0\",\"pluginsname\":\"footercustomerservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190423101219612886\":{\"name\":\"\\u7269\\u884c\\u5929\\u4e0b\",\"desc\":\"\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\\u9001\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891552781.png\",\"is_enable\":1,\"operation_time\":1556182603,\"id\":\"20190423101219612886\"},\"20190423101429924371\":{\"name\":\"\\u7cbe\\u81f4\\u670d\\u52a1\",\"desc\":\"\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891827973.png\",\"is_enable\":1,\"operation_time\":1555990919,\"id\":\"20190423101429924371\"},\"20190423101441929067\":{\"name\":\"\\u9000\\u6362\\u65e0\\u5fe7\",\"desc\":\"\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891594648.png\",\"is_enable\":1,\"operation_time\":1555990931,\"id\":\"20190423101441929067\"},\"20190423101454021035\":{\"name\":\"\\u6ee1\\u51cf\\u6d3b\\u52a8\",\"desc\":\"\\u6ee1500\\u5143\\u7acb\\u51cf90\\uff0c\\u65b0\\u7528\\u6237\\u7acb\\u51cf200\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555991139659862.png\",\"is_enable\":1,\"operation_time\":1555991141,\"id\":\"20190423101454021035\"}}}', '1', '1555984266', '1556182603'), ('36', 'membershiplevel', '{\"level_rules\":\"0\",\"pluginsname\":\"membershiplevel\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"level_list\":{\"20190425155935996197\":{\"name\":\"VIP1\",\"rules_min\":0,\"rules_max\":100,\"images_url\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"is_enable\":1,\"discount_rate\":\"\",\"order_price\":\"100.00\",\"full_reduction_price\":\"10.00\",\"operation_time\":1556184314,\"id\":\"20190425155935996197\",\"is_enable_text\":\"\\u5df2\\u542f\\u7528\",\"images_url_old\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"operation_time_time\":\"2019-04-25 17:25:14\",\"operation_time_date\":\"2019-04-25\"},\"20190425160645024007\":{\"name\":\"VIP2\",\"rules_min\":100,\"rules_max\":300,\"images_url\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"is_enable\":1,\"discount_rate\":\"0.8\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556182978,\"id\":\"20190425160645024007\",\"is_enable_text\":\"\\u5df2\\u542f\\u7528\",\"images_url_old\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"operation_time_time\":\"2019-04-25 17:02:58\",\"operation_time_date\":\"2019-04-25\"},\"20190425161453658835\":{\"name\":\"VIP3\",\"rules_min\":300,\"rules_max\":600,\"images_url\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"discount_rate\":\"0.7\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556182865,\"id\":\"20190425161453658835\",\"is_enable\":1,\"is_enable_text\":\"\\u5df2\\u542f\\u7528\",\"images_url_old\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"operation_time_time\":\"2019-04-25 17:01:05\",\"operation_time_date\":\"2019-04-25\"}}}', '0', '1555984266', '1556187419');
+INSERT INTO `s_plugins` VALUES ('1', 'commontopmaxpicture', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commontopmaxpicture\\/2019\\/02\\/09\\/1549671733978860.jpg\",\"bg_color\":\"#ce0000\",\"url\":\"https:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopmaxpicture\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550145321', '1551345727'), ('2', 'commontopnotice', '{\"content\":\"\\u6b22\\u8fce\\u6765\\u5230ShopXO\\u4f01\\u4e1a\\u7ea7B2C\\u5f00\\u6e90\\u7535\\u5546\\u7cfb\\u7edf\\u3001\\u6f14\\u793a\\u7ad9\\u70b9\\u8bf7\\u52ff\\u53d1\\u8d77\\u652f\\u4ed8\\u3001\\u4ee5\\u514d\\u7ed9\\u60a8\\u5e26\\u6765\\u4e0d\\u5fc5\\u8981\\u7684\\u8d22\\u4ea7\\u635f\\u5931\\u3002\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550156571', '1551345882'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550157860', '1551191932'), ('14', 'userloginrewardintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userloginrewardintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1551191930'), ('15', 'commongobacktop', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commongobacktop\\/2019\\/02\\/15\\/1550210425433304.png\",\"is_overall\":\"1\",\"pluginsname\":\"commongobacktop\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550200998', '1551191928'), ('16', 'commonrightnavigation', '{\"weixin_mini_qrcode_images\":\"\\/static\\/upload\\/images\\/plugins_commonrightnavigation\\/2019\\/02\\/17\\/1550375588899802.jpeg\",\"is_new_window_open\":\"0\",\"is_overall\":\"1\",\"is_goods_page_show_cart\":\"1\",\"pluginsname\":\"commonrightnavigation\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"alipay_mini_qrcode_images\":\"\",\"alipay_fuwu_qrcode_images\":\"\",\"weixin_fuwu_qrcode_images\":\"\"}', '0', '1550222925', '1556007360'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|12345678\\n\\u552e\\u540e|12345678\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550393304', '1556007348'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1551184852', '1553591863'), ('21', 'answers', '{\"application_name\":\"\\u95ee\\u7b54\",\"images\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/07\\/1551942704326624.jpg\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"images_bottom\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/13\\/1552463137211834.png\",\"url_bottom\":\"https:\\/\\/test.shopxo.net\",\"is_new_window_open_bottom\":\"1\",\"right_top_rec_name\":\"\",\"middle_new_name\":\"\",\"right_top_goods_name\":\"\",\"middle_new_page_number\":\"15\",\"search_page_number\":\"28\",\"home_new_goods_number\":\"12\",\"category_ids\":\"12,7,6,4,3,2,1\",\"pluginsname\":\"answers\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"basesave\"}', '1', '1551853705', '1552724209'), ('23', 'expressforkdn', '{\"ebid\":\"\",\"appkey\":\"\",\"express_ids\":{\"1\":\"\",\"2\":\"\",\"3\":\"\",\"4\":\"ZTO\",\"5\":\"\",\"6\":\"\",\"7\":\"\",\"8\":\"\",\"9\":\"\",\"10\":\"\",\"11\":\"\",\"12\":\"\",\"13\":\"\",\"14\":\"\"},\"pluginsname\":\"expressforkdn\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552358826', '1553161103'), ('25', 'touristbuy', '{\"application_name\":\"\\u8ba2\\u5355\\u67e5\\u8be2\",\"login_name\":\"\\u6e38\\u5ba2\\u767b\\u5f55\",\"nickname\":\"\\u6e38\\u5ba2\",\"query_tips\":\"\\u8bf7\\u8f93\\u5165\\u8ba2\\u5355\\u53f7\\uff0c\\u6536\\u4ef6\\u4eba\\u59d3\\u540d\\uff0c\\u6536\\u4ef6\\u4eba\\u7535\\u8bdd\\u5373\\u53ef\\u67e5\\u770b\\u8ba2\\u5355\\u8be6\\u60c5\",\"is_default_tourist\":\"0\",\"pluginsname\":\"touristbuy\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552656743', '1553486026'), ('26', 'freightfee', '{\"show_name\":\"\\u8fd0\\u8d39\",\"goods_ids\":\"2,5,4\",\"valuation\":\"0\",\"data\":[{\"region\":\"default\",\"region_show\":\"default\",\"first\":\"1\",\"first_price\":\"10\",\"continue\":\"1\",\"continue_price\":\"5\",\"free_shipping_price\":\"228\"}],\"pluginsname\":\"freightfee\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552894438', '1556262718'), ('27', 'newuserreduction', '{\"show_name\":\"\\u65b0\\u7528\\u6237\\u7acb\\u51cf\",\"full_amount\":\"\",\"price\":\"3\",\"is_random\":\"1\",\"pluginsname\":\"newuserreduction\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1553483809', '1553593711'), ('30', 'ucenter', '{\"login_sync_url\":\"\",\"login_async_url\":\"\",\"register_sync_url\":\"\",\"register_async_url\":\"\",\"logout_sync_url\":\"\",\"logout_async_url\":\"\",\"loginpwdupdate_async_url\":\"\",\"accounts_async_url\":\"\",\"pluginsname\":\"ucenter\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1554186010', '1554349799'), ('31', 'petscms', '{\"not_bind_desc\":\"\\u8be5\\u5ba0\\u7269\\u8fd8\\u6ca1\\u6709\\u4e3b\\u4eba\\u9886\\u53d6\\uff0c\\u7acb\\u5373\\u9886\\u53d6\\u53ef\\u7231\\u7684\\u5ba0\\u7269\\u5b9d\\u5b9d\\u54e6\\uff01\\uff01\\uff01\",\"pets_take\":\"\\u6211\\u8981\\u9886\\u53d6\",\"lose_provide\":\"\\u6211\\u8981\\u63d0\\u4f9b\\u4fe1\\u606f\",\"alipay_qrcode_name\":\"\",\"weixin_qrcode_name\":\"\",\"pluginsname\":\"petscms\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1554186010', '1555662725'), ('33', 'share', null, '1', '1555667312', '1555668223'), ('34', 'homemiddleadv', '{\"time_start\":\"2019-04-22 23:34:00\",\"time_end\":\"\",\"pluginsname\":\"homemiddleadv\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190422180652622612\":{\"name\":\"\\u667a\\u80fdPad\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400479636.jpg\",\"is_enable\":1,\"is_new_window_open\":1,\"operation_time\":1556182596,\"id\":\"20190422180652622612\"},\"20190422183713735111\":{\"name\":\"\\u667a\\u80fd\\u624b\\u673a\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400237551.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555988047,\"id\":\"20190422183713735111\"},\"20190422183742153442\":{\"name\":\"\\u667a\\u80fd\\u7535\\u8f6c\\u63a5\\u5934\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400780646.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948369,\"id\":\"20190422183742153442\"},\"20190422183756326575\":{\"name\":\"\\u65b0\\u4e00\\u4ee3\\u667a\\u80fd\\u5e73\\u677f\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400647560.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948385,\"id\":\"20190422183756326575\"}}}', '1', '1555917493', '1556182596'), ('35', 'footercustomerservice', '{\"is_only_home\":\"0\",\"pluginsname\":\"footercustomerservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190423101219612886\":{\"name\":\"\\u7269\\u884c\\u5929\\u4e0b\",\"desc\":\"\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\\u9001\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891552781.png\",\"is_enable\":1,\"operation_time\":1556182603,\"id\":\"20190423101219612886\"},\"20190423101429924371\":{\"name\":\"\\u7cbe\\u81f4\\u670d\\u52a1\",\"desc\":\"\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891827973.png\",\"is_enable\":1,\"operation_time\":1555990919,\"id\":\"20190423101429924371\"},\"20190423101441929067\":{\"name\":\"\\u9000\\u6362\\u65e0\\u5fe7\",\"desc\":\"\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891594648.png\",\"is_enable\":1,\"operation_time\":1555990931,\"id\":\"20190423101441929067\"},\"20190423101454021035\":{\"name\":\"\\u6ee1\\u51cf\\u6d3b\\u52a8\",\"desc\":\"\\u6ee1500\\u5143\\u7acb\\u51cf90\\uff0c\\u65b0\\u7528\\u6237\\u7acb\\u51cf200\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555991139659862.png\",\"is_enable\":1,\"operation_time\":1555991141,\"id\":\"20190423101454021035\"}}}', '1', '1555984266', '1556263194'), ('36', 'membershiplevel', '{\"level_rules\":\"0\",\"pluginsname\":\"membershiplevel\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"level_list\":{\"20190425155935996197\":{\"name\":\"VIP1\",\"rules_min\":0,\"rules_max\":100,\"images_url\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"is_enable\":1,\"discount_rate\":\"\",\"order_price\":\"100.00\",\"full_reduction_price\":\"10.00\",\"operation_time\":1556184314,\"id\":\"20190425155935996197\",\"is_enable_text\":\"\\u5df2\\u542f\\u7528\",\"images_url_old\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"operation_time_time\":\"2019-04-25 17:25:14\",\"operation_time_date\":\"2019-04-25\"},\"20190425160645024007\":{\"name\":\"VIP2\",\"rules_min\":100,\"rules_max\":300,\"images_url\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"is_enable\":1,\"discount_rate\":\"0.8\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556182978,\"id\":\"20190425160645024007\",\"is_enable_text\":\"\\u5df2\\u542f\\u7528\",\"images_url_old\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"operation_time_time\":\"2019-04-25 17:02:58\",\"operation_time_date\":\"2019-04-25\"},\"20190425161453658835\":{\"name\":\"VIP3\",\"rules_min\":300,\"rules_max\":600,\"images_url\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"discount_rate\":\"0.7\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556182865,\"id\":\"20190425161453658835\",\"is_enable\":1,\"is_enable_text\":\"\\u5df2\\u542f\\u7528\",\"images_url_old\":\"http:\\/\\/tp5-dev.com\\/static\\/upload\\/images\\/plugins_membershiplevel\\/2019\\/04\\/25\\/1556163954923228.jpg\",\"operation_time_time\":\"2019-04-25 17:01:05\",\"operation_time_date\":\"2019-04-25\"}}}', '0', '1555984266', '1556187419');
COMMIT;
-- ----------------------------
@@ -1197,13 +1197,13 @@ 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=89 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志';
+) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志';
-- ----------------------------
-- Records of `s_search_history`
-- ----------------------------
BEGIN;
-INSERT INTO `s_search_history` VALUES ('1', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555048567'), ('2', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555058264'), ('3', '90', '0', '1', '', '0-0', 'default', 'asc', '20190413', '1555157671'), ('4', '90', '0', '0', '', '0-0', 'default', 'asc', '20190414', '1555222450'), ('5', '90', '0', '1', '', '0-0', 'default', 'asc', '20190414', '1555222522'), ('6', '90', '0', '0', '', '0-0', 'default', 'asc', '20190415', '1555293685'), ('7', '90', '0', '53', '', '0-0', 'default', 'asc', '20190416', '1555400228'), ('8', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555402358'), ('9', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407340'), ('10', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407342'), ('11', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('12', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('13', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407367'), ('14', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407378'), ('15', '90', '0', '0', '', '0-0', 'default', 'asc', '20190422', '1555915151'), ('16', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915154'), ('17', '90', '0', '0', '', '0-0', 'min_price', 'asc', '20190422', '1555915155'), ('18', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915156'), ('19', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190422', '1555915157'), ('20', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915159'), ('21', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915159'), ('22', '90', '0', '0', '', '0-0', 'default', 'desc', '20190422', '1555915160'), ('23', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006494'), ('24', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006499'), ('25', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556008575'), ('26', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556009343'), ('27', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009712'), ('28', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009715'), ('29', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009787'), ('30', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014897'), ('31', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014939'), ('32', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016061'), ('33', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016064'), ('34', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016066'), ('35', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016067'), ('36', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016069'), ('37', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016070'), ('38', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016072'), ('39', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016073'), ('40', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016079'), ('41', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016083'), ('42', '90', '0', '0', '包包', '0-0', 'default', 'asc', '20190423', '1556016107'), ('43', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016131'), ('44', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016139'), ('45', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016141'), ('46', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016144'), ('47', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016146'), ('48', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016162'), ('49', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016163'), ('50', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016176'), ('51', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016655'), ('52', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016656'), ('53', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016658'), ('54', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016660'), ('55', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016717'), ('56', '90', '0', '0', '', '0-0', 'default', 'asc', '20190424', '1556069360'), ('57', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160619'), ('58', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160716'), ('59', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160717'), ('60', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160734'), ('61', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('62', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('63', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161001'), ('64', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161077'), ('65', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161078'), ('66', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161079'), ('67', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161089'), ('68', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161091'), ('69', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161092'), ('70', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161099'), ('71', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161118'), ('72', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161120'), ('73', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161174'), ('74', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161180'), ('75', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161235'), ('76', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161266'), ('77', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161272'), ('78', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161423'), ('79', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190425', '1556161425'), ('80', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190425', '1556161425'), ('81', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161441'), ('82', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161449'), ('83', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161453'), ('84', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161454'), ('85', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161481'), ('86', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161482'), ('87', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161483'), ('88', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161527');
+INSERT INTO `s_search_history` VALUES ('1', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555048567'), ('2', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555058264'), ('3', '90', '0', '1', '', '0-0', 'default', 'asc', '20190413', '1555157671'), ('4', '90', '0', '0', '', '0-0', 'default', 'asc', '20190414', '1555222450'), ('5', '90', '0', '1', '', '0-0', 'default', 'asc', '20190414', '1555222522'), ('6', '90', '0', '0', '', '0-0', 'default', 'asc', '20190415', '1555293685'), ('7', '90', '0', '53', '', '0-0', 'default', 'asc', '20190416', '1555400228'), ('8', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555402358'), ('9', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407340'), ('10', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407342'), ('11', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('12', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('13', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407367'), ('14', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407378'), ('15', '90', '0', '0', '', '0-0', 'default', 'asc', '20190422', '1555915151'), ('16', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915154'), ('17', '90', '0', '0', '', '0-0', 'min_price', 'asc', '20190422', '1555915155'), ('18', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915156'), ('19', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190422', '1555915157'), ('20', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915159'), ('21', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915159'), ('22', '90', '0', '0', '', '0-0', 'default', 'desc', '20190422', '1555915160'), ('23', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006494'), ('24', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006499'), ('25', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556008575'), ('26', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556009343'), ('27', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009712'), ('28', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009715'), ('29', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009787'), ('30', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014897'), ('31', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014939'), ('32', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016061'), ('33', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016064'), ('34', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016066'), ('35', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016067'), ('36', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016069'), ('37', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016070'), ('38', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016072'), ('39', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016073'), ('40', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016079'), ('41', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016083'), ('42', '90', '0', '0', '包包', '0-0', 'default', 'asc', '20190423', '1556016107'), ('43', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016131'), ('44', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016139'), ('45', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016141'), ('46', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016144'), ('47', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016146'), ('48', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016162'), ('49', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016163'), ('50', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016176'), ('51', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016655'), ('52', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016656'), ('53', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016658'), ('54', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016660'), ('55', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016717'), ('56', '90', '0', '0', '', '0-0', 'default', 'asc', '20190424', '1556069360'), ('57', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160619'), ('58', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160716'), ('59', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160717'), ('60', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160734'), ('61', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('62', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('63', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161001'), ('64', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161077'), ('65', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161078'), ('66', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161079'), ('67', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161089'), ('68', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161091'), ('69', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161092'), ('70', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161099'), ('71', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161118'), ('72', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161120'), ('73', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161174'), ('74', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161180'), ('75', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161235'), ('76', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161266'), ('77', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161272'), ('78', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161423'), ('79', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190425', '1556161425'), ('80', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190425', '1556161425'), ('81', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161441'), ('82', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161449'), ('83', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161453'), ('84', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161454'), ('85', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161481'), ('86', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161482'), ('87', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161483'), ('88', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161527'), ('89', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556249993'), ('90', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556262777'), ('91', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556262793'), ('92', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263175'), ('93', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263188'), ('94', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263196');
COMMIT;
-- ----------------------------
diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css
index 12d387dc6..6cbfe05c1 100755
--- a/public/static/index/default/css/goods.css
+++ b/public/static/index/default/css/goods.css
@@ -213,7 +213,7 @@ color:#F03726;font-size: 14px;text-align: center;border: 0;}
.buy-nav div.submit { width: 30%; }
.buy-nav span{display:inline-block;width: 50%;float: left; ;cursor: pointer; border-top: 1px solid #f5f5f5; border-left: 1px solid #f5f5f5;}
-.tb-detail-hd h1 {padding-bottom:0.4em; line-height: 1;font-size: 14px;font-weight: 600;color: #333; line-height: 20px;}
+.tb-detail-hd h1 {padding-bottom:0.4em; line-height: 1;font-size: 14px;font-weight: 600;color: #333; line-height: 24px;}
li.am-active hr{border-top: 1px solid #f00;}
diff --git a/public/static/plugins/css/footercustomerservice/style.css b/public/static/plugins/css/footercustomerservice/style.css
new file mode 100644
index 000000000..2d0e09a76
--- /dev/null
+++ b/public/static/plugins/css/footercustomerservice/style.css
@@ -0,0 +1,30 @@
+.plugins-footercustomerservice-customer-service {
+ background: #f8f8f8;
+ padding: 10px 0;
+ margin-top: 20px;
+}
+.plugins-footercustomerservice-customer-service .am-gallery-overlay .am-gallery-item img {
+ width: 50px;
+ float: left;
+}
+.plugins-footercustomerservice-customer-service .am-gallery-overlay .am-gallery-item .base {
+ margin-left: 60px;
+}
+.plugins-footercustomerservice-customer-service .am-gallery-overlay .am-gallery-item .base .title {
+ font-weight: 500;
+ font-size: 16px;
+ color: #505050;
+}
+.plugins-footercustomerservice-customer-service .am-gallery-overlay .am-gallery-item .base .desc {
+ color: #999;
+ margin-top: 5px;
+}
+@media only screen and (max-width:1025px) {
+ .plugins-footercustomerservice-customer-service .am-gallery-overlay .am-gallery-item {
+ border-bottom: 1px solid #f0f0f0;
+ padding-bottom: 10px;
+ }
+}
+.am-footer-default {
+ margin-top: 0;
+}
\ No newline at end of file
diff --git a/public/static/plugins/css/freightfee/admin.css b/public/static/plugins/css/freightfee/admin.css
index cf438692a..6959848ef 100755
--- a/public/static/plugins/css/freightfee/admin.css
+++ b/public/static/plugins/css/freightfee/admin.css
@@ -1,6 +1,9 @@
/**
* 首页
*/
+.freightfee-content .am-panel-bd .am-table {
+ margin-bottom: 0;
+}
.freightfee-content .items {
margin: 10px 0 20px 0;
border-bottom: 1px dashed #f1f1f1;
@@ -9,6 +12,11 @@
.freightfee-content .edit-submit {
margin-bottom: 20px;
}
+.freightfee-content .index-goods-list .am-panel-bd {
+ max-height: 300px;
+ overflow-y: scroll;
+ overflow-x: hidden;
+}
/**
* 运费模板
@@ -88,4 +96,93 @@
background: #4CAF50;
color: #fff;
border: 1px solid #409643;
-}
\ No newline at end of file
+}
+
+
+/**
+ * 商品推荐编辑
+ */
+.forth-selection-container select.forth-selection-form-category {
+ display: -webkit-inline-box;
+}
+.forth-selection-container .forth-selection-form-category, .forth-selection-container .chosen-container, .forth-selection-container .forth-selection-form-keywords {
+ width: 30% !important;
+}
+.forth-selection-container .chosen-container, .forth-selection-container .forth-selection-form-keywords {
+ display: -webkit-inline-box !important;
+}
+.forth-selection-container .chosen-single {
+ width: 100%;
+}
+.forth-selection-container .forth-selection-form {
+ margin-bottom: 2px;
+}
+.forth-selection-list {
+ overflow: hidden;
+ margin-bottom: 20px;
+ position: relative;
+}
+.forth-selection-list .forth-selection-items {
+ width: calc(50% - 50px);
+ height: 300px;
+}
+.forth-selection-list .forth-selection-items .title {
+ text-align: center;
+}
+.forth-selection-list .forth-selection-items .forth-selection-content {
+ border: 1px solid #eee;
+ height: calc(100% - 25px);
+ overflow-y: scroll;
+ overflow-x: hidden;
+ border-radius: 2px;
+ margin-top: 5px;
+ background: #fff;
+}
+.forth-selection-list .forth-selection-items .forth-selection-content li {
+ padding: 5px 45px 5px 5px;
+ border-style: dotted;
+ border-color: #eaeaea;
+ border-width: 1px 0;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ max-width: 100%;
+ color: #666;
+ position: relative;
+}
+.forth-selection-list .forth-selection-items .forth-selection-content li:nth-child(2) {
+ border-top: 0;
+}
+.forth-selection-list .forth-selection-items .forth-selection-content li i {
+ cursor: pointer;
+ padding: 0 10px 0 5px;
+ position: absolute;
+ top: 5px;
+ right: 5px;
+}
+.forth-selection-list .selected-all {
+ position: absolute;
+ margin-top: 140px;
+ margin-left: 20px;
+}
+.forth-selection-container input[name="goods_ids"] {
+ position: absolute;
+ left: -1000000px;
+ top: -1000000px;
+}
+.forth-selection-list i {
+ color: #888 !important;
+}
+.forth-selection-container .am-form-error .forth-selection-items .forth-selection-content {
+ border-color: #dd514c;
+}
+@media only screen and (max-width: 641px) {
+ .forth-selection-container .forth-selection-form-category, .forth-selection-container .forth-selection-form-keywords
+ {
+ width: calc(55% - 60px) !important;
+ display: -webkit-inline-box !important;
+ }
+ .forth-selection-container .chosen-container {
+ display: none !important;
+ }
+}
diff --git a/public/static/plugins/css/freightfee/style.css b/public/static/plugins/css/freightfee/style.css
new file mode 100644
index 000000000..4df5c8f66
--- /dev/null
+++ b/public/static/plugins/css/freightfee/style.css
@@ -0,0 +1,7 @@
+.plugins-freightfee-goods-icon {
+ background: #fff;
+ border: 1px solid #5eb95e;
+ color: #5eb95e;
+ font-weight: 500;
+ vertical-align: middle;
+}
\ No newline at end of file
diff --git a/public/static/plugins/js/freightfee/admin.js b/public/static/plugins/js/freightfee/admin.js
index d0ef81c93..7681bb883 100644
--- a/public/static/plugins/js/freightfee/admin.js
+++ b/public/static/plugins/js/freightfee/admin.js
@@ -274,4 +274,109 @@ $(function()
$('#freightfee-region-popup').modal('close');
});
+
+
+ // 添加元素到右侧
+ function RightElementAdd(value, name)
+ {
+ if($('.forth-selection-container ul.ul-right').find('.items-li-'+value).length == 0)
+ {
+ var html = '
'+name+'';
+ $('.forth-selection-container ul.ul-right').append(html);
+ }
+
+ // 右侧数据同步
+ RightElementGoods();
+
+ // 左侧是否还有内容
+ if($('.forth-selection-container ul.ul-left li').length == 0)
+ {
+ $('.forth-selection-container ul.ul-left .table-no').removeClass('none');
+ } else {
+ $('.forth-selection-container ul.ul-left .table-no').addClass('none');
+ }
+ }
+
+ // 批量-商品id同步
+ function RightElementGoods()
+ {
+ var value_all = [];
+ $('.forth-selection-container ul.ul-right li').each(function(k, v)
+ {
+ value_all[k] = $(this).find('span.name').data('value');
+ });
+ $('.forth-selection-container input[name="goods_ids"]').val(value_all.join(',')).blur();
+
+ // 右侧是否还有数据
+ if($('.forth-selection-container ul.ul-right li').length == 0)
+ {
+ $('.forth-selection-container ul.ul-right .table-no').removeClass('none');
+ } else {
+ $('.forth-selection-container ul.ul-right .table-no').addClass('none');
+ }
+ }
+ // 左侧点击到右侧
+ $('.forth-selection-container ul.ul-left').on('click', 'i.am-icon-angle-right', function()
+ {
+ var value = $(this).prev().data('value');
+ var name = $(this).prev().text();
+ $(this).parent().remove();
+ RightElementAdd(value, name);
+ });
+
+ // 左侧全部移动到右侧
+ $('.forth-selection-container .selected-all').on('click', function()
+ {
+ $('.forth-selection-container ul.ul-left li').each(function(k, v)
+ {
+ var value = $(this).find('span.name').data('value');
+ var name = $(this).find('span.name').text();
+ $(this).remove();
+ RightElementAdd(value, name);
+ });
+ });
+
+ // 右侧删除
+ $('.forth-selection-container ul.ul-right').on('click', 'i.am-icon-trash-o', function()
+ {
+ $(this).parent().remove();
+ RightElementGoods();
+ });
+
+ // 商品搜索
+ $('.forth-selection-form .search-submit').on('click', function()
+ {
+ var category_id = $('.forth-selection-form .forth-selection-form-category').val();
+ var keywords = $('.forth-selection-form .forth-selection-form-keywords').val();
+ console.log(category_id, keywords)
+
+ // ajax请求
+ $.ajax({
+ url:$('.forth-selection-form').data('search-url'),
+ type:'POST',
+ dataType:"json",
+ timeout:10000,
+ data:{"category_id": category_id, "keywords": keywords},
+ success:function(result)
+ {
+ if(result.code == 0)
+ {
+ var html = '';
+ for(var i in result.data)
+ {
+ html += '
'+result['data'][i]['title']+'';
+ }
+ $('ul.ul-left .table-no').addClass('none');
+ $('ul.ul-left li').remove();
+ $('ul.ul-left').append(html);
+ } else {
+ Prompt(result.msg);
+ }
+ },
+ error:function()
+ {
+ Prompt('网络异常错误');
+ }
+ });
+ });
});
\ No newline at end of file