From 3f7a7d0acbaec99bbbfb049ca448664e58ab30ad Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 26 Feb 2019 17:52:17 +0800 Subject: [PATCH 001/108] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/User.php | 3 + application/admin/lang/zh-cn.php | 4 ++ .../admin/view/default/config/index.html | 8 +++ .../admin/view/default/lib/user_status.html | 4 +- .../admin/view/default/user/index.html | 22 ++++++++ .../admin/view/default/user/save_info.html | 16 ++++++ application/index/view/default/config.json | 2 +- application/lang/zh-cn.php | 2 + application/service/UserService.php | 55 ++++++++++++++++++- config/shopxo.sql | 28 +++++++--- .../old/alipay/pages/common/copyright.axml | 2 +- .../old/weixin/pages/common/copyright.wxml | 2 +- public/core.php | 2 +- 13 files changed, 135 insertions(+), 15 deletions(-) diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 1cc03bde2..d7d5f1a5b 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -81,6 +81,9 @@ class User extends Common // 性别 $this->assign('common_gender_list', lang('common_gender_list')); + // 用户状态 + $this->assign('common_user_status_list', lang('common_user_status_list')); + // Excel地址 $this->assign('excel_url', MyUrl('admin/user/excelexport', $params)); diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 9e3c1bf56..53d22a1bd 100755 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -123,6 +123,10 @@ return array( 'name' => '生日', 'type' => 'string', ], + 'status_text'=> [ + 'name' => '状态', + 'type' => 'string', + ], 'mobile' => [ 'name' => '手机号码', 'type' => 'int', diff --git a/application/admin/view/default/config/index.html b/application/admin/view/default/config/index.html index 5ff00ced0..b2b6c6279 100755 --- a/application/admin/view/default/config/index.html +++ b/application/admin/view/default/config/index.html @@ -17,6 +17,14 @@ +
+ + +
+ + +
~ @@ -49,6 +55,7 @@ 手机号码 积分 性别 + 状态 生日 更多 操作 @@ -77,6 +84,9 @@ {{if empty($v['gender_text'])}}未设置{{else /}}{{$v.gender_text}}{{/if}} + + {{if empty($v['status_text'])}}未知{{else /}}{{$v.status_text}}{{/if}} + {{if empty($v['birthday_text'])}}未填写{{else /}}{{$v.birthday_text}}{{/if}} @@ -102,6 +112,18 @@
电子邮箱
{{if empty($v['email'])}}未填写{{else /}}{{$v.email}}{{/if}}
+
状态
+
{{if empty($v['status_text'])}}未知{{else /}}{{$v.status_text}}{{/if}}
+ +
支付宝openid
+
{{if empty($v['alipay_openid'])}}未知{{else /}}{{$v.alipay_openid}}{{/if}}
+ +
微信openid
+
{{if empty($v['weixin_openid'])}}未知{{else /}}{{$v.weixin_openid}}{{/if}}
+ +
百度openid
+
{{if empty($v['baidu_openid'])}}未知{{else /}}{{$v.baidu_openid}}{{/if}}
+
性别
{{if empty($v['gender_text'])}}未设置{{else /}}{{$v.gender_text}}{{/if}}
diff --git a/application/admin/view/default/user/save_info.html b/application/admin/view/default/user/save_info.html index c6ebfb844..4b047b80a 100755 --- a/application/admin/view/default/user/save_info.html +++ b/application/admin/view/default/user/save_info.html @@ -32,6 +32,20 @@
+ +
+ + +
+
+ + +
+
+ + +
+
@@ -46,6 +60,8 @@
+ {{include file="lib/user_status" /}} +
diff --git a/application/index/view/default/config.json b/application/index/view/default/config.json index 5b2f6403b..8e8519588 100755 --- a/application/index/view/default/config.json +++ b/application/index/view/default/config.json @@ -1,6 +1,6 @@ { "name":"默认模板", - "ver":"1.3.0", + "ver":"1.4.0", "author":"Devil", "home":"http://shopxo.net/" } \ No newline at end of file diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php index 2739d5f31..bb8bf384a 100755 --- a/application/lang/zh-cn.php +++ b/application/lang/zh-cn.php @@ -22,6 +22,7 @@ return array( '1.1.0' => array('value' => '1.1.0', 'name' => 'v1.1.0'), '1.2.0' => array('value' => '1.2.0', 'name' => 'v1.2.0'), '1.3.0' => array('value' => '1.3.0', 'name' => 'v1.3.0'), + '1.4.0' => array('value' => '1.4.0', 'name' => 'v1.4.0'), ), // 性别 @@ -210,6 +211,7 @@ return array( 0 => array('id' => 0, 'name' => '正常', 'checked' => true), 1 => array('id' => 1, 'name' => '禁止发言', 'tips' => '用户被禁止发言'), 2 => array('id' => 2, 'name' => '禁止登录', 'tips' => '用户被禁止登录'), + 3 => array('id' => 3, 'name' => '待审核', 'tips' => '用户等待审核中'), ), // 是否已评价 diff --git a/application/service/UserService.php b/application/service/UserService.php index dcc3b3469..0d861f926 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -45,6 +45,7 @@ class UserService if(!empty($data)) { $common_gender_list = lang('common_gender_list'); + $common_user_status_list = lang('common_user_status_list'); foreach($data as &$v) { // 生日 @@ -66,6 +67,9 @@ class UserService // 性别 $v['gender_text'] = $common_gender_list[$v['gender']]['name']; + + // 状态 + $v['status_text'] = $common_user_status_list[$v['status']]['name']; } } return DataReturn('处理成功', 0, $data); @@ -96,6 +100,12 @@ class UserService $where[] = ['gender', '=', intval($params['gender'])]; } + // 状态 + if(isset($params['status']) && $params['status'] > -1) + { + $where[] = ['status', '=', intval($params['status'])]; + } + // 时间 if(!empty($params['time_start'])) { @@ -170,9 +180,15 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'gender', - 'checked_data' => [0,1,2], + 'checked_data' => array_column(lang('common_gender_list'), 'id'), 'error_msg' => '性别值范围不正确', ], + [ + 'checked_type' => 'in', + 'key_name' => 'status', + 'checked_data' => array_column(lang('common_user_status_list'), 'id'), + 'error_msg' => '状态值范围不正确', + ], [ 'checked_type' => 'length', 'key_name' => 'address', @@ -203,6 +219,10 @@ class UserService 'address' => isset($params['address']) ? $params['address'] : '', 'gender' => intval($params['gender']), 'integral' => intval($params['integral']), + 'status' => intval($params['status']), + 'alipay_openid' => isset($params['alipay_openid']) ? $params['alipay_openid'] : '', + 'weixin_openid' => isset($params['weixin_openid']) ? $params['weixin_openid'] : '', + 'baidu_openid' => isset($params['baidu_openid']) ? $params['baidu_openid'] : '', 'birthday' => empty($params['birthday']) ? 0 : strtotime($params['birthday']), 'upd_time' => time(), ]; @@ -799,8 +819,9 @@ class UserService { return DataReturn('帐号不存在', -3); } + // 用户状态 - if($user['status'] == 2) + if(in_array($user['status'], [2,3])) { return DataReturn(lang('common_user_status_list')[$user['status']]['tips'], -10); } @@ -918,12 +939,17 @@ class UserService return DataReturn('验证码错误', -11); } + // 是否需要审核 + $common_register_is_enable_audit = MyC('common_register_is_enable_audit', 0); + + // 用户数据 $salt = GetNumberCode(6); $data = [ 'add_time' => time(), 'upd_time' => time(), 'salt' => $salt, 'pwd' => LoginPwdEncryption($params['pwd'], $salt), + 'status' => ($common_register_is_enable_audit == 1) ? 3 : 0, ]; if($params['type'] == 'sms') { @@ -939,6 +965,13 @@ class UserService // 清除验证码 $obj->Remove(); + // 是否需要审核 + if($common_register_is_enable_audit == 1) + { + return DataReturn('注册成功，请等待审核'); + } + + // 用户登录session纪录 if(self::UserLoginRecord($user_id)) { return DataReturn('注册成功', 0); @@ -1401,6 +1434,12 @@ class UserService $user = self::UserInfo($field, $params['openid']); if(!empty($user)) { + // 用户状态 + if(in_array($user['status'], [2,3])) + { + return DataReturn(lang('common_user_status_list')[$user['status']]['tips'], -10); + } + $data = $user; } @@ -1488,9 +1527,15 @@ class UserService { return DataReturn('用户openid不能为空', -20); } + + // 是否需要审核 + $common_register_is_enable_audit = MyC('common_register_is_enable_audit', 0); + + // 用户数据 $data = array( $accounts_field => $params[$accounts_field], 'mobile' => $params['mobile'], + 'status' => ($common_register_is_enable_audit == 1) ? 3 : 0, ); // 获取用户信息 @@ -1538,6 +1583,12 @@ class UserService // 清除验证码 $obj->Remove(); + // 是否需要审核 + if($common_register_is_enable_audit == 1) + { + return DataReturn('绑定成功、等待审核', -101); + } + return DataReturn('绑定成功', 0, self::UserLoginRecord($user_id, true)); } else { return DataReturn('绑定失败', -100); diff --git a/config/shopxo.sql b/config/shopxo.sql index d900793bf..65bcfc983 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -11,7 +11,7 @@ Target Server Version : 50722 File Encoding : utf-8 - Date: 02/25/2019 11:14:36 AM + Date: 02/26/2019 17:51:45 PM */ SET NAMES utf8mb4; @@ -244,7 +244,7 @@ CREATE TABLE `s_config` ( -- Records of `s_config` -- ---------------------------- BEGIN; -INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1549963896'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1549963896'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1549963896'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1549963896'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1546938183'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1546938183'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1546938183'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1550547827'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1550547827'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1550547827'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1550547827'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1550547827'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1550547827'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1546938183'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1550547827'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1550547827'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1550547827'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1546938183'), ('31', '', '分享页面规则描述', '', '', 'common', 'common_share_view_desc', '1542011644'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1550547827'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1550547827'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1550547827'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1550547827'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1550547827'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1550547827'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1550547827'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1550547827'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1550547827'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1546059985'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1546059985'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1546059985'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1546059985'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1546059985'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1546059985'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1549963896'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1549963896'), ('63', '

用户注册，你的验证码是  #code#

', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

密码找回，你的验证码是  #code#

', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

邮箱绑定，你的验证码是  #code#

', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1550547827'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1549963896'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1549963896'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1549963896'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1549963896'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1546938183'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); +INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1551173001'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1551173001'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1551173001'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1551173001'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1546938183'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1546938183'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1546938183'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1550547827'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1550547827'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1550547827'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1550547827'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1550547827'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1550547827'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1546938183'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1550547827'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1550547827'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1550547827'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1546938183'), ('31', '1', '用户注册开启审核', '开启后用户注册需要审核通过方可登录', '请选择用户注册开启审核', 'common', 'common_register_is_enable_audit', '1551173001'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1550547827'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1550547827'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1550547827'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1550547827'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1550547827'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1550547827'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1550547827'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1550547827'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1550547827'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1551174648'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1551174648'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1551174648'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1551174648'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1551174648'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1551174648'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1551173001'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1551173001'), ('63', '

用户注册，你的验证码是  #code#

', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

密码找回，你的验证码是  #code#

', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

邮箱绑定，你的验证码是  #code#

', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1550547827'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1551173001'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1551173001'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1551173001'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1551173001'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1546938183'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); COMMIT; -- ---------------------------- @@ -588,7 +588,14 @@ CREATE TABLE `s_message` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; + +-- ---------------------------- +-- Records of `s_message` +-- ---------------------------- +BEGIN; +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'); +COMMIT; -- ---------------------------- -- Table structure for `s_navigation` @@ -1038,7 +1045,7 @@ CREATE TABLE `s_user` ( `alipay_openid` char(60) NOT NULL DEFAULT '' COMMENT '支付宝openid', `weixin_openid` char(60) NOT NULL DEFAULT '' COMMENT '微信openid', `baidu_openid` char(60) NOT NULL DEFAULT '' COMMENT '百度openid', - `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态（0正常, 1禁止发言, 2禁止登录）', + `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态（0正常, 1禁止发言, 2禁止登录, 3待审核）', `salt` char(32) NOT NULL DEFAULT '' COMMENT '配合密码加密串', `pwd` char(32) NOT NULL DEFAULT '' COMMENT '登录密码', `username` char(60) NOT NULL DEFAULT '' COMMENT '用户名', @@ -1062,13 +1069,13 @@ CREATE TABLE `s_user` ( KEY `weixin_openid` (`weixin_openid`), KEY `mobile` (`mobile`), KEY `username` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户'; +) ENGINE=InnoDB AUTO_INCREMENT=93 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户'; -- ---------------------------- -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '2088502175420842-', '', '', '0', '430953', '13ee29b2b06000b088a07cf36e7062f7', '', '龚哥哥', '13250814883', 'fuxiang.gong@qq.com', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '982', '0', '0', '0', '0', '1550466434'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1550461701'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '430953', '13ee29b2b06000b088a07cf36e7062f7', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '982', '0', '0', '0', '0', '1551173481'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '3', '802141', '1809ca664268370c783732f9146e7d6d', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '5', '0', '0', '0', '1551173897', '1551174462'); COMMIT; -- ---------------------------- @@ -1111,6 +1118,13 @@ CREATE TABLE `s_user_integral_log` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; + +-- ---------------------------- +-- Records of `s_user_integral_log` +-- ---------------------------- +BEGIN; +INSERT INTO `s_user_integral_log` VALUES ('1', '92', '1', '0', '5', '登录奖励积分', '0', '1551174252'); +COMMIT; SET FOREIGN_KEY_CHECKS = 1; diff --git a/public/appmini/old/alipay/pages/common/copyright.axml b/public/appmini/old/alipay/pages/common/copyright.axml index 591291e3f..ba9d8059e 100755 --- a/public/appmini/old/alipay/pages/common/copyright.axml +++ b/public/appmini/old/alipay/pages/common/copyright.axml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/common/copyright.wxml b/public/appmini/old/weixin/pages/common/copyright.wxml index 591291e3f..ba9d8059e 100755 --- a/public/appmini/old/weixin/pages/common/copyright.wxml +++ b/public/appmini/old/weixin/pages/common/copyright.wxml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/public/core.php b/public/core.php index 50c4917d3..f65cafed5 100755 --- a/public/core.php +++ b/public/core.php @@ -13,7 +13,7 @@ if(version_compare(PHP_VERSION,'5.6.0','<')) die('PHP版本最低 5.6.0'); // 系统版本 -define('APPLICATION_VERSION', 'v1.3.0'); +define('APPLICATION_VERSION', 'v1.4.0'); // 定义系统目录分隔符 define('DS', '/'); From e8fd6b5571397898fd78e1378a2ec9260e48773d Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Tue, 26 Feb 2019 22:45:47 +0800 Subject: [PATCH 002/108] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=95=86?= =?UTF-8?q?=E5=93=81=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Goods.php | 21 ++-- application/api/controller/Goods.php | 10 +- application/index/controller/Common.php | 12 +- application/index/controller/Goods.php | 20 +-- application/index/controller/Search.php | 6 +- application/index/controller/User.php | 2 +- .../index/view/default/goods/index.html | 2 +- application/plugins/commongobacktop/Hook.php | 4 +- .../plugins/commononlineservice/Hook.php | 4 +- .../plugins/commonrightnavigation/Hook.php | 4 +- .../plugins/commontopmaxpicture/Hook.php | 4 +- application/plugins/commontopnotice/Hook.php | 4 +- .../plugins/usercentertopnotice/Hook.php | 4 +- .../plugins/userloginrewardintegral/Hook.php | 6 +- .../userloginrewardintegral/config.json | 2 +- .../usernotloginhidegoodsprice/Admin.php | 96 +++++++++++++++ .../usernotloginhidegoodsprice/Hook.php | 116 ++++++++++++++++++ .../usernotloginhidegoodsprice/config.json | 28 +++++ .../admin/index.html | 51 ++++++++ .../admin/saveinfo.html | 43 +++++++ application/service/BuyService.php | 24 ++-- application/service/GoodsService.php | 34 ++++- application/service/PluginsAdminService.php | 10 +- application/service/UserService.php | 16 ++- application/tags.php | 6 +- config/shopxo.php | 2 +- config/shopxo.sql | 35 ++---- public/static/index/default/css/goods.css | 2 +- .../css/usernotloginhidegoodsprice/admin.css | 15 +++ .../2019/02/26/1551184745400164.png | Bin 0 -> 6912 bytes 30 files changed, 489 insertions(+), 94 deletions(-) create mode 100644 application/plugins/usernotloginhidegoodsprice/Admin.php create mode 100644 application/plugins/usernotloginhidegoodsprice/Hook.php create mode 100644 application/plugins/usernotloginhidegoodsprice/config.json create mode 100755 application/plugins/view/usernotloginhidegoodsprice/admin/index.html create mode 100755 application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html create mode 100755 public/static/plugins/css/usernotloginhidegoodsprice/admin.css create mode 100644 public/static/upload/images/plugins_usernotloginhidegoodsprice/2019/02/26/1551184745400164.png diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index 900b94942..bbbc69978 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -74,12 +74,13 @@ class Goods extends Common // 获取数据列表 $data_params = [ - 'where' => $where, - 'm' => $page->GetPageStarNumber(), - 'n' => $number, - 'is_category' => 1, + 'where' => $where, + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'is_category' => 1, + 'is_admin_access' => 1, ]; - $data = GoodsService::GoodsList($data_params); + $ret = GoodsService::GoodsList($data_params); // 是否上下架 $this->assign('common_is_shelves_list', lang('common_is_shelves_list')); @@ -89,7 +90,7 @@ class Goods extends Common $this->assign('params', $params); $this->assign('page_html', $page->GetPageHtml()); - $this->assign('data', $data); + $this->assign('data', $ret['data']); return $this->fetch(); } @@ -116,15 +117,15 @@ class Goods extends Common 'is_content_app' => 1, 'is_category' => 1, ]; - $data = GoodsService::GoodsList($data_params); - if(empty($data[0])) + $ret = GoodsService::GoodsList($data_params); + if(empty($ret['data'][0])) { return $this->error('商品信息不存在', MyUrl('admin/goods/index')); } - $this->assign('data', $data[0]); + $this->assign('data', $ret['data'][0]); // 获取商品编辑规格 - $specifications = GoodsService::GoodsEditSpecifications($data[0]['id']); + $specifications = GoodsService::GoodsEditSpecifications($ret['data'][0]['id']); $this->assign('specifications', $specifications); } diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index 335081f61..18e42e6d9 100755 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -61,16 +61,16 @@ class Goods extends Common 'is_spec' => true, 'is_content_app' => true, ]; - $goods = GoodsService::GoodsList($params); - if(empty($goods[0]) || $goods[0]['is_delete_time'] != 0) + $ret = GoodsService::GoodsList($params); + if(empty($ret['data'][0]) || $ret['data'][0]['is_delete_time'] != 0) { return DataReturn('商品不存在或已删除', -1); } - unset($goods[0]['content_web']); + unset($ret['data'][0]['content_web']); // 当前登录用户是否已收藏 $ret_favor = GoodsService::IsUserGoodsFavor(['goods_id'=>$goods_id, 'user'=>$this->user]); - $goods[0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; + $ret['data'][0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; // 商品访问统计 GoodsService::GoodsAccessCountInc(['goods_id'=>$goods_id]); @@ -80,7 +80,7 @@ class Goods extends Common // 数据返回 $result = [ - 'goods' => $goods[0], + 'goods' => $ret['data'][0], 'common_order_is_booking' => (int) MyC('common_order_is_booking', 0), ]; return DataReturn('success', 0, $result); diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 052f1bff5..1671373b0 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -81,22 +81,22 @@ class Common extends Controller private function CommonPluginsInit() { // css钩子 - $this->assign('plugins_css_data', Hook::listen('plugins_css', ['hook_name'=>'plugins_css', 'is_control'=>false])); + $this->assign('plugins_css_data', Hook::listen('plugins_css', ['hook_name'=>'plugins_css', 'is_backend'=>false])); // js钩子 - $this->assign('plugins_js_data', Hook::listen('plugins_js', ['hook_name'=>'plugins_js', 'is_control'=>false])); + $this->assign('plugins_js_data', Hook::listen('plugins_js', ['hook_name'=>'plugins_js', 'is_backend'=>false])); // 公共header内钩子 - $this->assign('plugins_common_header_data', Hook::listen('plugins_common_header', ['hook_name'=>'plugins_common_header', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_common_header_data', Hook::listen('plugins_common_header', ['hook_name'=>'plugins_common_header', 'is_backend'=>false, 'user'=>$this->user])); // 公共页面底部钩子 - $this->assign('plugins_common_page_bottom_data', Hook::listen('plugins_common_page_bottom', ['hook_name'=>'plugins_common_page_bottom', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_common_page_bottom_data', Hook::listen('plugins_common_page_bottom', ['hook_name'=>'plugins_common_page_bottom', 'is_backend'=>false, 'user'=>$this->user])); // 公共顶部钩子 - $this->assign('plugins_view_common_top_data', Hook::listen('plugins_view_common_top', ['hook_name'=>'plugins_view_common_top', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_common_top_data', Hook::listen('plugins_view_common_top', ['hook_name'=>'plugins_view_common_top', 'is_backend'=>false, 'user'=>$this->user])); // 公共底部钩子 - $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_backend'=>false, 'user'=>$this->user])); } /** diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php index e41161b14..1e68569d1 100755 --- a/application/index/controller/Goods.php +++ b/application/index/controller/Goods.php @@ -52,24 +52,24 @@ class Goods extends Common 'is_photo' => true, 'is_spec' => true, ]; - $goods = GoodsService::GoodsList($params); - if(empty($goods[0]) || $goods[0]['is_delete_time'] != 0) + $ret = GoodsService::GoodsList($params); + if(empty($ret['data'][0]) || $ret['data'][0]['is_delete_time'] != 0) { $this->assign('msg', '资源不存在或已被删除'); return $this->fetch('/public/tips_error'); } else { // 当前登录用户是否已收藏 $ret_favor = GoodsService::IsUserGoodsFavor(['goods_id'=>$id, 'user'=>$this->user]); - $goods[0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; + $ret['data'][0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; // 商品评价总数 - $goods[0]['comments_count'] = GoodsService::GoodsCommentsTotal($id); + $ret['data'][0]['comments_count'] = GoodsService::GoodsCommentsTotal($id); // 商品收藏总数 - $goods[0]['favor_count'] = GoodsService::GoodsFavorTotal(['goods_id'=>$id]); + $ret['data'][0]['favor_count'] = GoodsService::GoodsFavorTotal(['goods_id'=>$id]); - $this->assign('goods', $goods[0]); - $this->assign('home_seo_site_title', $goods[0]['title']); + $this->assign('goods', $ret['data'][0]); + $this->assign('home_seo_site_title', $ret['data'][0]['title']); // 二维码 $this->assign('qrcode_url', MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode(MyUrl('index/goods/index', ['id'=>$id], true, true)))])); @@ -90,7 +90,8 @@ class Goods extends Common 'field' => 'id,title,title_color,price,images', 'n' => 10, ]; - $this->assign('left_goods', GoodsService::GoodsList($params)); + $right_goods = GoodsService::GoodsList($params); + $this->assign('left_goods', $right_goods['data']); // 详情tab商品 猜你喜欢 $params = [ @@ -103,7 +104,8 @@ class Goods extends Common 'field' => 'id,title,title_color,price,images,home_recommended_images', 'n' => 16, ]; - $this->assign('detail_like_goods', GoodsService::GoodsList($params)); + $like_goods = GoodsService::GoodsList($params); + $this->assign('detail_like_goods', $like_goods['data']); return $this->fetch(); } diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php index 160bd33f6..252260bc6 100755 --- a/application/index/controller/Search.php +++ b/application/index/controller/Search.php @@ -97,8 +97,8 @@ class Search extends Common public function GoodsList() { // 获取商品列表 - $data = SearchService::GoodsList($this->params); - if(empty($data['data'])) + $ret = SearchService::GoodsList($this->params); + if(empty($ret['data'])) { $msg = '没有相关数据'; $code = -100; @@ -111,7 +111,7 @@ class Search extends Common SearchService::SearchAdd($this->params); // 返回 - return DataReturn($msg, $code, $data); + return DataReturn($msg, $code, $ret['data']); } } ?> \ No newline at end of file diff --git a/application/index/controller/User.php b/application/index/controller/User.php index 21b511411..768f14ce9 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -137,7 +137,7 @@ class User extends Common $this->assign('goods_browse_list', $data['data']); // 用户中心顶部钩子 - $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_control'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_backend'=>false, 'user'=>$this->user])); return $this->fetch(); } diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html index d1af19eed..d474064fa 100755 --- a/application/index/view/default/goods/index.html +++ b/application/index/view/default/goods/index.html @@ -91,7 +91,7 @@
{{/if}}
-
促销价
+
销售价
¥ {{$goods.price}} diff --git a/application/plugins/commongobacktop/Hook.php b/application/plugins/commongobacktop/Hook.php index 7dbe9fce9..4cc87dd7d 100755 --- a/application/plugins/commongobacktop/Hook.php +++ b/application/plugins/commongobacktop/Hook.php @@ -33,9 +33,9 @@ class Hook extends Controller public function run($params = []) { // 是否控制器钩子 - // is_control 当前为控制器业务处理 + // is_backend 当前为后端业务处理 // hook_name 钩子名称 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { // 参数一 描述 // 参数二 0 为处理成功, 负数为失败 diff --git a/application/plugins/commononlineservice/Hook.php b/application/plugins/commononlineservice/Hook.php index 79057e630..f0393374c 100755 --- a/application/plugins/commononlineservice/Hook.php +++ b/application/plugins/commononlineservice/Hook.php @@ -33,9 +33,9 @@ class Hook extends Controller public function run($params = []) { // 是否控制器钩子 - // is_control 当前为控制器业务处理 + // is_backend 当前为后端业务处理 // hook_name 钩子名称 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { // 参数一 描述 // 参数二 0 为处理成功, 负数为失败 diff --git a/application/plugins/commonrightnavigation/Hook.php b/application/plugins/commonrightnavigation/Hook.php index a57c70e13..adc13e26c 100755 --- a/application/plugins/commonrightnavigation/Hook.php +++ b/application/plugins/commonrightnavigation/Hook.php @@ -34,9 +34,9 @@ class Hook extends Controller public function run($params = []) { // 是否控制器钩子 - // is_control 当前为控制器业务处理 + // is_backend 当前为后端业务处理 // hook_name 钩子名称 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { // 参数一 描述 // 参数二 0 为处理成功, 负数为失败 diff --git a/application/plugins/commontopmaxpicture/Hook.php b/application/plugins/commontopmaxpicture/Hook.php index a3a08052a..f602c2cde 100755 --- a/application/plugins/commontopmaxpicture/Hook.php +++ b/application/plugins/commontopmaxpicture/Hook.php @@ -31,8 +31,8 @@ class Hook extends Controller */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { return DataReturn('无需处理', 0); diff --git a/application/plugins/commontopnotice/Hook.php b/application/plugins/commontopnotice/Hook.php index c5f3b834e..6a9a3bec4 100755 --- a/application/plugins/commontopnotice/Hook.php +++ b/application/plugins/commontopnotice/Hook.php @@ -32,8 +32,8 @@ class Hook extends Controller */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { return DataReturn('无需处理', 0); diff --git a/application/plugins/usercentertopnotice/Hook.php b/application/plugins/usercentertopnotice/Hook.php index a23a50867..535a9f3a6 100755 --- a/application/plugins/usercentertopnotice/Hook.php +++ b/application/plugins/usercentertopnotice/Hook.php @@ -32,8 +32,8 @@ class Hook extends Controller */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { return DataReturn('无需处理', 0); diff --git a/application/plugins/userloginrewardintegral/Hook.php b/application/plugins/userloginrewardintegral/Hook.php index 0394faa75..4b3958c70 100755 --- a/application/plugins/userloginrewardintegral/Hook.php +++ b/application/plugins/userloginrewardintegral/Hook.php @@ -34,15 +34,15 @@ class Hook */ public function run($params = []) { - // 是否控制器钩子 - if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name'])) + // 是否后端钩子 + if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) { if(!empty($params['user_id'])) { switch($params['hook_name']) { // 用户登录成功后赠送积分 - case 'plugins_control_user_login_end' : + case 'plugins_service_user_login_end' : $ret = $this->LoginGiveIntegral($params); break; diff --git a/application/plugins/userloginrewardintegral/config.json b/application/plugins/userloginrewardintegral/config.json index 42ba38693..cfa30ca39 100755 --- a/application/plugins/userloginrewardintegral/config.json +++ b/application/plugins/userloginrewardintegral/config.json @@ -17,7 +17,7 @@ "is_home":false }, "hook":{ - "plugins_control_user_login_end":[ + "plugins_service_user_login_end":[ "app\\plugins\\userloginrewardintegral\\Hook" ] } diff --git a/application/plugins/usernotloginhidegoodsprice/Admin.php b/application/plugins/usernotloginhidegoodsprice/Admin.php new file mode 100644 index 000000000..04490d04c --- /dev/null +++ b/application/plugins/usernotloginhidegoodsprice/Admin.php @@ -0,0 +1,96 @@ +assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/index'); + } else { + return $ret['msg']; + } + } + + /** + * 编辑页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function saveinfo($params = []) + { + $ret = PluginsService::PluginsData('usernotloginhidegoodsprice'); + if($ret['code'] == 0) + { + // 限制终端 + $ret['data']['limit_terminal'] = empty($ret['data']['limit_terminal']) ? [] : explode(',', $ret['data']['limit_terminal']); + + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/usernotloginhidegoodsprice/admin/saveinfo'); + } else { + return $ret['msg']; + } + } + + /** + * 数据保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + return PluginsService::PluginsDataSave(['plugins'=>'usernotloginhidegoodsprice', 'data'=>$params]); + } +} +?> \ No newline at end of file diff --git a/application/plugins/usernotloginhidegoodsprice/Hook.php b/application/plugins/usernotloginhidegoodsprice/Hook.php new file mode 100644 index 000000000..bf3ef29b5 --- /dev/null +++ b/application/plugins/usernotloginhidegoodsprice/Hook.php @@ -0,0 +1,116 @@ +PriceHandle($params); + + // 默认返回视图 + } else { + return ''; + } + } + + /** + * 价格处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-14T22:19:08+0800 + * @param [array] $params [参数] + */ + private function PriceHandle($params) + { + // 获取应用数据 + $ret = PluginsService::PluginsData('usernotloginhidegoodsprice'); + if($ret['code'] == 0) + { + // 用户是否已登录 + if(session('user') != null) + { + return DataReturn('无需处理', 0); + } + + // 限制终端 + if(!empty($ret['data']['limit_terminal'])) + { + $limit_terminal_all = explode(',', $ret['data']['limit_terminal']); + $client_type = APPLICATION_CLIENT_TYPE; + if($client_type == 'pc' && IsMobile()) + { + $client_type = 'h5'; + } + if(!in_array($client_type, $limit_terminal_all)) + { + return DataReturn('无需处理', 0); + } + } + + // 原价 + $original_price_placeholder = isset($ret['data']['original_price_placeholder']) ? $ret['data']['original_price_placeholder'] : ''; + + // 销售价 + $price_placeholder = isset($ret['data']['price_placeholder']) ? $ret['data']['price_placeholder'] : ''; + + // 商品原价 + if(isset($params['goods']['original_price'])) + { + $params['goods']['original_price'] = $original_price_placeholder; + } + if(isset($params['goods']['min_original_price'])) + { + $params['goods']['min_original_price'] = $original_price_placeholder; + } + if(isset($params['goods']['max_original_price'])) + { + $params['goods']['max_original_price'] = $original_price_placeholder; + } + + // 销售价 + if(isset($params['goods']['price'])) + { + $params['goods']['price'] = $price_placeholder; + } + if(isset($params['goods']['min_price'])) + { + $params['goods']['min_price'] = $price_placeholder; + } + if(isset($params['goods']['max_price'])) + { + $params['goods']['max_price'] = $price_placeholder; + } + + return DataReturn('处理成功', 0); + } else { + return $ret; + } + } +} +?> \ No newline at end of file diff --git a/application/plugins/usernotloginhidegoodsprice/config.json b/application/plugins/usernotloginhidegoodsprice/config.json new file mode 100644 index 000000000..32a8a9cc2 --- /dev/null +++ b/application/plugins/usernotloginhidegoodsprice/config.json @@ -0,0 +1,28 @@ +{ + "base":{ + "plugins":"usernotloginhidegoodsprice", + "name":"未登录隐藏商品价格", + "logo":"\/static\/upload\/images\/plugins_usernotloginhidegoodsprice\/2019\/02\/26\/1551184745400164.png", + "author":"Devil", + "author_url":"https:\/\/shopxo.net\/", + "version":"1.0.0", + "desc":"用户未登录不展示商品价格", + "apply_terminal":[ + "pc", + "h5", + "app", + "alipay", + "weixin", + "baidu" + ], + "apply_version":[ + "1.4.0" + ], + "is_home":false + }, + "hook":{ + "plugins_service_goods_handle_begin":[ + "app\\plugins\\usernotloginhidegoodsprice\\Hook" + ] + } +} \ No newline at end of file diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/index.html b/application/plugins/view/usernotloginhidegoodsprice/admin/index.html new file mode 100755 index 000000000..5ea710202 --- /dev/null +++ b/application/plugins/view/usernotloginhidegoodsprice/admin/index.html @@ -0,0 +1,51 @@ +{{include file="public/header" /}} + + +
+
+ + 未登录隐藏商品价格 + 返回 + + +
+
+ +
+ {{if !empty($data['original_price_placeholder'])}} + {{$data.original_price_placeholder}} + {{else /}} + 未填写 + {{/if}} +
+
+
+ +
+ {{if !empty($data['price_placeholder'])}} + {{$data.price_placeholder}} + {{else /}} + 未填写 + {{/if}} +
+
+
+ +
+ {{if !empty($data['limit_terminal_text'])}} + {{$data.limit_terminal_text}} + {{else /}} + 全部 + {{/if}} +
+
+ + 编辑 +
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html b/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html new file mode 100755 index 000000000..9656f6595 --- /dev/null +++ b/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html @@ -0,0 +1,43 @@ +{{include file="public/header" /}} + + +
+
+ +
+ + 未登录隐藏商品价格 + 返回 + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 109297b86..98416c658 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -371,32 +371,32 @@ class BuyService ], 'field' => 'id, id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number', ]; - $goods = GoodsService::GoodsList($p); - if(empty($goods[0])) + $ret = GoodsService::GoodsList($p); + if(empty($ret['data'][0])) { return DataReturn('资源不存在或已被删除', -10); } // 规格 - $goods[0]['spec'] = self::GoodsSpecificationsHandle($params); + $ret['data'][0]['spec'] = self::GoodsSpecificationsHandle($params); // 获取商品基础信息 - $goods_base = GoodsService::GoodsSpecDetail(['id'=>$goods[0]['goods_id'], 'spec'=>$goods[0]['spec']]); + $goods_base = GoodsService::GoodsSpecDetail(['id'=>$ret['data'][0]['goods_id'], 'spec'=>$ret['data'][0]['spec']]); if($goods_base['code'] == 0) { - $goods[0]['inventory'] = $goods_base['data']['inventory']; - $goods[0]['price'] = $goods_base['data']['price']; - $goods[0]['original_price'] = $goods_base['data']['original_price']; - $goods[0]['spec_weight'] = $goods_base['data']['weight']; - $goods[0]['spec_coding'] = $goods_base['data']['coding']; - $goods[0]['spec_barcode'] = $goods_base['data']['barcode']; + $ret['data'][0]['inventory'] = $goods_base['data']['inventory']; + $ret['data'][0]['price'] = $goods_base['data']['price']; + $ret['data'][0]['original_price'] = $goods_base['data']['original_price']; + $ret['data'][0]['spec_weight'] = $goods_base['data']['weight']; + $ret['data'][0]['spec_coding'] = $goods_base['data']['coding']; + $ret['data'][0]['spec_barcode'] = $goods_base['data']['barcode']; } else { return $goods_base; } // 数量/小计 - $goods[0]['stock'] = $params['stock']; - $goods[0]['total_price'] = $params['stock']*$goods[0]['price']; + $ret['data'][0]['stock'] = $params['stock']; + $ret['data'][0]['total_price'] = $params['stock']*$ret['data'][0]['price']; return DataReturn('操作成功', 0, $goods); } diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 94913f675..84f835c60 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -11,6 +11,7 @@ namespace app\service; use think\Db; +use think\facade\Hook; use app\service\ResourcesService; use app\service\BrandService; use app\service\RegionService; @@ -153,7 +154,8 @@ class GoodsService foreach($goods_category as &$v) { $category_ids = self::GoodsCategoryItemsIds([$v['id']], 1); - $v['goods'] = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'is_home_recommended'=>1], 'm'=>0, 'n'=>6, 'field'=>'g.id,g.title,g.title_color,g.images,g.home_recommended_images,g.original_price,g.price,g.min_price,g.max_price,g.inventory,g.buy_min_number,g.buy_max_number']); + $goods = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'is_home_recommended'=>1], 'm'=>0, 'n'=>6, 'field'=>'g.id,g.title,g.title_color,g.images,g.home_recommended_images,g.original_price,g.price,g.min_price,g.max_price,g.inventory,g.buy_min_number,g.buy_max_number']); + $v['goods'] = $goods['data']; } } return $goods_category; @@ -246,6 +248,20 @@ class GoodsService // 开始处理数据 foreach($data as &$v) { + // 商品处理前钩子 + $hook_name = 'plugins_service_goods_handle_begin'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'goods' => &$v, + 'goods_id' => $v['id'] + ]); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } + // 商品url地址 if(!empty($v['id'])) { @@ -328,9 +344,23 @@ class GoodsService { $v['content_app'] = self::GoodsContentApp(['goods_id'=>$v['id']]); } + + // 商品处理前钩子 + $hook_name = 'plugins_service_goods_handle_end'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'goods' => &$v, + 'goods_id' => $v['id'] + ]); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } } } - return $data; + return DataReturn('处理成功', 0, $data); } /** diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index f2ad60dc9..1bb49c8ee 100644 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -486,7 +486,9 @@ class PluginsAdminService $admin=<<'plugins_control_user_login_begin', 'is_control'=>true, 'params'=>$params, 'user_id'=>$user['id']]); + $hook_name = 'plugins_service_user_login_begin'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'user_id' => $user['id'] + ]); if(isset($ret['code']) && $ret['code'] != 0) { return $ret; @@ -852,7 +858,13 @@ class UserService if(self::UserLoginRecord($user['id'])) { // 用户登录后钩子 - $ret = Hook::listen('plugins_control_user_login_end', ['hook_name'=>'plugins_control_user_login_end', 'is_control'=>true, 'params'=>$params, 'user_id'=>$user['id']]); + $hook_name = 'plugins_service_user_login_end'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'user_id' => $user['id'] + ]); if(isset($ret['code']) && $ret['code'] != 0) { return $ret; diff --git a/application/tags.php b/application/tags.php index 051a7d96e..634345bd2 100755 --- a/application/tags.php +++ b/application/tags.php @@ -41,7 +41,7 @@ return array ( array ( 0 => 'app\\plugins\\usercentertopnotice\\Hook', ), - 'plugins_control_user_login_end' => + 'plugins_service_user_login_end' => array ( 0 => 'app\\plugins\\userloginrewardintegral\\Hook', ), @@ -60,5 +60,9 @@ return array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', 1 => 'app\\plugins\\commononlineservice\\Hook', ), + 'plugins_service_goods_handle_begin' => + array ( + 0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', + ), ); ?> \ No newline at end of file diff --git a/config/shopxo.php b/config/shopxo.php index 3912d471c..1df505894 100644 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -15,7 +15,7 @@ return [ // 开发模式 - 'is_develop' => false, + 'is_develop' => true, // 默认编码 'default_charset' => 'utf-8', diff --git a/config/shopxo.sql b/config/shopxo.sql index 65bcfc983..30a17439a 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -1,20 +1,18 @@ /* - Navicat Premium Data Transfer + Navicat MySQL Data Transfer Source Server : 本机 - Source Server Type : MySQL - Source Server Version : 50722 + Source Server Version : 50716 Source Host : localhost - Source Database : shopxo_test + Source Database : shopxo_ttt - Target Server Type : MySQL - Target Server Version : 50722 + Target Server Version : 50716 File Encoding : utf-8 - Date: 02/26/2019 17:51:45 PM + Date: 02/26/2019 22:44:32 PM */ -SET NAMES utf8mb4; +SET NAMES utf8; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- @@ -348,7 +346,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', '9', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1711', '步', '/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', '10', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '2', '', '/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', '49', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '436', '步', '/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', '0', '18', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '321', '步', '/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', '26', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '7', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('9', '2', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '0', '598', '件', '/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', '61', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '13', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '4', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

\"d-1.jpg\"/

\"d-2.jpg\"/

', '3', '0', '11', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551064315'); +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', '20', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1711', '步', '/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', '10', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '2', '', '/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', '49', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '436', '步', '/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', '0', '146', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '321', '步', '/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', '42', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('9', '2', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '', '', '0', '598', '件', '/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', '62', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '13', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '4', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

\"d-1.jpg\"/

\"d-2.jpg\"/

', '3', '0', '11', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551064315'); COMMIT; -- ---------------------------- @@ -588,13 +586,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=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; -- ---------------------------- -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'); +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551192116'); COMMIT; -- ---------------------------- @@ -825,13 +823,13 @@ CREATE TABLE `s_plugins` ( PRIMARY KEY (`id`), UNIQUE KEY `plugins` (`plugins`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; -- ---------------------------- -- 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', '1550461322'), ('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', '1550461635'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550157860', '1550461859'), ('14', 'userloginrewardintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userloginrewardintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1550461995'), ('15', 'commongobacktop', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commongobacktop\\/2019\\/02\\/15\\/1550210425433304.png\",\"is_overall\":\"1\",\"pluginsname\":\"commongobacktop\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550200998', '1550468447'), ('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\"}', '1', '1550222925', '1550464997'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1550544406'); +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', '1551191935'), ('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', '1551191934'), ('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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u540e\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1551191908'); COMMIT; -- ---------------------------- @@ -1075,7 +1073,7 @@ CREATE TABLE `s_user` ( -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '430953', '13ee29b2b06000b088a07cf36e7062f7', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '982', '0', '0', '0', '0', '1551173481'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '3', '802141', '1809ca664268370c783732f9146e7d6d', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '5', '0', '0', '0', '1551173897', '1551174462'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '277585', 'c34289bfdf655809f384bcfcd2606b24', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '987', '0', '0', '0', '0', '1551192189'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '3', '802141', '1809ca664268370c783732f9146e7d6d', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '5', '0', '0', '0', '1551173897', '1551174462'); COMMIT; -- ---------------------------- @@ -1118,13 +1116,6 @@ CREATE TABLE `s_user_integral_log` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; - --- ---------------------------- --- Records of `s_user_integral_log` --- ---------------------------- -BEGIN; -INSERT INTO `s_user_integral_log` VALUES ('1', '92', '1', '0', '5', '登录奖励积分', '0', '1551174252'); -COMMIT; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index 71d3f45e1..cb1788567 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -381,7 +381,7 @@ li.am-comment{ width:100%} .tb-detail-price{ background: #fcf1e3 url(../images/goods_meta_bg.png); background-size: cover; -moz-background-size: cover; background-repeat: no-repeat; } .tb-detail-price .items {display: block;margin:0px 10px;} .tb-detail-price .items dt {width: 70px;float:left;text-align: left;} - .sys_item_price{font-size: 24px;font-weight: bold;} + .sys_item_price{font-size: 24px;font-weight: bold; line-height: 16px;} .sys_item_mktprice{font-size:14px ;} diff --git a/public/static/plugins/css/usernotloginhidegoodsprice/admin.css b/public/static/plugins/css/usernotloginhidegoodsprice/admin.css new file mode 100755 index 000000000..051871969 --- /dev/null +++ b/public/static/plugins/css/usernotloginhidegoodsprice/admin.css @@ -0,0 +1,15 @@ +/** + * 首页 + */ +.usernotloginhidegoodsprice-content .items { + margin: 10px 0 20px 0; + border-bottom: 1px dashed #f1f1f1; + padding-bottom: 20px; +} +.usernotloginhidegoodsprice-content .items .empty-text { + color: #ccc; +} + +.usernotloginhidegoodsprice-content .edit-submit { + margin-bottom: 20px; +} \ No newline at end of file diff --git a/public/static/upload/images/plugins_usernotloginhidegoodsprice/2019/02/26/1551184745400164.png b/public/static/upload/images/plugins_usernotloginhidegoodsprice/2019/02/26/1551184745400164.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6152f1bfeefb3eaece74085696625e5c992843 GIT binary patch literal 6912 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 an0rv%@J|fkJp3Wq!ckY&R;pL9iT)o#>>3vU literal 0 HcmV?d00001 From 4fdcb73a05e1a4c802a2f26ae842c01de70cbfb6 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Tue, 26 Feb 2019 22:54:03 +0800 Subject: [PATCH 003/108] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E5=BA=94=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usernotloginhidegoodsprice/Hook.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/application/plugins/usernotloginhidegoodsprice/Hook.php b/application/plugins/usernotloginhidegoodsprice/Hook.php index bf3ef29b5..092a559aa 100644 --- a/application/plugins/usernotloginhidegoodsprice/Hook.php +++ b/application/plugins/usernotloginhidegoodsprice/Hook.php @@ -48,16 +48,22 @@ class Hook extends Controller */ private function PriceHandle($params) { + // 后端访问不处理 + if(isset($params['params']['is_admin_access']) && $params['params']['is_admin_access'] == 1) + { + return DataReturn('无需处理', 0); + } + + // 用户是否已登录 + if(session('user') != null) + { + return DataReturn('无需处理', 0); + } + // 获取应用数据 $ret = PluginsService::PluginsData('usernotloginhidegoodsprice'); if($ret['code'] == 0) { - // 用户是否已登录 - if(session('user') != null) - { - return DataReturn('无需处理', 0); - } - // 限制终端 if(!empty($ret['data']['limit_terminal'])) { From b6d6437cc81e9a93a08a4430d134128974049fe7 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Tue, 26 Feb 2019 23:07:22 +0800 Subject: [PATCH 004/108] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E5=BA=94=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usernotloginhidegoodsprice/Hook.php | 70 ++++++++++++------- .../usernotloginhidegoodsprice/config.json | 5 +- application/service/GoodsService.php | 35 +++++++--- application/tags.php | 6 +- 4 files changed, 80 insertions(+), 36 deletions(-) diff --git a/application/plugins/usernotloginhidegoodsprice/Hook.php b/application/plugins/usernotloginhidegoodsprice/Hook.php index 092a559aa..bf0796372 100644 --- a/application/plugins/usernotloginhidegoodsprice/Hook.php +++ b/application/plugins/usernotloginhidegoodsprice/Hook.php @@ -85,32 +85,54 @@ class Hook extends Controller // 销售价 $price_placeholder = isset($ret['data']['price_placeholder']) ? $ret['data']['price_placeholder'] : ''; - // 商品原价 - if(isset($params['goods']['original_price'])) + switch($params['hook_name']) { - $params['goods']['original_price'] = $original_price_placeholder; - } - if(isset($params['goods']['min_original_price'])) - { - $params['goods']['min_original_price'] = $original_price_placeholder; - } - if(isset($params['goods']['max_original_price'])) - { - $params['goods']['max_original_price'] = $original_price_placeholder; - } + // 商品数据处理前 + case 'plugins_service_goods_handle_end' : + // 商品原价 + if(isset($params['goods']['original_price'])) + { + $params['goods']['original_price'] = $original_price_placeholder; + } + if(isset($params['goods']['min_original_price'])) + { + $params['goods']['min_original_price'] = $original_price_placeholder; + } + if(isset($params['goods']['max_original_price'])) + { + $params['goods']['max_original_price'] = $original_price_placeholder; + } - // 销售价 - if(isset($params['goods']['price'])) - { - $params['goods']['price'] = $price_placeholder; - } - if(isset($params['goods']['min_price'])) - { - $params['goods']['min_price'] = $price_placeholder; - } - if(isset($params['goods']['max_price'])) - { - $params['goods']['max_price'] = $price_placeholder; + // 销售价 + if(isset($params['goods']['price'])) + { + $params['goods']['price'] = $price_placeholder; + } + if(isset($params['goods']['min_price'])) + { + $params['goods']['min_price'] = $price_placeholder; + } + if(isset($params['goods']['max_price'])) + { + $params['goods']['max_price'] = $price_placeholder; + } + break; + + // 商品规格基础数据 + case 'plugins_service_goods_spec_base' : + if(isset($params['spec_base']['original_price'])) + { + $params['spec_base']['original_price'] = $original_price_placeholder; + } + if(isset($params['spec_base']['price'])) + { + $params['spec_base']['price'] = $price_placeholder; + } + break; + + // 默认 + default : + return DataReturn('无需处理', 0); } return DataReturn('处理成功', 0); diff --git a/application/plugins/usernotloginhidegoodsprice/config.json b/application/plugins/usernotloginhidegoodsprice/config.json index 32a8a9cc2..6ea5de002 100644 --- a/application/plugins/usernotloginhidegoodsprice/config.json +++ b/application/plugins/usernotloginhidegoodsprice/config.json @@ -21,7 +21,10 @@ "is_home":false }, "hook":{ - "plugins_service_goods_handle_begin":[ + "plugins_service_goods_handle_end":[ + "app\\plugins\\usernotloginhidegoodsprice\\Hook" + ], + "plugins_service_goods_spec_base":[ "app\\plugins\\usernotloginhidegoodsprice\\Hook" ] } diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 84f835c60..6639761a0 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -1802,22 +1802,37 @@ class GoodsService if(!empty($base_id)) { $base = Db::name('GoodsSpecBase')->find($base_id); - $base['weight'] = PriceBeautify($base['weight']); - if(!empty($base)) - { - return DataReturn('操作成功', 0, $base); - } } } } } else { $base = Db::name('GoodsSpecBase')->where($where)->find(); - $base['weight'] = PriceBeautify($base['weight']); - if(!empty($base)) - { - return DataReturn('操作成功', 0, $base); - } } + + // 是否有规格 + if(!empty($base)) + { + // 单位 .00 处理 + $base['weight'] = PriceBeautify($base['weight']); + + // 商品处理前钩子 + $hook_name = 'plugins_service_goods_spec_base'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'spec_base' => &$base, + 'goods_id' => $goods_id + ]); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } + + // 返回成功 + return DataReturn('操作成功', 0, $base); + } + return DataReturn('没有相关规格', -100); } diff --git a/application/tags.php b/application/tags.php index 634345bd2..37531d749 100755 --- a/application/tags.php +++ b/application/tags.php @@ -60,7 +60,11 @@ return array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', 1 => 'app\\plugins\\commononlineservice\\Hook', ), - 'plugins_service_goods_handle_begin' => + 'plugins_service_goods_handle_end' => + array ( + 0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', + ), + 'plugins_service_goods_spec_base' => array ( 0 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook', ), From 3f3d5a89647a90d48d958969839be706d1eb0bb2 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 27 Feb 2019 09:25:53 +0800 Subject: [PATCH 005/108] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md=20?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=9B=BE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81998b82a..f57d06387 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ ThinkPHP是一个快速、简单的基于MVC和面向对象的轻量级PHP开发 ![电脑端](https://images.gitee.com/uploads/images/2019/0111/104442_0a307119_488475.gif "1547174456822.gif") # 后台管理图片展示 -![后台管理](https://images.gitee.com/uploads/images/2019/0111/104511_63926cf8_488475.gif "1547174286447.gif") +![后台管理](https://images.gitee.com/uploads/images/2019/0227/092528_9eb4dbef_488475.gif "admin-2.gif") # 功能简介 ### 后端功能列表 From 160b73c80c83faa948e21d8b520c4c00595a105c Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 09:47:26 +0800 Subject: [PATCH 006/108] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/UserService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/service/UserService.php b/application/service/UserService.php index daf2dba10..1f087153b 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -1598,7 +1598,7 @@ class UserService // 是否需要审核 if($common_register_is_enable_audit == 1) { - return DataReturn('绑定成功、等待审核', -101); + return DataReturn('绑定成功、等待审核', 0); } return DataReturn('绑定成功', 0, self::UserLoginRecord($user_id, true)); From 592cfcc99a390c5f92514d0051575eb76993a2f4 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 09:51:02 +0800 Subject: [PATCH 007/108] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/UserService.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/application/service/UserService.php b/application/service/UserService.php index 1f087153b..9317a7855 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -1446,12 +1446,6 @@ class UserService $user = self::UserInfo($field, $params['openid']); if(!empty($user)) { - // 用户状态 - if(in_array($user['status'], [2,3])) - { - return DataReturn(lang('common_user_status_list')[$user['status']]['tips'], -10); - } - $data = $user; } @@ -1595,12 +1589,6 @@ class UserService // 清除验证码 $obj->Remove(); - // 是否需要审核 - if($common_register_is_enable_audit == 1) - { - return DataReturn('绑定成功、等待审核', 0); - } - return DataReturn('绑定成功', 0, self::UserLoginRecord($user_id, true)); } else { return DataReturn('绑定失败', -100); From cf09472af748aa4cc1ff7e06ee85bc51d940346d Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 10:17:33 +0800 Subject: [PATCH 008/108] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Common.php | 5 +---- application/index/controller/Common.php | 5 +++-- .../plugins/commonrightnavigation/Index.php | 5 +++-- .../usernotloginhidegoodsprice/Hook.php | 11 +++++++++-- application/service/UserService.php | 18 ++++++++++++++++++ 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index de58b36f5..0b46a2bf6 100755 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -119,10 +119,7 @@ class Common extends Controller private function CommonInit() { // 用户数据 - if(!empty($this->data_request['user_id'])) - { - $this->user = UserService::UserLoginRecord($this->data_request['user_id'], true); - } + $this->user = UserService::LoginUserInfo(); } /** diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 1671373b0..613c887b3 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -19,6 +19,7 @@ use app\service\MessageService; use app\service\SearchService; use app\service\ConfigService; use app\service\LinkService; +use app\service\UserService; /** * 前端公共控制器 @@ -128,7 +129,7 @@ class Common extends Controller */ protected function IsLogin() { - if(session('user') == null) + if(empty($this->user)) { if(IS_AJAX) { @@ -151,7 +152,7 @@ class Common extends Controller // 用户数据 if(session('user') != null) { - $this->user = session('user'); + $this->user = UserService::LoginUserInfo(); } } diff --git a/application/plugins/commonrightnavigation/Index.php b/application/plugins/commonrightnavigation/Index.php index 1278047e8..3162f0a98 100644 --- a/application/plugins/commonrightnavigation/Index.php +++ b/application/plugins/commonrightnavigation/Index.php @@ -13,6 +13,7 @@ namespace app\plugins\commonrightnavigation; use think\Controller; use app\service\AnswerService; use app\service\BuyService; +use app\service\UserService; /** * 右侧快捷导航 - 前端 @@ -34,7 +35,7 @@ class Index extends Controller public function answer($params = []) { $params = input('post.'); - $params['user'] = session('user'); + $params['user'] = UserService::LoginUserInfo(); return AnswerService::Add($params); } @@ -57,7 +58,7 @@ class Index extends Controller $this->assign('module_controller_action', $module_name.$controller_name.$action_name); // 购物车 - $cart_list = BuyService::CartList(['user'=>session('user')]); + $cart_list = BuyService::CartList(['user'=>UserService::LoginUserInfo()]); // 基础数据 $base = [ diff --git a/application/plugins/usernotloginhidegoodsprice/Hook.php b/application/plugins/usernotloginhidegoodsprice/Hook.php index bf0796372..5711fbe48 100644 --- a/application/plugins/usernotloginhidegoodsprice/Hook.php +++ b/application/plugins/usernotloginhidegoodsprice/Hook.php @@ -12,6 +12,7 @@ namespace app\plugins\usernotloginhidegoodsprice; use think\Controller; use app\service\PluginsService; +use app\service\UserService; /** * 未登录隐藏商品价格 - 钩子入口 @@ -55,9 +56,15 @@ class Hook extends Controller } // 用户是否已登录 - if(session('user') != null) + $user = UserService::LoginUserInfo(); + if(!empty($user)) { - return DataReturn('无需处理', 0); + // 查询用户状态是否待审核状态 + $user = UserService::UserInfo('id', $user['id']); + if(isset($user['status']) && in_array($user['status'], [0,1])) + { + return DataReturn('无需处理', 0); + } } // 获取应用数据 diff --git a/application/service/UserService.php b/application/service/UserService.php index 9317a7855..3f955c864 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -23,6 +23,24 @@ use app\service\RegionService; */ class UserService { + /** + * 获取用户登录信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-02-27 + * @desc description + */ + public static function LoginUserInfo() + { + if(APPLICATION == 'web') + { + return session('user'); + } else { + $params = input(); + return empty($params['user_id']) ? null : self::UserLoginRecord($params['user_id'], true); + } + } /** * 用户列表 * @author Devil From 25330333a175fc100a23c210bda26e4255349b3b Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 10:28:09 +0800 Subject: [PATCH 009/108] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/BuyService.php | 2 +- public/appmini/old/weixin/app.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 98416c658..5f08bbe05 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -398,7 +398,7 @@ class BuyService $ret['data'][0]['stock'] = $params['stock']; $ret['data'][0]['total_price'] = $params['stock']*$ret['data'][0]['price']; - return DataReturn('操作成功', 0, $goods); + return DataReturn('操作成功', 0, $ret['data']); } /** diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 39a9059d4..b33204a18 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -60,7 +60,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - //request_url: 'https://test.shopxo.net/', + request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", From 70e87a5c093d93bde4bb93069a65241a59aa04bf Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 11:51:19 +0800 Subject: [PATCH 010/108] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=99=90=E5=88=B6=E8=B4=AD=E7=89=A9=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usernotloginhidegoodsprice/Hook.php | 6 +-- application/service/BuyService.php | 42 +++++++++++++++---- application/service/GoodsService.php | 7 ++++ application/service/UserService.php | 32 ++++++++++++++ 4 files changed, 76 insertions(+), 11 deletions(-) diff --git a/application/plugins/usernotloginhidegoodsprice/Hook.php b/application/plugins/usernotloginhidegoodsprice/Hook.php index 5711fbe48..bf11c6529 100644 --- a/application/plugins/usernotloginhidegoodsprice/Hook.php +++ b/application/plugins/usernotloginhidegoodsprice/Hook.php @@ -59,9 +59,9 @@ class Hook extends Controller $user = UserService::LoginUserInfo(); if(!empty($user)) { - // 查询用户状态是否待审核状态 - $user = UserService::UserInfo('id', $user['id']); - if(isset($user['status']) && in_array($user['status'], [0,1])) + // 查询用户状态是否正常 + $ret = UserService::UserStatusCheck('id', $user['id']); + if($ret['code'] == 0) { return DataReturn('无需处理', 0); } diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 5f08bbe05..99ff5744c 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -65,6 +65,13 @@ class BuyService return DataReturn($ret, -1); } + // 查询用户状态是否正常 + $ret = UserService::UserStatusCheck('id', $params['user']['id']); + if($ret['code'] != 0) + { + return $ret; + } + // 获取商品 $goods_id = intval($params['goods_id']); $goods = Db::name('Goods')->where(['id'=>$goods_id, 'is_shelves'=>1, 'is_delete_time'=>0])->find(); @@ -190,8 +197,8 @@ class BuyService if($goods_base['code'] == 0) { $v['inventory'] = $goods_base['data']['inventory']; - $v['price'] = $goods_base['data']['price']; - $v['original_price'] = $goods_base['data']['original_price']; + $v['price'] = (float) $goods_base['data']['price']; + $v['original_price'] = (float) $goods_base['data']['original_price']; $v['spec_weight'] = $goods_base['data']['weight']; $v['spec_coding'] = $goods_base['data']['coding']; $v['spec_barcode'] = $goods_base['data']['barcode']; @@ -203,7 +210,7 @@ class BuyService $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['goods_id']]); $v['images_old'] = $v['images']; $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); - $v['total_price'] = $v['stock']*$v['price']; + $v['total_price'] = $v['stock']* ((float) $v['price']); $v['buy_max_number'] = ($v['buy_max_number'] <= 0) ? $v['inventory']: $v['buy_max_number']; } } @@ -241,6 +248,13 @@ class BuyService return DataReturn($ret, -1); } + // 查询用户状态是否正常 + $ret = UserService::UserStatusCheck('id', $params['user']['id']); + if($ret['code'] != 0) + { + return $ret; + } + // 删除 $where = [ 'id' => explode(',', $params['id']), @@ -299,6 +313,13 @@ class BuyService return DataReturn($ret, -1); } + // 查询用户状态是否正常 + $ret = UserService::UserStatusCheck('id', $params['user']['id']); + if($ret['code'] != 0) + { + return $ret; + } + // 更新 $where = [ 'id' => intval($params['id']), @@ -385,8 +406,8 @@ class BuyService if($goods_base['code'] == 0) { $ret['data'][0]['inventory'] = $goods_base['data']['inventory']; - $ret['data'][0]['price'] = $goods_base['data']['price']; - $ret['data'][0]['original_price'] = $goods_base['data']['original_price']; + $ret['data'][0]['price'] = (float) $goods_base['data']['price']; + $ret['data'][0]['original_price'] = (float) $goods_base['data']['original_price']; $ret['data'][0]['spec_weight'] = $goods_base['data']['weight']; $ret['data'][0]['spec_coding'] = $goods_base['data']['coding']; $ret['data'][0]['spec_barcode'] = $goods_base['data']['barcode']; @@ -396,7 +417,7 @@ class BuyService // 数量/小计 $ret['data'][0]['stock'] = $params['stock']; - $ret['data'][0]['total_price'] = $params['stock']*$ret['data'][0]['price']; + $ret['data'][0]['total_price'] = $params['stock']* ((float) $ret['data'][0]['price']); return DataReturn('操作成功', 0, $ret['data']); } @@ -604,6 +625,13 @@ class BuyService return DataReturn($ret, -1); } + // 查询用户状态是否正常 + $ret = UserService::UserStatusCheck('id', $params['user']['id']); + if($ret['code'] != 0) + { + return $ret; + } + // 清单商品 $goods = self::BuyTypeGoodsList($params); if(!isset($goods['code']) || $goods['code'] != 0) @@ -654,8 +682,6 @@ class BuyService $order['confirm_time'] = time(); } - //print_r($goods['data']);die; - // 开始事务 Db::startTrans(); diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 6639761a0..f89269570 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -472,6 +472,13 @@ class GoodsService return DataReturn($ret, -1); } + // 查询用户状态是否正常 + $ret = UserService::UserStatusCheck('id', $params['user']['id']); + if($ret['code'] != 0) + { + return $ret; + } + // 开始操作 $data = ['goods_id'=>intval($params['id']), 'user_id'=>$params['user']['id']]; $temp = Db::name('GoodsFavor')->where($data)->find(); diff --git a/application/service/UserService.php b/application/service/UserService.php index 3f955c864..7a19d0bfd 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -41,6 +41,38 @@ class UserService return empty($params['user_id']) ? null : self::UserLoginRecord($params['user_id'], true); } } + + /** + * 用户状态校验 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-02-27 + * @desc description + * @param [string] $field [条件字段] + * @param [string] $value [条件值] + */ + public static function UserStatusCheck($field, $value) + { + // 查询用户状态是否正常 + $user = self::UserInfo($field, $value); + if(empty($user)) + { + return DataReturn('用户不存在或已删除', -110); + } + if(!in_array($user['status'], [0,1])) + { + $common_user_status_list = lang('common_user_status_list'); + if(isset($common_user_status_list[$user['status']])) + { + return DataReturn($common_user_status_list[$user['status']]['tips'], -110); + } else { + return DataReturn('用户状态有误', -110); + } + } + return DataReturn('正常', 0); + } + /** * 用户列表 * @author Devil From 538e3c2f781ea094e53bfa40e4e330e1f36fda71 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 12:30:59 +0800 Subject: [PATCH 011/108] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=99=90=E5=88=B6=E8=B4=AD=E7=89=A9=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/BuyService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 99ff5744c..d1ccd7f1d 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -197,7 +197,7 @@ class BuyService if($goods_base['code'] == 0) { $v['inventory'] = $goods_base['data']['inventory']; - $v['price'] = (float) $goods_base['data']['price']; + $v['price'] = (float) $goods_base['data']['price']; $v['original_price'] = (float) $goods_base['data']['original_price']; $v['spec_weight'] = $goods_base['data']['weight']; $v['spec_coding'] = $goods_base['data']['coding']; @@ -210,7 +210,7 @@ class BuyService $v['goods_url'] = MyUrl('index/goods/index', ['id'=>$v['goods_id']]); $v['images_old'] = $v['images']; $v['images'] = ResourcesService::AttachmentPathViewHandle($v['images']); - $v['total_price'] = $v['stock']* ((float) $v['price']); + $v['total_price'] = $v['stock']* ((float) $v['price']); $v['buy_max_number'] = ($v['buy_max_number'] <= 0) ? $v['inventory']: $v['buy_max_number']; } } From 7e3c60e5ab87a78c06708a5c382e0515b6a3e277 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 12:33:07 +0800 Subject: [PATCH 012/108] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/shopxo.php | 2 +- config/shopxo.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/shopxo.php b/config/shopxo.php index 1df505894..3912d471c 100644 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -15,7 +15,7 @@ return [ // 开发模式 - 'is_develop' => true, + 'is_develop' => false, // 默认编码 'default_charset' => 'utf-8', diff --git a/config/shopxo.sql b/config/shopxo.sql index 30a17439a..ea885c853 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -242,7 +242,7 @@ CREATE TABLE `s_config` ( -- Records of `s_config` -- ---------------------------- BEGIN; -INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1551173001'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1551173001'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1551173001'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1551173001'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1546938183'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1546938183'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1546938183'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1550547827'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1550547827'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1550547827'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1550547827'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1550547827'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1550547827'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1546938183'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1550547827'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1550547827'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1550547827'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1546938183'), ('31', '1', '用户注册开启审核', '开启后用户注册需要审核通过方可登录', '请选择用户注册开启审核', 'common', 'common_register_is_enable_audit', '1551173001'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1550547827'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1550547827'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1550547827'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1550547827'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1550547827'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1550547827'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1550547827'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1550547827'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1550547827'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1551174648'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1551174648'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1551174648'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1551174648'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1551174648'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1551174648'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1551173001'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1551173001'), ('63', '

用户注册，你的验证码是  #code#

', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

密码找回，你的验证码是  #code#

', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

邮箱绑定，你的验证码是  #code#

', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1550547827'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1551173001'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1551173001'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1551173001'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1551173001'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1546938183'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); +INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1551173001'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1551173001'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1551173001'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1551173001'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1546938183'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1546938183'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1546938183'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1550547827'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1550547827'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1550547827'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1550547827'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1550547827'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1550547827'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1546938183'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1550547827'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1550547827'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1550547827'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1546938183'), ('31', '0', '用户注册开启审核', '开启后用户注册需要审核通过方可登录', '请选择用户注册开启审核', 'common', 'common_register_is_enable_audit', '1551173001'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1550547827'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1550547827'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1550547827'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1550547827'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1550547827'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1550547827'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1550547827'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1550547827'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1550547827'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1551174648'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1551174648'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1551174648'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1551174648'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1551174648'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1551174648'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1551173001'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1551173001'), ('63', '

用户注册，你的验证码是  #code#

', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

密码找回，你的验证码是  #code#

', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

邮箱绑定，你的验证码是  #code#

', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1550547827'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1551173001'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1551173001'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1551173001'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1551173001'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1546938183'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); COMMIT; -- ---------------------------- From 79e2f2f9ed6e222770c11c0a833082eee10d0fc2 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 12:34:40 +0800 Subject: [PATCH 013/108] =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/install/view/index/check.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/install/view/index/check.html b/application/install/view/index/check.html index 9c71bd37d..1711bd0a5 100644 --- a/application/install/view/index/check.html +++ b/application/install/view/index/check.html @@ -8,7 +8,7 @@

环境检查

- + @@ -59,7 +59,7 @@

目录/文件权限检查

坏境环境 程序所需 当前服务器 是否符合
- + @@ -357,7 +357,7 @@

函数/类

坏境环境 所需状态 当前状态 是否符合
- + From a46c5c5be90c92d449f3367c81a231b7e98615ad Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 17:09:19 +0800 Subject: [PATCH 014/108] debug --- public/appmini/old/weixin/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index b33204a18..39a9059d4 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -60,7 +60,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - request_url: 'https://test.shopxo.net/', + //request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", From 84b5fcb6485ad919fc78b4967b2966d75f1c964f Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 27 Feb 2019 17:48:59 +0800 Subject: [PATCH 015/108] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Search.php | 8 ++++---- application/service/SearchService.php | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/application/api/controller/Search.php b/application/api/controller/Search.php index cbb6611c6..e202727bb 100755 --- a/application/api/controller/Search.php +++ b/application/api/controller/Search.php @@ -50,17 +50,17 @@ class Search extends Common SearchService::SearchAdd($this->data_post); // 获取数据 - $result = SearchService::GoodsList($this->data_post); + $ret = SearchService::GoodsList($this->data_post); // 分类 if(!empty($this->data_post['category_id'])) { - $result['category'] = GoodsService::GoodsCategoryRow(['id'=>$this->data_post['category_id']]); + $ret['data']['category'] = GoodsService::GoodsCategoryRow(['id'=>$this->data_post['category_id']]); } else { - $result['category'] = []; + $ret['data']['category'] = []; } - return DataReturn('success', 0, $result); + return $ret; } } ?> \ No newline at end of file diff --git a/application/service/SearchService.php b/application/service/SearchService.php index 8d15cbe1c..615c6ea35 100755 --- a/application/service/SearchService.php +++ b/application/service/SearchService.php @@ -130,10 +130,11 @@ class SearchService $page = intval(input('page', 1)); $n = 10; $m = intval(($page-1)*$n); - $result['data'] = GoodsService::CategoryGoodsList(['where'=>$where, 'm'=>$m, 'n'=>$n, 'order_by'=>$order_by]); + $goods = GoodsService::CategoryGoodsList(['where'=>$where, 'm'=>$m, 'n'=>$n, 'order_by'=>$order_by]); + $result['data'] = $goods['data']; $result['page_total'] = ceil($result['total']/$n); } - return $result; + return DataReturn('处理成功', 0, $result); } /** From 5bc00c4c220abe6f32370e5299d039c4a1da06f9 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 28 Feb 2019 16:56:27 +0800 Subject: [PATCH 016/108] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Admin.php | 29 ++- .../admin/view/default/public/menu.html | 12 +- public/static/admin/default/css/common.css | 30 ++- public/static/admin/default/js/index.js | 211 +++++++++++++----- 4 files changed, 215 insertions(+), 67 deletions(-) diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index 0ae4d6ac6..f120f66ba 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -153,17 +153,26 @@ class Admin extends Common */ public function Save() { - // 登录校验 - $this->IsLogin(); - // 是否ajax if(!IS_AJAX) { return $this->error('非法访问'); } - // 开始操作 + // 登录校验 + $this->IsLogin(); + + // 参数 $params = input('post.'); + + // 不是操作自己的情况下 + if(!isset($params['id']) || $params['id'] != $this->admin['id']) + { + // 权限校验 + $this->IsPower(); + } + + // 开始操作 $params['admin'] = $this->admin; return AdminService::AdminSave($params); } @@ -177,18 +186,18 @@ class Admin extends Common */ public function Delete() { - // 登录校验 - $this->IsLogin(); - - // 权限校验 - $this->IsPower(); - // 是否ajax if(!IS_AJAX) { return $this->error('非法访问'); } + // 登录校验 + $this->IsLogin(); + + // 权限校验 + $this->IsPower(); + // 开始操作 $params = input('post.'); $params['admin'] = $this->admin; diff --git a/application/admin/view/default/public/menu.html b/application/admin/view/default/public/menu.html index ebc4f38bf..0e7212376 100755 --- a/application/admin/view/default/public/menu.html +++ b/application/admin/view/default/public/menu.html @@ -1,4 +1,4 @@ -
+
  • @@ -37,4 +37,14 @@ {{/foreach}}
+
+ + +
+
◆
+ +
+
+
◆
+
    \ No newline at end of file diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index ce53c16fe..4498413d0 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -376,16 +376,19 @@ ul {margin-top:0;} .admin-sidebar-sub {margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#404040;padding-left:24px;} .admin-sidebar-sub li:first-child {border-top:1px solid #dedede;} .admin-sidebar {height:100%;overflow-x:hidden;overflow-y:scroll;-webkit-overflow-scrolling:touch;} +.admin-sidebar .am-icon-angle-down {margin-top: 3px;} @media only screen and (min-width:641px) { - .admin-sidebar {display:block;position:static;background:none;width:245px;z-index:1;} + .admin-sidebar {display:block;width:185px;z-index:1;position: static;} .admin-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:visible;min-height:100%;} .admin-offcanvas-bar:after {content:none;} + #ifcontent { width: calc(100% - 185px); } } @media only screen and (max-width:640px) { .admin-sidebar {width:inherit;} .admin-offcanvas-bar {background:#f3f3f3;} .admin-offcanvas-bar:after {background:#BABABA;} .admin-sidebar-list a:hover,.admin-sidebar-list a:active {-webkit-transition:background-color .3s ease;-moz-transition:background-color .3s ease;-ms-transition:background-color .3s ease;-o-transition:background-color .3s ease;transition:background-color .3s ease;background:#E4E4E4;} + .admin-sidebar .am-offcanvas-bar { width: 70%; } } .common-nav-bar {position:fixed;z-index:10;bottom:30px;right:20px;} .admin {width:100%;height:100%;display:flex;display:-webkit-flex;padding-top:51px;background:#fff;} @@ -394,8 +397,9 @@ ul {margin-top:0;} .content-right {overflow:auto;flex:1;-webkit-flex:1;} .content-right .content {padding:10px 10px 0 10px;} .admin-sidebar-list li a {padding:0.6rem 0 0.6rem 1.6rem;} -.common-left-menu a:hover,.common-left-menu-active {background:#767778;color:#fff !important;} -#ifcontent {border:0px;width:100%;overflow-x:hidden;} +.common-left-menu a:hover { background:rgba(118, 119, 120, 0.1); } +.common-left-menu-active {background:rgba(118, 119, 120, 0.3) !important;color:#fff !important;} +#ifcontent {border:0px;overflow-x:hidden;} .am-table > tbody > tr > td {vertical-align:top;} .admin-offcanvas-bar, .admin-offcanvas-bar .am-list > li { background: #36373c; } .admin-offcanvas-bar .am-list > li { border: 1px solid #2e2e31; } @@ -428,4 +432,22 @@ ul {margin-top:0;} html, body { overflow-x: hidden; } -} \ No newline at end of file +} + + +.menu-mini .nav-name,.menu-mini .am-icon-angle-down,.menu-mini .admin-sidebar-sub{display:none}.menu-mini .admin-sidebar-list li a{padding-left:10px} + +/** + * mini开关 + */ +.menu-scaling-submit{position:absolute;left:189px;top:55px;opacity:.6;width:30px;height:25px;padding:2px 10px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;} + +/** + * mini小icon + */ +.menu-mini-container-tips{position:absolute;left:65px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none}.menu-mini-container-tips span{font-size:12px}.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#4884ff} + +/** + * mini子菜单 + */ +.menu-mini-container-popup{background:#36373c;position:absolute;left:65px;top:0;min-width:120px;height:auto;display:none}.menu-mini-container-popup ul{margin:0;padding:0}.menu-mini-container-popup ul li{line-height:35px;list-style-type:none}.menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff}.menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)}.menu-mini-container-popup ul li a span{font-size:12px}.menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31}.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c} \ No newline at end of file diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index d20ce3a8c..23ed0f7e9 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -1,65 +1,172 @@ -/** - * 全屏操作 - */ -var $fullscreen = $.AMUI.fullscreen; -$('#admin-fullscreen').on('click', function() +$(function() { - $fullscreen.toggle(); -}); -if($fullscreen.enabled) -{ - $(document).on($fullscreen.raw.fullscreenchange, function() + /** + * 全屏操作 + */ + var $fullscreen = $.AMUI.fullscreen; + $('#admin-fullscreen').on('click', function() { - $tag = $('.admin-fulltext'); - $tag.text($fullscreen.isFullscreen ? $tag.attr('fulltext-exit') : $tag.attr('fulltext-open')); + $fullscreen.toggle(); }); -} - -/** - * url加载 - */ -$('.common-left-menu, .common-nav-top').find('li a').on('click', function() -{ - var link = $(this).data('url'); - var type = $(this).data('type'); - if(link != undefined) + if($fullscreen.enabled) { - // 打开url地址 - $('#ifcontent').attr('src', link); - - // 顶部菜单事件，关闭弹层 - if(type == 'nav') + $(document).on($fullscreen.raw.fullscreenchange, function() { - if($(document).width() < 641) + $tag = $('.admin-fulltext'); + $tag.text($fullscreen.isFullscreen ? $tag.attr('fulltext-exit') : $tag.attr('fulltext-open')); + }); + } + + /** + * url加载 + */ + $(document).on('click', '.common-left-menu li a, .common-nav-top li a, .menu-mini-container-popup ul li a', function() + { + var link = $(this).data('url'); + var type = $(this).data('type'); + if(link != undefined) + { + // 打开url地址 + $('#ifcontent').attr('src', link); + + // 顶部菜单事件，关闭弹层 + if(type == 'nav') + { + if($(document).width() < 641) + { + $('.header-nav-submit').trigger('click'); + } else { + $(this).parents('.common-nav-top').trigger('click'); + } + } + + // 关闭左侧弹层 + if(type == 'menu') + { + $('#admin-offcanvas').offCanvas('close'); + } + } else { + // 左侧菜单剪头方向处理 + if(type == 'menu') { - $('.header-nav-submit').trigger('click'); - } else { - $(this).parents('.common-nav-top').trigger('click'); + if($(this).find('i').length > 0) + { + $(this).find('i').toggleClass('left-menu-more-ico-rotate'); + } } } + }); - // 关闭左侧弹层 - if(type == 'menu') + /** + * 菜单选择 + */ + $('.common-left-menu li a').on('click', function() + { + $('.common-left-menu a').removeClass('common-left-menu-active'); + $(this).addClass('common-left-menu-active'); + }); + + /** + * mini伸缩开关 + */ + $('.menu-scaling-submit').on('click', function() + { + var status = $(this).attr('data-status') || 0; + $('#admin-offcanvas ul').css('opacity', 0.1); + $('.menu-mini-container-popup').hide(); + $('.menu-mini-container-tips').hide(); + if(status == 0) { - $('#admin-offcanvas').offCanvas('close'); + $(this).animate({left: "64px"}, 300); + $(this).removeClass('am-icon-angle-double-left').addClass('am-icon-angle-double-right'); + $('#admin-offcanvas').addClass('menu-mini'); + $('#admin-offcanvas').animate({width: "60px"}, 300); + $('#ifcontent').css({"width":"calc(100% - 60px)"}); + } else { + $(this).animate({left: "189px"}, 300); + $(this).removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); + $('#admin-offcanvas').animate({width: "185px"}, 300); + setTimeout(function() { + $('#admin-offcanvas').removeClass('menu-mini'); + $('#ifcontent').css({"width":"calc(100% - 185px)"}); + }, 300); } - } else { - // 左侧菜单剪头方向处理 - if(type == 'menu') - { - if($(this).find('i').length > 0) - { - $(this).find('i').toggleClass('left-menu-more-ico-rotate'); - } - } - } -}); + $('#admin-offcanvas ul').animate({opacity: 1}, 300); + $(this).attr('data-status', status == 0 ? 1 : 0); + }); + + /** + * mini菜单操作 + */ + var timer_menu = null; + $(document).on('mouseenter', '.menu-mini li', function() + { + clearTimeout(timer_menu); + var html = $(this).find('ul.admin-sidebar-sub').html() || null; + var top = $(this).offset().top; + var win_height = $(window).height(); + if(html == null) + { + $('.menu-mini-container-popup').hide(); + $('.menu-mini-container-tips').show(); + $('.menu-mini-container-tips span').text($(this).find('span.nav-name').text()); + $('.menu-mini-container-tips').css('top', top); + } else { + $('.menu-mini-container-popup ul').html(html); + $('.menu-mini-container-tips').hide(); + $('.menu-mini-container-popup').show(); + + // 容器是否超出底部 + var h = $('.menu-mini-container-popup').height(); + if(h+top > win_height) + { + $('.menu-mini-container-popup').css('top', win_height-h); + } else { + $('.menu-mini-container-popup').css('top', top); + } + } + }); + $(document).on('mouseleave', '.menu-mini li', function() + { + $('.menu-mini-container-tips').hide(); + clearTimeout(timer_menu); + timer_menu = setTimeout(function() + { + $('.menu-mini-container-tips').hide(); + if(($('.menu-mini-container-popup').attr('data-is-leave') || 0) == 0) + { + $('.menu-mini-container-popup').hide(); + } + }, 3000); + }); + $(document).on('mouseenter', '.menu-mini-container-popup', function() + { + $(this).attr('data-is-leave', 1); + }).mouseleave(function() + { + $(this).attr('data-is-leave', 0); + $(this).hide(); + }); + + // 浏览器窗口实时事件 + $(window).resize(function() + { + // 小屏幕关闭mini导航 + if($(document).width() <= 640) + { + $('.menu-scaling-submit').attr('data-status', 0); + $('.menu-scaling-submit').css({"left": "189px"}); + $('.menu-scaling-submit').removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); + $('#admin-offcanvas').css({"width": "inherit"}); + $('#admin-offcanvas').removeClass('menu-mini'); + $('#ifcontent').css({"width":"100%"}); + } else { + if(($('.menu-scaling-submit').attr('data-status') || 0) == 0) + { + $('#admin-offcanvas').css({"width": "185px"}); + $('#ifcontent').css({"width":"calc(100% - 185px)"}); + } + } + }); -/** - * 菜单选择 - */ -$('.common-left-menu li a').on('click', function() -{ - $('.common-left-menu a').removeClass('common-left-menu-active'); - $(this).addClass('common-left-menu-active'); }); \ No newline at end of file From 25d03521d6e02fd9c7817429106c91316553d7af Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 28 Feb 2019 17:27:24 +0800 Subject: [PATCH 017/108] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/commongobacktop/Admin.php | 2 +- .../plugins/commonrightnavigation/Admin.php | 2 +- .../plugins/commontopmaxpicture/Admin.php | 2 +- .../view/commongobacktop/admin/index.html | 2 +- .../view/commontopmaxpicture/admin/index.html | 2 +- application/service/PluginsService.php | 29 ++++++++++++++----- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/application/plugins/commongobacktop/Admin.php b/application/plugins/commongobacktop/Admin.php index a67f10f14..e428721f4 100755 --- a/application/plugins/commongobacktop/Admin.php +++ b/application/plugins/commongobacktop/Admin.php @@ -79,7 +79,7 @@ class Admin extends Controller */ public function save($params = []) { - return PluginsService::PluginsDataSave(['plugins'=>'commongobacktop', 'data'=>$params]); + return PluginsService::PluginsDataSave(['plugins'=>'commongobacktop', 'data'=>$params], ['images']); } } ?> \ No newline at end of file diff --git a/application/plugins/commonrightnavigation/Admin.php b/application/plugins/commonrightnavigation/Admin.php index be883b2d4..92132f8bf 100755 --- a/application/plugins/commonrightnavigation/Admin.php +++ b/application/plugins/commonrightnavigation/Admin.php @@ -79,7 +79,7 @@ class Admin extends Controller */ public function save($params = []) { - return PluginsService::PluginsDataSave(['plugins'=>'commonrightnavigation', 'data'=>$params]); + return PluginsService::PluginsDataSave(['plugins'=>'commonrightnavigation', 'data'=>$params], ['alipay_mini_qrcode_images', 'alipay_fuwu_qrcode_images', 'weixin_mini_qrcode_images', 'weixin_fuwu_qrcode_images']); } } ?> \ No newline at end of file diff --git a/application/plugins/commontopmaxpicture/Admin.php b/application/plugins/commontopmaxpicture/Admin.php index fd70b9eb6..59446be6e 100755 --- a/application/plugins/commontopmaxpicture/Admin.php +++ b/application/plugins/commontopmaxpicture/Admin.php @@ -79,7 +79,7 @@ class Admin extends Controller */ public function save($params = []) { - return PluginsService::PluginsDataSave(['plugins'=>'commontopmaxpicture', 'data'=>$params]); + return PluginsService::PluginsDataSave(['plugins'=>'commontopmaxpicture', 'data'=>$params], ['images']); } } ?> \ No newline at end of file diff --git a/application/plugins/view/commongobacktop/admin/index.html b/application/plugins/view/commongobacktop/admin/index.html index bf1462ea9..d359840e8 100755 --- a/application/plugins/view/commongobacktop/admin/index.html +++ b/application/plugins/view/commongobacktop/admin/index.html @@ -12,7 +12,7 @@
    - +
    diff --git a/application/plugins/view/commontopmaxpicture/admin/index.html b/application/plugins/view/commontopmaxpicture/admin/index.html index 42d34f94c..679cee556 100755 --- a/application/plugins/view/commontopmaxpicture/admin/index.html +++ b/application/plugins/view/commontopmaxpicture/admin/index.html @@ -12,7 +12,7 @@
    - +
    diff --git a/application/service/PluginsService.php b/application/service/PluginsService.php index 72cbc1e3d..b57e2a5cd 100644 --- a/application/service/PluginsService.php +++ b/application/service/PluginsService.php @@ -29,10 +29,10 @@ class PluginsService * @version 1.0.0 * @date 2018-09-29 * @desc description - * @param [string] $plugins [应用标记] - * @param [array] $images_field [图片字段] + * @param [string] $plugins [应用标记] + * @param [array] $attachment_field [附件字段] */ - public static function PluginsData($plugins, $images_field = []) + public static function PluginsData($plugins, $attachment_field = []) { // 获取数据 $data = Db::name('Plugins')->where(['plugins'=>$plugins])->value('data'); @@ -41,9 +41,9 @@ class PluginsService $data = json_decode($data, true); // 是否有图片需要处理 - if(!empty($images_field) && is_array($images_field)) + if(!empty($attachment_field) && is_array($attachment_field)) { - foreach($images_field as $field) + foreach($attachment_field as $field) { if(isset($data[$field])) { @@ -63,9 +63,10 @@ class PluginsService * @version 1.0.0 * @date 2018-09-29 * @desc description - * @param [string] $plugins [应用标记] + * @param [string] $plugins [应用标记] + * @param [array] $attachment_field [附件字段] */ - public static function PluginsDataSave($params = []) + public static function PluginsDataSave($params = [], $attachment_field = []) { // 请求参数 $p = [ @@ -86,6 +87,20 @@ class PluginsService return DataReturn($ret, -1); } + // 附件处理 + $attachment = ResourcesService::AttachmentParams($params['data'], $attachment_field); + if($attachment['code'] != 0) + { + return $attachment; + } + if(!empty($attachment['data'])) + { + foreach($attachment['data'] as $field=>$value) + { + $params['data'][$field] = $value; + } + } + // 数据更新 if(Db::name('Plugins')->where(['plugins'=>$params['plugins']])->update(['data'=>json_encode($params['data']), 'upd_time'=>time()])) { From eed5ef50778c16fda0a540ae6270e8aeb1d0ac05 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 28 Feb 2019 17:42:12 +0800 Subject: [PATCH 018/108] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/view/commononlineservice/index/content.html | 4 ++-- public/static/admin/default/css/common.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/plugins/view/commononlineservice/index/content.html b/application/plugins/view/commononlineservice/index/content.html index 4a94762bb..2e56e826d 100755 --- a/application/plugins/view/commononlineservice/index/content.html +++ b/application/plugins/view/commononlineservice/index/content.html @@ -16,9 +16,9 @@ {{if IsMobile()}} {{else /}} - + {{/if}} - 点击这里给我发消息 + 点击这里给我发消息 {{/foreach}} diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 4498413d0..433a15c7c 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -445,9 +445,9 @@ ul {margin-top:0;} /** * mini小icon */ -.menu-mini-container-tips{position:absolute;left:65px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none}.menu-mini-container-tips span{font-size:12px}.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#4884ff} +.menu-mini-container-tips{position:absolute;left:68px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none}.menu-mini-container-tips span{font-size:12px}.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#4884ff} /** * mini子菜单 */ -.menu-mini-container-popup{background:#36373c;position:absolute;left:65px;top:0;min-width:120px;height:auto;display:none}.menu-mini-container-popup ul{margin:0;padding:0}.menu-mini-container-popup ul li{line-height:35px;list-style-type:none}.menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff}.menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)}.menu-mini-container-popup ul li a span{font-size:12px}.menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31}.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c} \ No newline at end of file +.menu-mini-container-popup{background:#36373c;position:absolute;left:68px;top:0;min-width:120px;height:auto;display:none}.menu-mini-container-popup ul{margin:0;padding:0}.menu-mini-container-popup ul li{line-height:35px;list-style-type:none}.menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff}.menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)}.menu-mini-container-popup ul li a span{font-size:12px}.menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31}.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c} \ No newline at end of file From d836aeef49bd3314649a055e4e861703acb702c7 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 28 Feb 2019 22:07:21 +0800 Subject: [PATCH 019/108] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/css/common.css | 18 ++++++++++++++---- public/static/admin/default/js/index.js | 6 +++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 433a15c7c..4fcfaab99 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -396,7 +396,7 @@ ul {margin-top:0;} /*---right Content---*/ .content-right {overflow:auto;flex:1;-webkit-flex:1;} .content-right .content {padding:10px 10px 0 10px;} -.admin-sidebar-list li a {padding:0.6rem 0 0.6rem 1.6rem;} +.admin-sidebar-list li a {padding:0.6rem;} .common-left-menu a:hover { background:rgba(118, 119, 120, 0.1); } .common-left-menu-active {background:rgba(118, 119, 120, 0.3) !important;color:#fff !important;} #ifcontent {border:0px;overflow-x:hidden;} @@ -435,7 +435,8 @@ ul {margin-top:0;} } -.menu-mini .nav-name,.menu-mini .am-icon-angle-down,.menu-mini .admin-sidebar-sub{display:none}.menu-mini .admin-sidebar-list li a{padding-left:10px} +.menu-mini .nav-name,.menu-mini .am-icon-angle-down,.menu-mini .admin-sidebar-sub{display:none} +.menu-mini .admin-sidebar-list li {text-align: center;} /** * mini开关 @@ -445,9 +446,18 @@ ul {margin-top:0;} /** * mini小icon */ -.menu-mini-container-tips{position:absolute;left:68px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none}.menu-mini-container-tips span{font-size:12px}.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#4884ff} +.menu-mini-container-tips{position:absolute;left:68px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none} +.menu-mini-container-tips span{font-size:12px} +.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#4884ff} /** * mini子菜单 */ -.menu-mini-container-popup{background:#36373c;position:absolute;left:68px;top:0;min-width:120px;height:auto;display:none}.menu-mini-container-popup ul{margin:0;padding:0}.menu-mini-container-popup ul li{line-height:35px;list-style-type:none}.menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff}.menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)}.menu-mini-container-popup ul li a span{font-size:12px}.menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31}.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c} \ No newline at end of file +.menu-mini-container-popup{background:#36373c;position:absolute;left:68px;top:0;min-width:120px;height:auto;display:none} +.menu-mini-container-popup ul{margin:0;padding:0} +.menu-mini-container-popup ul li{line-height:35px;list-style-type:none} +.menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff} +.menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)} +.menu-mini-container-popup ul li a span{font-size:12px} +.menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31} +.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c} \ No newline at end of file diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index 23ed0f7e9..65ce4dd7f 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -77,11 +77,11 @@ $(function() $('.menu-mini-container-tips').hide(); if(status == 0) { - $(this).animate({left: "64px"}, 300); + $(this).animate({left: "59px"}, 300); $(this).removeClass('am-icon-angle-double-left').addClass('am-icon-angle-double-right'); $('#admin-offcanvas').addClass('menu-mini'); - $('#admin-offcanvas').animate({width: "60px"}, 300); - $('#ifcontent').css({"width":"calc(100% - 60px)"}); + $('#admin-offcanvas').animate({width: "55px"}, 300); + $('#ifcontent').css({"width":"calc(100% - 55px)"}); } else { $(this).animate({left: "189px"}, 300); $(this).removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); From 09c50b18994b50c14a476e35332ea2bc8d6e4e66 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 28 Feb 2019 22:12:19 +0800 Subject: [PATCH 020/108] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/js/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index 65ce4dd7f..134940104 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -142,7 +142,8 @@ $(function() $(document).on('mouseenter', '.menu-mini-container-popup', function() { $(this).attr('data-is-leave', 1); - }).mouseleave(function() + }). + $(document).on('mouseleave', '.menu-mini-container-popup', function() { $(this).attr('data-is-leave', 0); $(this).hide(); From 1e6c92cf0a49573bb34980fc9c17a8a87a6f5820 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 28 Feb 2019 22:17:00 +0800 Subject: [PATCH 021/108] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/css/common.css | 4 ++-- public/static/admin/default/js/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 4fcfaab99..fb4b3be33 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -446,14 +446,14 @@ ul {margin-top:0;} /** * mini小icon */ -.menu-mini-container-tips{position:absolute;left:68px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none} +.menu-mini-container-tips{position:absolute;left:63px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none} .menu-mini-container-tips span{font-size:12px} .menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#4884ff} /** * mini子菜单 */ -.menu-mini-container-popup{background:#36373c;position:absolute;left:68px;top:0;min-width:120px;height:auto;display:none} +.menu-mini-container-popup{background:#36373c;position:absolute;left:63px;top:0;min-width:120px;height:auto;display:none} .menu-mini-container-popup ul{margin:0;padding:0} .menu-mini-container-popup ul li{line-height:35px;list-style-type:none} .menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff} diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index 134940104..2b10dd011 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -142,7 +142,7 @@ $(function() $(document).on('mouseenter', '.menu-mini-container-popup', function() { $(this).attr('data-is-leave', 1); - }). + }); $(document).on('mouseleave', '.menu-mini-container-popup', function() { $(this).attr('data-is-leave', 0); From 7fe6ba2064bdf8a8040f45f251eb4b496fdd3cc7 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 28 Feb 2019 22:36:04 +0800 Subject: [PATCH 022/108] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/default/public/menu.html | 4 ++-- public/static/admin/default/js/index.js | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/application/admin/view/default/public/menu.html b/application/admin/view/default/public/menu.html index 0e7212376..b06fc1c44 100755 --- a/application/admin/view/default/public/menu.html +++ b/application/admin/view/default/public/menu.html @@ -17,7 +17,7 @@ {{else /}}
  • - + {{if !empty($v['icon'])}}{{/if}} {{$v.name}} @@ -25,7 +25,7 @@
      {{foreach $v.items as $vs}}
    • - + {{if !empty($vs['icon'])}}{{/if}} {{$vs.name}} diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index 2b10dd011..19a68208b 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -149,6 +149,22 @@ $(function() $(this).hide(); }); + /** + * mini菜单选择 + */ + $(document).on('click', '.menu-mini-container-popup ul li a', function() + { + $('.admin-sidebar-list li a').removeClass('common-left-menu-active'); + $('.menu-mini-container-popup ul li a').removeClass('common-left-menu-active'); + + var parent_id = $(this).data('parent-id') || 0; + if(parent_id != 0) + { + $('.menu-parent-items-'+parent_id).addClass('common-left-menu-active'); + } + $(this).addClass('common-left-menu-active'); + }); + // 浏览器窗口实时事件 $(window).resize(function() { From e6b40a0e67ba3595bdbbdbb8f6db920e9ee1d7b6 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 28 Feb 2019 22:54:17 +0800 Subject: [PATCH 023/108] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/css/common.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index fb4b3be33..116838b77 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -434,7 +434,9 @@ ul {margin-top:0;} } } - +/** + * mini菜单 + */ .menu-mini .nav-name,.menu-mini .am-icon-angle-down,.menu-mini .admin-sidebar-sub{display:none} .menu-mini .admin-sidebar-list li {text-align: center;} From 6a49c236343f2a1c00630febb2686d0be1939091 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 28 Feb 2019 23:09:01 +0800 Subject: [PATCH 024/108] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/default/admin/save_info.html | 2 +- public/static/admin/default/css/common.css | 8 ++++---- public/static/admin/default/js/index.js | 8 ++++---- public/static/common/css/common.css | 4 +++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/application/admin/view/default/admin/save_info.html b/application/admin/view/default/admin/save_info.html index 2a4a3fd9d..d18dc5faf 100755 --- a/application/admin/view/default/admin/save_info.html +++ b/application/admin/view/default/admin/save_info.html @@ -30,7 +30,7 @@ {{if !isset($data['id']) or $admin['id'] neq $data['id']}}
      - {{foreach $role as $v}} diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 116838b77..140f32db5 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -1,7 +1,7 @@ /** * 公共 */ -* { font-size: 14px; } +* { font-size: 12px; } .w100 {width:100%;} .fw-100 {font-weight:100;} .fw-700 {font-weight:700;} @@ -376,12 +376,12 @@ ul {margin-top:0;} .admin-sidebar-sub {margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#404040;padding-left:24px;} .admin-sidebar-sub li:first-child {border-top:1px solid #dedede;} .admin-sidebar {height:100%;overflow-x:hidden;overflow-y:scroll;-webkit-overflow-scrolling:touch;} -.admin-sidebar .am-icon-angle-down {margin-top: 3px;} +.admin-sidebar .am-icon-angle-down {margin-top: 5px;} @media only screen and (min-width:641px) { - .admin-sidebar {display:block;width:185px;z-index:1;position: static;} + .admin-sidebar {display:block;width:170px;z-index:1;position: static;} .admin-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:visible;min-height:100%;} .admin-offcanvas-bar:after {content:none;} - #ifcontent { width: calc(100% - 185px); } + #ifcontent { width: calc(100% - 170px); } } @media only screen and (max-width:640px) { .admin-sidebar {width:inherit;} diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index 19a68208b..179525918 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -85,10 +85,10 @@ $(function() } else { $(this).animate({left: "189px"}, 300); $(this).removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); - $('#admin-offcanvas').animate({width: "185px"}, 300); + $('#admin-offcanvas').animate({width: "170px"}, 300); setTimeout(function() { $('#admin-offcanvas').removeClass('menu-mini'); - $('#ifcontent').css({"width":"calc(100% - 185px)"}); + $('#ifcontent').css({"width":"calc(100% - 170px)"}); }, 300); } $('#admin-offcanvas ul').animate({opacity: 1}, 300); @@ -180,8 +180,8 @@ $(function() } else { if(($('.menu-scaling-submit').attr('data-status') || 0) == 0) { - $('#admin-offcanvas').css({"width": "185px"}); - $('#ifcontent').css({"width":"calc(100% - 185px)"}); + $('#admin-offcanvas').css({"width": "170px"}); + $('#ifcontent').css({"width":"calc(100% - 170px)"}); } } }); diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 4247ec6e8..543dec6f4 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -145,11 +145,13 @@ iframe { width: 100%; height: 100%; border: 0; } */ .plug-file-upload-submit { display: inline-block; - padding: 8px 15px; + padding: 8px 5px; color: #70b2f3; border: 1px dashed #70b2f3; background: #fff; cursor: pointer; + min-width: 100px; + text-align: center; } .plug-file-upload-submit:hover { color: #36c; From b4870073bf737d348c380dc9abdc0471075654a6 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 1 Mar 2019 09:39:30 +0800 Subject: [PATCH 025/108] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/css/common.css | 2 +- public/static/admin/default/js/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 140f32db5..a3b687e5c 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -443,7 +443,7 @@ ul {margin-top:0;} /** * mini开关 */ -.menu-scaling-submit{position:absolute;left:189px;top:55px;opacity:.6;width:30px;height:25px;padding:2px 10px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;} +.menu-scaling-submit{position:absolute;left:175px;top:55px;opacity:.6;width:30px;height:25px;padding:2px 10px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;} /** * mini小icon diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index 179525918..f09373ae4 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -83,7 +83,7 @@ $(function() $('#admin-offcanvas').animate({width: "55px"}, 300); $('#ifcontent').css({"width":"calc(100% - 55px)"}); } else { - $(this).animate({left: "189px"}, 300); + $(this).animate({left: "175px"}, 300); $(this).removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); $('#admin-offcanvas').animate({width: "170px"}, 300); setTimeout(function() { @@ -172,7 +172,7 @@ $(function() if($(document).width() <= 640) { $('.menu-scaling-submit').attr('data-status', 0); - $('.menu-scaling-submit').css({"left": "189px"}); + $('.menu-scaling-submit').css({"left": "175px"}); $('.menu-scaling-submit').removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); $('#admin-offcanvas').css({"width": "inherit"}); $('#admin-offcanvas').removeClass('menu-mini'); From 75146c1d7485b18f64f7b14c46d2792a2a3df374 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 1 Mar 2019 11:02:50 +0800 Subject: [PATCH 026/108] =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/view/default/public/nav.html | 4 +- public/static/admin/default/css/common.css | 2 +- public/static/admin/default/js/index.js | 17 ----- public/static/common/js/common.js | 76 +++++++++++++++++++ 4 files changed, 79 insertions(+), 20 deletions(-) diff --git a/application/admin/view/default/public/nav.html b/application/admin/view/default/public/nav.html index 868ed94ec..d7850e14d 100755 --- a/application/admin/view/default/public/nav.html +++ b/application/admin/view/default/public/nav.html @@ -19,9 +19,9 @@ {{if !IsMobile()}}
    • - + - 开启全屏 + 开启全屏
      • {{/if}} diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index a3b687e5c..370bbd01a 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -51,7 +51,7 @@ input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single .am-alert-tips, .am-alert-tips * { font-size: 12px; } body {margin:0;color:#797979;} -html,body {position:relative;background:#fff;height:100%;} +html,body {position:relative;background:#fff;height:100%;width:100%;} h1,h2,h3,h4,h5,h6 {font-family:'Karla',sans-serif;margin:10px 0;} h1 {line-height:43px;} h2 {line-height:35px;} diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index f09373ae4..94c7742b1 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -1,22 +1,5 @@ $(function() { - /** - * 全屏操作 - */ - var $fullscreen = $.AMUI.fullscreen; - $('#admin-fullscreen').on('click', function() - { - $fullscreen.toggle(); - }); - if($fullscreen.enabled) - { - $(document).on($fullscreen.raw.fullscreenchange, function() - { - $tag = $('.admin-fulltext'); - $tag.text($fullscreen.isFullscreen ? $tag.attr('fulltext-exit') : $tag.attr('fulltext-open')); - }); - } - /** * url加载 */ diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index f1bc46c49..da6ad4029 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -975,10 +975,86 @@ function ConfirmNetworkAjax(e) }); } +/** + * 开启全屏 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-01 + * @desc description + */ +function FullscreenOpen() +{ + var elem = document.body; + if(elem.webkitRequestFullScreen) + { + elem.webkitRequestFullScreen(); + } else if (elem.mozRequestFullScreen) + { + elem.mozRequestFullScreen(); + } else if (elem.requestFullScreen) + { + elem.requestFullScreen(); + } else { + Prompt("浏览器不支持全屏API或已被禁用"); + return false; + } + return true; +} + +/** + * 关闭全屏 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-01 + * @desc description + */ +function FullscreenExit() +{ + var elem = document; + if (elem.webkitCancelFullScreen) + { + elem.webkitCancelFullScreen(); + } else if (elem.mozCancelFullScreen) + { + elem.mozCancelFullScreen(); + } else if (elem.cancelFullScreen) + { + elem.cancelFullScreen(); + } else if (elem.exitFullscreen) + { + elem.exitFullscreen(); + } else { + Prompt("浏览器不支持全屏API或已被禁用"); + return false; + } + return true; +} + // 公共数据操作 $(function() { + // 全屏操作 + $('.fullscreen-event').on('click', function() + { + var status = $(this).attr('data-status') || 0; + if(status == 0) + { + if(FullscreenOpen()) + { + $(this).find('.fullscreen-text').text($(this).data('fulltext-exit') || '退出全屏'); + } + } else { + if(FullscreenExit()) + { + $(this).find('.fullscreen-text').text($(this).data('fulltext-open') || '开启全屏'); + } + } + $(this).attr('data-status', status == 0 ? 1 : 0); + }); + // 多选插件初始化 if($('.chosen-select').length > 0) { From 9c60b55815d84ff3f7a94fca8e0253cd3ed608f4 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 1 Mar 2019 11:34:43 +0800 Subject: [PATCH 027/108] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/default/public/nav.html | 2 +- public/static/admin/default/css/common.css | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/application/admin/view/default/public/nav.html b/application/admin/view/default/public/nav.html index d7850e14d..b62c8326e 100755 --- a/application/admin/view/default/public/nav.html +++ b/application/admin/view/default/public/nav.html @@ -4,7 +4,7 @@

      ShopXO后台管理系统

    • - diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 370bbd01a..0da1c64dc 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -364,8 +364,13 @@ a:focus {outline:0;text-decoration:none;} @media only screen and (max-width:641px) {.am-dropdown-content {border:0px;} header .tpl-header-list-user-nick {color:#fff;} } -header {min-height:51px;background-color:#4386fb !important; border-color:#4386fb; color:#fff;} +header { background-color:#4386fb !important; border-color:#4386fb; color:#fff;} +header, header.am-topbar { min-height:35px; } +header .am-topbar-brand { height:35px; } header .am-dropdown-content {border-radius:2px;} +header .am-topbar-brand, .am-topbar-nav > li > a { line-height: 35px; } +header .am-topbar-brand h2 { margin: 0; } +header .header-nav-submit { margin: 4px 10px 0 0; } ul {margin-top:0;} .admin-header {position:fixed;top:0;left:0;right:0;z-index:1000;font-size:1.4rem;margin-bottom:0;} .admin-sidebar {width:260px;min-height:100%;float:left;border-right:1px solid #cecece;} @@ -391,7 +396,7 @@ ul {margin-top:0;} .admin-sidebar .am-offcanvas-bar { width: 70%; } } .common-nav-bar {position:fixed;z-index:10;bottom:30px;right:20px;} -.admin {width:100%;height:100%;display:flex;display:-webkit-flex;padding-top:51px;background:#fff;} +.admin {width:100%;height:100%;display:flex;display:-webkit-flex;padding-top:35px;background:#fff;} .admin .am-g {padding-left:0;padding-right:0;} /*---right Content---*/ .content-right {overflow:auto;flex:1;-webkit-flex:1;} From 6819c9516feb013d9833820d436341c2950c1610 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 1 Mar 2019 11:43:09 +0800 Subject: [PATCH 028/108] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/css/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 0da1c64dc..547e7d73d 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -448,7 +448,7 @@ ul {margin-top:0;} /** * mini开关 */ -.menu-scaling-submit{position:absolute;left:175px;top:55px;opacity:.6;width:30px;height:25px;padding:2px 10px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;} +.menu-scaling-submit{position:absolute;left:175px;top:40px;opacity:.6;width:30px;height:25px;padding:2px 10px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;} /** * mini小icon From 19e9769716da893b6227302c20bffb5a7815a04f Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 1 Mar 2019 18:29:05 +0800 Subject: [PATCH 029/108] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/StatisticalService.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/application/service/StatisticalService.php b/application/service/StatisticalService.php index 954bcf20c..275907618 100644 --- a/application/service/StatisticalService.php +++ b/application/service/StatisticalService.php @@ -413,13 +413,22 @@ class StatisticalService // 初始化 self::Init($params); - // 获取热销商品 + // 获取订单id $where = [ - ['o.status', '<=', 4], - ['o.add_time', '>=', self::$seven_time_start], - ['o.add_time', '<=', self::$seven_time_end], + ['status', '<=', 4], + ['add_time', '>=', self::$seven_time_start], + ['add_time', '<=', self::$seven_time_end], ]; - $data = Db::name('Order')->alias('o')->join(['__ORDER_DETAIL__'=>'od'], 'o.id=od.order_id')->where($where)->field('od.title AS name,sum(od.buy_number) AS value')->order('value desc')->limit(10)->group('od.goods_id')->select(); + $order_ids = Db::name('Order')->where($where)->column('id'); + + // 获取订单详情热销商品 + if(empty($order_ids)) + { + $data = []; + } else { + $data = Db::name('OrderDetail')->field('title AS name,sum(buy_number) AS value')->where('order_id', 'IN', $order_ids)->select(); + } + if(!empty($data)) { foreach($data as &$v) From 0de02aa25e6b22b794a653d8065840d30cd16a2c Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 2 Mar 2019 00:17:20 +0800 Subject: [PATCH 030/108] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/lang/zh-cn.php | 10 +++++----- application/index/view/default/personal/index.html | 8 ++++++-- application/index/view/default/safety/email_info.html | 4 ++-- application/index/view/default/safety/index.html | 4 ++-- application/index/view/default/safety/mobile_info.html | 4 ++-- .../index/view/default/safety/new_email_info.html | 4 ++-- .../index/view/default/safety/new_mobile_info.html | 4 ++-- .../index/view/default/user/email_reg_info.html | 4 ++-- .../index/view/default/user/forget_pwd_info.html | 4 ++-- application/index/view/default/user/sms_reg_info.html | 4 ++-- public/static/index/default/css/common.css | 4 ++-- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/application/index/lang/zh-cn.php b/application/index/lang/zh-cn.php index 7f5f7f3ed..dd95bc78c 100755 --- a/application/index/lang/zh-cn.php +++ b/application/index/lang/zh-cn.php @@ -112,8 +112,8 @@ return array( 'nickname' => array('name' => '昵称'), 'gender_text' => array('name' => '性别'), 'birthday_text' => array('name' => '生日'), - 'mobile_security' => array('name' => '手机号码', 'tips' => '修改'), - 'email_security' => array('name' => '电子邮箱', 'tips' => '修改'), + 'mobile_security' => array('name' => '手机号码', 'tips' => '修改', 'path' => 'index/safety/mobileinfo'), + 'email_security' => array('name' => '电子邮箱', 'tips' => '修改', 'path' => 'index/safety/mobileinfo'), 'add_time_text' => array('name' => '注册时间'), 'upd_time_text' => array('name' => '最后更新时间'), ), @@ -124,7 +124,7 @@ return array( array( 'title' => '登录密码', 'msg' => '互联网存在被盗风险，建议您定期更改密码以保护安全。', - 'url' => MyUrl('index/safety/loginpwdinfo'), + 'path' => 'index/safety/loginpwdinfo', 'type' => 'loginpwd', ), array( @@ -132,7 +132,7 @@ return array( 'no_msg' => '您还没有绑定手机号码', 'ok_msg' => '已绑定手机 #accounts#', 'tips' => '可用于登录，密码找回，账户安全管理校验，接受账户提醒通知。', - 'url' => MyUrl('index/safety/mobileinfo'), + 'path' => 'index/safety/mobileinfo', 'type' => 'mobile', ), array( @@ -140,7 +140,7 @@ return array( 'no_msg' => '您还没有绑定电子邮箱', 'ok_msg' => '已绑定电子邮箱 #accounts#', 'tips' => '可用于登录，密码找回，账户安全管理校验，接受账户提醒邮件。', - 'url' => MyUrl('index/safety/emailinfo'), + 'path' => 'index/safety/emailinfo', 'type' => 'email', ), ), diff --git a/application/index/view/default/personal/index.html b/application/index/view/default/personal/index.html index 7d921381d..8d8c367f5 100755 --- a/application/index/view/default/personal/index.html +++ b/application/index/view/default/personal/index.html @@ -38,8 +38,12 @@ {{else /}} {{$user[$k]}} {{/if}} - {{if isset($v['tips'])}} - {{$v.tips|raw}} + {{if !empty($v['tips'])}} + {{if !empty($v['path'])}} + {{:str_replace('{path}', MyUrl($v['path']), $v['tips'])}} + {{else /}} + {{$v.tips|raw}} + {{/if}} {{/if}} {{/if}} diff --git a/application/index/view/default/safety/email_info.html b/application/index/view/default/safety/email_info.html index 06832aee3..06b56cd0f 100755 --- a/application/index/view/default/safety/email_info.html +++ b/application/index/view/default/safety/email_info.html @@ -56,8 +56,8 @@
    - - 看不清换一张 + + 看不清换一张
    diff --git a/application/index/view/default/safety/index.html b/application/index/view/default/safety/index.html index 26c6ecfb1..9d98e164d 100755 --- a/application/index/view/default/safety/index.html +++ b/application/index/view/default/safety/index.html @@ -44,9 +44,9 @@ {{/if}}
    {{if empty($data[$v['type']]) and empty($v['msg'])}} - 绑定 + 绑定 {{else /}} - 修改 + 修改 {{/if}}
    diff --git a/application/index/view/default/safety/mobile_info.html b/application/index/view/default/safety/mobile_info.html index 470ee49c1..9a7af84ca 100755 --- a/application/index/view/default/safety/mobile_info.html +++ b/application/index/view/default/safety/mobile_info.html @@ -56,8 +56,8 @@
    - - 看不清换一张 + + 看不清换一张
    diff --git a/application/index/view/default/safety/new_email_info.html b/application/index/view/default/safety/new_email_info.html index a77fb4182..b8f2dff96 100755 --- a/application/index/view/default/safety/new_email_info.html +++ b/application/index/view/default/safety/new_email_info.html @@ -56,8 +56,8 @@
    - - 看不清换一张 + + 看不清换一张
    diff --git a/application/index/view/default/safety/new_mobile_info.html b/application/index/view/default/safety/new_mobile_info.html index cbf324dcc..3ba14600d 100755 --- a/application/index/view/default/safety/new_mobile_info.html +++ b/application/index/view/default/safety/new_mobile_info.html @@ -56,8 +56,8 @@
    - - 看不清换一张 + + 看不清换一张
    diff --git a/application/index/view/default/user/email_reg_info.html b/application/index/view/default/user/email_reg_info.html index 4b0331700..6f4c5f84d 100755 --- a/application/index/view/default/user/email_reg_info.html +++ b/application/index/view/default/user/email_reg_info.html @@ -69,8 +69,8 @@
    - 'reg'])}}"' /> - 看不清换一张 + + 看不清换一张
    diff --git a/application/index/view/default/user/forget_pwd_info.html b/application/index/view/default/user/forget_pwd_info.html index 2daa82b10..9aa29b597 100755 --- a/application/index/view/default/user/forget_pwd_info.html +++ b/application/index/view/default/user/forget_pwd_info.html @@ -59,8 +59,8 @@
    - 'forget'])}}"' /> - 看不清换一张 + + 看不清换一张
    diff --git a/application/index/view/default/user/sms_reg_info.html b/application/index/view/default/user/sms_reg_info.html index bbe71542e..c56003855 100755 --- a/application/index/view/default/user/sms_reg_info.html +++ b/application/index/view/default/user/sms_reg_info.html @@ -69,8 +69,8 @@
    - 'reg'])}}"' /> - 看不清换一张 + + 看不清换一张
    diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index fc7ffdc9f..8ed3a6059 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -55,8 +55,8 @@ a:hover, a:focus { color: #d2364c; text-decoration: underline; } .spatic{width:100%; height:16px;} h5{float: right;color: #666;padding-right:20px;} - input.add,input.min{width:15px} +.c-p {cursor:pointer;} .last{border-right:none !important;} /*选项卡样式定义*/ .am-nav-tabs,.am-tabs-bd{border-color:transparent ;} @@ -695,7 +695,7 @@ background:url(../images/ibar_sprites.png) no-repeat;background-position:0px -23 .user-content-body {-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto; } .user-offcanvas-bar { z-index: 900; } @media only screen and (min-width:640px) { - .user-sidebar {display:block;position:static;background:none; border-top: 5px solid #ED5564;} + .user-sidebar {display:block;position:relative;background:none; border-top: 5px solid #ED5564;z-index: 0;} .user-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:hidden;} .user-offcanvas-bar:after {content:none;} .user-main { padding: 0 5px; } From b47fb7608691e7cf7bb1501f1d455c574d5ca8a9 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 2 Mar 2019 11:09:08 +0800 Subject: [PATCH 031/108] =?UTF-8?q?=E4=BC=98=E5=8C=96esc=E9=80=80=E5=87=BA?= =?UTF-8?q?=E5=85=A8=E5=B1=8F=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/common/js/common.js | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index da6ad4029..1be1f528d 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -1032,6 +1032,29 @@ function FullscreenExit() return true; } +/** + * 全屏ESC监听 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-01 + * @desc description + */ +var fullscreen_counter = 0; +function FullscreenEscEvent() +{ + fullscreen_counter++; + if(fullscreen_counter%2 == 0) + { + var $fullscreen = $('.fullscreen-event'); + if(($fullscreen.attr('data-status') || 0) == 1) + { + $fullscreen.find('.fullscreen-text').text($fullscreen.data('fulltext-open') || '开启全屏'); + $fullscreen.attr('data-status', 0); + } + } +} + // 公共数据操作 $(function() @@ -1053,7 +1076,23 @@ $(function() } } $(this).attr('data-status', status == 0 ? 1 : 0); + $(this).attr('data-status-y', status); }); + + // esc退出全屏事件 + document.addEventListener("fullscreenchange", function(e) { + FullscreenEscEvent(); + }); + document.addEventListener("mozfullscreenchange", function(e) { + FullscreenEscEvent(); + }); + document.addEventListener("webkitfullscreenchange", function(e) { + FullscreenEscEvent(); + }); + document.addEventListener("msfullscreenchange", function(e) { + FullscreenEscEvent(); + }); + // 多选插件初始化 if($('.chosen-select').length > 0) From f4a1a7cc2dbe9d72f5769493c6ab9ae2c74cece1 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 2 Mar 2019 14:33:51 +0800 Subject: [PATCH 032/108] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/view/default/admin/login_info.html | 10 ++-- .../admin/view/default/admin/save_info.html | 2 +- .../admin/view/default/appconfig/index.html | 6 +-- .../view/default/apphomenav/save_info.html | 2 +- .../default/appminialipayconfig/index.html | 2 +- .../default/appminiweixinconfig/index.html | 6 +-- .../admin/view/default/article/save_info.html | 4 +- .../view/default/articlecategory/index.html | 2 +- .../admin/view/default/brand/save_info.html | 4 +- .../view/default/brandcategory/index.html | 2 +- .../admin/view/default/config/index.html | 20 ++++---- .../view/default/customview/save_info.html | 4 +- .../admin/view/default/email/index.html | 20 ++++---- .../admin/view/default/email/message.html | 8 ++-- .../admin/view/default/express/index.html | 2 +- .../admin/view/default/goods/save_info.html | 21 ++++----- .../view/default/goodscategory/index.html | 2 +- .../view/default/lib/excel_win_html.html | 2 +- .../admin/view/default/link/index.html | 4 +- .../admin/view/default/navigation/index.html | 16 +++---- .../admin/view/default/payment/index.html | 2 +- .../admin/view/default/payment/save_info.html | 2 +- .../view/default/pluginsadmin/first_step.html | 4 +- .../view/default/pluginsadmin/save_info.html | 12 ++--- .../admin/view/default/power/index.html | 4 +- .../view/default/power/role_save_info.html | 2 +- .../admin/view/default/region/index.html | 2 +- .../view/default/screeningprice/index.html | 2 +- application/admin/view/default/seo/index.html | 14 +++--- .../admin/view/default/site/index.html | 38 +++++++-------- .../admin/view/default/slide/save_info.html | 2 +- application/admin/view/default/sms/index.html | 8 ++-- .../admin/view/default/sms/message.html | 8 ++-- .../admin/view/default/sqlconsole/index.html | 2 +- .../admin/view/default/user/save_info.html | 2 +- .../view/default/personal/save_info.html | 2 +- .../index/view/default/safety/email_info.html | 4 +- .../view/default/safety/login_pwd_info.html | 2 +- .../view/default/safety/mobile_info.html | 2 +- .../view/default/safety/new_email_info.html | 2 +- .../view/default/safety/new_mobile_info.html | 2 +- .../view/default/user/email_reg_info.html | 46 ++++++++++--------- .../view/default/user/forget_pwd_info.html | 39 +++++++++------- .../index/view/default/user/login_info.html | 15 +++--- .../view/default/user/modal_login_info.html | 15 +++--- .../index/view/default/user/sms_reg_info.html | 45 +++++++++--------- .../view/commongobacktop/admin/saveinfo.html | 2 +- .../commononlineservice/admin/saveinfo.html | 2 +- .../commonrightnavigation/admin/saveinfo.html | 2 +- .../commonrightnavigation/index/content.html | 8 ++-- .../commontopmaxpicture/admin/saveinfo.html | 2 +- .../view/commontopnotice/admin/saveinfo.html | 2 +- .../usercentertopnotice/admin/saveinfo.html | 2 +- .../admin/saveinfo.html | 2 +- .../admin/saveinfo.html | 2 +- public/static/admin/default/css/admin.css | 1 + public/static/admin/default/css/goods.css | 3 +- public/static/common/css/common.css | 16 ++++++- public/static/index/default/css/user.css | 3 +- .../css/commonrightnavigation/style.css | 3 ++ 60 files changed, 251 insertions(+), 216 deletions(-) diff --git a/application/admin/view/default/admin/login_info.html b/application/admin/view/default/admin/login_info.html index dd0d92735..4b71819b2 100755 --- a/application/admin/view/default/admin/login_info.html +++ b/application/admin/view/default/admin/login_info.html @@ -6,21 +6,21 @@
    -
    +
    - - + + + + @@ -79,12 +89,20 @@ 未填写 {{/if}} - + + + + + - - {{/foreach}} diff --git a/application/admin/view/default/public/footer.html b/application/admin/view/default/public/footer.html index c74f6b266..4d5f3fd45 100755 --- a/application/admin/view/default/public/footer.html +++ b/application/admin/view/default/public/footer.html @@ -1,5 +1,15 @@ + + +{{if !empty($plugins_admin_view_common_bottom_data) and is_array($plugins_admin_view_common_bottom_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{foreach $plugins_admin_view_common_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +{{/if}} + @@ -55,4 +65,28 @@ {{if !empty($module_js)}} +{{/if}} + + +{{if !empty($plugins_admin_js_data) and is_array($plugins_admin_js_data)}} + {{foreach $plugins_admin_js_data as $hook}} + {{if is_string($hook)}} + + {{elseif is_array($hook) /}} + {{foreach $hook as $hook_js}} + {{if is_string($hook_js)}} + + {{/if}} + {{/foreach}} + {{/if}} + {{/foreach}} +{{/if}} + + +{{if !empty($plugins_admin_common_page_bottom_data) and is_array($plugins_admin_common_page_bottom_data)}} + {{foreach $plugins_admin_common_page_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} {{/if}} \ No newline at end of file diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html index 6c9f39fba..ffa76ed8e 100755 --- a/application/admin/view/default/public/header.html +++ b/application/admin/view/default/public/header.html @@ -15,8 +15,40 @@ {{if !empty($module_css)}} {{/if}} + + + {{if !empty($plugins_admin_css_data) and is_array($plugins_admin_css_data)}} + {{foreach $plugins_admin_css_data as $hook}} + {{if is_string($hook)}} + + {{elseif is_array($hook) /}} + {{foreach $hook as $hook_css}} + {{if is_string($hook_css)}} + + {{/if}} + {{/foreach}} + {{/if}} + {{/foreach}} + {{/if}} + + + {{if !empty($plugins_admin_common_header_data) and is_array($plugins_admin_common_header_data)}} + {{foreach $plugins_admin_common_header_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} - \ No newline at end of file + + +{{if !empty($plugins_admin_view_common_top_data) and is_array($plugins_admin_view_common_top_data) and (!isset($is_header) or $is_header eq 1)}} + {{foreach $plugins_admin_view_common_top_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +{{/if}} \ No newline at end of file diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html index 3f2a3d33b..eecbab79e 100755 --- a/application/index/view/default/order/index.html +++ b/application/index/view/default/order/index.html @@ -204,6 +204,20 @@ {{if in_array($order['status'], [4,5,6])}} {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
    + plugins_service_order_handle_operation_html +
    + {{/if}} + {{if !empty($order['plugins_service_order_handle_operation_html']) and is_array($order['plugins_service_order_handle_operation_html'])}} + {{foreach $order.plugins_service_order_handle_operation_html as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} {{/if}} diff --git a/application/plugins/expressforkdn/Admin.php b/application/plugins/expressforkdn/Admin.php new file mode 100644 index 000000000..f29d24fb1 --- /dev/null +++ b/application/plugins/expressforkdn/Admin.php @@ -0,0 +1,65 @@ +assign('express_list', ExpressService::ExpressList()); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/expressforkdn/admin/index'); + } else { + return $ret['msg']; + } + } + + /** + * 编辑页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function saveinfo($params = []) + { + $ret = PluginsService::PluginsData('expressforkdn'); + if($ret['code'] == 0) + { + $this->assign('express_list', ExpressService::ExpressList()); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/expressforkdn/admin/saveinfo'); + } else { + return $ret['msg']; + } + } + /** + * 数据保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + return PluginsService::PluginsDataSave(['plugins'=>'expressforkdn', 'data'=>$params]); + } +} +?> \ No newline at end of file diff --git a/application/plugins/expressforkdn/Hook.php b/application/plugins/expressforkdn/Hook.php new file mode 100644 index 000000000..6a3ac4ef9 --- /dev/null +++ b/application/plugins/expressforkdn/Hook.php @@ -0,0 +1,317 @@ +operation($params); + break; + + // 弹窗代码 + case 'plugins_view_common_bottom' : + case 'plugins_admin_view_common_bottom' : + $ret = $this->html($params); + break; + + // 页面底部 + case 'plugins_common_page_bottom' : + case 'plugins_admin_common_page_bottom' : + $ret = $this->js($params); + break; + + // header代码 + case 'plugins_common_header' : + case 'plugins_admin_common_header' : + $ret = $this->css($params); + break; + + default : + $ret = ''; + } + return $ret; + } + return ''; + } + + /** + * css + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-06T16:16:34+0800 + * @param [array] $params [输入参数] + */ + public function css($params = []) + { + return ''; + } + + /** + * js + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-06T16:16:34+0800 + * @param [array] $params [输入参数] + */ + public function js($params = []) + { + return ''; + } + + /** + * 视图 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-06T16:16:34+0800 + * @param [array] $params [输入参数] + */ + public function html($params = []) + { + // 获取应用数据 + $ret = PluginsService::PluginsData('expressforkdn', ['images']); + if($ret['code'] == 0) + { + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/expressforkdn/admin/content'); + } else { + return $ret['msg']; + } + } + + /** + * 操作 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-06T16:16:34+0800 + * @param [array] $params [输入参数] + */ + public function operation($params = []) + { + if(empty($params['order'])) + { + return DataReturn('订单为空', -1); + } + + // 钩子html + if(isset($params['order']['status']) && in_array($params['order']['status'], [3,4])) + { + + $params['order']['plugins_service_order_handle_operation_html'][] = ''; + } + + return DataReturn('处理成功', 0); + } + + /** + * 获取物流信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-12 + * @desc description + * @param [array] $params [输入参数] + * @return [type] [description] + */ + public function getexpinfo($params = []) + { + // html + $html = ''; + + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'express_id', + 'error_msg' => '快递id有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'express_number', + 'error_msg' => '快递单号有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1, '

    '.$ret.'

    '); + } + + // 获取配置数据 + $ret = PluginsService::PluginsData('expressforkdn'); + if($ret['code'] == 0) + { + // 是否配置物流代码 + if(empty($ret['data']['express_ids'][$params['express_id']])) + { + return DataReturn('请先再后台配置物流代码', -1, '

    请先再后台配置物流代码

    '); + } + + // 获取快递信息 + $data = $this->expresstraces(['shipper_code'=>$ret['data']['express_ids'][$params['express_id']],'logistic_code'=>$params['express_number'], 'config'=>$ret['data']]); + + // 状态列表 + $status_arr = [ + 0 => '暂无物流信息', + 1 => '快递公司已揽收', + 2 => '快递正在配送途中...', + 3 => '该物流已被签收', + 4 => '该物流问题件，请咨询物流商处理！', + ]; + if(!isset($data['State']) || !isset($status_arr[$data['State']])) + { + return DataReturn('查询失败', -1, '

    查询失败

    '); + } + + // 开始处理 + $html .='

    '.$status_arr[$data['State']].'

    '; + $html .= '
      '; + + // 快递信息 + if(in_array($data['State'], [2,3]) && !empty($data['Traces']) && is_array($data['Traces'])) + { + foreach($data['Traces'] as $k=>$v) + { + $html .='
    • '.$v['AcceptTime'].''.$v['AcceptStation'].'
      • '; + } + } + return DataReturn('处理成功', 0, $html); + } else { + return DataReturn($ret['msg'], -100); + } + } + + /** + * 获取物流信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-12 + * @desc description + * @param [array] $params [输入参数] + * @return [type] [description] + */ + public function expresstraces($params = []) + { + // 参数 + if(empty($params['shipper_code']) || empty($params['logistic_code']) || empty($params['config'])) + { + return ['State'=>0, 'Reason'=>'请求参数有误']; + } + + // 请求数据 + $url = 'http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx'; + $request_data = json_encode([ + 'OrderCode' => '', + 'ShipperCode' => $params['shipper_code'], + 'LogisticCode' => $params['logistic_code'], + ]); + $data = array( + 'EBusinessID' => $params['config']['ebid'], + 'RequestType' => '1002', + 'RequestData' => urlencode($request_data) , + 'DataType' => '2', + ); + $data['DataSign'] = $this->encrypt($request_data, $params['config']['appkey']); + return $this->request_post($url, $data); + } + + /** + * post提交数据 + * @param string $url 请求Url + * @param array $data 提交的数据 + * @return url响应返回的html + */ + public function request_post($url, $data) + { + $temps = array(); + foreach ($data as $key => $value) { + $temps[] = sprintf('%s=%s', $key, $value); + } + $post_data = implode('&', $temps); + $url_info = parse_url($url); + if(empty($url_info['port'])) + { + $url_info['port']=80; + } + $httpheader = "POST " . $url_info['path'] . " HTTP/1.0\r\n"; + $httpheader.= "Host:" . $url_info['host'] . "\r\n"; + $httpheader.= "Content-Type:application/x-www-form-urlencoded\r\n"; + $httpheader.= "Content-Length:" . strlen($post_data) . "\r\n"; + $httpheader.= "Connection:close\r\n\r\n"; + $httpheader.= $post_data; + $fd = fsockopen($url_info['host'], $url_info['port']); + fwrite($fd, $httpheader); + $gets = ""; + $headerFlag = true; + while (!feof($fd)) { + if (($header = @fgets($fd)) && ($header == "\r\n" || $header == "\n")) { + break; + } + } + while (!feof($fd)) { + $gets.= fread($fd, 128); + } + fclose($fd); + + return json_decode($gets, true); + } + /** + * 电商Sign签名生成 + * @param data 内容 + * @param appkey Appkey + * @return DataSign签名 + */ + public function encrypt($data, $appkey) { + return urlencode(base64_encode(md5($data.$appkey))); + } +} +?> \ No newline at end of file diff --git a/application/plugins/expressforkdn/config.json b/application/plugins/expressforkdn/config.json new file mode 100644 index 000000000..531289217 --- /dev/null +++ b/application/plugins/expressforkdn/config.json @@ -0,0 +1,42 @@ +{ + "base":{ + "plugins":"expressforkdn", + "name":"快递鸟API接口", + "logo":"\/static\/upload\/images\/plugins_expressforkdn\/2019\/03\/11\/1552286675575734.png", + "author":"guoguo", + "author_url":"http:\/\/gadmin.cojz8.com", + "version":"1.0.0", + "desc":"集成快递鸟第三方后台查询接口", + "apply_terminal":[ + "pc", + "h5" + ], + "apply_version":[ + "1.4.0" + ], + "is_home":false + }, + "hook":{ + "plugins_view_common_bottom":[ + "app\\plugins\\expressforkdn\\Hook" + ], + "plugins_admin_view_common_bottom":[ + "app\\plugins\\expressforkdn\\Hook" + ], + "plugins_common_page_bottom":[ + "app\\plugins\\expressforkdn\\Hook" + ], + "plugins_admin_common_page_bottom":[ + "app\\plugins\\expressforkdn\\Hook" + ], + "plugins_common_header":[ + "app\\plugins\\expressforkdn\\Hook" + ], + "plugins_admin_common_header":[ + "app\\plugins\\expressforkdn\\Hook" + ], + "plugins_service_order_handle_begin":[ + "app\\plugins\\expressforkdn\\Hook" + ] + } +} \ No newline at end of file diff --git a/application/plugins/view/expressforkdn/admin/content.html b/application/plugins/view/expressforkdn/admin/content.html new file mode 100644 index 000000000..ddb6dc867 --- /dev/null +++ b/application/plugins/view/expressforkdn/admin/content.html @@ -0,0 +1,10 @@ + +
      +
      +
      +

      物流信息

      + × +
      +
      ...
      +
      +
      \ No newline at end of file diff --git a/application/plugins/view/expressforkdn/admin/index.html b/application/plugins/view/expressforkdn/admin/index.html new file mode 100644 index 000000000..839293ad3 --- /dev/null +++ b/application/plugins/view/expressforkdn/admin/index.html @@ -0,0 +1,54 @@ +{{include file="public/header" /}} + + +
      +
      + + 快递鸟API接口 + 返回 + + +
      +
      + +
      + {{if empty($data['ebid'])}} + 未填写 + {{else /}} + {{$data.ebid}} + {{/if}} +
      +
      +
      + +
      + {{if empty($data['appkey'])}} + 未填写 + {{else /}} + {{$data.appkey}} + {{/if}} +
      +
      +
      + +
      + {{if !empty($express_list)}} + {{foreach $express_list as $express}} + {{if $express.is_enable eq 1}} +

      {{$express.name}} {{if !empty($data['express_ids'][$express['id']])}}({{$data.express_ids[$express.id]}}){{/if}}

      + {{/if}} + {{/foreach}} + {{/if}} +
      +
      + + + 编辑 +
      +
      +
      + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/expressforkdn/admin/saveinfo.html b/application/plugins/view/expressforkdn/admin/saveinfo.html new file mode 100644 index 000000000..8028844ea --- /dev/null +++ b/application/plugins/view/expressforkdn/admin/saveinfo.html @@ -0,0 +1,44 @@ +{{include file="public/header" /}} + + +
      +
      + +
      + + 快递鸟API接口 + 返回 + + +
      + + +
      + +
      + + +
      +
      + + {{if !empty($express_list)}} + {{foreach $express_list as $express}} + {{if $express.is_enable eq 1}} +

      {{$express.name}}

      + + {{/if}} + {{/foreach}} + {{/if}} +
      +
      + +
      + + +
      +
      + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/service/OrderService.php b/application/service/OrderService.php index a98882761..a061089d0 100755 --- a/application/service/OrderService.php +++ b/application/service/OrderService.php @@ -11,6 +11,7 @@ namespace app\service; use think\Db; +use think\facade\Hook; use app\service\PaymentService; use app\service\BuyService; use app\service\IntegralService; @@ -578,6 +579,20 @@ class OrderService $order_pay_status = lang('common_order_pay_status'); foreach($data as &$v) { + // 订单处理前钩子 + $hook_name = 'plugins_service_order_handle_begin'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'order' => &$v, + 'order_id' => $v['id'] + ]); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } + // 状态 $v['status_name'] = $order_status_list[$v['status']]['name']; @@ -692,8 +707,23 @@ class OrderService // 描述 $v['describe'] = '共'.$v['items_count'].'件 合计:￥'.$v['total_price'].'元'; } + + // 订单处理后钩子 + $hook_name = 'plugins_service_order_handle_end'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'order' => &$v, + 'order_id' => $v['id'] + ]); + if(isset($ret['code']) && $ret['code'] != 0) + { + return $ret; + } } } + return DataReturn('处理成功', 0, $data); } diff --git a/application/tags.php b/application/tags.php index 9a337d3bc..98eba492f 100755 --- a/application/tags.php +++ b/application/tags.php @@ -59,6 +59,7 @@ return array ( array ( 0 => 'app\\plugins\\commonrightnavigation\\Hook', 1 => 'app\\plugins\\commononlineservice\\Hook', + 2 => 'app\\plugins\\expressforkdn\\Hook', ), 'plugins_service_goods_handle_end' => array ( @@ -72,5 +73,29 @@ return array ( array ( 0 => 'app\\plugins\\answers\\Hook', ), + 'plugins_admin_view_common_bottom' => + array ( + 0 => 'app\\plugins\\expressforkdn\\Hook', + ), + 'plugins_common_page_bottom' => + array ( + 0 => 'app\\plugins\\expressforkdn\\Hook', + ), + 'plugins_admin_common_page_bottom' => + array ( + 0 => 'app\\plugins\\expressforkdn\\Hook', + ), + 'plugins_common_header' => + array ( + 0 => 'app\\plugins\\expressforkdn\\Hook', + ), + 'plugins_admin_common_header' => + array ( + 0 => 'app\\plugins\\expressforkdn\\Hook', + ), + 'plugins_service_order_handle_begin' => + array ( + 0 => 'app\\plugins\\expressforkdn\\Hook', + ), ); ?> \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index c45b5d262..2f4046c99 100755 --- a/changelog.txt +++ b/changelog.txt @@ -5,8 +5,9 @@ 1. 后台管理菜单优化、部分细节优化及BUG修复 2. 新增商品价格配置显隐应用 3. 新增问答增强版应用 - 4. 新增码支付模块 - 开发中 - 5. 新增游客购物应用 - 开发中 + 4. 新增物流查询应用 + 5. 新增码支付模块 - 开发中 + 6. 新增游客购物应用 - 开发中 前端功能列表 1. 新增商品价格配置显隐应用 diff --git a/public/static/plugins/css/expressforkdn/admin.css b/public/static/plugins/css/expressforkdn/admin.css new file mode 100755 index 000000000..096cfea7f --- /dev/null +++ b/public/static/plugins/css/expressforkdn/admin.css @@ -0,0 +1,32 @@ +/** + * 首页 + */ +.expressforkdn-content .items { + margin: 10px 0 20px 0; + border-bottom: 1px dashed #f1f1f1; + padding-bottom: 20px; +} +.expressforkdn-content .express-items { + overflow: hidden; +} +.expressforkdn-content .express-items p { + border: 1px dashed #ccc; + padding: 6px; + float: left; + margin: 0; +} +.expressforkdn-content .express-items p input { + display: -webkit-inline-box; + width: 80px; + font-size: 12px !important; +} +.expressforkdn-content .express-items p:not(:last-child) { + margin: 0 20px 10px 0; +} +.expressforkdn-content .edit-submit { + margin-bottom: 20px; +} + +/** + * 编辑页面 + */ diff --git a/public/static/upload/images/plugins_expressforkdn/2019/03/11/1552286675575734.png b/public/static/upload/images/plugins_expressforkdn/2019/03/11/1552286675575734.png new file mode 100644 index 0000000000000000000000000000000000000000..bdc357cd859e982c0c656c2de077d5b3069c3405 GIT binary patch literal 17303 zcmV)QK(xP!P)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C zIK)XrK~#9!oLzaGT~(3(>b%=qmQE)jge3_P2m=HrDhh%NAfk?f$Rev7f+(AS2#SoX zA|fD&tOJMxVG|>}qq2x$7a}UMC`%F`3E4=}d%ySYsrlocrRv=KI?S|~U-#?R_uYF= zom#&7s*1X%?M*}s0y7aY17H9k0y98FU}k_&{D9&|xc9iXGZ}*WTXKI2kfGwuL=^wZ zU8uN}zee$0@j2lhV8mazH~T*!f4%TGl)jU|{-FrO#l6A3k(mvw&71L#l1CHQk5A-Q z1&DWEykC4rQ1=?HqpkvZ&!%`D^7o-`qPQ~vR4hkaQz8Ng>^__1IuJkvA~MA8B5@1D z&M`PVv)krkJ3;OeWB~U6g%v^RM*tjdK0KBM7kdCEDwf7A9+;V#VXe*cxB-3-{L{JD z;vxWW63Hl*3~o!v?TTK&C=q^5+y;`6GcMkkiG}b_5iZ9;ia9Qy64+vW!|Iq~>Aehc z*r0Hp5DpfKKXcFSC64soBwxhLM8^Ln3Mq@D0T?ifr4K?`ob~w8wn?xY*CPtKyH&Rm z#PJdocY^>1yUk({xgAR1DZbcklz$r$#g)n8Uy_tI5}O}2Px0m;TyCAC5cu;8xtc+T z1f@seok4t=qb%w@a9YtxHXHXHQ0zCz6avR_kq}li2pl^d$V9}p0cM7j3@9BUj~0>N z53w;!LLExo1Sx9aTm)HT@%&QsGp*twKT;lf4x1U5m_TF_ z>Xo2Gh~zbk8(=QtaTUzV5uUaMh(6Lgt3VC=iMKM)UHvfF%xqlFU|`R9w$c| zz`=k~^hAUCb?X!r0V#{Z0I@q{RuHa1d_bqH2yu~3+(qqohjSDiu6Xxu<$`3oKQB~=R|!rjQE?`u6myInhycTo zaX|DI#2=9V1r_HkT5xqZxHvQ9PB{b2HfNhN+u)cI5~Y`T!_h|&M~(fWurO@?=_#(D z5MUB26^ITx`71^z-gxT~Z^9WZ3XdJ{)EIda_{V4Y9EEKVir9O9(HJlaOJZ}_rqIyd7KtLR&zeiIT!?wt@PMJ~>Wwjw=SQNlTD za7cYw{NDssNXCWxNvs;otc-{YGsNk8l=&4mWW42u@WeQ7m=93c9}~G%(tU!^>fZTg zP*jA4oH531ZJ2gk8i65>D_=zIG8=8E9fg=2upo zagYJaz|{$kzbZ%P)kic!M~R(>76f+_q(LDW|C2x5CSY8_p%SNrDXa;nM}ln*w(Nt= zp!W#mV+@wd5uzgID61|`^&jPxkwo4KXGDfS@#%uk9o%sjF2=}%Wte0*jk~={CIKmt zTvKQI1NNfe1PcBt1@IsV>4o+d?zf5=DY(^MV1-!-E(bgPz~OLP%eILS8tAAn#Pi~) zQ9Q>IvypxWB-j!Jg|w?7j*x&JI4XSi=P?KtCWlBUZV^L8wdW6Avf|QM$!NvHbMBl% zL_^9PutbHNy^UUATnke6!`YyKj*;}HiER@$Cs?AWJ(WU_{w0)-hIXL*27B)==vayX zVidCC#wdPD40lKvLJCX4979cbAfI>j)lK71+xHtq75sls1TmQ5D)AVUGl1R?f8E0}1>SLXk9J*`vIO zj;xRQn4`XT2Hk0KB<8p{WGqxKON~}e$p|~_Q9;(ow1g&|N@1nOobY90ttp8(qL0K< zK~sXbQPemr1>Z;A!mSL)M5$~JKAV4^dmw^d5-GVv#5rsZW+LU*1OwpK++B?oHZCHm zu!vIMhGbVnYGv53;Ar7V!f!5zr3i?gkUw#S;>FAhnkl(yoTwlHFDpwXLS?a5(NeKL zlw1y^1Lgye4M@F+cAaJuo`PE&+vFm>=5|_P%fi1dA-=(BV#KJ*VXKIVv*4gcu(e2a zSP!OzW9i}NklSGsP$cI&84r)gFqgue5Zq}nQoR%lZH&w^n#8kAG=4NB0n!l|9Eo7K zNVszFT-7@HJf+u|oaWgID{Vp6xkDkb<|0jsW(kB$__mzDrGVT2aK1z?6WZG;Fzv$oW&x}UXWu0bnf?EZ8zzz5UV7$cQpR^dcGv3+fVuV3A2oyyu{Vh3`gC z>YbzYjZuiefth8f6x~Px?SL7X(2vS*7cdAV0VR7C6RfH~yrfTzOX~|8A#RbB@ssW& z>y(~A5_7N>85t6RWONx=oP!_+RiUDGBGh6jw?k-o$w^4`yM{!ZK*}guS}#S1fCn>3 zfOpbP#E*$<#7WdeV3FR@PJ%bG7Ui<4^~KJFe{v98Wgc6MA`x{S1T$)aU)VVM1+iBK&&hbE0ltj$_y7aNebVc z(C8_9^(>%v|3D_7wccSM;a@RZ3s{0>0LFy8qXuphI*7z@LOf-HbnD>XD8>n;p{OPn zaLI@FcppQ6ok_F=#kA9uqB2026*|Hgh&zr+>5?iW$y_7Aa>!6h3X@DL1}~PRe@Fr6 z7iml8JRnCA$kJ(AX?x1hmXtw3X;IJsDIswT0-Y4`yPjaw{){JJlmz586(|8Tlh8Vz zm@Lvn6cJJCS)~ezV3`bHB^8n7VmieUby^hH$n$eYL69w&Ey0TWA$>+AtfJS{>)GJ^ zBy2vtb8wc1^-^-;E++n~WQrk4v?P><7(cPRbNLaGYvz=aOsf$|o2&?|0p*t z6A(cGxI{q&G3B$19hG`7SRD_nCDaX25)ntvr-C{P@*zdoD=u*4kqA;kDVr9ZpWyaz z$-RpN56hf0Hwrg2=s@9s>in9pc*2D%lg#`TTnHvH--Jd*>|IPx|6+<1EH3%&oKmV% zqXJ3H25F9dncD_Z92URWA>W{>vLY!@A%PW;Uy=M0`^uy#7X`-@#LN~9a5H2RlazG= z*{Xz~0H7cMC?OoAH!sEz`iV#;f{=#Biw%hY*64nIW{3Fax!~fUIdrOvdxLWY;~d{p-~HeBdEs|dvSn(QUas` zKkZEgT2_cEA}tT{fRo|K^9>JaM2QMm;e8Rk2$X%+7AWEG`rH?Zw5AG>Gl^Bi(gBUr zF$~2QiBVC45QL7|5)~mBrz)Og%}XU)07@*RmHLHm@8^CB8%OjeM+mS$d)wqUMA;dK~?ac)|9xlxDY7X%k2a0+;BpQTxjTrOc`YxSs>u$(aZFRA!apXE@^%Jv{f=wn&6& zY7`+!`6AXxNp=M!%pkpNBKahd-L9xNg0vCg5GDz<23)7&8%BE-^^F zTC)sMpg<7-j$D`|rZZ5bK7L=k?aCmGm=rY2N#RFv5gTo2;$EPX7KLF?@l??YtFk5* zRg}Uv4J>?#hMI7;RCYRW>!F@A7e^Ho zJQ06x3*?fC3?n8%qf=-lguvFNDXawr=cOW5CzxS|qt2!T98QRZLF&URg1*2c!bS~o zMAm_3V+0|ggbvCmF{y;V5NcsLG6sAMti_8WVIPrjENp;J-x3Q7E^BO}Y_~Fz=%Cyh z119I`t0FLRNufY$B9Wk`P@7f`JA$#1xUOV%Kw#Y>F>cZ-I1160R57F@ub2b$-iW|6 zDaADueCa@6;!roI3GrTHDlk3;84)O^E0{|BO6h6`{4HZ<6iz+a!0S*9e=;Ry8X3MK zbwwo?R;d~Z<7mZAayy}cdksv6EF-DoU(^=~*^{{efpq%SqzJN#$bgXGfP#n>tu8A? z9QBRhnI&m4MEe(ckqSixGPeh*JcSxA(t(DO4v|`s9uCVSiSRgs@mH>nKSM+%SUU+R zNQDB-t_+kEHtmaWL#2D*FiQQS5zqj(lhAvHC>A^^^iKFr?722E;!FwI-bYhC2VyuK zEI29Z2fG6R?_bJHg)jp~2ybB5v0{~>0=ws^VO)JDg{pZ9)tO@PL`2OlcqgW!7$)Mh zB9le|0v7NQOY*gYW)y5k;fac;BT~fk81w;Yg|DbOtwP;ms#t`hCVbWQ70V)&aP#GC223DA2Z-_F_5@Ci|xVEvx%b!n~x(~P>32V<1 z@OH{Nuxg2F9mvL#>0r}FjlRtDFVjq{!Wbj~LNYO;bfL5#x(F`Ze8Je1d2<%W$ocY; zXQFs>O#0lgtbmZ5RMD=36@tLtmyewGSUbcXJ0X(b4GB9CU07KbEK662Ku&;!J6mf* zHkPOjrW5%P>Z{%R8|#23H|rT0lO!S}N~7z`rO?R4cfx)kUG>J{&ODQZR4IJXLc!T~ zBcU`XR5|#FEOMMox|~ZP9IPM)O-^*{?%A76(J&-E7h;t)1-fDMiXzq-AQc9Y=|HU$ zwGKkg!>d3Us2#SB<^XIR49L8Hq?9vKG*eO)R7y&wnw?|HvUwECY(7}$QH8VQUCs_R9aPJB zcnz6$bWDb=vmK#)gg|JHz}ADK=A9H9mMdxG6M>+luz-bzWR$Bdbm@ZtW`if{i??Fi z7Zp?o7+id=f)5e&Mr6oEUbMjGWaBEoe+s8#RaKA3PoOeOF~;T*rnk1>hf}SK^AR#N z>YB!E$&Roc0RXOJcsanaFM%UpMbA>hP@I)Z*aUw@vbY3sSeFaxuuf!IIjt%Ng(3!y zq`9Dklu}kuwn`mGqL=jIVs%c`Mx9g0bi%Z= z9meq6V9UeHf!qbcZV__Q&1@p}?uwZy+-U*rsc=cgy-1rUaL??0+r~{DS+h`cDF9O= znEJZ6hL-*f0$B_DXIWyP(RPiS^@;IYf37xWQuye`nnmlL|JBIy=hH-q)4RlAQsxmN z4H+X_*%u(5W(EmtCo*M<%aUQRZ%h}Ku7+ACYMoT;O~?Z_7R*dt)AviF)^Zg|a0}bUZ@AgMS5`1y#aoA0y|(oCr^DKS2>1i2 zFwt>ae0#J@TXA1+n%`w|vh=+svBQ zKQO#{P4DwBz7bCBXZF~kZ(wNZl%6~8c|vUi0l;p%Y}eM7)$5JFKEJScV2BwTZP>HT ztZ8j+wIy$_e(~iuKmZ$qabvQ@3m3ld(yMIR2mo6kmwwvEKf3)xkN#a2 zM#>CpLLP`T08#|WXseQK5a)m^SX_?EfGxj#N7}zfHy#0F@w}t*;dP}b1miZ}ebSC! zhb(n~>gluW*I!XYXaL|jv){Ay?RVDo4y=3amg1M2f8d+TR;(%RbJ2oprcUVr@aMn0 zvg^M88Pt?9WG!EG)>n@?{L{r>b!~QVAq@iyZw=>QhyOTx;TtQ42UhRD_pUen{OIDv zMl;`F>#sDL4KOB8?%sCR^bMy>_|W^e+VTCfKKR}(0UUSQwez2RVcfVe&XD>twXA0T zZHrBA{>^-Cht;{1FgOU*HGThN-BIemCUcR+uiCpep1#k|bp8uT#0tiuTMprb708%= z@Xd1VC7T$Gk+=W8`mu{O+Yy6{ZwD~%z9%=_V8TZ~v@L+^=00%pnKwK?|7U;u$D&CS z$9;ImZHjk3{^yrhuj%cXFmC+V&V_HRIP9292^d^_Te#Gi%?`ZbXWu&L^B=*eUxjFX z{o7a0o%bhzhQt-#%~x;V;MDEDCX&iB!=696pPLa?5;T^XQ-#_>K!eaX`zUrQFV>L~_pe&rd*6c#zIxE^#bL^GJ9plE0-brvLE)NjE?sru6?gac4KkynJ)1FY z%I2F*eRJum?r~#|{_3Z~+urlRV@Nc|la-Ku4@iPA)HQv-mhAo#2B*rkI=VOe!gWaZ zK{hsFFc#fAqK+_Hn5q@<(E5;Unw*asy<;8phxow*&aq-H-S74IcT$J&V8m z-Vbm3*|qlr*ztX{{&d&5Uf~?{&98jwl5@TWVC}krP39c&!S`1Q&F=AI zw%_x-*WX7k``Q!JVSG?!mKRkQTQ5P%TT!dDX ziV7AxlfC(5elaPuioMTO|!+h@3JBIHsyY~L#A{UHl}U;kTxiah{u;87QW`PQqy1E8z3y{ohR zx#t%yS@PDv%U4yZky_2X`qY)iI4N7ZZs3V${t3d_ryd;MbK6~yF=Ml7Q+C^BcJa!R zx8Eu5H|zm`gT8)oQj|@Bw#KAm0JmBhl^O^Z1+cNgUNCt)J*L3QvGlpod5S%7rlMpJ|70K_^p)(9C2YGR6Fgk z)sF9*RlN7R=iYeccMdGRU+}lr9)0RXYU}yt>9^l=z1zr-eD3t`9KCn({S(jp^U7cT z?%Iow?&@p@@cc`Qe{%UP63F39HJk-7A9%|v$x6Ht#4<7l>GuILk zW$lSmBz@fem+sUodffTT?-rL?wtUU^PuRcsew&XR4`5=?*fnbh?!4i9#f#@%IuDHR z9lxIw+j|xe8MgKFPu;6{<Yq4|IR&HYdP_hrWyKmOz8H|O2|)TSFx zX3ISj#$0v7?;6b}Ko|VrOX1nK-|eJg-LAahcdOp%UG+{M7-Pn?x3{;|>y5#|ky=*U zXiCq~-@R6#u&D<_0#6}CoSnL+?=K9w(TtLamlvrGs{@c?tKW0zZ7k!~QhR4+ymk8* zi%;0}z#BO^I?MppJazf-(ggt*FP>y@(QN=8d-|m(o_YDydc7%aGfQe;WUT~=)t~a)rvAHW zA7|_R^|f!dO_-L{fvkSyTu)(hKu%B3*qz?L6@YvH@XUm9Zi&Bl-c2i3_l?=?5CBiy z|0B5#0DgAueW(3!t}$#afoRvAx1Bs`eDSNBpUReP93JaJ@kc+3FPxYq_(tZQHG;4GxWr)SEY7d4h1I z4z0`xaz(9sEO5zW#zp`#u^o)sHHxh@J$`9GSoZrLZ1l-Bq-@?bE^C zy8Cy}j33wez^~4z8T0xZ%X|BVg6|X!q~%FH<|8~=_=Yur@#>y;9 zwz)LASz5bOW>cii#VXQLBdcF;_OHywZopN0;QA3vn2~i&9A5gI>?_2;n#X^la5u(> zy#I6kEe~zC^^D>whkWCw0It3CgfH&5OYzDtZhPdo?_K}e)0cUyY2$FuyX`!?XTsRx z^)DTJ*@6dt0-$eT_`10do^$aXg?j1j8@%g(o_YE&ul(`Ovxi3-Z?9N8bNZBnzj4X& zNBqZ}*)subx6O=EG|!nox!t(~*PIkyJnH1DlGG?v&y%FmCB7|-V?+c;pQ~uOE=j5T z_J%9J{oq-f?sIvmDor`28+_`5<#&Ix|K)qfZoPN$u4eC&ymx8R_u#T09qAmHm)^t|zs(XI-5guP$6hz`DM{uYBwBzP=%2 zG{eNZEq(pNW5;wn{oJbzTz%m;!Y$oAZ@$PQsulrMIs}p##sGEA*q=li1)-6OAUug= zmWl68CNVHJ{P_3Vr)(>NVw9btbqlT=T>SV(``%EzueAT@tAH6q#*A}n1e(oPGx#nIN*P>K9GrR43=9drL^=pTG9RIJcAOHN$ zb1u3=f{OBtvZyLp_P1-pX$xOnn;k-W&qQZHA9P856S|}^ve3VjMIo^&Q6@1{Ktvp6 zUA6q-^QIp(SCB5!Jz$`Fha*Q;ytw?X!#Di=FPgne?a-Ro{~Q3gS#SLP#YF&3ow~`Z zi&pdxj6D6<#TQ+5&#cWi`tCXZz38o#gc?yTEY{Diy?@T^nF9mEot^DZ|K*iakKO0@ zkNmYh(yX2bQT`ra@VK#EOO~xJ_CP2Fm4^rtz3r@Nwanc2hXrHDb_@)TSZgOv7&mv` zd|iXZ8qWlkIFT|ZTEq?HDFrG&EXzAY+CUQ41Q!Ni@T3nO)iv{@nuAplN%Z~orrNlv zgReiF53CT~!7Nc5OglISH`=-;=XqxHe&mC(^@K#42)Ud7Zt_dqGw$J?Z{S>L)R^h2yvb(bX-KoTF66kY{~5jjiIABd3T;5-w-Q|DfIGA+KH2>Q7S&yuo^MNp;95zq*)BB z(glH<=jq~{Zn8!Uq9j(@wQ9%uFUjZ9E%;WuHVbF_?N=a4; z_|(=l7k%^OWA+9WjRM`T9{$Z)d+qrFu`6`aH}<;zl4CUg)UR*(ztHYU^@)KPrvgRg zRbCJW;i1@{qF7wNsq6=Z2wF*))1o{3it8#(FS;hPpR?Bc;+^RpaQwIUcIb^KY!0+_ zQ(F&eV~GfP{idHDI0kEeaKdMIeE*hnwwrm}*FL?+N4ERUF`sM8Y6bXn;}yqGo;dzz z=Y4I=nD$eS-Dl3WGe5c8dw+51v7UaxUpnAp56%C_caQu0?jN2F;Joi2dgl$NerSiS z{`SJ6YcD?fx=W7!+^0VXV9#CWoO;gOZD&op?x#mzbmmvUwDne--g3=}zxm}U(m3kd;I55`sQ9gJ?E>U2)>M|K~SO9 z1Oi3i>(9@<`sDpTTKv|^UtV_HvgKaqO{N(0e&;Qi! z@7-?e8O35QfARVw4%_2`pWiiW^Nj}<-~7@mOLqRiR{MTtr`P^``HTO2bJpe?A9ldU zCX5^NjW6#h%RVD?p=M?2Seg_~ws^&ep82xpf~!6Bbw%!rM0Y$0R7*7F2N4Y~euATM zRwsdh!GGSz*7C@59$w1zwLp_#E;{SWJzIYH#>`Gfz42$ZucylQX{5)!Ba29rKH8?=WYJsZ)A( z+3WQGzWtFW?*Gw6SKRaLbFZ&iJJ8JYsT=nE`o5>y+iLecu;75bKD75?=TDwE{>>$; z_WkTm7hQSJb(b9dZ##c$yRBy|eS6JQ&;E;m-99qAv!iY5wnzN-!M~h&$`|I|F@NFW z%sl{f9+Q2oX`=5I4=(<4s2V*71p{Pe1OLyscTRw{NA(Nx>m>X>4GqgvKIJ82Rp znW=st4@FXVI51?2;)KAt6A-l-Uh?di_w23$Jbwt+J^quz{DEr45SmBtId_wdCT+9T zw9oFjL!+5*v(@xH4?O3|-=1G@G|xEs3sa}`G@JQ(m(Kgb-n)Eqw>evFvB?+q-nqAb zc={$A9CGxfix*sd@m2TqzCQPv=U&}(<4OJf!%zR^)t{e#gk?Vc+x!3cvO6z1_wWlZ zzvl-hAJEy+w*59UvYJ`&_t*b$#~C}mZ_CZ5PxSrIg z;MO}I`=47+@9OH9|Ky8{m#mz7G1ip~@1M1Ufms4*FW1v6@0 z`A9tAsmWY0J_Y(kaxb=_2Bh6FKzUhiz{I0uu%mI6U zh=5NXcNtJn11e)r>t?f>F{xij|MbD{uJy&L7xnm(ToXsh~B^li-x|t=Y}0PYYAmj005>xy<<_{NOk}CA1qT z;Jq5C9kn)?4m1ZjA3!#SP(wa6WuI$g2xpta@BH>#&_$d{2l|AoS?T6OG`UM#l8EHZR=-Wu}vE-G=57X~4VHH$=2GT?QICO0;zRk#Vpf-j~2MAp2qRtJu z*2#Gt+#n*#2hr>UH&_4mMB5lHPQvh8PrviqZ-wrk6#K2IOkA{Yk=I6|jSYcysbW=B z#jz@;JjFpBWtFfBGf@&8lae49X>~4;j<8hRd`hf!{G3ps+co1rfe;awS=LnZLkIzG zfZEY9iKrc5ZuX(M7F@I|Q681-2m|3fs{o4C$jHhVRkVzjRYp}|ZHZoAJ_HFNJQ3uU z`&z|WQJ>iAI!OU=t4}0k$)*t*4xxQI?v zMB826OROPCv;pgu6dI@^R)v+2y^o7EWkNbCx6fU>)i6Dwxv3JltJ2F(FmQ=N&r!$Cgwg;sJyFI9eTtglD6Rqaz&+`PZ{#>Oe`cTMKAMw@yxRE?H!m@1(l>dtE^Nk!)J;GHTn}ps>CTk zf_6e!KbTu?;!$_fu*pyNlBjBI zhGY0H>Jf{3MhTp?chGVi++`5~(8#fpsPWlahRc^p&U;Cf<7WxoUfo z*%}hHNKg$*50FuH(yrPl?cpEAO-~SrZSgoX2a26RlTQ`RZzJqcAeT=k#BGuXvf5ouT9Yal0d(S z%HuB}8RDV#m}0}5(y~PHq1Zq|d-0L(mv+?rzbKzXx~YY>;gVO17CTKPk*CVFh;*%R zlSX!=5Iu!h3>%d0EQvZON@5b-Cj;qhDuBU;jPM!aF(I7@6Gg8j-2y5G`^s}KCNhb! zVbtm{@Mwy@rSIQL%()`_q@9zJGNMGCnqp>w?3ob9A2U^KDa2S`g63q4jD_A0ms%-W zifWAtW;*o6gs5ZG|Dm-3K;pqxpsks}>_j_D8HlQCI8y{E$)qsZA4*O>NV!u1eGHwR*pz0Z z3!0{eaw{Z@TSE)w_lVZq(bJ97Zp3&puGqlQNFJmQKDTgxRneikF~hpVihUcK7!AY@ zS0*H2nbql4d5O2PXJ}#b}FiZFvf>?R8y-8;42+`s+Le)gj?YHVPd>Q z7Avks z5CL0;>u_jw#}F;t)Q|?%K1$B!Oy?RWkdgj{YyuJTLrL!z){!tlk5{KsYP}i@N#{VW z7wN0E9+j_OEf*lcMrR&L(8^yAzC#7bI--T-Sh?aUIm$Z?b zd&$JCT~c0Ow2aX$^Si-L^Z?W(CKF~^I0=wIC@a{lwcDbWyE+4` zq=wWC*Gh%MzUL$pk_aUkl1%A9tR!3?4U$4@94U6oD<#JTE7E`^HzJ)3MWG6m5vRU; zY>vcKA(n&3V^LJUh(A*~pe=hK)f^c%tq`IL`&^YW zqqOA_Dv3jqfWxhnVT1z&#axdMrWV>xCey=OSM+Y1t< zSp+I6pCr&LBgjOfhO>#zX%Ruk;q>Vq_+G{;wopAxwOUT6A@RHNrb_lK{%2&XGcos= zH5lYF_0ozaoQTxtQH)vW@2!hQ7ebOR<3(1_p}vt zW|Te9B2{qYZKit->ZDs4Srna6e6U8Pz*W|Pv>*;iD7$soRm~)B#rZyCjrmt{FF)0!Gl8=JNaNuU&)>g!2{N&iwmoUa0XEC3Rt1Fpn190e$C z<+COUOIrVeCVI2fK(InzaZ46cYGAlBV3s3LRk>4uAKJ*YF*EEi*Se@}JlFy@BSk!^ z0K%xnsaNBAN%W$B7kNin`BZIS%kF6jFlc!oC0nX7J0yhnsnFGiFV(9Ei8axRtfEY-WM zHEChExQazl$P8B-8RqpYI`gO@LQAm7!v!`62qt5y!8Sk{bxd?zciUt;QZz&Wa<)y_ z1_0O*vcttBnk)&~LOBTqSSw+xNo+Lwmqy3?D!D}^xW;hE2wh35pg9vQvWQSvS zC6U`8LMD53x;bOSF(n|B2US735)Y-aZlM<7u#DJK@0ya)7Pq}nx zD9q?%Ld_}qwr(;RC}S{2Rs(>^0ETTiN#~qLRv`xR#nRR)%?y0c43=ZXO_;60qta|b zoMH%7@u#G%RV|BYk$F)UVjfNRmIWVSG;K2ZxK+ZKt6qv!DgzLiF0Qo!HJA+b)nK63 z;Y^Ti0ARK}vYI$|#Zji{zGf;_VkJ78$>E30iKOdxp-fd&iF6rDeo?SK^7TqS9kr16 z^1-4?(I%quxM2xbNH0_7*x3(IVJ4V1ri>^9)j01bn?h%*9rXfA-^R`Au5C6D$j#PjTI_%NHSTP{h;ltqy>*=_XT`h zBh$uILp}m-QZ^RU22&$u&IbT+K8W11ZGiJavA9Ek8c~I0wEEmpj8ImU!AmBo7#a5x zG+STumql|$BnfA&g&5WOgsKxVN&;Ei?Q}4V>ck9yxad+x8B7Mw**1}lf$3nXfe73r z+k|Zp8r*CkZ@A#c4*Q6+7A`HPIKQiik7*P%JQIEODOIEi9h`_&kxiP`CrX(B)dxah zd=-rA5}csIZ|2mlmh3Hie4@x8))*PU;2c>e*SZLXsfN5Cw#hKWmUx8oI&6~xGzVgD z5SNZr6Tk^-#x?VL6sWk{mWX)moi6ljH{t0gF^?#NouROJuKXJq4lKO(LCr6BaH@ddVeo@QSG z;mPRfmQ+^35)BLur%4*7#FfzDFKhJ1v*ILPSt7%;c13*cpU`zlgF)f;$dPaC!?)mK zQkk@kQqe%{?e9TbCZR74P;-{R=0ujWaj12IY7E08E6CQtO*9&o>y$TK@m;geA1@<@ zUCLaeq+3-bF5XpQn_2-2(fLtw&CDn(^YpJo6-ZzkakQzBzyaTIoEENtKu^6#B(N zY48e{MyT_$9d-jNG$U9H5RdvT(RI*6>7`=is!F(OZ-7Pk7H2h<;{(LL7tVyTfys!Q zK!dXJsEsowvkcT%g9h2wDIWnh**4wd=L6pQg>koX_;Cvsh45m_I$e(@t#IdwVo%v} zs|W3;a5?lX*#q6UQp|ZzZdHbN$*?uF&gl`ni53)IIbfhxpkS0Yz$3^eP+PYp7;Cw{ z2DX8G7|jvO1@uS&Q9b~;<|o2Y!RT3pL?=|(Qi(5>RzD30eC{^dK<3J{MuMQkq5?5U zSH=(lCl7R9u82g^W;eQGiDeuYj&kNfxEgBhpc+vJ+acsbXzNCM4+?ab`(S})KR5aa zjR+BQBeF5vL)Q}5rMw60%>%ar<D;cFv};# zm`ZV{)Lm>D49d_P0DxvcH~UJ7Nj0uak-b?@ zNJ-9b>qQ&|kg5D*sng2l(d!>ZLL5N_V4&B9%J{5om?hm-IeoO!SC&Xdb>9tE@01~c zKZdsH*T=NZ-chV}_pPiod`K+>oFs@;et4=JZ;%pR!mP8jk4kEFMJKuh77SfF;oDtT z;FIC@DAY2=<~LL&o|NM9X*N=p(=&6@*EX!*{|*2iXDTJ@s^fnE0000 Date: Tue, 12 Mar 2019 18:07:42 +0800 Subject: [PATCH 056/108] =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/shopxo.sql | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/config/shopxo.sql b/config/shopxo.sql index 41e30a5c7..93026870e 100755 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -11,7 +11,7 @@ Target Server Version : 50722 File Encoding : utf-8 - Date: 03/11/2019 17:57:45 PM + Date: 03/12/2019 18:07:16 PM */ SET NAMES utf8mb4; @@ -357,7 +357,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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1711', '步', '/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', '11', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '2', '', '/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', '51', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '436', '步', '/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', '0', '152', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '320', '步', '/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', '53', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '66', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '14', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

      \"d-1.jpg\"/

      \"d-2.jpg\"/

      ', '3', '0', '15', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551751113'); +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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '12', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '2', '', '/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', '51', '', '/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', '0', '153', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '320', '步', '/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', '53', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '66', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '14', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

      \"d-1.jpg\"/

      \"d-2.jpg\"/

      ', '3', '0', '15', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551751113'); COMMIT; -- ---------------------------- @@ -371,13 +371,13 @@ CREATE TABLE `s_goods_browse` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; -- ---------------------------- -- Records of `s_goods_browse` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1551858521'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552287523'); +INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552362006'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552287523'), ('6', '2', '77', '1552380261', '1552380261'); COMMIT; -- ---------------------------- @@ -521,7 +521,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', '436', '0.00', '', '', '3200.00', '1547452798'), ('25', '6', '2998.90', '320', '0.00', '', '', '3200.00', '1547453157'), ('27', '8', '356.00', '35', '0.00', '', '', '672.00', '1547454269'), ('37', '9', '120.00', '12', '0.00', '', '', '160.00', '1547454828'), ('38', '9', '120.00', '87', '0.00', '', '', '160.00', '1547454828'), ('39', '9', '120.00', '13', '0.00', '', '', '160.00', '1547454828'), ('40', '9', '120.00', '76', '0.00', '', '', '160.00', '1547454828'), ('41', '9', '136.00', '43', '0.00', '', '', '188.00', '1547454828'), ('42', '9', '136.00', '56', '0.00', '', '', '188.00', '1547454828'), ('43', '9', '136.00', '21', '0.00', '', '', '188.00', '1547454828'), ('44', '9', '158.00', '243', '0.00', '', '', '216.00', '1547454828'), ('45', '9', '158.00', '45', '0.00', '', '', '216.00', '1547454828'), ('46', '10', '228.00', '36', '0.00', '', '', '568.00', '1547455375'), ('47', '11', '258.00', '367', '0.00', '', '', '268.00', '1547455700'), ('53', '2', '6050.00', '100', '0.00', '', '', '6800.00', '1547458880'), ('54', '2', '6600.00', '200', '0.00', '', '', '7200.00', '1547458880'), ('55', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('56', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1547458880'), ('57', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1547458880'), ('58', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('59', '2', '4500.00', '100', '0.00', '', '', '6800.00', '1547458880'), ('60', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1547458880'), ('61', '2', '5500.00', '61', '0.00', '', '', '6000.00', '1547458880'), ('71', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1547485917'), ('78', '7', '168.00', '320', '0.00', '', '', '760.00', '1547540607'), ('109', '12', '128.00', '12', '0.50', 'gg11', 'txm11', '188.00', '1551064315'), ('110', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1551064315'), ('111', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1551064315'), ('112', '12', '118.00', '46', '457.60', 'gg44', 'txm44', '150.00', '1551064315'), ('113', '12', '118.00', '81', '37.00', 'gg55', 'txm55', '150.00', '1551064315'); +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', '320', '0.00', '', '', '3200.00', '1547453157'), ('27', '8', '356.00', '35', '0.00', '', '', '672.00', '1547454269'), ('37', '9', '120.00', '12', '0.00', '', '', '160.00', '1547454828'), ('38', '9', '120.00', '87', '0.00', '', '', '160.00', '1547454828'), ('39', '9', '120.00', '13', '0.00', '', '', '160.00', '1547454828'), ('40', '9', '120.00', '76', '0.00', '', '', '160.00', '1547454828'), ('41', '9', '136.00', '43', '0.00', '', '', '188.00', '1547454828'), ('42', '9', '136.00', '56', '0.00', '', '', '188.00', '1547454828'), ('43', '9', '136.00', '21', '0.00', '', '', '188.00', '1547454828'), ('44', '9', '158.00', '243', '0.00', '', '', '216.00', '1547454828'), ('45', '9', '158.00', '45', '0.00', '', '', '216.00', '1547454828'), ('46', '10', '228.00', '36', '0.00', '', '', '568.00', '1547455375'), ('47', '11', '258.00', '367', '0.00', '', '', '268.00', '1547455700'), ('53', '2', '6050.00', '100', '0.00', '', '', '6800.00', '1547458880'), ('54', '2', '6600.00', '200', '0.00', '', '', '7200.00', '1547458880'), ('55', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('56', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1547458880'), ('57', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1547458880'), ('58', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('59', '2', '4500.00', '99', '0.00', '', '', '6800.00', '1547458880'), ('60', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1547458880'), ('61', '2', '5500.00', '61', '0.00', '', '', '6000.00', '1547458880'), ('71', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1547485917'), ('78', '7', '168.00', '320', '0.00', '', '', '760.00', '1547540607'), ('109', '12', '128.00', '12', '0.50', 'gg11', 'txm11', '188.00', '1551064315'), ('110', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1551064315'), ('111', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1551064315'), ('112', '12', '118.00', '46', '457.60', 'gg44', 'txm44', '150.00', '1551064315'), ('113', '12', '118.00', '81', '37.00', 'gg55', 'txm55', '150.00', '1551064315'); COMMIT; -- ---------------------------- @@ -611,13 +611,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=9 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; -- ---------------------------- -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552272529'); +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552272529'), ('9', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552361991'), ('10', '77', '订单支付', '订单支付成功，金额2499元', '2', '1', '0', '0', '0', '0', '1552362074'), ('11', '77', '订单发货', '订单已发货', '2', '1', '0', '0', '0', '0', '1552362108'), ('12', '77', '订单支付', '订单支付成功，金额4500元', '3', '1', '0', '0', '0', '0', '1552380271'), ('13', '77', '订单发货', '订单已发货', '3', '1', '0', '0', '0', '0', '1552380288'); COMMIT; -- ---------------------------- @@ -696,13 +696,13 @@ CREATE TABLE `s_order` ( KEY `shop_id` (`shop_id`), KEY `status` (`status`), KEY `pay_status` (`pay_status`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单'; -- ---------------------------- -- Records of `s_order` -- ---------------------------- BEGIN; -INSERT INTO `s_order` VALUES ('1', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'); +INSERT INTO `s_order` VALUES ('1', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'), ('2', '20190312114031822173', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '73107853468716', '2', '3', '1', '0.00', '2499.00', '2499.00', '2499.00', '1552362074', '1552362031', '1552362108', '0', '0', '0', '0', '0', '0', '0', '0', '1552362031', '1552362108'), ('3', '20190312164430579995', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '767', '2', '3', '1', '0.00', '4500.00', '4500.00', '4500.00', '1552380271', '1552380270', '1552380288', '0', '0', '0', '0', '0', '0', '0', '0', '1552380270', '1552380288'); COMMIT; -- ---------------------------- @@ -751,13 +751,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=5 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单详情'; -- ---------------------------- -- Records of `s_order_detail` -- ---------------------------- BEGIN; -INSERT INTO `s_order_detail` VALUES ('1', '92', '1', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0', '', '', '1551239422', '0'), ('2', '92', '1', '9', '0', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '188.00', '136.00', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '2', '0', '', '', '1551239422', '0'); +INSERT INTO `s_order_detail` VALUES ('1', '92', '1', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0', '', '', '1551239422', '0'), ('2', '92', '1', '9', '0', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '188.00', '136.00', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '2', '0', '', '', '1551239422', '0'), ('3', '77', '2', '5', '0', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '2499.00', '', '1', '0', '', '', '1552362031', '0'), ('4', '77', '3', '2', '0', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6800.00', '4500.00', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e8c\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"32G\"}]', '1', '0', '', '', '1552380270', '0'); COMMIT; -- ---------------------------- @@ -778,13 +778,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=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单商品库存变更日志'; +) ENGINE=InnoDB AUTO_INCREMENT=5 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', '6', '2', '321', '320', '0', '0', '1551239424'), ('2', '1', '9', '2', '598', '596', '0', '0', '1551239424'); +INSERT INTO `s_order_goods_inventory_log` VALUES ('1', '1', '6', '2', '321', '320', '0', '0', '1551239424'), ('2', '1', '9', '2', '598', '596', '0', '0', '1551239424'), ('3', '2', '5', '2', '436', '435', '0', '0', '1552362074'), ('4', '3', '2', '2', '1711', '1710', '0', '0', '1552380271'); COMMIT; -- ---------------------------- @@ -804,13 +804,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=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单状态历史纪录'; +) ENGINE=InnoDB AUTO_INCREMENT=6 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', '系统', '1551239424'); +INSERT INTO `s_order_status_history` VALUES ('1', '1', '1', '2', '支付[待付款-待发货]', '0', '系统', '1551239424'), ('2', '2', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552362074'), ('3', '2', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552362108'), ('4', '3', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552380271'), ('5', '3', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552380288'); COMMIT; -- ---------------------------- @@ -833,13 +833,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=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付日志'; -- ---------------------------- -- Records of `s_pay_log` -- ---------------------------- BEGIN; -INSERT INTO `s_pay_log` VALUES ('1', '92', '1', '', '用户-fux***com', '3270.90', '3270.90', '订单支付', 'DeliveryPayment', '货到付款', '1', '1551239424'); +INSERT INTO `s_pay_log` VALUES ('1', '92', '1', '', '用户-fux***com', '3270.90', '3270.90', '订单支付', 'DeliveryPayment', '货到付款', '1', '1551239424'), ('2', '77', '2', '', '用户-龚哥哥', '2499.00', '2499.00', '订单支付', 'DeliveryPayment', '货到付款', '1', '1552362074'), ('3', '77', '3', '', '用户-龚哥哥', '4500.00', '4500.00', '订单支付', 'DeliveryPayment', '货到付款', '1', '1552380271'); COMMIT; -- ---------------------------- @@ -867,13 +867,13 @@ CREATE TABLE `s_payment` ( PRIMARY KEY (`id`), UNIQUE KEY `payment` (`payment`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式'; -- ---------------------------- -- Records of `s_payment` -- ---------------------------- BEGIN; -INSERT INTO `s_payment` VALUES ('1', '货到付款', 'DeliveryPayment', '', '0.0.1', '不限', '送货上门后收取货款', 'Devil', 'http://shopxo.net/', '', '', '[\"pc\",\"h5\",\"app\",\"alipay\",\"weixin\",\"baidu\"]', '1', '1', '0', '1551238240', '1551238244'); +INSERT INTO `s_payment` VALUES ('2', '货到付款', 'DeliveryPayment', '', '0.0.1', '不限', '送货上门后收取货款', 'Devil', 'http://shopxo.net/', '', '', '[\"pc\",\"h5\",\"app\",\"alipay\",\"weixin\",\"baidu\"]', '1', '1', '0', '1552362056', '1552362059'); COMMIT; -- ---------------------------- @@ -890,13 +890,13 @@ CREATE TABLE `s_plugins` ( PRIMARY KEY (`id`), UNIQUE KEY `plugins` (`plugins`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; +) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; -- ---------------------------- -- 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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u540e\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1551239173'), ('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\",\"right_top_rec_name\":\"\",\"middle_new_name\":\"\",\"right_top_goods_name\":\"\",\"middle_new_page_number\":\"15\",\"category_ids\":\"12,7,6,4,3,2,1\",\"pluginsname\":\"answers\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"basesave\"}', '1', '1551853705', '1552296663'); +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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u540e\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1551239173'), ('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\",\"right_top_rec_name\":\"\",\"middle_new_name\":\"\",\"right_top_goods_name\":\"\",\"middle_new_page_number\":\"15\",\"category_ids\":\"12,7,6,4,3,2,1\",\"pluginsname\":\"answers\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"basesave\"}', '1', '1551853705', '1552296663'), ('23', 'expressforkdn', '{\"ebid\":\"1301013\",\"appkey\":\"ab11f813-811b-4b4b-9fbd-5f79886ec840\",\"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', '1552385092'); COMMIT; -- ---------------------------- @@ -1191,7 +1191,7 @@ CREATE TABLE `s_user` ( -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '371043', 'a9484d6b05ec225a5a10db9980bda758', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1007', '0', '0', '0', '0', '1552297232'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '0', '681141', '0461e68ca574a0d7622e7c078a1d73c3', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '10', '0', '0', '0', '1551173897', '1551239413'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '749260', '92b6a30c6014c9eb880e837b7a68c536', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1012', '0', '0', '0', '0', '1552361991'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '0', '681141', '0461e68ca574a0d7622e7c078a1d73c3', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '10', '0', '0', '0', '1551173897', '1551239413'); COMMIT; -- ---------------------------- @@ -1217,13 +1217,13 @@ CREATE TABLE `s_user_address` ( PRIMARY KEY (`id`), KEY `user_id` (`user_id`), KEY `is_enable` (`is_delete_time`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户地址'; +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户地址'; -- ---------------------------- -- Records of `s_user_address` -- ---------------------------- BEGIN; -INSERT INTO `s_user_address` VALUES ('1', '92', '', '2323', '17602128368', '1', '37', '567', '23', '116.4113820000', '39.9184710000', '0', '0', '1551238222', '0'); +INSERT INTO `s_user_address` VALUES ('1', '92', '', '2323', '17602128368', '1', '37', '567', '23', '116.4113820000', '39.9184710000', '0', '0', '1551238222', '0'), ('2', '77', '', '绿色校园', '13222333333', '1', '38', '577', '333', '116.3911060000', '39.9422140000', '1', '0', '1552362027', '0'); COMMIT; -- ---------------------------- @@ -1241,13 +1241,13 @@ CREATE TABLE `s_user_integral_log` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; -- ---------------------------- -- Records of `s_user_integral_log` -- ---------------------------- BEGIN; -INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'); +INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'), ('6', '77', '1', '1007', '1012', '登录奖励积分', '0', '1552361991'); COMMIT; SET FOREIGN_KEY_CHECKS = 1; From 6c79fec45d0c1783a83f8000db03307048b187ea Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 12 Mar 2019 18:26:15 +0800 Subject: [PATCH 057/108] =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/view/default/order/detail.html | 14 ++++++++++++++ .../plugins/view/answers/admin/sliderinfo.html | 2 +- application/service/PluginsAdminService.php | 2 +- application/service/ThemeService.php | 2 +- public/static/index/default/css/order.detail.css | 5 +++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html index 056f3f39f..b740fb9c8 100755 --- a/application/index/view/default/order/detail.html +++ b/application/index/view/default/order/detail.html @@ -205,6 +205,20 @@ {{if in_array($data['status'], [4,5,6])}} {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
      + plugins_service_order_handle_operation_html +
      + {{/if}} + {{if !empty($data['plugins_service_order_handle_operation_html']) and is_array($data['plugins_service_order_handle_operation_html'])}} + {{foreach $data.plugins_service_order_handle_operation_html as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} {{if in_array($data['status'], [3,4])}}
      diff --git a/application/plugins/view/answers/admin/sliderinfo.html b/application/plugins/view/answers/admin/sliderinfo.html index 0d2f6f03a..97fc7d37d 100644 --- a/application/plugins/view/answers/admin/sliderinfo.html +++ b/application/plugins/view/answers/admin/sliderinfo.html @@ -23,7 +23,7 @@
      - +
      diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php index 1bb49c8ee..e7a1cab53 100755 --- a/application/service/PluginsAdminService.php +++ b/application/service/PluginsAdminService.php @@ -867,7 +867,7 @@ php; } // 文件格式化校验 - $type = array('application/zip', 'application/octet-stream'); + $type = array('application/zip', 'application/octet-stream', 'application/x-zip-compressed'); if(!in_array($_FILES['file']['type'], $type)) { return DataReturn('文件格式有误，请上传zip压缩包', -2); diff --git a/application/service/ThemeService.php b/application/service/ThemeService.php index 203fc4df4..7c3396724 100755 --- a/application/service/ThemeService.php +++ b/application/service/ThemeService.php @@ -100,7 +100,7 @@ class ThemeService } // 文件格式化校验 - $type = array('application/zip', 'application/octet-stream'); + $type = array('application/zip', 'application/octet-stream', 'application/x-zip-compressed'); if(!in_array($_FILES['theme']['type'], $type)) { return DataReturn('文件格式有误，请上传zip压缩包', -2); diff --git a/public/static/index/default/css/order.detail.css b/public/static/index/default/css/order.detail.css index 3f13443c5..21b74169f 100755 --- a/public/static/index/default/css/order.detail.css +++ b/public/static/index/default/css/order.detail.css @@ -137,6 +137,11 @@ ul.progress li.current .title { .order-base .logistics { margin-top: 10px; } +.order-base .am-btn-block { + width: auto; + padding-left: 1em; + padding-right: 1em; +} @media only screen and (min-width: 641px) { .order-base .base-left, .order-base .base-right { width: 50%; From 1359e9a240e1a248ab2730acf6d2114ffc3cb5e7 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 12 Mar 2019 18:27:55 +0800 Subject: [PATCH 058/108] =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/expressforkdn/Admin.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/plugins/expressforkdn/Admin.php b/application/plugins/expressforkdn/Admin.php index f29d24fb1..13791d3bd 100644 --- a/application/plugins/expressforkdn/Admin.php +++ b/application/plugins/expressforkdn/Admin.php @@ -3,7 +3,6 @@ namespace app\plugins\expressforkdn; use think\Controller; use app\service\PluginsService; -use think\facade\Hook; use app\service\ExpressService; /** From 08395a536d89a14d5619f4be8618ab5a3b2f6619 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 12 Mar 2019 18:33:32 +0800 Subject: [PATCH 059/108] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/view/default/order/detail.html | 10 +++++----- application/index/view/default/order/index.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html index b740fb9c8..afa1f0d02 100755 --- a/application/index/view/default/order/detail.html +++ b/application/index/view/default/order/detail.html @@ -191,19 +191,19 @@ 您可以 {{/if}} {{if in_array($data['status'], [0,1])}} - + {{/if}} {{if in_array($data['status'], [1])}} - + {{/if}} {{if in_array($data['status'], [3])}} - + {{/if}} {{if in_array($data['status'], [4]) and $data['user_is_comments'] eq 0}} - 评价 + 评价 {{/if}} {{if in_array($data['status'], [4,5,6])}} - + {{/if}} diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html index eecbab79e..d971298d5 100755 --- a/application/index/view/default/order/index.html +++ b/application/index/view/default/order/index.html @@ -190,19 +190,19 @@
    + @@ -98,6 +99,7 @@ 未回复 {{/if}} + diff --git a/application/index/view/default/public/header_top_nav.html b/application/index/view/default/public/header_top_nav.html index 45cf5b816..acbd603cc 100755 --- a/application/index/view/default/public/header_top_nav.html +++ b/application/index/view/default/public/header_top_nav.html @@ -20,11 +20,11 @@ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
    - plugins_service_header_navigation_top_left + plugins_view_header_navigation_top_left
    {{/if}} - {{if !empty($plugins_service_header_navigation_top_left_data) and is_array($plugins_service_header_navigation_top_left_data) and (!isset($is_footer) or $is_footer eq 1)}} - {{foreach $plugins_service_header_navigation_top_left_data as $hook}} + {{if !empty($plugins_view_header_navigation_top_left_data) and is_array($plugins_view_header_navigation_top_left_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{foreach $plugins_view_header_navigation_top_left_data as $hook}} {{if is_string($hook) or is_int($hook)}} {{$hook|raw}} {{/if}} diff --git a/application/index/view/default/user/email_reg_info.html b/application/index/view/default/user/email_reg_info.html index 48a84b4aa..59fec28e4 100755 --- a/application/index/view/default/user/email_reg_info.html +++ b/application/index/view/default/user/email_reg_info.html @@ -23,8 +23,23 @@ -
    {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
    + plugins_view_user_email_reg_info +
    + {{/if}} + {{if !empty($plugins_view_user_email_reg_info_data) and is_array($plugins_view_user_email_reg_info_data)}} + {{foreach $plugins_view_user_email_reg_info_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
    +
    diff --git a/application/index/view/default/user/sms_reg_info.html b/application/index/view/default/user/sms_reg_info.html index 15ba6c3c3..6f59b3b34 100755 --- a/application/index/view/default/user/sms_reg_info.html +++ b/application/index/view/default/user/sms_reg_info.html @@ -23,8 +23,23 @@ -
    {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
    + plugins_view_user_sms_reg_info +
    + {{/if}} + {{if !empty($plugins_view_user_sms_reg_info_data) and is_array($plugins_view_user_sms_reg_info_data)}} + {{foreach $plugins_view_user_sms_reg_info_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
    +
    坏境环境 所需状态 当前状态 是否符合
    用户信息 联系信息内容是否显示标题内容 回复内容回复时间 创建时间是否显示 更多 操作
    {{$v.content}}{{$v.title}}{{$v.content}} + {{if $v['is_reply'] eq 1}} + {{$v.reply}} + {{else /}} + 未回复 + {{/if}} + {{$v.reply_time}}{{$v.add_time}} {{$v.reply}}{{$v.add_time}} 查看更多
    @@ -130,6 +148,9 @@ {{/if}} +
    标题
    +
    {{if empty($v['title'])}}未填写{{else /}}{{$v.title}}{{/if}}
    +
    内容
    {{$v.content}}
    @@ -137,7 +158,16 @@
    {{if empty($v['is_show_text'])}}未填写{{else /}}{{$v.is_show_text}}{{/if}}
    回复内容
    -
    {{if empty($v['reply'])}}未填写{{else /}}{{$v.reply}}{{/if}}
    +
    + {{if $v['is_reply'] eq 1}} + {{$v.reply}} + {{else /}} + 未回复 + {{/if}} +
    + +
    回复时间
    +
    {{$v.reply_time}}
    创建时间
    {{$v.add_time}}
    diff --git a/application/index/controller/Article.php b/application/index/controller/Article.php index 617ade41b..754e616f9 100755 --- a/application/index/controller/Article.php +++ b/application/index/controller/Article.php @@ -11,6 +11,7 @@ namespace app\index\controller; use app\service\ArticleService; +use app\service\SeoService; /** * 文章详情 @@ -64,7 +65,7 @@ class Article extends Common } // 浏览器标题 - $this->assign('home_seo_site_title', $this->GetBrowserSeoTitle($article['data'][0]['title'], 1)); + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($article['data'][0]['title'])); // 获取分类和文字 $article_category_content = ArticleService::ArticleCategoryListContent(); diff --git a/application/index/controller/Category.php b/application/index/controller/Category.php index fe46204ba..e12ce71b5 100755 --- a/application/index/controller/Category.php +++ b/application/index/controller/Category.php @@ -10,6 +10,8 @@ // +---------------------------------------------------------------------- namespace app\index\controller; +use app\service\SeoService; + /** * 商品分类 * @author Devil @@ -41,6 +43,9 @@ class Category extends Common */ public function Index() { + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('商品分类', 1)); + return $this->fetch(); } } diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 613c887b3..74d7fdc34 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -255,38 +255,11 @@ class Common extends Controller */ private function NavInit() { - $navigation = NavigationService::Home(); + $navigation = NavigationService::Nav(); $this->nav_header = $navigation['header']; $this->nav_footer = $navigation['footer']; } - /** - * [GetBrowserSeoTitle 获取浏览器seo标题] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-02-25T14:21:21+0800 - * @param [string] $title [标题] - * @param [int] $type [页面类型 0, 1, 2] - * @return [string] [浏览器seo标题] - */ - protected function GetBrowserSeoTitle($title, $type) - { - switch($type) - { - case 0: - break; - - case 1: - $site_name = MyC('home_site_name'); - break; - - default: - $site_name = MyC('home_seo_site_title'); - } - return empty($title) ? $site_name : $title.' - '.$site_name; - } - /** * [_empty 空方法操作] * @author Devil diff --git a/application/index/controller/Customview.php b/application/index/controller/Customview.php index 5387e4914..532811110 100755 --- a/application/index/controller/Customview.php +++ b/application/index/controller/Customview.php @@ -11,6 +11,7 @@ namespace app\index\controller; use app\service\CustomViewService; +use app\service\SeoService; /** * 自定义页面 @@ -58,7 +59,7 @@ class CustomView extends Common CustomViewService::CustomViewAccessCountInc(['id'=>$id]); // 浏览器标题 - $this->assign('home_seo_site_title', $this->GetBrowserSeoTitle($data['data'][0]['title'], 1)); + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($data['data'][0]['title'])); $this->assign('data', $data['data'][0]); $this->assign('is_header', $data['data'][0]['is_header']); diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php index 1e68569d1..ddb2da5bc 100755 --- a/application/index/controller/Goods.php +++ b/application/index/controller/Goods.php @@ -11,6 +11,7 @@ namespace app\index\controller; use app\service\GoodsService; +use app\service\SeoService; /** * 商品详情 @@ -68,8 +69,11 @@ class Goods extends Common // 商品收藏总数 $ret['data'][0]['favor_count'] = GoodsService::GoodsFavorTotal(['goods_id'=>$id]); + // 商品数据 $this->assign('goods', $ret['data'][0]); - $this->assign('home_seo_site_title', $ret['data'][0]['title']); + + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($ret['data'][0]['title'])); // 二维码 $this->assign('qrcode_url', MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode(MyUrl('index/goods/index', ['id'=>$id], true, true)))])); diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php index 252260bc6..12bb426cd 100755 --- a/application/index/controller/Search.php +++ b/application/index/controller/Search.php @@ -12,6 +12,7 @@ namespace app\index\controller; use app\service\SearchService; use app\service\BrandService; +use app\service\SeoService; /** * 搜索 @@ -82,6 +83,9 @@ class Search extends Common // 参数 $this->assign('params', $this->params); + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('商品搜索', 1)); + return $this->fetch(); } } diff --git a/application/index/controller/User.php b/application/index/controller/User.php index 768f14ce9..a68ed8f8e 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -15,6 +15,7 @@ use app\service\OrderService; use app\service\GoodsService; use app\service\UserService; use app\service\BuyService; +use app\service\SeoService; /** * 用户 @@ -139,6 +140,9 @@ class User extends Common // 用户中心顶部钩子 $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_backend'=>false, 'user'=>$this->user])); + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户中心', 1)); + return $this->fetch(); } @@ -153,6 +157,9 @@ class User extends Common { if(empty($this->user)) { + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('密码找回', 1)); + return $this->fetch(); } else { $this->assign('msg', '已经登录了，如要重置密码，请先退出当前账户'); @@ -174,6 +181,9 @@ class User extends Common { if(empty($this->user)) { + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户注册', 1)); + return $this->fetch(); } else { $this->assign('msg', '已经登录了，如要注册新账户，请先退出当前账户'); @@ -198,6 +208,9 @@ class User extends Common { if(empty($this->user)) { + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户邮箱注册', 1)); + $this->assign('referer_url', $this->GetrefererUrl()); return $this->fetch(); } else { @@ -223,6 +236,9 @@ class User extends Common { if(empty($this->user)) { + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户短信注册', 1)); + $this->assign('referer_url', $this->GetrefererUrl()); return $this->fetch(); } else { @@ -248,6 +264,9 @@ class User extends Common { if(empty($this->user)) { + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户登录', 1)); + $this->assign('referer_url', $this->GetrefererUrl()); return $this->fetch(); } else { @@ -277,6 +296,9 @@ class User extends Common { if(empty($this->user)) { + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户登录', 1)); + $this->assign('referer_url', $this->GetrefererUrl()); return $this->fetch(); } else { diff --git a/application/plugins/answers/Hook.php b/application/plugins/answers/Hook.php index 2fa9566ca..d4e8ac633 100644 --- a/application/plugins/answers/Hook.php +++ b/application/plugins/answers/Hook.php @@ -11,6 +11,7 @@ namespace app\plugins\answers; use think\Controller; +use app\service\PluginsService; /** * 问答 - 钩子入口 @@ -36,8 +37,31 @@ class Hook extends Controller // 默认返回视图 } else { - return 'hello world!'; + // 大导航前面添加问答地址 + if(!empty($params['hook_name']) && $params['hook_name'] == 'plugins_service_navigation_header_handle') + { + if(is_array($params['header'])) + { + // 获取应用数据 + $ret = PluginsService::PluginsData('answers', ['images']); + if($ret['code'] == 0 && !empty($ret['data']['application_name'])) + { + $nav = [ + 'id' => 0, + 'pid' => 0, + 'name' => $ret['data']['application_name'], + 'url' => PluginsHomeUrl('answers', 'index', 'index'), + 'data_type' => 'custom', + 'is_show' => 1, + 'is_new_window_open' => 0, + 'items' => [], + ]; + array_unshift($params['header'], $nav); + } + } + } } + return DataReturn('无需处理', 0); } } ?> \ No newline at end of file diff --git a/application/plugins/answers/Index.php b/application/plugins/answers/Index.php index 621e4a329..9d8a49a56 100644 --- a/application/plugins/answers/Index.php +++ b/application/plugins/answers/Index.php @@ -14,6 +14,7 @@ use think\Controller; use app\service\PluginsService; use app\service\AnswerService; use app\service\UserService; +use app\service\SeoService; use app\plugins\answers\Service; /** @@ -65,6 +66,10 @@ class Index extends Controller $this->assign('plugins_answers_rc_list', []); } + // 浏览器标题 + $seo_name = empty($base['data']['application_name']) ? '问答' : $base['data']['application_name']; + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($seo_name, 1)); + return $this->fetch('../../../plugins/view/answers/index/index'); } @@ -100,9 +105,93 @@ class Index extends Controller $detail = Service::AnswerRow($params); $this->assign('plugins_answers_detail', $detail); + // 浏览器标题 + if(!empty($detail['data']['title'])) + { + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($detail['data']['title'])); + } else if(!empty($detail['data']['content'])) + { + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($detail['data']['content'])); + } + return $this->fetch('../../../plugins/view/answers/index/detail'); } + /** + * 搜索 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-11 + * @desc description + * @param [array] $params [输入参数] + */ + public function search($params = []) + { + if(input('post.answers_keywords')) + { + $answers_keywords = str_replace(['?', ' ', '+', '-'], '', trim(input('post.answers_keywords'))); + return redirect(PluginsHomeUrl('answers', 'index', 'search', ['answers_keywords'=>$answers_keywords])); + } else { + // 基础数据 + $base = PluginsService::PluginsData('answers', ['images']); + $this->assign('plugins_answers_data', isset($base['data']) ? $base['data'] : []); + + // 商品数据 + $goods = Service::GoodsList(); + $this->assign('plugins_answers_goods_list', $goods['data']['goods']); + + // 推荐问答 + if(!empty($base['data']['category_ids'])) + { + $answers = Service::AnswerList(['n'=>100, 'category_ids'=> $base['data']['category_ids']]); + $this->assign('plugins_answers_rc_list', $answers['data']); + } else { + $this->assign('plugins_answers_rc_list', []); + } + + // 获取搜索数据 + // 分页 + $number = 10; + + // 条件 + $keywords_arr = empty($params['answers_keywords']) ? [] : ['keywords'=>$params['answers_keywords']]; + $where = Service::AnswerListWhere(array_merge($params, $keywords_arr)); + + // 获取总数 + $total = AnswerService::AnswerTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => PluginsHomeUrl('answers', 'index', 'search'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + 'field' => 'id,title,content,add_time', + ); + $data = AnswerService::AnswerList($data_params); + $this->assign('plugins_answers_data_list', $data['data']); + + // 参数 + $this->assign('params', $params); + + // 浏览器标题 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('问答搜索', 1)); + + return $this->fetch('../../../plugins/view/answers/index/search'); + } + } + /** * 提问 * @author Devil diff --git a/application/plugins/answers/Service.php b/application/plugins/answers/Service.php index e62f6c55e..10adc5cbe 100644 --- a/application/plugins/answers/Service.php +++ b/application/plugins/answers/Service.php @@ -310,14 +310,15 @@ class Service } /** - * 问答列表 + * 条件 * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-06T21:31:53+0800 - * @param [array] $params [输入参数] + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-11 + * @desc description + * @param [array] $params [输入参数] */ - public static function AnswerList($params = []) + public static function AnswerListWhere($params = []) { // 条件 $where = [ @@ -328,7 +329,7 @@ class Service // 搜索关键字 if(!empty($params['keywords'])) { - $where[] = ['content', 'like', '%'.$params['keywords'].'%']; + $where[] = ['title|content', 'like', '%'.$params['keywords'].'%']; } // 指定问答id @@ -337,6 +338,19 @@ class Service $where[] = ['id', 'in', explode(',', $params['category_ids'])]; } + return $where; + } + + /** + * 问答列表 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + * @param [array] $params [输入参数] + */ + public static function AnswerList($params = []) + { // 字段 $field = empty($params['field']) ? 'id,name,title,content,reply,is_reply,reply_time,add_time' : $params['field']; @@ -344,7 +358,7 @@ class Service $data_params = array( 'm' => 0, 'n' => isset($params['n']) ? intval($params['n']) : 10, - 'where' => $where, + 'where' => self::AnswerListWhere($params), 'field' => $field, ); return AnswerService::AnswerList($data_params); diff --git a/application/plugins/answers/config.json b/application/plugins/answers/config.json index a73d7f7cd..aee1534c9 100644 --- a/application/plugins/answers/config.json +++ b/application/plugins/answers/config.json @@ -1,12 +1,12 @@ { "base":{ "plugins":"answers", - "name":"问答", + "name":"问答增强版", "logo":"\/static\/upload\/images\/plugins_answers\/2019\/03\/06\/1551853529634743.png", "author":"Devil", "author_url":"https:\/\/shopxo.net\/", "version":"1.0.0", - "desc":"问答系统", + "desc":"问答系统增强、独立首页、详情、搜索、可配置推荐问答及商品", "apply_terminal":[ "pc", "h5" @@ -17,6 +17,8 @@ "is_home":true }, "hook":{ - + "plugins_service_navigation_header_handle":[ + "app\\plugins\\answers\\Hook" + ] } } \ No newline at end of file diff --git a/application/plugins/view/answers/admin/baseinfo.html b/application/plugins/view/answers/admin/baseinfo.html index 38480c36b..308e06056 100755 --- a/application/plugins/view/answers/admin/baseinfo.html +++ b/application/plugins/view/answers/admin/baseinfo.html @@ -10,8 +10,13 @@ 返回 +
    + + +
    +
    - +
      {{if !empty($data['images_old'])}}
    • @@ -25,7 +30,7 @@
    - +
    @@ -41,22 +46,22 @@
    - +
    - +
    - +
    - +
    diff --git a/application/plugins/view/answers/admin/index.html b/application/plugins/view/answers/admin/index.html index 287c6c091..a8b9a5dfc 100644 --- a/application/plugins/view/answers/admin/index.html +++ b/application/plugins/view/answers/admin/index.html @@ -16,6 +16,17 @@ 编辑
    +
    + +
    + {{if empty($data['application_name'])}} + 未设置应用导航名称 + {{else /}} + {{$data.application_name}} + {{/if}} +
    +
    +
    diff --git a/application/plugins/view/answers/admin/sliderinfo.html b/application/plugins/view/answers/admin/sliderinfo.html index 10f9e5c45..0d2f6f03a 100644 --- a/application/plugins/view/answers/admin/sliderinfo.html +++ b/application/plugins/view/answers/admin/sliderinfo.html @@ -23,7 +23,7 @@
    - +
    diff --git a/application/plugins/view/answers/index/detail.html b/application/plugins/view/answers/index/detail.html index cfef4c142..d4a96fc74 100644 --- a/application/plugins/view/answers/index/detail.html +++ b/application/plugins/view/answers/index/detail.html @@ -14,7 +14,7 @@
    - +
    {{if isset($plugins_answers_detail['code']) and $plugins_answers_detail['code'] eq 0}} {{if !empty($plugins_answers_detail['data']['content'])}} @@ -46,11 +46,8 @@
    - -
    - 我要提问 - 我的提问 -
    + + {{include file="../../../plugins/view/answers/index/operation" /}}
    @@ -62,6 +59,7 @@ {{$plugins_answers_data.right_top_rec_name}} {{/if}} + 更多 »
    {{if !empty($plugins_answers_rc_list)}} @@ -93,6 +91,7 @@ {{$plugins_answers_data.right_top_goods_name}} {{/if}} + 更多 »
    {{if !empty($plugins_answers_goods_list)}}
    @@ -39,11 +40,8 @@
    - -
    - 我要提问 - 我的提问 -
    + + {{include file="../../../plugins/view/answers/index/operation" /}}
    @@ -55,6 +53,7 @@ {{$plugins_answers_data.right_top_rec_name}} {{/if}} + 更多 »
    {{if !empty($plugins_answers_rc_list)}} @@ -89,7 +88,7 @@
    -
    +

    {{if empty($plugins_answers_data['middle_new_name'])}} @@ -98,20 +97,21 @@ {{$plugins_answers_data.middle_new_name}} {{/if}}

    + 更多 »
    {{if !empty($plugins_answers_middle_answer_list)}} @@ -132,6 +132,7 @@ {{$plugins_answers_data.right_top_goods_name}} {{/if}} + 更多 »
    {{if !empty($plugins_answers_goods_list)}}
      diff --git a/application/plugins/view/answers/index/operation.html b/application/plugins/view/answers/index/operation.html new file mode 100644 index 000000000..4c97b5289 --- /dev/null +++ b/application/plugins/view/answers/index/operation.html @@ -0,0 +1,17 @@ + +
      + 我要提问 + 我的提问 +
      + + + +
      + + + + +
      + \ No newline at end of file diff --git a/application/plugins/view/answers/index/search.html b/application/plugins/view/answers/index/search.html new file mode 100644 index 000000000..4fa25ca5e --- /dev/null +++ b/application/plugins/view/answers/index/search.html @@ -0,0 +1,117 @@ +{{include file="public/header" /}} + + +{{include file="public/header_top_nav" /}} + + +{{include file="public/nav_search" /}} + + +{{include file="public/header_nav" /}} + + +{{include file="public/goods_category" /}} + + +
      + +
      + {{if !empty($plugins_answers_data_list)}} +
      +
      + +
      +
      + {{$page_html|raw}} + {{else /}} +
      没有相关数据
      + {{/if}} +
      + + +
      + + {{include file="../../../plugins/view/answers/index/operation" /}} + + +
      +
      +

      + {{if empty($plugins_answers_data['right_top_rec_name'])}} + 推荐问答 + {{else /}} + {{$plugins_answers_data.right_top_rec_name}} + {{/if}} +

      + 更多 » +
      +
      + {{if !empty($plugins_answers_rc_list)}} + + {{/if}} +
      +
      + + +
      +
      +

      + {{if empty($plugins_answers_data['right_top_goods_name'])}} + 推荐商品 + {{else /}} + {{$plugins_answers_data.right_top_goods_name}} + {{/if}} +

      + 更多 » +
      + {{if !empty($plugins_answers_goods_list)}} + + {{/if}} +
      +
      + + + {{include file="../../../plugins/view/answers/index/popup" /}} +
      + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/commongobacktop/admin/saveinfo.html b/application/plugins/view/commongobacktop/admin/saveinfo.html index c1c9a8ada..aff6f342d 100755 --- a/application/plugins/view/commongobacktop/admin/saveinfo.html +++ b/application/plugins/view/commongobacktop/admin/saveinfo.html @@ -11,7 +11,7 @@
      - +
      • @@ -22,7 +22,7 @@
      - +
      {{foreach $is_whether_list as $v}}
      - +
      @@ -26,7 +26,7 @@
      - +
      {{foreach $is_whether_list as $v}}
      - +
      % diff --git a/application/plugins/view/commonrightnavigation/admin/saveinfo.html b/application/plugins/view/commonrightnavigation/admin/saveinfo.html index e4ab7ad2a..7a4de4d26 100755 --- a/application/plugins/view/commonrightnavigation/admin/saveinfo.html +++ b/application/plugins/view/commonrightnavigation/admin/saveinfo.html @@ -11,7 +11,7 @@
      - +
        {{if !empty($data['alipay_mini_qrcode_images'])}}
      • @@ -25,7 +25,7 @@
      - +
        {{if !empty($data['alipay_fuwu_qrcode_images'])}}
      • @@ -39,7 +39,7 @@
      - +
        {{if !empty($data['weixin_mini_qrcode_images'])}}
      • @@ -53,7 +53,7 @@
      - +
        {{if !empty($data['weixin_fuwu_qrcode_images'])}}
      • @@ -78,7 +78,7 @@
      - +
      {{foreach $is_whether_list as $v}}
      - +
      {{foreach $is_whether_list as $v}}
      - +
      ~ diff --git a/application/plugins/view/commontopnotice/admin/saveinfo.html b/application/plugins/view/commontopnotice/admin/saveinfo.html index aadeb9a7a..fcb1ef0bb 100755 --- a/application/plugins/view/commontopnotice/admin/saveinfo.html +++ b/application/plugins/view/commontopnotice/admin/saveinfo.html @@ -11,12 +11,12 @@
      - +
      - +
      {{foreach $is_whether_list as $v}}
      - +
      ~ diff --git a/application/plugins/view/usercentertopnotice/admin/saveinfo.html b/application/plugins/view/usercentertopnotice/admin/saveinfo.html index c03f44f2d..ed9c29690 100755 --- a/application/plugins/view/usercentertopnotice/admin/saveinfo.html +++ b/application/plugins/view/usercentertopnotice/admin/saveinfo.html @@ -11,12 +11,12 @@
      - +
      - +
      ~ diff --git a/application/plugins/view/userloginrewardintegral/admin/saveinfo.html b/application/plugins/view/userloginrewardintegral/admin/saveinfo.html index 2f8a94646..a52c1e6ce 100755 --- a/application/plugins/view/userloginrewardintegral/admin/saveinfo.html +++ b/application/plugins/view/userloginrewardintegral/admin/saveinfo.html @@ -16,7 +16,7 @@
      - +
      {{foreach $is_whether_list as $v}}
      - +
      ~ diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/index.html b/application/plugins/view/usernotloginhidegoodsprice/admin/index.html index 5ea710202..6b1906b79 100755 --- a/application/plugins/view/usernotloginhidegoodsprice/admin/index.html +++ b/application/plugins/view/usernotloginhidegoodsprice/admin/index.html @@ -30,7 +30,7 @@
      - +
      {{if !empty($data['limit_terminal_text'])}} {{$data.limit_terminal_text}} diff --git a/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html b/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html index eca129908..b84cf86cb 100755 --- a/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html +++ b/application/plugins/view/usernotloginhidegoodsprice/admin/saveinfo.html @@ -11,7 +11,7 @@
      - +
    {{if in_array($order['status'], [0,1])}} - + {{/if}} {{if in_array($order['status'], [1])}} - 支付 + 支付 {{/if}} {{if in_array($order['status'], [3])}} - + {{/if}} {{if in_array($order['status'], [4]) and $order['user_is_comments'] eq 0}} - 评价 + 评价 {{/if}} {{if in_array($order['status'], [4,5,6])}} - + {{/if}} From 804012bfd2df689cf00083c0655bb821b6c1d74b Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Tue, 12 Mar 2019 23:39:42 +0800 Subject: [PATCH 060/108] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=99=BB=E5=BD=95=E5=A4=B1=E6=95=88=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=85=BC=E5=AE=B9=E6=80=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/expressforkdn/Hook.php | 2 +- public/static/index/default/css/order.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/plugins/expressforkdn/Hook.php b/application/plugins/expressforkdn/Hook.php index 6a3ac4ef9..6deebf954 100644 --- a/application/plugins/expressforkdn/Hook.php +++ b/application/plugins/expressforkdn/Hook.php @@ -85,7 +85,7 @@ class Hook extends Controller $(".plugins-expressforkdn-submit").on("click", function() { $.ajax({ - url:"'.PluginsAdminUrl('expressforkdn', 'hook', 'getexpinfo').'", + url:"'.PluginsHomeUrl('expressforkdn', 'hook', 'getexpinfo').'", type:"POST", dataType:"json", data: {express_id: $(this).data("exp-id"), express_number: $(this).data("exp-num")}, diff --git a/public/static/index/default/css/order.css b/public/static/index/default/css/order.css index bbd80e756..84b633e0a 100755 --- a/public/static/index/default/css/order.css +++ b/public/static/index/default/css/order.css @@ -90,7 +90,7 @@ table.data-ongoing .base-operate { border-top: 1px dashed #fff1f5; } * 商品列表 */ .goods-detail { position: relative; min-height: 80px; } -.goods-detail img { width: 80px; height: 80px; position: absolute; } +.goods-detail img { width: 80px; height: 80px; position: absolute; left: 0; } .goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; } .goods-title:hover { text-decoration: underline; } .goods-base { float: left; top: 0; margin-left: 85px; } From 77e21a40fd859cc661565156ffc0b6ea367af54f Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 13 Mar 2019 15:47:36 +0800 Subject: [PATCH 061/108] =?UTF-8?q?=E9=97=AE=E7=AD=94=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96+=E5=90=8E=E5=8F=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Admin.php | 8 +- application/admin/controller/Apphomenav.php | 6 +- application/admin/controller/Article.php | 6 +- application/admin/controller/Brand.php | 6 +- application/admin/controller/Customview.php | 6 +- application/admin/controller/Goods.php | 4 +- application/admin/controller/Power.php | 10 +- application/admin/controller/Slide.php | 6 +- application/admin/controller/User.php | 13 +- .../admin/view/default/answer/index.html | 2 + .../admin/view/default/sqlconsole/index.html | 2 +- application/plugins/answers/Admin.php | 6 +- application/plugins/answers/Index.php | 18 ++- application/plugins/answers/Service.php | 4 +- .../plugins/view/answers/admin/baseinfo.html | 48 ++++++- .../plugins/view/answers/admin/index.html | 31 +++++ .../plugins/view/answers/index/detail.html | 38 ++++-- .../plugins/view/answers/index/index.html | 126 ++++++++++++------ .../plugins/view/answers/index/search.html | 10 +- application/service/AnswerService.php | 18 +++ application/service/GoodsService.php | 2 +- public/static/plugins/css/answers/admin.css | 2 +- public/static/plugins/css/answers/index.css | 64 +++++++-- .../2019/03/13/1552463137211834.png | Bin 0 -> 48751 bytes 24 files changed, 330 insertions(+), 106 deletions(-) create mode 100644 public/static/upload/images/plugins_answers/2019/03/13/1552463137211834.png diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index f120f66ba..de6a37952 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -117,6 +117,7 @@ class Admin extends Common } // 管理员编辑 + $data = []; if(!empty($params['id'])) { $data_params = [ @@ -124,13 +125,14 @@ class Admin extends Common 'm' => 0, 'n' => 1, ]; - $data = AdminService::AdminList($data_params); - if(empty($data[0])) + $ret = AdminService::AdminList($data_params); + if(empty($ret[0])) { return $this->error('管理员信息不存在', MyUrl('admin/index/index')); } - $this->assign('data', $data[0]); + $data = $ret[0]; } + $this->assign('data', $data); // 角色 $role_params = [ diff --git a/application/admin/controller/Apphomenav.php b/application/admin/controller/Apphomenav.php index b4c6e7920..d2c3db9b6 100755 --- a/application/admin/controller/Apphomenav.php +++ b/application/admin/controller/Apphomenav.php @@ -109,6 +109,7 @@ class AppHomeNav extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -118,9 +119,10 @@ class AppHomeNav extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = AppNavService::AppHomeNavList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = AppNavService::AppHomeNavList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 所属平台 $this->assign('common_platform_type', lang('common_platform_type')); diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index 3987ef525..5b8332464 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -110,6 +110,7 @@ class Article extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -119,9 +120,10 @@ class Article extends Common 'where' => ['a.id'=>intval($params['id'])], 'field' => 'a.*', ); - $data = ArticleService::ArticleList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = ArticleService::ArticleList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index 3f356d345..6593f0de9 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -107,6 +107,7 @@ class Brand extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -116,9 +117,10 @@ class Brand extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = BrandService::BrandList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = BrandService::BrandList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php index 314f2c124..785ba0311 100755 --- a/application/admin/controller/Customview.php +++ b/application/admin/controller/Customview.php @@ -112,6 +112,7 @@ class CustomView extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -121,9 +122,10 @@ class CustomView extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = CustomViewService::CustomViewList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = CustomViewService::CustomViewList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index bbbc69978..803bafcf3 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -107,6 +107,7 @@ class Goods extends Common $params = input(); // 商品信息 + $data = []; if(!empty($params['id'])) { $data_params = [ @@ -122,12 +123,13 @@ class Goods extends Common { return $this->error('商品信息不存在', MyUrl('admin/goods/index')); } - $this->assign('data', $ret['data'][0]); + $data = $ret['data'][0]; // 获取商品编辑规格 $specifications = GoodsService::GoodsEditSpecifications($ret['data'][0]['id']); $this->assign('specifications', $specifications); } + $this->assign('data', $data); // 地区信息 $this->assign('region_province_list', RegionService::RegionItems(['pid'=>0])); diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index 129289c58..5ee0aff68 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -134,20 +134,22 @@ class Power extends Common $params = input(); // 角色组 + $data = []; if(!empty($params['id'])) { $data_params = [ 'where' => ['id'=>intval($params['id'])], ]; - $data = AdminPowerService::RoleList($data_params); - if(!empty($data[0]['id'])) + $ret = AdminPowerService::RoleList($data_params); + if(!empty($ret[0]['id'])) { - $this->assign('data', $data[0]); + $data = $ret[0]; // 权限关联数据 - $params['role_id'] = $data[0]['id']; + $params['role_id'] = $ret[0]['id']; } } + $this->assign('data', $data); // 菜单列表 $power = AdminPowerService::RolePowerEditData($params); diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php index 41f7e3809..bfed445e7 100755 --- a/application/admin/controller/Slide.php +++ b/application/admin/controller/Slide.php @@ -109,6 +109,7 @@ class Slide extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -118,9 +119,10 @@ class Slide extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = SlideService::SlideList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = SlideService::SlideList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index d7d5f1a5b..f44fd2054 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -131,6 +131,7 @@ class User extends Common $params = input(); // 用户编辑 + $data = []; if(!empty($params['id'])) { $data_params = [ @@ -138,14 +139,18 @@ class User extends Common 'm' => 0, 'n' => 1, ]; - $data = UserService::UserList($data_params); - if(empty($data['data'][0])) + $ret = UserService::UserList($data_params); + if(empty($ret['data'][0])) { return $this->error('用户信息不存在', MyUrl('admin/user/index')); } - $data['data'][0]['birthday_text'] = empty($data['data'][0]['birthday']) ? '' : date('Y-m-d', $data['data'][0]['birthday']); - $this->assign('data', $data['data'][0]); + + // 生日 + $ret['data'][0]['birthday_text'] = empty($ret['data'][0]['birthday']) ? '' : date('Y-m-d', $ret['data'][0]['birthday']); + + $data = $ret['data'][0]; } + $this->assign('data', $data); // 性别 $this->assign('common_gender_list', lang('common_gender_list')); diff --git a/application/admin/view/default/answer/index.html b/application/admin/view/default/answer/index.html index 1f9c9e5d7..061e06020 100755 --- a/application/admin/view/default/answer/index.html +++ b/application/admin/view/default/answer/index.html @@ -48,6 +48,7 @@ 标题 内容 回复内容访问次数 回复时间 创建时间 是否显示{{$v.access_count}} {{$v.reply_time}} {{$v.add_time}} diff --git a/application/admin/view/default/sqlconsole/index.html b/application/admin/view/default/sqlconsole/index.html index 0140673bb..3762390e9 100755 --- a/application/admin/view/default/sqlconsole/index.html +++ b/application/admin/view/default/sqlconsole/index.html @@ -11,7 +11,7 @@
    - +
    diff --git a/application/plugins/answers/Admin.php b/application/plugins/answers/Admin.php index 35650b243..7e222072c 100644 --- a/application/plugins/answers/Admin.php +++ b/application/plugins/answers/Admin.php @@ -35,7 +35,7 @@ class Admin extends Controller public function index($params = []) { // 基础数据 - $base = PluginsService::PluginsData('answers', ['images']); + $base = PluginsService::PluginsData('answers', ['images', 'images_bottom']); $this->assign('data', isset($base['data']) ? $base['data'] : []); // 幻灯片 @@ -62,7 +62,7 @@ class Admin extends Controller */ public function baseinfo($params = []) { - $ret = PluginsService::PluginsData('answers', ['images']); + $ret = PluginsService::PluginsData('answers', ['images', 'images_bottom']); if($ret['code'] == 0) { // 是否 @@ -99,7 +99,7 @@ class Admin extends Controller */ public function basesave($params = []) { - return PluginsService::PluginsDataSave(['plugins'=>'answers', 'data'=>$params], ['images']); + return PluginsService::PluginsDataSave(['plugins'=>'answers', 'data'=>$params], ['images', 'images_bottom']); } /** diff --git a/application/plugins/answers/Index.php b/application/plugins/answers/Index.php index 9d8a49a56..dfd9785b9 100644 --- a/application/plugins/answers/Index.php +++ b/application/plugins/answers/Index.php @@ -15,6 +15,7 @@ use app\service\PluginsService; use app\service\AnswerService; use app\service\UserService; use app\service\SeoService; +use app\service\GoodsService; use app\plugins\answers\Service; /** @@ -66,6 +67,13 @@ class Index extends Controller $this->assign('plugins_answers_rc_list', []); } + // 最新商品 + if(!empty($base['data']['home_new_goods_number'])) + { + $goods = GoodsService::GoodsList(['where'=>['is_delete_time'=>0], 'field'=>'id,title,images,min_price', 'n'=>intval($base['data']['home_new_goods_number'])]); + $this->assign('plugins_new_goods_list', $goods['data']); + } + // 浏览器标题 $seo_name = empty($base['data']['application_name']) ? '问答' : $base['data']['application_name']; $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle($seo_name, 1)); @@ -105,6 +113,12 @@ class Index extends Controller $detail = Service::AnswerRow($params); $this->assign('plugins_answers_detail', $detail); + // 浏览次数 + if($detail['code'] == 0 && !empty($detail['data']['id'])) + { + AnswerService::AnswerAccessCountInc(['answer_id'=>$detail['data']['id']]); + } + // 浏览器标题 if(!empty($detail['data']['title'])) { @@ -152,7 +166,7 @@ class Index extends Controller // 获取搜索数据 // 分页 - $number = 10; + $number = isset($base['data']['search_page_number']) ? intval($base['data']['search_page_number']) : 28; // 条件 $keywords_arr = empty($params['answers_keywords']) ? [] : ['keywords'=>$params['answers_keywords']]; @@ -177,7 +191,7 @@ class Index extends Controller 'm' => $page->GetPageStarNumber(), 'n' => $number, 'where' => $where, - 'field' => 'id,title,content,add_time', + 'field' => 'id,title,content,add_time,is_reply', ); $data = AnswerService::AnswerList($data_params); $this->assign('plugins_answers_data_list', $data['data']); diff --git a/application/plugins/answers/Service.php b/application/plugins/answers/Service.php index 10adc5cbe..4c8bd7f5e 100644 --- a/application/plugins/answers/Service.php +++ b/application/plugins/answers/Service.php @@ -302,7 +302,7 @@ class Service ]; // 指定字段 - $field = 'g.id,g.title,g.images'; + $field = 'g.id,g.title,g.images,g.min_price'; // 获取数据 $ret = GoodsService::CategoryGoodsList(['where'=>$where, 'm'=>0, 'n'=>100, 'field'=>$field]); @@ -387,7 +387,7 @@ class Service ]; // 字段 - $field = 'title,content,reply,is_reply,reply_time,add_time'; + $field = 'id,name,title,content,reply,is_reply,access_count,reply_time,add_time'; // 获取列表 $data_params = array( diff --git a/application/plugins/view/answers/admin/baseinfo.html b/application/plugins/view/answers/admin/baseinfo.html index 308e06056..31bc4d738 100755 --- a/application/plugins/view/answers/admin/baseinfo.html +++ b/application/plugins/view/answers/admin/baseinfo.html @@ -20,7 +20,7 @@
      {{if !empty($data['images_old'])}}
    • - + ×
      • @@ -28,14 +28,12 @@
    +上传图片
    -
    - +
    -
    - +
    {{foreach $is_whether_list as $v}}
    +
    + +
      + {{if !empty($data['images_bottom_old'])}} +
    • + + + × +
      • + {{/if}} +
    +
    +上传图片
    +
    +
    + + +
    +
    + +
    + {{foreach $is_whether_list as $v}} + + {{/foreach}} +
    +
    +
    @@ -62,7 +88,17 @@
    - + +
    + +
    + + +
    + +
    + +
    diff --git a/application/plugins/view/answers/admin/index.html b/application/plugins/view/answers/admin/index.html index a8b9a5dfc..951a025cc 100644 --- a/application/plugins/view/answers/admin/index.html +++ b/application/plugins/view/answers/admin/index.html @@ -71,6 +71,28 @@
    +
    + +
    + {{if empty($data['search_page_number'])}} + 默认 28 条 + {{else /}} + {{$data.search_page_number}} 条 + {{/if}} +
    +
    + +
    + +
    + {{if empty($data['home_new_goods_number'])}} + 不展示 + {{else /}} + {{$data.home_new_goods_number}} 条 + {{/if}} +
    +
    +
    @@ -79,6 +101,15 @@
    + +
    + +
    + + + +
    +
    diff --git a/application/plugins/view/answers/index/detail.html b/application/plugins/view/answers/index/detail.html index d4a96fc74..38a9c9a13 100644 --- a/application/plugins/view/answers/index/detail.html +++ b/application/plugins/view/answers/index/detail.html @@ -18,23 +18,34 @@
    {{if isset($plugins_answers_detail['code']) and $plugins_answers_detail['code'] eq 0}} {{if !empty($plugins_answers_detail['data']['content'])}} - {{if !empty($plugins_answers_detail['data']['title'])}} -

    {{$plugins_answers_detail.data.title}}

    - {{/if}} -
    -

    {{$plugins_answers_detail.data.content}}

    -

    {{$plugins_answers_detail.data.add_time_date}}

    +
    + {{if !empty($plugins_answers_detail['data']['title'])}} +

    主题：{{$plugins_answers_detail.data.title}}

    + {{/if}} +

    阅读数：{{$plugins_answers_detail.data.access_count}}

    +
    +
    {{$plugins_answers_detail.data.content}}
    +
    + 留言时间：{{$plugins_answers_detail.data.add_time_date}} + {{if !empty($plugins_answers_detail['data']['name'])}} +        + 留言人：{{$plugins_answers_detail.data.name}} + {{/if}}
    -
    - {{if isset($plugins_answers_detail['data']['is_reply']) and $plugins_answers_detail['data']['is_reply'] eq 1}} + {{if isset($plugins_answers_detail['data']['is_reply']) and $plugins_answers_detail['data']['is_reply'] eq 1}} +
    管理员已回答

    {{$plugins_answers_detail.data.reply}}

    -

    {{$plugins_answers_detail.data.reply_time_date}}

    - {{else /}} +
    +
    + 回复时间：{{$plugins_answers_detail.data.reply_time_date}} +
    + {{else /}} +
    管理员待回复 - {{/if}} -
    +
    + {{/if}}
    {{else /}}
    没有相关数据
    @@ -101,6 +112,9 @@ {{$goods.title}}

    {{$goods.title}}

    +
    + ￥{{$goods.min_price}} +
    diff --git a/application/plugins/view/answers/index/index.html b/application/plugins/view/answers/index/index.html index afcac572c..ee202f4d9 100644 --- a/application/plugins/view/answers/index/index.html +++ b/application/plugins/view/answers/index/index.html @@ -86,69 +86,111 @@
    {{/if}} - -
    -
    +
    + +
    +
    +
    +

    + {{if empty($plugins_answers_data['middle_new_name'])}} + 最新问答 + {{else /}} + {{$plugins_answers_data.middle_new_name}} + {{/if}} +

    + 更多 » +
    +
    + {{if !empty($plugins_answers_middle_answer_list)}} + +
    + 查看更多 » +
    + {{else /}} +
    没有相关数据
    + {{/if}} +
    +
    +
    + + +

    - {{if empty($plugins_answers_data['middle_new_name'])}} - 最新问答 + {{if empty($plugins_answers_data['right_top_goods_name'])}} + 推荐商品 {{else /}} - {{$plugins_answers_data.middle_new_name}} + {{$plugins_answers_data.right_top_goods_name}} {{/if}}

    - 更多 » + 更多 »
    -
    - {{if !empty($plugins_answers_middle_answer_list)}} -
    +
    + + {{/foreach}} + + {{/if}}
    - -
    -
    -

    - {{if empty($plugins_answers_data['right_top_goods_name'])}} - 推荐商品 - {{else /}} - {{$plugins_answers_data.right_top_goods_name}} - {{/if}} -

    - 更多 » + + {{if !empty($plugins_answers_data['images_bottom'])}} +
    + + +
    - {{if !empty($plugins_answers_goods_list)}} -
    + {{/if}} {{include file="../../../plugins/view/answers/index/popup" /}} diff --git a/application/plugins/view/answers/index/search.html b/application/plugins/view/answers/index/search.html index 4fa25ca5e..8f067a399 100644 --- a/application/plugins/view/answers/index/search.html +++ b/application/plugins/view/answers/index/search.html @@ -13,7 +13,7 @@ {{include file="public/goods_category" /}} -
    +
    {{if !empty($plugins_answers_data_list)}} @@ -23,6 +23,11 @@ {{foreach $plugins_answers_data_list as $answers}}
  • + {{if isset($answers['is_reply']) and $answers['is_reply'] eq 1}} + 已回复 + {{else /}} + 待回复 + {{/if}} {{if empty($answers['title'])}} {{$answers.content}} {{else /}} @@ -98,6 +103,9 @@ {{$goods.title}}

    {{$goods.title}}

    +
    + ￥{{$goods.min_price}} +
    • diff --git a/application/service/AnswerService.php b/application/service/AnswerService.php index a86cdd222..222d09ea0 100755 --- a/application/service/AnswerService.php +++ b/application/service/AnswerService.php @@ -382,5 +382,23 @@ class AnswerService } return DataReturn('编辑失败或数据未改变', -100); } + + /** + * 访问统计加1 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-15 + * @desc description + * @param [array] $params [输入参数] + */ + public static function AnswerAccessCountInc($params = []) + { + if(!empty($params['answer_id'])) + { + return Db::name('Answer')->where(['id'=>intval($params['answer_id'])])->setInc('access_count'); + } + return false; + } } ?> \ No newline at end of file diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 9be3cb4eb..18e1d6c2e 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -680,7 +680,7 @@ class GoodsService { if(!empty($params['goods_id'])) { - return Db::name('Goods')->where(array('id'=>intval($params['goods_id'])))->setInc('access_count'); + return Db::name('Goods')->where(['id'=>intval($params['goods_id'])])->setInc('access_count'); } return false; } diff --git a/public/static/plugins/css/answers/admin.css b/public/static/plugins/css/answers/admin.css index 38753df9c..ed43dd046 100644 --- a/public/static/plugins/css/answers/admin.css +++ b/public/static/plugins/css/answers/admin.css @@ -36,7 +36,7 @@ /** * 编辑页面 */ -ul.plugins-images-view li { +ul.plugins-images-view li, ul.plugins-images-bottom-view li { width: 100%; height: auto; } diff --git a/public/static/plugins/css/answers/index.css b/public/static/plugins/css/answers/index.css index b1071e670..f188026dc 100644 --- a/public/static/plugins/css/answers/index.css +++ b/public/static/plugins/css/answers/index.css @@ -3,6 +3,9 @@ padding-top: 10px; padding-bottom: 2px; } +.plugins-answers .answers-goods { + overflow: hidden; +} .plugins-answers .answers-goods .am-list-news-hd { padding-bottom: 0; } @@ -47,6 +50,12 @@ .plugins-answers .am-gallery-bordered .am-gallery-title { font-size: 12px; } +.plugins-answers .answers-top, .plugins-answers .answers-middle { + overflow: hidden; +} +.plugins-answers .answers-top, .plugins-answers .answers-middle-banner { + margin-top: 10px; +} @media only screen and (min-width:640px) { .plugins-answers .am-u-md-8, .plugins-answers .am-gallery { @@ -64,10 +73,7 @@ color: #d2364c; text-decoration: underline; } - .plugins-answers .answers-top, .plugins-answers .answers-middle-banner { - margin-top: 10px; - overflow: hidden; - } + .plugins-answers .answers-sidebar, .plugins-answers .answers-goods { padding-right: 1px; } @@ -101,23 +107,30 @@ .plugins-answers .am-list-news-hd { padding-bottom: 5px; } + .plugins-answers .answers-top { + margin-top: 0; + } } /** * 详情 */ -.plugins-answers-detail { +.plugins-answers-detail, .plugins-answers-search { padding-top: 10px; } -.plugins-answers-detail .base-content { - border: 1px dashed transparent; - background: linear-gradient(white,white) padding-box, - repeating-linear-gradient(-45deg, #ccc 0, #ccc 0.25em, white 0, white 0.6em); +.plugins-answers-detail .am-u-md-8 { + border: 1px solid #dedede; +} +.plugins-answers-detail .base-content, .plugins-answers-detail .base-footer { padding: 10px; } -.plugins-answers-detail .base-date { +.plugins-answers-detail .base-content { + border-top: 1px solid #dedede; +} +.plugins-answers-detail .base-footer { text-align: right; - margin-top: 5px; + border-top: 1px dashed #e7e7e7; + border-bottom: 1px dashed #e7e7e7; } .plugins-answers-detail .base { margin-top: 10px; @@ -128,13 +141,38 @@ background: #fff7ef; } .plugins-answers-detail .am-panel-success { - background: #f2fff1; + background: #e7ffe5; +} +.plugins-answers-detail .am-panel { + margin: 0; + border: 0; +} +.plugins-answers-detail .base-title { + position: relative; + height: 45px; + padding: 10px; + background: #f6f6f6; +} +.plugins-answers-detail .base-title .highlighted { + color: #FF9800; } .plugins-answers-detail h2 { font-weight: 500; - margin-bottom: 5px; font-size: 16px; } +.plugins-answers-detail .base-title .gray-text { + position: absolute; + right: 10px; + top: 15px; +} .plugins-answers-detail .base .reply-content { margin-top: 5px; +} +.plugins-answers-detail .reply-footer { + border-bottom: 0; +} +@media only screen and (max-width:640px) { + .plugins-answers-detail .answers-btn-list { + margin-top: 10px; + } } \ No newline at end of file diff --git a/public/static/upload/images/plugins_answers/2019/03/13/1552463137211834.png b/public/static/upload/images/plugins_answers/2019/03/13/1552463137211834.png new file mode 100644 index 0000000000000000000000000000000000000000..cf193d173ba983ab844d7473b8abea58da323c25 GIT binary patch literal 48751 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 )t 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 b- Date: Wed, 13 Mar 2019 16:11:28 +0800 Subject: [PATCH 062/108] =?UTF-8?q?=E9=97=AE=E7=AD=94=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96+=E5=90=8E=E5=8F=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/view/answers/index/popup.html | 6 ++-- config/shopxo.sql | 35 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/application/plugins/view/answers/index/popup.html b/application/plugins/view/answers/index/popup.html index a0bc9a029..491a3fe9a 100644 --- a/application/plugins/view/answers/index/popup.html +++ b/application/plugins/view/answers/index/popup.html @@ -7,8 +7,8 @@

    - - + +
    @@ -16,7 +16,7 @@
    - +
    diff --git a/config/shopxo.sql b/config/shopxo.sql index 93026870e..db5e6d0c5 100755 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -11,7 +11,7 @@ Target Server Version : 50722 File Encoding : utf-8 - Date: 03/12/2019 18:07:16 PM + Date: 03/13/2019 15:54:42 PM */ SET NAMES utf8mb4; @@ -56,9 +56,10 @@ CREATE TABLE `s_answer` ( `content` char(255) NOT NULL DEFAULT '' COMMENT '详细内容', `reply` char(255) NOT NULL DEFAULT '' COMMENT '回复内容', `is_reply` tinyint(1) unsigned DEFAULT '0' COMMENT '是否已回复（0否, 1是）', - `is_show` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否显示（0不显示, 1显示）', - `is_delete_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '是否已删除（0否, 大于0删除时间）', `reply_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '回复时间', + `is_show` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否显示（0不显示, 1显示）', + `access_count` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '访问次数', + `is_delete_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '是否已删除（0否, 大于0删除时间）', `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`), @@ -71,7 +72,7 @@ CREATE TABLE `s_answer` ( -- Records of `s_answer` -- ---------------------------- BEGIN; -INSERT INTO `s_answer` VALUES ('1', '0', '测试名字', '1322222222', '什么时候发布新版', '请问新版本什么时候发布呀？非常期待哦~', '', '0', '1', '0', '0', '1551941748', '0'), ('2', '77', 'test', '13555555555', '男女薪酬差距过大问题', '男女薪酬差距过大，你怎么看？', '很正常的现象，毕竟大多数人是拖后腿的。\n\n女性工资高于男性的有，但是就平均来讲，却是另一种情况。原因就在于岗位不同，自然薪酬就不一样。女性由于身体各方面条件的限制，可以说是选择工作岗位比男性少了不少，女性可以做销售，可以做文职，当然也可以做互联网，但是有的女生身体素质不太适用于熬夜加班，毕竟女生担当了生儿育女这一项风险极大的活动，自然受到很多的限制，所以在岗位的选择，工作时间的适应上，女性并不占优势，薪酬的比例自然就降低了。', '1', '1', '0', '1558948854', '1551948802', '1551948854'), ('3', '0', '测试2', '13444556666', '《绿皮书》破亿', '为什么电影《绿皮书》三天票房能破亿？', '', '0', '1', '0', '0', '1551948896', '0'), ('4', '0', '测试3', '13222666666', '詹姆斯总得分超乔丹', '詹姆斯总得分超乔丹，怎么评价这一纪录？', '', '0', '1', '0', '0', '1551948947', '0'), ('5', '0', '测试5', '13222335555', '植物奶油和动物奶油的区别', '植物奶油和动物奶油的区别是？', '', '0', '1', '0', '0', '1551948985', '0'), ('6', '0', '测试6', '13222333333', '', '既然彩虹是圆形的，那为什么我们看到的都是拱形的?', '', '0', '1', '0', '0', '1551949040', '0'), ('7', '0', '测试7', '13277888888', '', '给我家孩子投一票”，绑架了近一半人的朋友圈', '', '0', '1', '0', '0', '1551949065', '0'), ('8', '0', '测试8', '13233222222', '', '秃如其来的年轻人，这是怎么了？', '', '0', '1', '0', '0', '1551949100', '0'), ('9', '0', '测试的', '13445555555', '', '小学生异地转学籍需要什么手续？', '', '0', '1', '0', '0', '1551949178', '0'), ('10', '0', '测试a', '13222112222', '', '巴厘岛旅游出入境及免签流程？', '', '0', '1', '0', '0', '1551949200', '0'), ('11', '0', 'cessss', '13444555555', '', '日常生活中哪些物品需要缴纳消费税？', '', '0', '1', '0', '0', '1551949219', '0'), ('12', '0', 'tttstt', '13566666666', '', '申请更换机动车车身颜色需要办理哪些手续？', '', '0', '1', '0', '0', '1551949243', '0'), ('13', '0', 'ttvvvkkkk', '13555666666', '', '房产税与契税有什么区别?', '', '0', '1', '0', '0', '1551949326', '0'), ('14', '0', 'Cesd', '13566666666', '', '家庭聚会时，可以做哪些自制饮料？', '', '0', '1', '0', '0', '1551949382', '0'), ('15', '0', '测试的订', '13455667777', '', '一个狗喝了我家的洗手盆里的水，水扔了，洗手盆还能用吗？会不会感染病？', '', '0', '1', '0', '0', '1551949425', '0'), ('16', '0', 'rrttt', '13455667777', '', '古代中国朴素唯物主义自然观有哪些作用?', '', '0', '1', '0', '0', '1551949762', '0'), ('17', '0', '你好', '13455666666', '', '一部耽美漫画男主家穷从小就去了攻的家里作为玩具陪伴攻受长大回到家里攻搅黄受家里的生意让受再回到身边', '', '0', '1', '0', '0', '1551949840', '0'), ('18', '7', '122天天', '13455555555', '', '6吨粮食酒里加20公斤冰糖可以吗？', '', '0', '1', '0', '0', '1551949870', '0'), ('19', '77', 'v看见', '13455222222', '', '単位与个人无解除劳动关系手续转入社保个人窗口合法吗', '', '0', '1', '0', '0', '1551949947', '0'), ('20', '77', '', '', '', '如果你是汉献帝被挟曹操天子以令诸侯你会怎么做？', '', '0', '1', '0', '0', '1551954351', '0'); +INSERT INTO `s_answer` VALUES ('1', '0', '测试名字', '1322222222', '什么时候发布新版', '请问新版本什么时候发布呀？非常期待哦~', '', '0', '0', '1', '48', '0', '1551941748', '0'), ('2', '77', 'test', '13555555555', '男女薪酬差距过大问题', '男女薪酬差距过大，你怎么看？', '很正常的现象，毕竟大多数人是拖后腿的。\n\n女性工资高于男性的有，但是就平均来讲，却是另一种情况。原因就在于岗位不同，自然薪酬就不一样。女性由于身体各方面条件的限制，可以说是选择工作岗位比男性少了不少，女性可以做销售，可以做文职，当然也可以做互联网，但是有的女生身体素质不太适用于熬夜加班，毕竟女生担当了生儿育女这一项风险极大的活动，自然受到很多的限制，所以在岗位的选择，工作时间的适应上，女性并不占优势，薪酬的比例自然就降低了。', '1', '1558948854', '1', '60', '0', '1551948802', '1551948854'), ('3', '0', '测试2', '13444556666', '《绿皮书》破亿', '为什么电影《绿皮书》三天票房能破亿？', '', '0', '0', '1', '1', '0', '1551948896', '0'), ('4', '0', '测试3', '13222666666', '詹姆斯总得分超乔丹', '詹姆斯总得分超乔丹，怎么评价这一纪录？', '', '0', '0', '1', '0', '0', '1551948947', '0'), ('5', '0', '测试5', '13222335555', '植物奶油和动物奶油的区别', '植物奶油和动物奶油的区别是？', '', '0', '0', '1', '0', '0', '1551948985', '0'), ('6', '0', '测试6', '13222333333', '', '既然彩虹是圆形的，那为什么我们看到的都是拱形的?', '', '0', '0', '1', '3', '0', '1551949040', '0'), ('7', '0', '测试7', '13277888888', '', '给我家孩子投一票”，绑架了近一半人的朋友圈', '', '0', '0', '1', '1', '0', '1551949065', '0'), ('8', '0', '测试8', '13233222222', '', '秃如其来的年轻人，这是怎么了？', '', '0', '0', '1', '0', '0', '1551949100', '0'), ('9', '0', '测试的', '13445555555', '', '小学生异地转学籍需要什么手续？', '', '0', '0', '1', '1', '0', '1551949178', '0'), ('10', '0', '测试a', '13222112222', '', '巴厘岛旅游出入境及免签流程？', '', '0', '0', '1', '0', '0', '1551949200', '0'), ('11', '0', 'cessss', '13444555555', '', '日常生活中哪些物品需要缴纳消费税？', '', '0', '0', '1', '0', '0', '1551949219', '0'), ('12', '0', 'tttstt', '13566666666', '', '申请更换机动车车身颜色需要办理哪些手续？', '', '0', '0', '1', '17', '0', '1551949243', '0'), ('13', '0', 'ttvvvkkkk', '13555666666', '', '房产税与契税有什么区别?', '', '0', '0', '1', '0', '0', '1551949326', '0'), ('14', '0', 'Cesd', '13566666666', '', '家庭聚会时，可以做哪些自制饮料？', '', '0', '0', '1', '0', '0', '1551949382', '0'), ('15', '0', '测试的订', '13455667777', '', '一个狗喝了我家的洗手盆里的水，水扔了，洗手盆还能用吗？会不会感染病？', '', '0', '0', '1', '1', '0', '1551949425', '0'), ('16', '0', 'rrttt', '13455667777', '', '古代中国朴素唯物主义自然观有哪些作用?', '', '0', '0', '1', '0', '0', '1551949762', '0'), ('17', '0', '你好', '13455666666', '', '一部耽美漫画男主家穷从小就去了攻的家里作为玩具陪伴攻受长大回到家里攻搅黄受家里的生意让受再回到身边', '', '0', '0', '1', '0', '0', '1551949840', '0'), ('18', '7', '122天天', '13455555555', '', '6吨粮食酒里加20公斤冰糖可以吗？', '', '0', '0', '1', '0', '0', '1551949870', '0'), ('19', '77', 'v看见', '13455222222', '', '単位与个人无解除劳动关系手续转入社保个人窗口合法吗', '', '0', '0', '1', '0', '0', '1551949947', '0'), ('20', '77', '', '', '', '如果你是汉献帝被挟曹操天子以令诸侯你会怎么做？', '', '0', '0', '1', '0', '0', '1551954351', '0'); COMMIT; -- ---------------------------- @@ -357,7 +358,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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '12', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '2', '', '/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', '51', '', '/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', '0', '153', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '320', '步', '/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', '53', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '66', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '14', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '15', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551751113'); +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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '12', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '2', '', '/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', '51', '', '/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', '154', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '320', '步', '/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', '53', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '66', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '15', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '15', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551751113'); COMMIT; -- ---------------------------- @@ -377,7 +378,7 @@ CREATE TABLE `s_goods_browse` ( -- Records of `s_goods_browse` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552362006'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552287523'), ('6', '2', '77', '1552380261', '1552380261'); +INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552447538'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552461784'), ('6', '2', '77', '1552380261', '1552380261'); COMMIT; -- ---------------------------- @@ -611,13 +612,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=14 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; +) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; -- ---------------------------- -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552272529'), ('9', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552361991'), ('10', '77', '订单支付', '订单支付成功，金额2499元', '2', '1', '0', '0', '0', '0', '1552362074'), ('11', '77', '订单发货', '订单已发货', '2', '1', '0', '0', '0', '0', '1552362108'), ('12', '77', '订单支付', '订单支付成功，金额4500元', '3', '1', '0', '0', '0', '0', '1552380271'), ('13', '77', '订单发货', '订单已发货', '3', '1', '0', '0', '0', '0', '1552380288'); +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552272529'), ('9', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552361991'), ('10', '77', '订单支付', '订单支付成功，金额2499元', '2', '1', '0', '0', '0', '0', '1552362074'), ('11', '77', '订单发货', '订单已发货', '2', '1', '0', '0', '0', '0', '1552362108'), ('12', '77', '订单支付', '订单支付成功，金额4500元', '3', '1', '0', '0', '0', '0', '1552380271'), ('13', '77', '订单发货', '订单已发货', '3', '1', '0', '0', '0', '0', '1552380288'), ('14', '77', '积分变动', '订单商品完成赠送积分增加56', '0', '0', '0', '0', '0', '0', '1552386780'), ('15', '77', '订单收货', '订单收货成功', '2', '1', '0', '0', '0', '0', '1552386780'); COMMIT; -- ---------------------------- @@ -702,7 +703,7 @@ CREATE TABLE `s_order` ( -- Records of `s_order` -- ---------------------------- BEGIN; -INSERT INTO `s_order` VALUES ('1', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'), ('2', '20190312114031822173', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '73107853468716', '2', '3', '1', '0.00', '2499.00', '2499.00', '2499.00', '1552362074', '1552362031', '1552362108', '0', '0', '0', '0', '0', '0', '0', '0', '1552362031', '1552362108'), ('3', '20190312164430579995', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '767', '2', '3', '1', '0.00', '4500.00', '4500.00', '4500.00', '1552380271', '1552380270', '1552380288', '0', '0', '0', '0', '0', '0', '0', '0', '1552380270', '1552380288'); +INSERT INTO `s_order` VALUES ('1', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'), ('2', '20190312114031822173', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '73107853468716', '2', '4', '1', '0.00', '2499.00', '2499.00', '2499.00', '1552362074', '1552362031', '1552362108', '0', '1552386780', '0', '0', '0', '0', '0', '0', '1552362031', '1552386780'), ('3', '20190312164430579995', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '767', '2', '3', '1', '0.00', '4500.00', '4500.00', '4500.00', '1552380271', '1552380270', '1552380288', '0', '0', '0', '0', '0', '0', '0', '0', '1552380270', '1552380288'); COMMIT; -- ---------------------------- @@ -804,13 +805,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=6 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单状态历史纪录'; +) ENGINE=InnoDB AUTO_INCREMENT=7 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', '系统', '1551239424'), ('2', '2', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552362074'), ('3', '2', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552362108'), ('4', '3', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552380271'), ('5', '3', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552380288'); +INSERT INTO `s_order_status_history` VALUES ('1', '1', '1', '2', '支付[待付款-待发货]', '0', '系统', '1551239424'), ('2', '2', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552362074'), ('3', '2', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552362108'), ('4', '3', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552380271'), ('5', '3', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552380288'), ('6', '2', '3', '4', '收货[待收货-已完成]', '77', '龚哥哥', '1552386780'); COMMIT; -- ---------------------------- @@ -896,7 +897,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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u540e\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1551239173'), ('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\",\"right_top_rec_name\":\"\",\"middle_new_name\":\"\",\"right_top_goods_name\":\"\",\"middle_new_page_number\":\"15\",\"category_ids\":\"12,7,6,4,3,2,1\",\"pluginsname\":\"answers\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"basesave\"}', '1', '1551853705', '1552296663'), ('23', 'expressforkdn', '{\"ebid\":\"1301013\",\"appkey\":\"ab11f813-811b-4b4b-9fbd-5f79886ec840\",\"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', '1552385092'); +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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1552463476'), ('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', '1552463173'), ('23', 'expressforkdn', '{\"ebid\":\"1301013\",\"appkey\":\"ab11f813-811b-4b4b-9fbd-5f79886ec840\",\"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', '1552385092'); COMMIT; -- ---------------------------- @@ -1114,13 +1115,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=41 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; +) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; -- ---------------------------- -- Records of `s_search_history` -- ---------------------------- BEGIN; -INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'); +INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'), ('41', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446286'), ('42', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446830'), ('43', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461592'), ('44', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461878'); COMMIT; -- ---------------------------- @@ -1191,7 +1192,7 @@ CREATE TABLE `s_user` ( -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '749260', '92b6a30c6014c9eb880e837b7a68c536', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1012', '0', '0', '0', '0', '1552361991'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '0', '681141', '0461e68ca574a0d7622e7c078a1d73c3', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '10', '0', '0', '0', '1551173897', '1551239413'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '749260', '92b6a30c6014c9eb880e837b7a68c536', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1068', '0', '0', '0', '0', '1552361991'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '0', '681141', '0461e68ca574a0d7622e7c078a1d73c3', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '10', '0', '0', '0', '1551173897', '1551239413'); COMMIT; -- ---------------------------- @@ -1241,13 +1242,13 @@ CREATE TABLE `s_user_integral_log` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; +) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; -- ---------------------------- -- Records of `s_user_integral_log` -- ---------------------------- BEGIN; -INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'), ('6', '77', '1', '1007', '1012', '登录奖励积分', '0', '1552361991'); +INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'), ('6', '77', '1', '1007', '1012', '登录奖励积分', '0', '1552361991'), ('7', '77', '1', '1012', '1068', '订单商品完成赠送', '0', '1552386780'); COMMIT; SET FOREIGN_KEY_CHECKS = 1; From a8b859394b54abeb5e43d5ce956613ebc7db3b71 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 13 Mar 2019 16:13:00 +0800 Subject: [PATCH 063/108] =?UTF-8?q?=E9=97=AE=E7=AD=94=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/view/answers/index/popup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/plugins/view/answers/index/popup.html b/application/plugins/view/answers/index/popup.html index 491a3fe9a..3370bc160 100644 --- a/application/plugins/view/answers/index/popup.html +++ b/application/plugins/view/answers/index/popup.html @@ -7,7 +7,7 @@
    - +
    From 527ff8b6ed71fd74face4b7ee6e99b661ebb51e2 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 13 Mar 2019 16:20:33 +0800 Subject: [PATCH 064/108] =?UTF-8?q?=E9=97=AE=E7=AD=94=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/view/answers/index/popup.html | 6 +++--- public/static/common/css/common.css | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/plugins/view/answers/index/popup.html b/application/plugins/view/answers/index/popup.html index 3370bc160..30ecf677b 100644 --- a/application/plugins/view/answers/index/popup.html +++ b/application/plugins/view/answers/index/popup.html @@ -7,7 +7,7 @@
    - +
    @@ -15,11 +15,11 @@
    - +
    - +
    diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index e93ed59be..5e663252e 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -19,7 +19,9 @@ .am-form-group:hover>input, .am-form-group:hover>select, .am-form-group:hover>textarea, .am-form-group:hover .chosen-choices, .am-form-group:hover .chosen-single { border: 1px solid #999 ; } .am-form-error .chosen-choices, .am-form-error .chosen-default { border: 1px solid #dd514c !important; } .am-form-success .chosen-choices, .am-form-success .chosen-single { border: 1px solid #5eb95e !important; } -form.am-form .am-form-group-label-tips { font-size: 12px; font-weight: 100; color: #ccc; margin-left: 10px; } +form.am-form .am-form-group-label-tips, form.am-form .am-form-group-label-tips-must { font-size: 12px; font-weight: 100; margin-left: 10px; } +form.am-form .am-form-group-label-tips { color: #ccc; } +form.am-form .am-form-group-label-tips-must { color: #f00; } .am-form-group:hover>label { color: #333 !important; } .am-form-group:hover>label>.am-form-group-label-tips { color: #FF9800 !important; } From 66c114723379b3281c273d7f7519d97349f921a7 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 13 Mar 2019 17:59:47 +0800 Subject: [PATCH 065/108] =?UTF-8?q?=E7=A0=81=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/payment/CodePay.php | 249 +++++++++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) create mode 100644 extend/payment/CodePay.php diff --git a/extend/payment/CodePay.php b/extend/payment/CodePay.php new file mode 100644 index 000000000..946f3648c --- /dev/null +++ b/extend/payment/CodePay.php @@ -0,0 +1,249 @@ +config = $params; + } + + /** + * 配置信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + */ + public function Config() + { + // 基础信息 + $base = [ + 'name' => '码支付', // 插件名称 + 'version' => '0.0.1', // 插件版本 + 'apply_version' => '不限', // 适用系统版本描述 + 'apply_terminal'=> ['pc','h5'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu'] + 'desc' => '适用PC+H5，即时到帐支付方式，免费帮助个人实现支付后立即通知。 立即申请', // 插件描述（支持html） + 'author' => 'Devil', // 开发者 + 'author_url' => 'http://shopxo.net/', // 开发者主页 + ]; + + // 配置信息 + $element = [ + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'id', + 'placeholder' => '码支付ID', + 'title' => '码支付ID', + 'is_required' => 0, + 'message' => '请填写码支付ID', + ], + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'key', + 'placeholder' => '通信密钥', + 'title' => '通信密钥', + 'is_required' => 0, + 'message' => '请填写通信密钥', + ], + ]; + + return [ + 'base' => $base, + 'element' => $element, + ]; + } + + /** + * 支付入口 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Pay($params = []) + { + // 参数 + if(empty($params)) + { + return DataReturn('参数不能为空', -1); + } + + // 配置信息 + if(empty($this->config)) + { + return DataReturn('支付缺少配置', -1); + } + + // 处理支付 + $parameter = array( + 'id' => $this->config['id'], + 'type' => 1, + 'notify_url' => $params['notify_url'], + 'return_url' => $params['call_back_url'], + + /* 业务参数 */ + 'pay_id' => $params['order_no'].GetNumberCode(6), + 'price' => $params['total_price'], + 'param' => $params['name'] + ); + + $param = $this->GetParamSign($parameter); + $url = 'http://api2.fateqq.com:52888/creat_order/?'.$param['urls'].'&sign='.md5($param['sign'].$this->config['key']); + return DataReturn('处理成功', 0, $url); + } + + /** + * [GetParamSign 签名生成] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:28:07+0800 + * @param [array] $params [输入参数] + */ + private function GetParamSign($params = []) + { + $sign = ''; + $urls = ''; + ksort($params); + reset($params); + + foreach($params AS $key => $val) + { + // 跳过这些不参数签名 + if($val == '' || $key == 'sign') + { + continue; + } + + //后面追加&拼接URL + if($sign != '') + { + $sign .= "&"; + $urls .= "&"; + } + $sign .= "$key=$val"; //拼接为url参数形式 + $urls .= "$key=" . urlencode($val); //拼接为url参数形式并URL编码参数值 + } + + $result = array( + 'urls' => $urls, + 'sign' => $sign, + ); + return $result; + } + + /** + * 支付回调处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Respond($params = []) + { + if(empty($this->config)) + { + return DataReturn('配置有误', -1); + } + if(empty($params['pay_no'])) + { + return DataReturn('支付失败', -1); + } + + // 签名验证 + $param = $this->GetParamSign($params); + if(md5($param['sign'].$this->config['key']) != $params['sign']) + { + return DataReturn('签名错误', -1); + } + + // 支付状态 + if(isset($params['status'])) + { + switch($params['status']) + { + // 成功 + case 0 : + $ret = DataReturn('支付成功', 0, $this->ReturnData($params)); + break; + + // 失败 + case 1 : + $ret = DataReturn('支付失败', -100); + break; + + // 参数有误 + case 2 : + $ret = DataReturn('支付参数有误', -1001); + break; + + // 默认 + default : + $ret = DataReturn('支付异常错误', -1002); + } + } else { + $ret = DataReturn('支付异常错误', -1003); + } + return $ret; + } + + /** + * [ReturnData 返回数据统一格式] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-10-06T16:54:24+0800 + * @param [array] $data [返回数据] + */ + private function ReturnData($data) + { + // 返回数据固定基础参数 + $data['trade_no'] = isset($data['pay_no']) ? $data['pay_no'] : ''; // 支付平台 - 订单号 + $data['buyer_user'] = isset($data['pay_id']) ? $data['pay_id'] : ''; // 支付平台 - 用户 + $data['out_trade_no'] = substr($data['pay_id'], 0, strlen($data['pay_id'])-6); // 本系统发起支付的 - 订单号 + $data['subject'] = isset($data['param']) ? $data['param'] : ''; // 本系统发起支付的 - 商品名称 + $data['pay_price'] = $data['money']; // 本系统发起支付的 - 总价 + + return $data; + } +} +?> \ No newline at end of file From e535429548efd57f056fd8515973dfdbe84ffe48 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 13 Mar 2019 18:20:00 +0800 Subject: [PATCH 066/108] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A0=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{CodePay.php => CodePayAlipay.php} | 6 +- extend/payment/CodePayQQ.php | 249 ++++++++++++++++++ extend/payment/CodePayWeixin.php | 249 ++++++++++++++++++ 3 files changed, 501 insertions(+), 3 deletions(-) rename extend/payment/{CodePay.php => CodePayAlipay.php} (98%) create mode 100644 extend/payment/CodePayQQ.php create mode 100644 extend/payment/CodePayWeixin.php diff --git a/extend/payment/CodePay.php b/extend/payment/CodePayAlipay.php similarity index 98% rename from extend/payment/CodePay.php rename to extend/payment/CodePayAlipay.php index 946f3648c..7ca2ef816 100644 --- a/extend/payment/CodePay.php +++ b/extend/payment/CodePayAlipay.php @@ -11,14 +11,14 @@ namespace payment; /** - * 码支付 + * 码支付-支付宝 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 * @date 2018-09-19 * @desc description */ -class CodePay +class CodePayAlipay { // 插件配置参数 private $config; @@ -49,7 +49,7 @@ class CodePay { // 基础信息 $base = [ - 'name' => '码支付', // 插件名称 + 'name' => '码支付-支付宝', // 插件名称 'version' => '0.0.1', // 插件版本 'apply_version' => '不限', // 适用系统版本描述 'apply_terminal'=> ['pc','h5'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu'] diff --git a/extend/payment/CodePayQQ.php b/extend/payment/CodePayQQ.php new file mode 100644 index 000000000..efcf51bda --- /dev/null +++ b/extend/payment/CodePayQQ.php @@ -0,0 +1,249 @@ +config = $params; + } + + /** + * 配置信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + */ + public function Config() + { + // 基础信息 + $base = [ + 'name' => '码支付-微信', // 插件名称 + 'version' => '0.0.1', // 插件版本 + 'apply_version' => '不限', // 适用系统版本描述 + 'apply_terminal'=> ['pc','h5'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu'] + 'desc' => '适用PC+H5，即时到帐支付方式，免费帮助个人实现支付后立即通知。 立即申请', // 插件描述（支持html） + 'author' => 'Devil', // 开发者 + 'author_url' => 'http://shopxo.net/', // 开发者主页 + ]; + + // 配置信息 + $element = [ + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'id', + 'placeholder' => '码支付ID', + 'title' => '码支付ID', + 'is_required' => 0, + 'message' => '请填写码支付ID', + ], + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'key', + 'placeholder' => '通信密钥', + 'title' => '通信密钥', + 'is_required' => 0, + 'message' => '请填写通信密钥', + ], + ]; + + return [ + 'base' => $base, + 'element' => $element, + ]; + } + + /** + * 支付入口 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Pay($params = []) + { + // 参数 + if(empty($params)) + { + return DataReturn('参数不能为空', -1); + } + + // 配置信息 + if(empty($this->config)) + { + return DataReturn('支付缺少配置', -1); + } + + // 处理支付 + $parameter = array( + 'id' => $this->config['id'], + 'type' => 2, + 'notify_url' => $params['notify_url'], + 'return_url' => $params['call_back_url'], + + /* 业务参数 */ + 'pay_id' => $params['order_no'].GetNumberCode(6), + 'price' => $params['total_price'], + 'param' => $params['name'] + ); + + $param = $this->GetParamSign($parameter); + $url = 'http://api2.fateqq.com:52888/creat_order/?'.$param['urls'].'&sign='.md5($param['sign'].$this->config['key']); + return DataReturn('处理成功', 0, $url); + } + + /** + * [GetParamSign 签名生成] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:28:07+0800 + * @param [array] $params [输入参数] + */ + private function GetParamSign($params = []) + { + $sign = ''; + $urls = ''; + ksort($params); + reset($params); + + foreach($params AS $key => $val) + { + // 跳过这些不参数签名 + if($val == '' || $key == 'sign') + { + continue; + } + + //后面追加&拼接URL + if($sign != '') + { + $sign .= "&"; + $urls .= "&"; + } + $sign .= "$key=$val"; //拼接为url参数形式 + $urls .= "$key=" . urlencode($val); //拼接为url参数形式并URL编码参数值 + } + + $result = array( + 'urls' => $urls, + 'sign' => $sign, + ); + return $result; + } + + /** + * 支付回调处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Respond($params = []) + { + if(empty($this->config)) + { + return DataReturn('配置有误', -1); + } + if(empty($params['pay_no'])) + { + return DataReturn('支付失败', -1); + } + + // 签名验证 + $param = $this->GetParamSign($params); + if(md5($param['sign'].$this->config['key']) != $params['sign']) + { + return DataReturn('签名错误', -1); + } + + // 支付状态 + if(isset($params['status'])) + { + switch($params['status']) + { + // 成功 + case 0 : + $ret = DataReturn('支付成功', 0, $this->ReturnData($params)); + break; + + // 失败 + case 1 : + $ret = DataReturn('支付失败', -100); + break; + + // 参数有误 + case 2 : + $ret = DataReturn('支付参数有误', -1001); + break; + + // 默认 + default : + $ret = DataReturn('支付异常错误', -1002); + } + } else { + $ret = DataReturn('支付异常错误', -1003); + } + return $ret; + } + + /** + * [ReturnData 返回数据统一格式] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-10-06T16:54:24+0800 + * @param [array] $data [返回数据] + */ + private function ReturnData($data) + { + // 返回数据固定基础参数 + $data['trade_no'] = isset($data['pay_no']) ? $data['pay_no'] : ''; // 支付平台 - 订单号 + $data['buyer_user'] = isset($data['pay_id']) ? $data['pay_id'] : ''; // 支付平台 - 用户 + $data['out_trade_no'] = substr($data['pay_id'], 0, strlen($data['pay_id'])-6); // 本系统发起支付的 - 订单号 + $data['subject'] = isset($data['param']) ? $data['param'] : ''; // 本系统发起支付的 - 商品名称 + $data['pay_price'] = $data['money']; // 本系统发起支付的 - 总价 + + return $data; + } +} +?> \ No newline at end of file diff --git a/extend/payment/CodePayWeixin.php b/extend/payment/CodePayWeixin.php new file mode 100644 index 000000000..4e21cff6e --- /dev/null +++ b/extend/payment/CodePayWeixin.php @@ -0,0 +1,249 @@ +config = $params; + } + + /** + * 配置信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + */ + public function Config() + { + // 基础信息 + $base = [ + 'name' => '码支付-微信', // 插件名称 + 'version' => '0.0.1', // 插件版本 + 'apply_version' => '不限', // 适用系统版本描述 + 'apply_terminal'=> ['pc','h5'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu'] + 'desc' => '适用PC+H5，即时到帐支付方式，免费帮助个人实现支付后立即通知。 立即申请', // 插件描述（支持html） + 'author' => 'Devil', // 开发者 + 'author_url' => 'http://shopxo.net/', // 开发者主页 + ]; + + // 配置信息 + $element = [ + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'id', + 'placeholder' => '码支付ID', + 'title' => '码支付ID', + 'is_required' => 0, + 'message' => '请填写码支付ID', + ], + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'key', + 'placeholder' => '通信密钥', + 'title' => '通信密钥', + 'is_required' => 0, + 'message' => '请填写通信密钥', + ], + ]; + + return [ + 'base' => $base, + 'element' => $element, + ]; + } + + /** + * 支付入口 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Pay($params = []) + { + // 参数 + if(empty($params)) + { + return DataReturn('参数不能为空', -1); + } + + // 配置信息 + if(empty($this->config)) + { + return DataReturn('支付缺少配置', -1); + } + + // 处理支付 + $parameter = array( + 'id' => $this->config['id'], + 'type' => 3, + 'notify_url' => $params['notify_url'], + 'return_url' => $params['call_back_url'], + + /* 业务参数 */ + 'pay_id' => $params['order_no'].GetNumberCode(6), + 'price' => $params['total_price'], + 'param' => $params['name'] + ); + + $param = $this->GetParamSign($parameter); + $url = 'http://api2.fateqq.com:52888/creat_order/?'.$param['urls'].'&sign='.md5($param['sign'].$this->config['key']); + return DataReturn('处理成功', 0, $url); + } + + /** + * [GetParamSign 签名生成] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:28:07+0800 + * @param [array] $params [输入参数] + */ + private function GetParamSign($params = []) + { + $sign = ''; + $urls = ''; + ksort($params); + reset($params); + + foreach($params AS $key => $val) + { + // 跳过这些不参数签名 + if($val == '' || $key == 'sign') + { + continue; + } + + //后面追加&拼接URL + if($sign != '') + { + $sign .= "&"; + $urls .= "&"; + } + $sign .= "$key=$val"; //拼接为url参数形式 + $urls .= "$key=" . urlencode($val); //拼接为url参数形式并URL编码参数值 + } + + $result = array( + 'urls' => $urls, + 'sign' => $sign, + ); + return $result; + } + + /** + * 支付回调处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Respond($params = []) + { + if(empty($this->config)) + { + return DataReturn('配置有误', -1); + } + if(empty($params['pay_no'])) + { + return DataReturn('支付失败', -1); + } + + // 签名验证 + $param = $this->GetParamSign($params); + if(md5($param['sign'].$this->config['key']) != $params['sign']) + { + return DataReturn('签名错误', -1); + } + + // 支付状态 + if(isset($params['status'])) + { + switch($params['status']) + { + // 成功 + case 0 : + $ret = DataReturn('支付成功', 0, $this->ReturnData($params)); + break; + + // 失败 + case 1 : + $ret = DataReturn('支付失败', -100); + break; + + // 参数有误 + case 2 : + $ret = DataReturn('支付参数有误', -1001); + break; + + // 默认 + default : + $ret = DataReturn('支付异常错误', -1002); + } + } else { + $ret = DataReturn('支付异常错误', -1003); + } + return $ret; + } + + /** + * [ReturnData 返回数据统一格式] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-10-06T16:54:24+0800 + * @param [array] $data [返回数据] + */ + private function ReturnData($data) + { + // 返回数据固定基础参数 + $data['trade_no'] = isset($data['pay_no']) ? $data['pay_no'] : ''; // 支付平台 - 订单号 + $data['buyer_user'] = isset($data['pay_id']) ? $data['pay_id'] : ''; // 支付平台 - 用户 + $data['out_trade_no'] = substr($data['pay_id'], 0, strlen($data['pay_id'])-6); // 本系统发起支付的 - 订单号 + $data['subject'] = isset($data['param']) ? $data['param'] : ''; // 本系统发起支付的 - 商品名称 + $data['pay_price'] = $data['money']; // 本系统发起支付的 - 总价 + + return $data; + } +} +?> \ No newline at end of file From 88e9c9900d41fe239290f97c064ea42c1fbfecb6 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 13 Mar 2019 18:21:11 +0800 Subject: [PATCH 067/108] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A0=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/payment/CodePayQQ.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extend/payment/CodePayQQ.php b/extend/payment/CodePayQQ.php index efcf51bda..e3343a698 100644 --- a/extend/payment/CodePayQQ.php +++ b/extend/payment/CodePayQQ.php @@ -49,7 +49,7 @@ class CodePayQQ { // 基础信息 $base = [ - 'name' => '码支付-微信', // 插件名称 + 'name' => '码支付-QQ', // 插件名称 'version' => '0.0.1', // 插件版本 'apply_version' => '不限', // 适用系统版本描述 'apply_terminal'=> ['pc','h5'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu'] From d30f9b0fcea26b2c1200850be3b3cd26780d5aaa Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Thu, 14 Mar 2019 00:22:17 +0800 Subject: [PATCH 068/108] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E5=BF=AB=E9=80=92=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../old/alipay/pages/user-order-detail/user-order-detail.js | 2 +- .../old/weixin/pages/user-order-detail/user-order-detail.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js index 335e88b12..2047bdb99 100755 --- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js @@ -49,7 +49,7 @@ Page({ {name: "支付金额", value: data.pay_price}, {name: "支付方式", value: data.payment_name}, {name: "快递公司", value: data.express_name}, - {name: "快递单号", value: data.expres_number}, + {name: "快递单号", value: data.express_number}, {name: "用户留言", value: data.user_note}, {name: "创建时间", value: data.add_time}, {name: "确认时间", value: data.confirm_time}, diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js index 3aefb8d46..62179e87f 100755 --- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js @@ -49,7 +49,7 @@ Page({ {name: "支付金额", value: data.pay_price || ''}, {name: "支付方式", value: data.payment_name || ''}, {name: "快递公司", value: data.express_name || ''}, - {name: "快递单号", value: data.expres_number || ''}, + {name: "快递单号", value: data.express_number || ''}, {name: "用户留言", value: data.user_note || ''}, {name: "创建时间", value: data.add_time || ''}, {name: "确认时间", value: data.confirm_time || ''}, From 2442ad1f49ed6f2db4776d2f34f33761edf9e0eb Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 14 Mar 2019 10:14:39 +0800 Subject: [PATCH 069/108] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/controller/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/index/controller/User.php b/application/index/controller/User.php index a68ed8f8e..537a0a5a0 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -52,7 +52,7 @@ class User extends Common $referer_url = empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/user/index') : $_SERVER['HTTP_REFERER']; if(!empty($_SERVER['HTTP_REFERER'])) { - $all = ['logininfo', 'reginfo', 'smsreginfo', 'emailreginfo', 'forgetpwdinfo']; + $all = ['login', 'regster', 'forget', 'logininfo', 'reginfo', 'smsreginfo', 'emailreginfo', 'forgetpwdinfo']; foreach($all as $v) { if(strpos($_SERVER['HTTP_REFERER'], $v) !== false) From 5a92e740d4790e1252bc449d53bc6c63ced50998 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 14 Mar 2019 10:36:03 +0800 Subject: [PATCH 070/108] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- route/route.config | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/route/route.config b/route/route.config index d1cc92e0f..3d0af72cc 100755 --- a/route/route.config +++ b/route/route.config @@ -51,36 +51,4 @@ Route::get('regster'.$ds.'sms', 'index/user/smsreginfo'); Route::get('regster'.$ds.'email', 'index/user/emailreginfo'); Route::get('forget', 'index/user/forgetpwdinfo'); Route::get('logout', 'index/user/logout'); - -// 用户消息 -Route::rule('user'.$ds.'message', 'index/message/index', 'GET|POST'); - -// 用户积分 -Route::rule('user'.$ds.'integral', 'index/userintegral/index', 'GET|POST'); - -// 我的足迹 -Route::rule('user'.$ds.'goods'.$ds.'browse', 'index/usergoodsbrowse/index', 'GET|POST'); - -// 用户资料 -Route::get('user'.$ds.'personal', 'index/personal/index'); -Route::get('user'.$ds.'personal'.$ds.'save', 'index/personal/saveinfo'); - -// 用户地址 -Route::get('user'.$ds.'address', 'index/useraddress/index'); - -// 用户安全 -Route::get('user'.$ds.'safety', 'index/safety/index'); -Route::get('user'.$ds.'safety'.$ds.'login', 'index/safety/loginpwdinfo'); -Route::get('user'.$ds.'safety'.$ds.'mobile', 'index/safety/mobileinfo'); -Route::get('user'.$ds.'safety'.$ds.'new'.$ds.'mobile', 'index/safety/newmobileinfo'); -Route::get('user'.$ds.'safety'.$ds.'email', 'index/safety/emailinfo'); -Route::get('user'.$ds.'safety'.$ds.'new'.$ds.'email', 'index/safety/newemailinfo'); - -// 用户订单 -Route::rule('user'.$ds.'order', 'index/order/index', 'GET|POST'); -Route::get('user'.$ds.'order'.$ds.'detail'.$ds.':id', 'index/order/detail'); -Route::get('user'.$ds.'order'.$ds.'comments'.$ds.':id', 'index/order/comments'); - -// 用户收藏/商品 -Route::rule('user'.$ds.'favor'.$ds.'goods', 'index/userfavor/goods', 'GET|POST'); ?> \ No newline at end of file From 3e9ca8b4f87ff9b9a5f3cff5e7655a9282f7db27 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 14 Mar 2019 10:46:38 +0800 Subject: [PATCH 071/108] =?UTF-8?q?=E9=97=AE=E7=AD=94=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/plugins/css/answers/index.css | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/public/static/plugins/css/answers/index.css b/public/static/plugins/css/answers/index.css index f188026dc..37211b9f4 100644 --- a/public/static/plugins/css/answers/index.css +++ b/public/static/plugins/css/answers/index.css @@ -6,6 +6,10 @@ .plugins-answers .answers-goods { overflow: hidden; } +.plugins-answers .answers-goods ul.am-gallery { + width: calc(100% + 10px); + margin-left: -5px; +} .plugins-answers .answers-goods .am-list-news-hd { padding-bottom: 0; } @@ -17,12 +21,6 @@ .plugins-answers .answers-middle-banner img { width: 100%; } -.plugins-answers .answers-goods .am-gallery-bordered > li:nth-of-type(2n + 1) { - padding-left: 0; -} -.plugins-answers .answers-goods .am-gallery-bordered > li:nth-of-type(2n + 2) { - padding-right: 0; -} .plugins-answers .am-slider-c3 .am-slider-counter { background-color: #d13a49; } From e34a65e3e19d90008ed931b920ed878c43d0ade4 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 14 Mar 2019 11:09:41 +0800 Subject: [PATCH 072/108] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/index/default/css/goods.css | 9 ++++----- public/static/index/default/css/search.css | 2 +- public/static/plugins/css/answers/index.css | 9 +++++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index cb1788567..99853bafb 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -42,7 +42,6 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;} .theme-signin-left .sku-line.selected{background:#d2364c;color: #fff; border: 1px solid #d2364c;} .sku-line-images { padding:3px !important; } .sku-line-images img { width: 30px; height: 30px; } - .theme-signin .btn{width:100%;font-size: 16px;padding:5px ;} .btn-op{position:fixed;left:0;bottom: 0;width:100%; z-index: 3;} .iteminfo_parameter dt.buy-event {text-align: left;width:100% ;} @@ -53,8 +52,8 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;} .am-sticky-placeholder .am-nav-tabs > li.am-active span { color: #333; } .buy-nav-opt span { font-size: 12px; color: #555; } .attr-not-active { border: 1px solid #f03726 !important; box-shadow: 0 0px 3px #ed7f76, 0 0 6px rgba(0, 0, 0, 0); } -.sku-items-disabled { color: #d2cfcf !important; background-color: #ffffff !important; border: 1px dashed #d5d5d5 !important; } -.sku-dont-choose { color: #b4b3b3 !important; background-color: #ffffff !important; border: 1px solid #ebeaea !important; } +.sku-items-disabled { color: #d2cfcf !important; background-color: #ffffff !important; border: 1px dashed #d5d5d5 !important; box-shadow: none !important; } +.sku-dont-choose { color: #b4b3b3 !important; background-color: #ffffff !important; border: 1px solid #ebeaea !important; box-shadow: none !important; } .sku-dont-choose img { opacity: 0.5; } .sku-items-disabled img{ opacity: 0.3; } @@ -75,7 +74,7 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;} .theme-options ul{float: left;} .theme-signin-left .sku-line {background: none;border-radius:0 ;margin:5px;padding:0px 8px;border:1px solid #d5d5d5 ;color:#333; background-color: #f5f5f5; } - .theme-signin-left .sku-line.selected {background:none;color:#333;border: 1px solid #e23f36; box-shadow: 0px 0 0px 1px #e23f36; } + .theme-signin-left .sku-line.selected, .theme-signin-left .sku-line:hover {background:none;color:#333;border: 1px solid #e23f36; box-shadow: 0px 0 0px 1px #e23f36; } /*选中样式*/ .sku-line{position: relative;} @@ -200,7 +199,7 @@ flex: 1 1 0%;line-height: 16px;cursor: pointer;} .iteminfo_parameter.munber,.iteminfo_parameter.freight{display:none ;} .iteminfo_parameter.munber dd{margin-left:5px ;} #min, #add{ width: 35px; height: 25px; outline:none; line-height: 23px; padding: 0; cursor: pointer; } -#text_box { width: 60px; height: 25px; text-align: center; font-size: 16px !important; } +#text_box { width: 60px; height: 25px; text-align: center; font-size: 12px !important; } .theme-popover .am-input-group { display: inline-flex; } diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css index 9c727422b..8c18f1129 100755 --- a/public/static/index/default/css/search.css +++ b/public/static/index/default/css/search.css @@ -126,7 +126,7 @@ dl#select3 .dd-conent{ left:-200%; right:0px;} .data-list { width: calc(100% + 10px); margin-left: -5px; } /*选中效果*/ - .search-list ul li:hover .i-pic.limit,.search-side li:hover .i-pic.check{box-shadow:0px 12px 12px -10px rgba(0,0,0,.4); border: 1px solid #d2364c; } + .search-list ul li:hover .i-pic.limit,.search-side li:hover .i-pic.check{ -webkit-box-shadow: 0px 12px 12px -10px rgba(0,0,0,.4); box-shadow:0px 12px 12px -10px rgba(0,0,0,.4); border: 4px solid #d2364c; -webkit-transition: border-color .2s ease-in; -moz-transition: border-color .2s ease-in; -ms-transition: border-color .2s ease-in; -o-transition: border-color .2s ease-in; transition: border-color .2s ease-in; } } @media only screen and (max-width: 640px) { diff --git a/public/static/plugins/css/answers/index.css b/public/static/plugins/css/answers/index.css index 37211b9f4..0cc0b63d9 100644 --- a/public/static/plugins/css/answers/index.css +++ b/public/static/plugins/css/answers/index.css @@ -61,8 +61,13 @@ } .plugins-answers .am-gallery-bordered .am-gallery-item:hover { -webkit-box-shadow: 0px 12px 12px -10px rgba(0,0,0,.4); - box-shadow: 0px 12px 12px -10px rgba(0,0,0,.4); - border: 1px solid #d2364c; + box-shadow:0px 12px 12px -10px rgba(0,0,0,.4); + border: 4px solid #d2364c; + -webkit-transition: border-color .2s ease-in; + -moz-transition: border-color .2s ease-in; + -ms-transition: border-color .2s ease-in; + -o-transition: border-color .2s ease-in; + transition: border-color .2s ease-in; } .plugins-answers .am-gallery-bordered .am-gallery-item:hover a { text-decoration: none; From 8064f66636557565c2f12e1a7aa0a1abc94df94e Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 14 Mar 2019 15:44:45 +0800 Subject: [PATCH 073/108] =?UTF-8?q?tp=E6=A1=86=E6=9E=B6=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E4=B8=8D=E4=BA=86https=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common.php | 6 ++++++ public/core.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/common.php b/application/common.php index 695926d8a..b12ab6a68 100755 --- a/application/common.php +++ b/application/common.php @@ -225,6 +225,12 @@ function MyUrl($path, $params=[]) $url = str_replace('public/', '', $url); } + // tpurl方法是否识别到https + if(__MY_HTTP__ == 'https' && substr($url, 0, 5) != 'https') + { + $url = 'https'.mb_substr($url, 4, null, 'utf-8'); + } + return $url; } diff --git a/public/core.php b/public/core.php index f65cafed5..aa61e042c 100755 --- a/public/core.php +++ b/public/core.php @@ -19,7 +19,7 @@ define('APPLICATION_VERSION', 'v1.4.0'); define('DS', '/'); // HTTP类型 -define('__MY_HTTP__', ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') || (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off')) ? 'https' : 'http'); +define('__MY_HTTP__', ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') || (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') || (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) || (!empty($_SERVER['HTTP_FROM_HTTPS']) && $_SERVER['HTTP_FROM_HTTPS'] !== 'off')) ? 'https' : 'http'); // 根目录 $my_root = empty($_SERVER['SCRIPT_NAME']) ? '' : substr($_SERVER['SCRIPT_NAME'], 1, strrpos($_SERVER['SCRIPT_NAME'], '/')); From c0b9c68dff2ee923f1d577904d83a8a848751fcf Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 14 Mar 2019 15:48:04 +0800 Subject: [PATCH 074/108] =?UTF-8?q?tp=E6=A1=86=E6=9E=B6=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E4=B8=8D=E4=BA=86https=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/common.php b/application/common.php index b12ab6a68..21f7920f9 100755 --- a/application/common.php +++ b/application/common.php @@ -225,7 +225,7 @@ function MyUrl($path, $params=[]) $url = str_replace('public/', '', $url); } - // tpurl方法是否识别到https + // tp框架url方法是否识别到https if(__MY_HTTP__ == 'https' && substr($url, 0, 5) != 'https') { $url = 'https'.mb_substr($url, 4, null, 'utf-8'); From d460819dd17c40f3dc02e281b5909828ca04da13 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 15 Mar 2019 10:50:27 +0800 Subject: [PATCH 075/108] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E6=96=B0=E7=89=88=E6=9C=AC=E6=94=AF=E4=BB=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/payment/Alipay.php | 524 ++++++++++++++----------------- extend/payment/AlipayAncient.php | 487 ++++++++++++++++++++++++++++ 2 files changed, 716 insertions(+), 295 deletions(-) create mode 100755 extend/payment/AlipayAncient.php diff --git a/extend/payment/Alipay.php b/extend/payment/Alipay.php index e7fee9fa2..1007c452f 100755 --- a/extend/payment/Alipay.php +++ b/extend/payment/Alipay.php @@ -11,7 +11,7 @@ namespace payment; /** - * 支付宝支付 + * 支付宝支付 - 新版本接口 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -50,10 +50,10 @@ class Alipay // 基础信息 $base = [ 'name' => '支付宝', // 插件名称 - 'version' => '0.0.1', // 插件版本 + 'version' => '0.0.2', // 插件版本 'apply_version' => '不限', // 适用系统版本描述 'apply_terminal'=> ['pc','h5'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu'] - 'desc' => '适用PC+H5，即时到帐支付方式，买家的交易资金直接打入卖家支付宝账户，快速回笼交易资金。 立即申请', // 插件描述（支持html） + 'desc' => '***新版本接口*** 适用PC+H5，即时到帐支付方式，买家的交易资金直接打入卖家支付宝账户，快速回笼交易资金。 立即申请', // 插件描述（支持html） 'author' => 'Devil', // 开发者 'author_url' => 'http://shopxo.net/', // 开发者主页 ]; @@ -64,117 +64,39 @@ class Alipay 'element' => 'input', 'type' => 'text', 'default' => '', - 'name' => 'account', - 'placeholder' => '支付宝账号', - 'title' => '支付宝账号', + 'name' => 'appid', + 'placeholder' => '应用ID', + 'title' => '应用ID', 'is_required' => 0, - 'message' => '请填写支付宝账号', + 'message' => '请填写应用ID', ], [ - 'element' => 'input', - 'type' => 'text', - 'default' => '', - 'name' => 'partner', - 'placeholder' => '合作者身份 partner ID', - 'title' => '合作者身份 partner ID', + 'element' => 'textarea', + 'name' => 'rsa_public', + 'placeholder' => '应用公钥', + 'title' => '应用公钥', 'is_required' => 0, - 'message' => '请填写合作者身份 partner ID', + 'rows' => 6, + 'message' => '请填写应用公钥', ], [ - 'element' => 'input', - 'type' => 'text', - 'default' => '', - 'name' => 'key', - 'placeholder' => '交易安全校验码 key', - 'title' => '交易安全校验码 key', + 'element' => 'textarea', + 'name' => 'rsa_private', + 'placeholder' => '应用私钥', + 'title' => '应用私钥', 'is_required' => 0, - 'message' => '请填写交易安全校验码 key', + 'rows' => 6, + 'message' => '请填写应用私钥', + ], + [ + 'element' => 'textarea', + 'name' => 'out_rsa_public', + 'placeholder' => '支付宝公钥', + 'title' => '支付宝公钥', + 'is_required' => 0, + 'rows' => 6, + 'message' => '请填写支付宝公钥', ], - // [ - // 'element' => 'input', // 表单标签 - // 'type' => 'text', // input类型 - // 'default' => '', // 默认值 - // 'name' => 'testinput', // name名称 - // 'placeholder' => '测试输入框不需要验证', // input默认显示文字 - // 'title' => '测试输入框不需要验证', // 展示title名称 - // 'is_required' => 0, // 是否需要强制填写/选择 - // 'message' => '请填写测试输入框不需要验证', // 错误提示（is_required=1方可有效） - // ], - // [ - // 'element' => 'textarea', - // 'default' => '', - // 'name' => 'rsa_private', - // 'placeholder' => 'RSA证书', - // 'title' => 'RSA证书', - // 'is_required' => 0, - // 'minlength' => 10, // 最小输入字符（is_required=1方可有效） - // //'maxlength' => 300, // 最大输入字符, 填则不限（is_required=1方可有效） - // 'rows' => 6, - // ], - // [ - // 'element' => 'input', - // 'type' => 'checkbox', - // 'element_data' => [ - // ['value'=>1, 'name'=>'选项1'], - // ['value'=>2, 'name'=>'选项2',], - // ['value'=>3, 'name'=>'选项3'], - // ['value'=>4, 'name'=>'选项4'] - // ], - // 'is_block' => 1, // 是否每个选项行内展示（默认0） - // 'minchecked' => 2, // 最小选项（默认以is_required=1至少一项，则0） - // 'maxchecked' => 3, // 最大选项 - // 'name' => 'checkbox', - // 'title' => '多选项测试', // 展示title名称 - // 'is_required' => 1, // 是否需要强制填写/选择 - // 'message' => '请选择多选项测试选择 至少选择2项最多选择3项', // 错误提示信息 - // ], - // [ - // 'element' => 'input', - // 'type' => 'radio', - // 'element_data' => [ - // ['value'=>1, 'name'=>'选项1',], - // ['value'=>2, 'name'=>'选项2'], - // ['value'=>3, 'name'=>'选项3'], - // ['value'=>4, 'name'=>'选项4'] - // ], - // 'is_block' => 1, // 是否每个选项行内展示（默认0） - // 'name' => 'radio', - // 'title' => '单选项测试', // 展示title名称 - // 'is_required' => 1, // 是否需要强制填写/选择 - // 'message' => '请选择单选项测试', - // ], - // [ - // 'element' => 'select', - // 'placeholder' => '选一个撒1', - // 'is_multiple' => 0, // 是否开启多选（默认0 关闭） - // 'element_data' => [ - // ['value'=>1, 'name'=>'选项1'], - // ['value'=>2, 'name'=>'选项2'], - // ['value'=>3, 'name'=>'选项3'], - // ['value'=>4, 'name'=>'选项4'] - // ], - // 'name' => 'select1', - // 'title' => '下拉单选测试', // 展示title名称 - // 'is_required' => 1, // 是否需要强制填写/选择 - // 'message' => '请选择下拉单选测试', - // ], - // [ - // 'element' => 'select', - // 'placeholder' => '选一个撒2', - // 'is_multiple' => 1, // 是否开启多选（默认0 关闭） - // 'element_data' => [ - // ['value'=>1, 'name'=>'选项1'], - // ['value'=>2, 'name'=>'选项2'], - // ['value'=>3, 'name'=>'选项3'], - // ['value'=>4, 'name'=>'选项4'] - // ], - // 'minchecked' => 2, // 最小选项（默认以is_required=1至少一项，则0） - // 'maxchecked' => 3, // 最大选项 - // 'name' => 'select2', - // 'title' => '下拉多选测试', // 展示title名称 - // 'is_required' => 1, // 是否需要强制填写/选择 - // 'message' => '请选择下拉多选测试 至少选择2项最多选择3项', - // ], ]; return [ @@ -226,113 +148,33 @@ class Alipay */ private function PayMobile($params = []) { - // 获取请求token - $ret = $this->GetRequestToken($params); - if($ret['code'] != 0) - { - return $ret; - } - - // 拼接wap数据 - $req_data = ''.$ret['data'].''; + // 支付参数 $parameter = array( - 'service' => 'alipay.wap.auth.authAndExecute', - 'format' => 'xml', - 'v' => '2.0', - 'partner' => $this->config['partner'], - 'sec_id' => 'MD5', - 'req_data' => $req_data, - 'request_token' => $ret['data'] + 'app_id' => $this->config['appid'], + 'method' => 'alipay.trade.wap.pay', + 'format' => 'JSON', + 'charset' => 'utf-8', + 'sign_type' => 'RSA2', + 'timestamp' => date('Y-m-d H:i:s'), + 'version' => '1.0', + 'return_url' => $params['call_back_url'], + 'notify_url' => $params['notify_url'], ); - - $param = $this->GetParamSign($parameter); - $url = 'http://wappaygw.alipay.com/service/rest.htm?'.$param['urlcode'].'&sign='.md5($param['sign']); - return DataReturn('处理成功', 0, $url); - } - - /** - * [GetRequestToken 获取临时token] - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2018-09-28T00:43:36+0800 - * @param [array] $params [输入参数] - */ - private function GetRequestToken($params = []) - { - $parameter = array( - 'service' => 'alipay.wap.trade.create.direct', - 'format' => 'xml', - 'v' => '2.0', - 'partner' => $this->config['partner'], - 'req_id' => $params['order_no'], - 'sec_id' => 'MD5', - 'req_data' => $this->GetReqData($params), + $biz_content = array( + 'product_code' => 'QUICK_WAP_WAY', 'subject' => $params['name'], 'out_trade_no' => $params['order_no'], - 'total_fee' => $params['total_price'], - 'seller_account_name' => $this->config['account'], - 'call_back_url' => $params['call_back_url'], - 'notify_url' => $params['notify_url'], - 'out_user' => $params['out_user'], - 'merchant_url' => isset($params['merchant_url']) ? $params['merchant_url'] : $params['call_back_url'], + 'total_amount' => $params['total_price'], ); + $parameter['biz_content'] = json_encode($biz_content, JSON_UNESCAPED_UNICODE); + + // 生成签名参数+签名 + $parameter['sign'] = $this->MyRsaSign($this->GetSignContent($parameter)); - $param = $this->GetParamSign($parameter); - $ret = urldecode(file_get_contents('http://wappaygw.alipay.com/service/rest.htm?'.$param['urlcode'].'&sign='.md5($param['sign']))); - - // 把切割后的字符串数组变成变量与数值组合的数组 - $para_split = explode('&',$ret); - $para_text = []; - foreach($para_split as $item) - { - //获得第一个=字符的位置 - $npos = strpos($item, '='); - //获得字符串长度 - $nlen = strlen($item); - //获得变量名 - $key = substr($item, 0, $npos); - //获得数值 - $value = substr($item, $npos+1, $nlen-$npos-1); - //放入数组中 - $para_text[$key] = $value; - } - if(empty($para_text['res_data'])) - { - return DataReturn('支付宝异常错误', -1); - } - - $req = Xml_Array($para_text['res_data']); - if(empty($req['request_token'])) - { - return DataReturn('支付宝异常错误', -1); - } - return DataReturn('处理成功', 0, $req['request_token']); + // 输出执行form表单post提交 + exit($this->BuildRequestForm($parameter)); } - /** - * [GetReqData 订单信息拼接] - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2018-09-28T00:46:02+0800 - * @param [array] $params [输入参数] - */ - private function GetReqData($params = []) - { - return ' - '.$params['name'].' - '.$params['order_no'].' - '.$params['total_price'].' - '.$this->config['account'].' - '.$params['call_back_url'].' - '.$params['notify_url'].' - '.$params['out_user'].' - '.(isset($params['merchant_url']) ? $params['merchant_url'] : $params['call_back_url']).' - 3600 - 0 - '; - } /** * [PayWeb PC支付] @@ -344,66 +186,34 @@ class Alipay */ private function PayWeb($params = []) { + // 支付参数 $parameter = array( - 'service' => 'create_direct_pay_by_user', - 'partner' => $this->config['partner'], - '_input_charset' => 'utf-8', - 'notify_url' => $params['notify_url'], - 'return_url' => $params['call_back_url'], - - /* 业务参数 */ - 'subject' => $params['name'], - 'out_trade_no' => $params['order_no'], - 'price' => $params['total_price'], - - 'quantity' => 1, - 'payment_type' => 1, - - /* 物流参数 */ - // 'logistics_type' => 'EXPRESS', - // 'logistics_fee' => 0, - // 'logistics_payment' => 'BUYER_PAY_AFTER_RECEIVE', - - /* 买卖双方信息 */ - 'seller_email' => $this->config['account'], + 'app_id' => $this->config['appid'], + 'method' => 'alipay.trade.page.pay', + 'format' => 'JSON', + 'charset' => 'utf-8', + 'sign_type' => 'RSA2', + 'timestamp' => date('Y-m-d H:i:s'), + 'version' => '1.0', + 'return_url' => $params['call_back_url'], + 'notify_url' => $params['notify_url'], ); + $biz_content = array( + 'product_code' => 'FAST_INSTANT_TRADE_PAY', + 'subject' => $params['name'], + 'out_trade_no' => $params['order_no'], + 'total_amount' => $params['total_price'], + ); + $parameter['biz_content'] = json_encode($biz_content, JSON_UNESCAPED_UNICODE); - $param = $this->GetParamSign($parameter); - $url = 'https://mapi.alipay.com/gateway.do?'.$param['urlcode'].'&sign='.md5($param['sign']).'&sign_type=MD5'; - return DataReturn('处理成功', 0, $url); + // 生成签名参数+签名 + $parameter['sign'] = $this->MyRsaSign($this->GetSignContent($parameter)); + + // 输出执行form表单post提交 + exit($this->BuildRequestForm($parameter)); } - /** - * [GetParamSign 签名生成] - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2018-09-28T00:28:07+0800 - * @param [array] $params [输入参数] - */ - private function GetParamSign($params = []) - { - $urlcode = ''; - $url = ''; - ksort($params); - - foreach($params AS $key => $val) - { - $urlcode .= "$key=" .urlencode($val). "&"; - $url .= "$key=$val&"; - } - - $result = array( - 'urlcode' => substr($urlcode, 0, -1), - 'url' => substr($url, 0, -1), - 'sign' => '', - ); - if(!empty($this->config['key'])) - { - $result['sign'] = $result['url'].$this->config['key']; - } - return $result; - } + /** * 支付回调处理 @@ -416,46 +226,30 @@ class Alipay */ public function Respond($params = []) { - if(empty($this->config)) - { - return DataReturn('配置有误', -1); - } - $data = empty($_POST) ? $_GET : array_merge($_GET, $_POST); ksort($data); - $sign = ''; - if(isset($data['sec_id']) && $data['sec_id'] == 'MD5') + // 参数字符串 + $prestr = ''; + foreach($data AS $key=>$val) { - $data_xml = json_decode(json_encode((array) simplexml_load_string($data['notify_data'])), true); - $data = array_merge($data, $data_xml); - $sign = 'service='.$data['service'].'&v='.$data['v'].'&sec_id='.$data['sec_id'].'¬ify_data='.$data['notify_data']; - } else { - foreach($data AS $key=>$val) + if ($key != 'sign' && $key != 'sign_type' && $key != 'code') { - if ($key != 'sign' && $key != 'sign_type' && $key != 'code') - { - $sign .= "$key=$val&"; - } + $prestr .= "$key=$val&"; } - $sign = substr($sign, 0, -1); } + $prestr = substr($prestr, 0, -1); - // 签名校验 - if(!isset($data['sign']) || md5($sign.$this->config['key']) != $data['sign']) + // 签名 + if(!$this->OutRsaVerify($prestr, $data['sign'])) { return DataReturn('签名校验失败', -1); } // 支付状态 - $status = isset($data['trade_status']) ? $data['trade_status'] : $data['result']; - switch($status) + if(!empty($data['trade_no']) || (isset($data['trade_status']) && in_array($data['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED']))) { - case 'TRADE_SUCCESS': - case 'TRADE_FINISHED': - case 'success': - return DataReturn('支付成功', 0, $this->ReturnData($data)); - break; + return DataReturn('支付成功', 0, $this->ReturnData($data)); } return DataReturn('处理异常错误', -100); } @@ -470,18 +264,158 @@ class Alipay */ private function ReturnData($data) { - // 兼容web版本支付参数 - $buyer_user = isset($data['buyer_logon_id']) ? $data['buyer_logon_id'] : (isset($data['buyer_email']) ? $data['buyer_email'] : ''); - $pay_price = isset($data['total_amount']) ? $data['total_amount'] : (isset($data['total_fee']) ? $data['total_fee'] : ''); - // 返回数据固定基础参数 - $data['trade_no'] = isset($data['trade_no']) ? $data['trade_no'] : ''; // 支付平台 - 订单号 - $data['buyer_user'] = $buyer_user; // 支付平台 - 用户 - $data['out_trade_no'] = isset($data['out_trade_no']) ? $data['out_trade_no'] : ''; // 本系统发起支付的 - 订单号 - $data['subject'] = isset($data['subject']) ? $data['subject'] : ''; // 本系统发起支付的 - 商品名称 - $data['pay_price'] = $pay_price; // 本系统发起支付的 - 总价 + $data['trade_no'] = $data['trade_no']; // 支付平台 - 订单号 + $data['buyer_user'] = $data['seller_id']; // 支付平台 - 用户 + $data['out_trade_no'] = $data['out_trade_no']; // 本系统发起支付的 - 订单号 + $data['subject'] = isset($data['subject']) ? $data['subject'] : ''; // 本系统发起支付的 - 商品名称 + $data['pay_price'] = $data['total_amount']; // 本系统发起支付的 - 总价 return $data; } + + /** + * 建立请求，以表单HTML形式构造（默认） + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-15 + * @desc description + * @param [array] $params [请求参数数组] + * @return [string] [提交表单HTML文本] + */ + private function BuildRequestForm($params) + { + $html = ""; + while(list ($key, $val) = each($params)) + { + if(!empty($val)) + { + $val = str_replace("'", "'", $val); + $html .= ""; + } + } + + //submit按钮控件请不要含有name属性 + $html .= ""; + + $html .= ""; + + return $html; + } + + /** + * 获取签名内容 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-15 + * @desc description + * @param [array] $params [需要签名的参数] + */ + public function GetSignContent($params) + { + ksort($params); + $string = ""; + $i = 0; + foreach($params as $k => $v) + { + if(!empty($v) && "@" != substr($v, 0, 1)) + { + if ($i == 0) { + $string .= "$k" . "=" . "$v"; + } else { + $string .= "&" . "$k" . "=" . "$v"; + } + $i++; + } + } + unset($k, $v); + return $string; + } + + /** + * [MyRsaSign 签名字符串] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2017-09-24T08:38:28+0800 + * @param [string] $prestr [需要签名的字符串] + * @return [string] [签名结果] + */ + private function MyRsaSign($prestr) + { + $res = "-----BEGIN RSA PRIVATE KEY-----\n"; + $res .= wordwrap($this->config['rsa_private'], 64, "\n", true); + $res .= "\n-----END RSA PRIVATE KEY-----"; + return openssl_sign($prestr, $sign, $res, OPENSSL_ALGO_SHA256) ? base64_encode($sign) : null; + } + + /** + * [MyRsaDecrypt RSA解密] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2017-09-24T09:12:06+0800 + * @param [string] $content [需要解密的内容，密文] + * @return [string] [解密后内容，明文] + */ + private function MyRsaDecrypt($content) + { + $res = "-----BEGIN PUBLIC KEY-----\n"; + $res .= wordwrap($this->config['rsa_public'], 64, "\n", true); + $res .= "\n-----END PUBLIC KEY-----"; + $res = openssl_get_privatekey($res); + $content = base64_decode($content); + $result = ''; + for($i=0; $iconfig['out_rsa_public'], 64, "\n", true); + $res .= "\n-----END PUBLIC KEY-----"; + $pkeyid = openssl_pkey_get_public($res); + $sign = base64_decode($sign); + if($pkeyid) + { + $verify = openssl_verify($prestr, $sign, $pkeyid, OPENSSL_ALGO_SHA256); + openssl_free_key($pkeyid); + } + return (isset($verify) && $verify == 1) ? true : false; + } + + /** + * [SyncRsaVerify 同步返回签名验证] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2017-09-25T13:13:39+0800 + * @param [array] $data [返回数据] + * @param [boolean] $key [数据key] + */ + private function SyncRsaVerify($data, $key) + { + $string = json_encode($data[$key], JSON_UNESCAPED_UNICODE); + return $this->OutRsaVerify($string, $data['sign']); + } } ?> \ No newline at end of file diff --git a/extend/payment/AlipayAncient.php b/extend/payment/AlipayAncient.php new file mode 100755 index 000000000..2ccd86c95 --- /dev/null +++ b/extend/payment/AlipayAncient.php @@ -0,0 +1,487 @@ +config = $params; + } + + /** + * 配置信息 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + */ + public function Config() + { + // 基础信息 + $base = [ + 'name' => '支付宝', // 插件名称 + 'version' => '0.0.1', // 插件版本 + 'apply_version' => '不限', // 适用系统版本描述 + 'apply_terminal'=> ['pc','h5'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu'] + 'desc' => '***老版本接口*** 适用PC+H5，即时到帐支付方式，买家的交易资金直接打入卖家支付宝账户，快速回笼交易资金。 立即申请', // 插件描述（支持html） + 'author' => 'Devil', // 开发者 + 'author_url' => 'http://shopxo.net/', // 开发者主页 + ]; + + // 配置信息 + $element = [ + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'account', + 'placeholder' => '支付宝账号', + 'title' => '支付宝账号', + 'is_required' => 0, + 'message' => '请填写支付宝账号', + ], + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'partner', + 'placeholder' => '合作者身份 partner ID', + 'title' => '合作者身份 partner ID', + 'is_required' => 0, + 'message' => '请填写合作者身份 partner ID', + ], + [ + 'element' => 'input', + 'type' => 'text', + 'default' => '', + 'name' => 'key', + 'placeholder' => '交易安全校验码 key', + 'title' => '交易安全校验码 key', + 'is_required' => 0, + 'message' => '请填写交易安全校验码 key', + ], + // [ + // 'element' => 'input', // 表单标签 + // 'type' => 'text', // input类型 + // 'default' => '', // 默认值 + // 'name' => 'testinput', // name名称 + // 'placeholder' => '测试输入框不需要验证', // input默认显示文字 + // 'title' => '测试输入框不需要验证', // 展示title名称 + // 'is_required' => 0, // 是否需要强制填写/选择 + // 'message' => '请填写测试输入框不需要验证', // 错误提示（is_required=1方可有效） + // ], + // [ + // 'element' => 'textarea', + // 'default' => '', + // 'name' => 'rsa_private', + // 'placeholder' => 'RSA证书', + // 'title' => 'RSA证书', + // 'is_required' => 0, + // 'minlength' => 10, // 最小输入字符（is_required=1方可有效） + // //'maxlength' => 300, // 最大输入字符, 填则不限（is_required=1方可有效） + // 'rows' => 6, + // ], + // [ + // 'element' => 'input', + // 'type' => 'checkbox', + // 'element_data' => [ + // ['value'=>1, 'name'=>'选项1'], + // ['value'=>2, 'name'=>'选项2',], + // ['value'=>3, 'name'=>'选项3'], + // ['value'=>4, 'name'=>'选项4'] + // ], + // 'is_block' => 1, // 是否每个选项行内展示（默认0） + // 'minchecked' => 2, // 最小选项（默认以is_required=1至少一项，则0） + // 'maxchecked' => 3, // 最大选项 + // 'name' => 'checkbox', + // 'title' => '多选项测试', // 展示title名称 + // 'is_required' => 1, // 是否需要强制填写/选择 + // 'message' => '请选择多选项测试选择 至少选择2项最多选择3项', // 错误提示信息 + // ], + // [ + // 'element' => 'input', + // 'type' => 'radio', + // 'element_data' => [ + // ['value'=>1, 'name'=>'选项1',], + // ['value'=>2, 'name'=>'选项2'], + // ['value'=>3, 'name'=>'选项3'], + // ['value'=>4, 'name'=>'选项4'] + // ], + // 'is_block' => 1, // 是否每个选项行内展示（默认0） + // 'name' => 'radio', + // 'title' => '单选项测试', // 展示title名称 + // 'is_required' => 1, // 是否需要强制填写/选择 + // 'message' => '请选择单选项测试', + // ], + // [ + // 'element' => 'select', + // 'placeholder' => '选一个撒1', + // 'is_multiple' => 0, // 是否开启多选（默认0 关闭） + // 'element_data' => [ + // ['value'=>1, 'name'=>'选项1'], + // ['value'=>2, 'name'=>'选项2'], + // ['value'=>3, 'name'=>'选项3'], + // ['value'=>4, 'name'=>'选项4'] + // ], + // 'name' => 'select1', + // 'title' => '下拉单选测试', // 展示title名称 + // 'is_required' => 1, // 是否需要强制填写/选择 + // 'message' => '请选择下拉单选测试', + // ], + // [ + // 'element' => 'select', + // 'placeholder' => '选一个撒2', + // 'is_multiple' => 1, // 是否开启多选（默认0 关闭） + // 'element_data' => [ + // ['value'=>1, 'name'=>'选项1'], + // ['value'=>2, 'name'=>'选项2'], + // ['value'=>3, 'name'=>'选项3'], + // ['value'=>4, 'name'=>'选项4'] + // ], + // 'minchecked' => 2, // 最小选项（默认以is_required=1至少一项，则0） + // 'maxchecked' => 3, // 最大选项 + // 'name' => 'select2', + // 'title' => '下拉多选测试', // 展示title名称 + // 'is_required' => 1, // 是否需要强制填写/选择 + // 'message' => '请选择下拉多选测试 至少选择2项最多选择3项', + // ], + ]; + + return [ + 'base' => $base, + 'element' => $element, + ]; + } + + /** + * 支付入口 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Pay($params = []) + { + // 参数 + if(empty($params)) + { + return DataReturn('参数不能为空', -1); + } + + // 配置信息 + if(empty($this->config)) + { + return DataReturn('支付缺少配置', -1); + } + + // 手机/PC + if(IsMobile()) + { + $ret = $this->PayMobile($params); + } else { + $ret = $this->PayWeb($params); + } + return $ret; + } + + /** + * [PayMobile wap手机支付] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:41:09+0800 + * @param [array] $params [输入参数] + */ + private function PayMobile($params = []) + { + // 获取请求token + $ret = $this->GetRequestToken($params); + if($ret['code'] != 0) + { + return $ret; + } + + // 拼接wap数据 + $req_data = ''.$ret['data'].''; + $parameter = array( + 'service' => 'alipay.wap.auth.authAndExecute', + 'format' => 'xml', + 'v' => '2.0', + 'partner' => $this->config['partner'], + 'sec_id' => 'MD5', + 'req_data' => $req_data, + 'request_token' => $ret['data'] + ); + + $param = $this->GetParamSign($parameter); + $url = 'http://wappaygw.alipay.com/service/rest.htm?'.$param['urlcode'].'&sign='.md5($param['sign']); + return DataReturn('处理成功', 0, $url); + } + + /** + * [GetRequestToken 获取临时token] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:43:36+0800 + * @param [array] $params [输入参数] + */ + private function GetRequestToken($params = []) + { + $parameter = array( + 'service' => 'alipay.wap.trade.create.direct', + 'format' => 'xml', + 'v' => '2.0', + 'partner' => $this->config['partner'], + 'req_id' => $params['order_no'], + 'sec_id' => 'MD5', + 'req_data' => $this->GetReqData($params), + 'subject' => $params['name'], + 'out_trade_no' => $params['order_no'], + 'total_fee' => $params['total_price'], + 'seller_account_name' => $this->config['account'], + 'call_back_url' => $params['call_back_url'], + 'notify_url' => $params['notify_url'], + 'out_user' => $params['out_user'], + 'merchant_url' => isset($params['merchant_url']) ? $params['merchant_url'] : $params['call_back_url'], + ); + + $param = $this->GetParamSign($parameter); + $ret = urldecode(file_get_contents('http://wappaygw.alipay.com/service/rest.htm?'.$param['urlcode'].'&sign='.md5($param['sign']))); + + // 把切割后的字符串数组变成变量与数值组合的数组 + $para_split = explode('&',$ret); + $para_text = []; + foreach($para_split as $item) + { + //获得第一个=字符的位置 + $npos = strpos($item, '='); + //获得字符串长度 + $nlen = strlen($item); + //获得变量名 + $key = substr($item, 0, $npos); + //获得数值 + $value = substr($item, $npos+1, $nlen-$npos-1); + //放入数组中 + $para_text[$key] = $value; + } + if(empty($para_text['res_data'])) + { + return DataReturn('支付宝异常错误', -1); + } + + $req = Xml_Array($para_text['res_data']); + if(empty($req['request_token'])) + { + return DataReturn('支付宝异常错误', -1); + } + return DataReturn('处理成功', 0, $req['request_token']); + } + + /** + * [GetReqData 订单信息拼接] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:46:02+0800 + * @param [array] $params [输入参数] + */ + private function GetReqData($params = []) + { + return ' + '.$params['name'].' + '.$params['order_no'].' + '.$params['total_price'].' + '.$this->config['account'].' + '.$params['call_back_url'].' + '.$params['notify_url'].' + '.$params['out_user'].' + '.(isset($params['merchant_url']) ? $params['merchant_url'] : $params['call_back_url']).' + 3600 + 0 + '; + } + + /** + * [PayWeb PC支付] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:23:04+0800 + * @param [array] $params [输入参数] + */ + private function PayWeb($params = []) + { + $parameter = array( + 'service' => 'create_direct_pay_by_user', + 'partner' => $this->config['partner'], + '_input_charset' => 'utf-8', + 'notify_url' => $params['notify_url'], + 'return_url' => $params['call_back_url'], + + /* 业务参数 */ + 'subject' => $params['name'], + 'out_trade_no' => $params['order_no'], + 'price' => $params['total_price'], + + 'quantity' => 1, + 'payment_type' => 1, + + /* 物流参数 */ + // 'logistics_type' => 'EXPRESS', + // 'logistics_fee' => 0, + // 'logistics_payment' => 'BUYER_PAY_AFTER_RECEIVE', + + /* 买卖双方信息 */ + 'seller_email' => $this->config['account'], + ); + + $param = $this->GetParamSign($parameter); + $url = 'https://mapi.alipay.com/gateway.do?'.$param['urlcode'].'&sign='.md5($param['sign']).'&sign_type=MD5'; + return DataReturn('处理成功', 0, $url); + } + + /** + * [GetParamSign 签名生成] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-09-28T00:28:07+0800 + * @param [array] $params [输入参数] + */ + private function GetParamSign($params = []) + { + $urlcode = ''; + $url = ''; + ksort($params); + + foreach($params AS $key => $val) + { + $urlcode .= "$key=" .urlencode($val). "&"; + $url .= "$key=$val&"; + } + + $result = array( + 'urlcode' => substr($urlcode, 0, -1), + 'url' => substr($url, 0, -1), + 'sign' => '', + ); + if(!empty($this->config['key'])) + { + $result['sign'] = $result['url'].$this->config['key']; + } + return $result; + } + + /** + * 支付回调处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-19 + * @desc description + * @param [array] $params [输入参数] + */ + public function Respond($params = []) + { + if(empty($this->config)) + { + return DataReturn('配置有误', -1); + } + + $data = empty($_POST) ? $_GET : array_merge($_GET, $_POST); + ksort($data); + + $sign = ''; + if(isset($data['sec_id']) && $data['sec_id'] == 'MD5') + { + $data_xml = json_decode(json_encode((array) simplexml_load_string($data['notify_data'])), true); + $data = array_merge($data, $data_xml); + $sign = 'service='.$data['service'].'&v='.$data['v'].'&sec_id='.$data['sec_id'].'¬ify_data='.$data['notify_data']; + } else { + foreach($data AS $key=>$val) + { + if ($key != 'sign' && $key != 'sign_type' && $key != 'code') + { + $sign .= "$key=$val&"; + } + } + $sign = substr($sign, 0, -1); + } + + // 签名校验 + if(!isset($data['sign']) || md5($sign.$this->config['key']) != $data['sign']) + { + return DataReturn('签名校验失败', -1); + } + + // 支付状态 + $status = isset($data['trade_status']) ? $data['trade_status'] : $data['result']; + switch($status) + { + case 'TRADE_SUCCESS': + case 'TRADE_FINISHED': + case 'success': + return DataReturn('支付成功', 0, $this->ReturnData($data)); + break; + } + return DataReturn('处理异常错误', -100); + } + + /** + * [ReturnData 返回数据统一格式] + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2018-10-06T16:54:24+0800 + * @param [array] $data [返回数据] + */ + private function ReturnData($data) + { + // 兼容web版本支付参数 + $buyer_user = isset($data['buyer_logon_id']) ? $data['buyer_logon_id'] : (isset($data['buyer_email']) ? $data['buyer_email'] : ''); + $pay_price = isset($data['total_amount']) ? $data['total_amount'] : (isset($data['total_fee']) ? $data['total_fee'] : ''); + + // 返回数据固定基础参数 + $data['trade_no'] = isset($data['trade_no']) ? $data['trade_no'] : ''; // 支付平台 - 订单号 + $data['buyer_user'] = $buyer_user; // 支付平台 - 用户 + $data['out_trade_no'] = isset($data['out_trade_no']) ? $data['out_trade_no'] : ''; // 本系统发起支付的 - 订单号 + $data['subject'] = isset($data['subject']) ? $data['subject'] : ''; // 本系统发起支付的 - 商品名称 + $data['pay_price'] = $pay_price; // 本系统发起支付的 - 总价 + + return $data; + } +} +?> \ No newline at end of file From e4287b9b57d924e00c25d8b117d1e3603b556009 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 15 Mar 2019 11:05:01 +0800 Subject: [PATCH 076/108] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/view/default/order/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html index afa1f0d02..36eb7ea1a 100755 --- a/application/index/view/default/order/detail.html +++ b/application/index/view/default/order/detail.html @@ -356,7 +356,7 @@
    没有支付方式
    {{/if}}
    -
    +
    From b3832b67533d8f679ea1d6853e33fefb97a14df4 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 15 Mar 2019 11:14:55 +0800 Subject: [PATCH 077/108] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/payment/Alipay.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extend/payment/Alipay.php b/extend/payment/Alipay.php index 1007c452f..383ce1bed 100755 --- a/extend/payment/Alipay.php +++ b/extend/payment/Alipay.php @@ -287,7 +287,7 @@ class Alipay private function BuildRequestForm($params) { $html = "
    "; - while(list ($key, $val) = each($params)) + foreach($params as $key=>$val) { if(!empty($val)) { From 886d34ff886d30e76f7b53ff577f45b40408321d Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 15 Mar 2019 17:46:35 +0800 Subject: [PATCH 078/108] =?UTF-8?q?=E6=96=B0=E5=A2=9Eqq=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/controller/Common.php | 17 +- application/index/controller/Personal.php | 3 +- application/index/controller/Safety.php | 3 +- application/index/controller/User.php | 6 + application/index/lang/zh-cn.php | 137 +------- .../index/view/default/personal/index.html | 18 +- .../view/default/public/header_top_nav.html | 119 +++---- .../index/view/default/safety/index.html | 4 +- application/plugins/shopoauth/Admin.php | 73 ++++ application/plugins/shopoauth/Auth.php | 146 ++++++++ application/plugins/shopoauth/Hook.php | 190 +++++++++++ application/plugins/shopoauth/LoginEvent.php | 33 ++ application/plugins/shopoauth/ThinkOauth.php | 285 ++++++++++++++++ application/plugins/shopoauth/config.json | 32 ++ application/plugins/shopoauth/sdk/QqSDK.php | 98 ++++++ .../plugins/view/shopoauth/admin/index.html | 61 ++++ .../view/shopoauth/admin/saveinfo.html | 55 +++ application/service/NavigationService.php | 313 +++++++++++++++++- application/tags.php | 10 + config/shopxo.sql | 96 +++--- public/static/plugins/css/shopoauth/admin.css | 11 + .../2019/03/13/1552472848865750.png | Bin 0 -> 5186 bytes 22 files changed, 1444 insertions(+), 266 deletions(-) create mode 100644 application/plugins/shopoauth/Admin.php create mode 100644 application/plugins/shopoauth/Auth.php create mode 100644 application/plugins/shopoauth/Hook.php create mode 100644 application/plugins/shopoauth/LoginEvent.php create mode 100644 application/plugins/shopoauth/ThinkOauth.php create mode 100644 application/plugins/shopoauth/config.json create mode 100644 application/plugins/shopoauth/sdk/QqSDK.php create mode 100644 application/plugins/view/shopoauth/admin/index.html create mode 100644 application/plugins/view/shopoauth/admin/saveinfo.html create mode 100644 public/static/plugins/css/shopoauth/admin.css create mode 100644 public/static/upload/images/plugins_shopoauth/2019/03/13/1552472848865750.png diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 74d7fdc34..d3806cca0 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -98,6 +98,9 @@ class Common extends Controller // 公共底部钩子 $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_backend'=>false, 'user'=>$this->user])); + + // 公共顶部小导航钩子-左侧 + $this->assign('plugins_service_header_navigation_top_left_data', Hook::listen('plugins_service_header_navigation_top_left', ['hook_name'=>'plugins_service_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); } /** @@ -211,20 +214,11 @@ class Common extends Controller $this->assign('user', $this->user); // 用户中心菜单 - $this->assign('user_left_menu', lang('user_left_menu')); + $this->assign('user_left_menu', NavigationService::UsersCenterLeftList()); // 商品大分类 $this->assign('goods_category_list', GoodsService::GoodsCategory()); - // 购物车商品总数 - $common_cart_total = BuyService::UserCartTotal(['user'=>$this->user]); - $this->assign('common_cart_total', ($common_cart_total > 99) ? '99+' : $common_cart_total); - - // 未读消息总数 - $params = ['user'=>$this->user, 'is_more'=>1, 'is_read'=>0, 'user_type'=>'user']; - $common_message_total = MessageService::UserMessageTotal($params); - $this->assign('common_message_total', ($common_message_total > 99) ? '99+' : $common_message_total); - // 搜索框下热门关键字 $home_search_keywords = []; switch(intval(MyC('home_search_keywords_type', 0))) @@ -244,6 +238,9 @@ class Common extends Controller // 开发模式 $this->assign('shopxo_is_develop', config('shopxo.is_develop')); + + // 顶部右侧导航 + $this->assign('common_nav_top_right_list', NavigationService::HomeHavTopRight(['user'=>$this->user])); } /** diff --git a/application/index/controller/Personal.php b/application/index/controller/Personal.php index c021fd9d9..05cd0d97f 100755 --- a/application/index/controller/Personal.php +++ b/application/index/controller/Personal.php @@ -11,6 +11,7 @@ namespace app\index\controller; use app\service\UserService; +use app\service\NavigationService; /** * 个人资料 @@ -46,7 +47,7 @@ class Personal extends Common */ public function Index() { - $this->assign('personal_show_list', lang('personal_show_list')); + $this->assign('personal_show_list', NavigationService::UsersPersonalShowFieldList()); return $this->fetch(); } diff --git a/application/index/controller/Safety.php b/application/index/controller/Safety.php index 751d8b15a..f32a6317b 100755 --- a/application/index/controller/Safety.php +++ b/application/index/controller/Safety.php @@ -11,6 +11,7 @@ namespace app\index\controller; use app\service\SafetyService; +use app\service\NavigationService; /** * 安全 @@ -47,7 +48,7 @@ class Safety extends Common public function Index() { // 安全信息列表 - $this->assign('safety_panel_list', lang('safety_panel_list')); + $this->assign('safety_panel_list', NavigationService::UsersSafetyPanelList()); // 数据列表 $data = array( diff --git a/application/index/controller/User.php b/application/index/controller/User.php index 537a0a5a0..f212b6417 100755 --- a/application/index/controller/User.php +++ b/application/index/controller/User.php @@ -16,6 +16,7 @@ use app\service\GoodsService; use app\service\UserService; use app\service\BuyService; use app\service\SeoService; +use app\service\MessageService; /** * 用户 @@ -93,6 +94,11 @@ class User extends Common $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); $this->assign('user_order_status', $user_order_status['data']); + // 未读消息总数 + $params = ['user'=>$this->user, 'is_more'=>1, 'is_read'=>0, 'user_type'=>'user']; + $common_message_total = MessageService::UserMessageTotal($params); + $this->assign('common_message_total', ($common_message_total > 99) ? '99+' : $common_message_total); + // 获取进行中的订单列表 $params = array_merge($_POST, $_GET); $params['user'] = $this->user; diff --git a/application/index/lang/zh-cn.php b/application/index/lang/zh-cn.php index 4a217880d..b0e08572a 100755 --- a/application/index/lang/zh-cn.php +++ b/application/index/lang/zh-cn.php @@ -16,140 +16,5 @@ * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -return array( - // 用户中心菜单, is_show = [0禁用, 1启用] - 'user_left_menu' => array( - array( - 'control' => 'user', - 'action' => 'index', - 'name' => '个人中心', - 'is_show' => 1, - 'icon' => 'am-icon-home', - ), - array( - 'name' => '交易管理', - 'is_show' => 1, - 'icon' => 'am-icon-cube', - 'item' => array( - array( - 'control' => 'order', - 'action' => 'index', - 'name' => '订单管理', - 'is_show' => 1, - 'icon' => 'am-icon-th-list', - ), - array( - 'control' => 'userfavor', - 'action' => 'goods', - 'name' => '我的收藏', - 'is_show' => 1, - 'icon' => 'am-icon-heart-o', - ), - ) - ), - array( - 'name' => '资料管理', - 'is_show' => 1, - 'icon' => 'am-icon-user', - 'item' => array( - array( - 'control' => 'personal', - 'action' => 'index', - 'name' => '个人资料', - 'is_show' => 1, - 'icon' => 'am-icon-gear', - ), - array( - 'control' => 'useraddress', - 'action' => 'index', - 'name' => '我的地址', - 'is_show' => 1, - 'icon' => 'am-icon-street-view', - ), - array( - 'control' => 'safety', - 'action' => 'index', - 'name' => '安全设置', - 'is_show' => 1, - 'icon' => 'am-icon-user-secret', - ), - array( - 'control' => 'message', - 'action' => 'index', - 'name' => '我的消息', - 'is_show' => 1, - 'icon' => 'am-icon-bell-o', - ), - array( - 'control' => 'userintegral', - 'action' => 'index', - 'name' => '我的积分', - 'is_show' => 1, - 'icon' => 'am-icon-fire', - ), - array( - 'control' => 'usergoodsbrowse', - 'action' => 'index', - 'name' => '我的足迹', - 'is_show' => 1, - 'icon' => 'am-icon-lastfm', - ), - array( - 'control' => 'answer', - 'action' => 'index', - 'name' => '问答/留言', - 'is_show' => 1, - 'icon' => 'am-icon-question', - ), - array( - 'control' => 'user', - 'action' => 'logout', - 'name' => '安全退出', - 'is_show' => 1, - 'icon' => 'am-icon-power-off', - ), - ) - ), - ), - - - // 个人资料展示列表 - 'personal_show_list' => array( - 'avatar' => array('name' => '头像', 'tips' => '修改'), - 'nickname' => array('name' => '昵称'), - 'gender_text' => array('name' => '性别'), - 'birthday_text' => array('name' => '生日'), - 'mobile_security' => array('name' => '手机号码', 'tips' => '修改', 'path' => 'index/safety/mobileinfo'), - 'email_security' => array('name' => '电子邮箱', 'tips' => '修改', 'path' => 'index/safety/mobileinfo'), - 'add_time_text' => array('name' => '注册时间'), - 'upd_time_text' => array('name' => '最后更新时间'), - ), - - - // 安全项列表 - 'safety_panel_list' => array( - array( - 'title' => '登录密码', - 'msg' => '互联网存在被盗风险，建议您定期更改密码以保护安全。', - 'path' => 'index/safety/loginpwdinfo', - 'type' => 'loginpwd', - ), - array( - 'title' => '手机号码', - 'no_msg' => '您还没有绑定手机号码', - 'ok_msg' => '已绑定手机 #accounts#', - 'tips' => '可用于登录，密码找回，账户安全管理校验，接受账户提醒通知。', - 'path' => 'index/safety/mobileinfo', - 'type' => 'mobile', - ), - array( - 'title' => '电子邮箱', - 'no_msg' => '您还没有绑定电子邮箱', - 'ok_msg' => '已绑定电子邮箱 #accounts#', - 'tips' => '可用于登录，密码找回，账户安全管理校验，接受账户提醒邮件。', - 'path' => 'index/safety/emailinfo', - 'type' => 'email', - ), - ), -); +return []; ?> \ No newline at end of file diff --git a/application/index/view/default/personal/index.html b/application/index/view/default/personal/index.html index 8d8c367f5..2ae00f43b 100755 --- a/application/index/view/default/personal/index.html +++ b/application/index/view/default/personal/index.html @@ -28,16 +28,20 @@
    {{foreach $personal_show_list as $k=>$v}} - {{if isset($user[$k])}} + {{if isset($user[$k]) or (isset($v['is_ext']) and $v['is_ext'] eq 1)}}
    {{$v.name}}
    - {{if empty($user[$k])}} - 未填写 - {{elseif $k eq 'avatar' /}} - + {{if isset($v['is_ext']) and $v['is_ext'] eq 1}} + {{$v.value}} {{else /}} - {{$user[$k]}} - {{/if}} + {{if empty($user[$k])}} + 未填写 + {{elseif $k eq 'avatar' /}} + + {{else /}} + {{$user[$k]}} + {{/if}} + {{/if}} {{if !empty($v['tips'])}} {{if !empty($v['path'])}} {{:str_replace('{path}', MyUrl($v['path']), $v['tips'])}} diff --git a/application/index/view/default/public/header_top_nav.html b/application/index/view/default/public/header_top_nav.html index 87550fbda..45cf5b816 100755 --- a/application/index/view/default/public/header_top_nav.html +++ b/application/index/view/default/public/header_top_nav.html @@ -16,76 +16,63 @@ 您好 {{$user.user_name_view}}，欢迎来到 {{:MyC('home_site_name')}} [退出] {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
    + plugins_service_header_navigation_top_left +
    + {{/if}} + {{if !empty($plugins_service_header_navigation_top_left_data) and is_array($plugins_service_header_navigation_top_left_data) and (!isset($is_footer) or $is_footer eq 1)}} + {{foreach $plugins_service_header_navigation_top_left_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}}
    - \ No newline at end of file + +
    +
    +
    + + 第三方账号登陆 + 点击申请 + 返回 + +
    + +
    + {{if empty($data['auth']['qq']['name'])}} + qq + {{else /}} + {{$data.auth.qq.name}} + {{/if}} +
    +
    +
    + +
    + {{if empty($data['auth']['qq']['app_key'])}} + 未填写 + {{else /}} + {{$data.auth.qq.app_key}} + {{/if}} +
    +
    +
    + +
    + {{if empty($data['auth']['qq']['app_secret'])}} + 未填写 + {{else /}} + {{$data.auth.qq.app_secret}} + {{/if}} +
    +
    +
    + +
    + {{if isset($data['auth']['qq']['open']) and $data['auth']['qq']['open'] eq 1}} + 已开启 + {{else /}} + 未开启 + {{/if}} +
    +
    + + 编辑 +
    +
    +
    + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/shopoauth/admin/saveinfo.html b/application/plugins/view/shopoauth/admin/saveinfo.html new file mode 100644 index 000000000..f948ddced --- /dev/null +++ b/application/plugins/view/shopoauth/admin/saveinfo.html @@ -0,0 +1,55 @@ +{{include file="public/header" /}} + + +
    +
    + + + + 第三方账号登陆 + 返回 + + +
    +
    +

    QQ

    +
    +
    +
    + + +
    +
    + + +
    + +
    + + +
    +
    + +
    + {{foreach $is_whether_list as $v}} + + {{/foreach}} +
    +
    +
    +
    + +
    + +
    + + +
    +
    + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index ab17d12d7..2da007341 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -56,7 +56,7 @@ class NavigationService $hook_name = 'plugins_service_navigation_header_handle'; $ret = Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, 'params' => &$params, 'header' => &$header, ]); @@ -80,7 +80,7 @@ class NavigationService $hook_name = 'plugins_service_navigation_footer_handle'; $ret = Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, 'params' => &$params, 'footer' => &$footer, ]); @@ -479,5 +479,314 @@ class NavigationService } return DataReturn('编辑失败或数据未改变', -100); } + + /** + * 获取前端顶部右侧导航 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-15 + * @desc description + * @param array $params [description] + */ + public static function HomeHavTopRight($params = []) + { + $common_cart_total = 0; + $common_message_total = -1; + if(!empty($params['user'])) + { + // 购物车商品总数 + $common_cart_total = BuyService::UserCartTotal(['user'=>$params['user']]); + $common_cart_total = ($common_cart_total > 99) ? '99+' : $common_cart_total; + + // 未读消息总数 + $message_params = ['user'=>$params['user'], 'is_more'=>1, 'is_read'=>0, 'user_type'=>'user']; + $common_message_total = MessageService::UserMessageTotal($message_params); + $common_message_total = ($common_message_total > 99) ? '99+' : (($common_message_total <= 0) ? -1 : $common_message_total); + } + + // 列表 + $data = [ + [ + 'name' => '个人中心', + 'is_login' => 1, + 'badge' => null, + 'icon' => 'am-icon-user', + 'url' => MyUrl('index/user/index'), + 'items' => [], + ], + [ + 'name' => '我的交易', + 'is_login' => 1, + 'badge' => null, + 'icon' => 'am-icon-cube', + 'url' => '', + 'items' => [ + [ + 'name' => '我的订单', + 'url' => MyUrl('index/order/index'), + ], + ], + ], + [ + 'name' => '我的收藏', + 'is_login' => 1, + 'badge' => null, + 'icon' => 'am-icon-heart', + 'url' => '', + 'items' => [ + [ + 'name' => '商品收藏', + 'url' => MyUrl('index/userfavor/goods'), + ], + ], + ], + [ + 'name' => '购物车', + 'is_login' => 1, + 'badge' => $common_cart_total, + 'icon' => 'am-icon-shopping-cart', + 'url' => MyUrl('index/cart/index'), + 'items' => [], + ], + [ + 'name' => '消息', + 'is_login' => 1, + 'badge' => $common_message_total, + 'icon' => 'am-icon-bell', + 'url' => MyUrl('index/message/index'), + 'items' => [], + ], + ]; + + // 顶部小导航右侧钩子 + $hook_name = 'plugins_service_header_navigation_top_right_handle'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'data' => &$data, + ]); + + return $data; + } + + /** + * 用户中心资料修改展示字段 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-15 + * @desc description + * @param array $params [description] + */ + public static function UsersPersonalShowFieldList($params = []) + { + $data = [ + 'avatar' => [ + 'name' => '头像', + 'tips' => '修改' + ], + 'nickname' => [ + 'name' => '昵称' + ], + 'gender_text' => [ + 'name' => '性别' + ], + 'birthday_text' => [ + 'name' => '生日' + ], + 'mobile_security' => [ + 'name' => '手机号码', + 'tips' => '修改' + ], + 'email_security' => [ + 'name' => '电子邮箱', + 'tips' => '修改' + ], + 'add_time_text' => [ + 'name' => '注册时间' + ], + 'upd_time_text' => [ + 'name' => '最后更新时间' + ], + ]; + + // 用户中心资料修改展示字段钩子 + $hook_name = 'plugins_service_users_personal_show_field_list_handle'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'data' => &$data, + ]); + + return $data; + } + + /** + * 用户安全项列表 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-15 + * @desc description + * @param array $params [description] + */ + public static function UsersSafetyPanelList($params = []) + { + $data = [ + [ + 'title' => '登录密码', + 'msg' => '互联网存在被盗风险，建议您定期更改密码以保护安全。', + 'url' => MyUrl('index/safety/loginpwdinfo'), + 'type' => 'loginpwd', + ], + [ + 'title' => '手机号码', + 'no_msg' => '您还没有绑定手机号码', + 'ok_msg' => '已绑定手机 #accounts#', + 'tips' => '可用于登录，密码找回，账户安全管理校验，接受账户提醒通知。', + 'url' => MyUrl('index/safety/mobileinfo'), + 'type' => 'mobile', + ], + [ + 'title' => '电子邮箱', + 'no_msg' => '您还没有绑定电子邮箱', + 'ok_msg' => '已绑定电子邮箱 #accounts#', + 'tips' => '可用于登录，密码找回，账户安全管理校验，接受账户提醒邮件。', + 'url' => MyUrl('index/safety/emailinfo'), + 'type' => 'email', + ], + ]; + + // 用户安全项列表钩子 + $hook_name = 'plugins_service_users_safety_panel_list_handle'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'data' => &$data, + ]); + + return $data; + } + + /** + * 用户中心左侧菜单 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-15 + * @desc description + * @param array $params [description] + */ + public static function UsersCenterLeftList($params = []) + { + $data = [ + [ + 'control' => 'user', + 'action' => 'index', + 'name' => '个人中心', + 'is_show' => 1, + 'icon' => 'am-icon-home', + ], + [ + 'name' => '交易管理', + 'is_show' => 1, + 'icon' => 'am-icon-cube', + 'item' => [ + [ + 'control' => 'order', + 'action' => 'index', + 'name' => '订单管理', + 'is_show' => 1, + 'icon' => 'am-icon-th-list', + ], + [ + 'control' => 'userfavor', + 'action' => 'goods', + 'name' => '我的收藏', + 'is_show' => 1, + 'icon' => 'am-icon-heart-o', + ], + ] + ], + [ + 'name' => '资料管理', + 'is_show' => 1, + 'icon' => 'am-icon-user', + 'item' => [ + [ + 'control' => 'personal', + 'action' => 'index', + 'name' => '个人资料', + 'is_show' => 1, + 'icon' => 'am-icon-gear', + ], + [ + 'control' => 'useraddress', + 'action' => 'index', + 'name' => '我的地址', + 'is_show' => 1, + 'icon' => 'am-icon-street-view', + ], + [ + 'control' => 'safety', + 'action' => 'index', + 'name' => '安全设置', + 'is_show' => 1, + 'icon' => 'am-icon-user-secret', + ], + [ + 'control' => 'message', + 'action' => 'index', + 'name' => '我的消息', + 'is_show' => 1, + 'icon' => 'am-icon-bell-o', + ], + [ + 'control' => 'userintegral', + 'action' => 'index', + 'name' => '我的积分', + 'is_show' => 1, + 'icon' => 'am-icon-fire', + ], + [ + 'control' => 'usergoodsbrowse', + 'action' => 'index', + 'name' => '我的足迹', + 'is_show' => 1, + 'icon' => 'am-icon-lastfm', + ], + [ + 'control' => 'answer', + 'action' => 'index', + 'name' => '问答/留言', + 'is_show' => 1, + 'icon' => 'am-icon-question', + ], + [ + 'control' => 'user', + 'action' => 'logout', + 'name' => '安全退出', + 'is_show' => 1, + 'icon' => 'am-icon-power-off', + ], + ] + ], + ]; + + // 用户中心左侧菜单钩子 + $hook_name = 'plugins_service_users_center_left_menu_handle'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'data' => &$data, + ]); + + return $data; + } } ?> \ No newline at end of file diff --git a/application/tags.php b/application/tags.php index 98eba492f..ed88258ce 100755 --- a/application/tags.php +++ b/application/tags.php @@ -44,6 +44,7 @@ return array ( 'plugins_service_user_login_end' => array ( 0 => 'app\\plugins\\userloginrewardintegral\\Hook', + 1 => 'app\\plugins\\shopoauth\\Hook', ), 'plugins_css' => array ( @@ -88,6 +89,7 @@ return array ( 'plugins_common_header' => array ( 0 => 'app\\plugins\\expressforkdn\\Hook', + 1 => 'app\\plugins\\shopoauth\\Hook', ), 'plugins_admin_common_header' => array ( @@ -97,5 +99,13 @@ return array ( array ( 0 => 'app\\plugins\\expressforkdn\\Hook', ), + 'plugins_service_header_navigation_top_left' => + array ( + 0 => 'app\\plugins\\shopoauth\\Hook', + ), + 'plugins_service_users_personal_show_field_list_handle' => + array ( + 0 => 'app\\plugins\\shopoauth\\Hook', + ), ); ?> \ No newline at end of file diff --git a/config/shopxo.sql b/config/shopxo.sql index db5e6d0c5..0191748e5 100755 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -11,7 +11,7 @@ Target Server Version : 50722 File Encoding : utf-8 - Date: 03/13/2019 15:54:42 PM + Date: 03/15/2019 17:46:18 PM */ SET NAMES utf8mb4; @@ -40,7 +40,7 @@ CREATE TABLE `s_admin` ( -- Records of `s_admin` -- ---------------------------- BEGIN; -INSERT INTO `s_admin` VALUES ('1', 'admin', '7a967ef74ec3b8ace07f08a832470e27', '176118', '17688888888', '0', '385', '1552269605', '1', '1481350313', '1551341520'), ('3', 'testtest', 'a3a3368a4a310b29cd6662e386a46b19', '580271', '13222333333', '2', '51', '1551341548', '13', '1483947758', '1551341720'); +INSERT INTO `s_admin` VALUES ('1', 'admin', 'd13c80c2fc08dfa2790a7f8d64d75ff2', '760623', '17688888888', '0', '387', '1552642286', '1', '1481350313', '1551341520'), ('3', 'testtest', 'a3a3368a4a310b29cd6662e386a46b19', '580271', '13222333333', '2', '51', '1551341548', '13', '1483947758', '1551341720'); COMMIT; -- ---------------------------- @@ -231,7 +231,7 @@ CREATE TABLE `s_cart` ( KEY `goods_id` (`goods_id`), KEY `title` (`title`), KEY `stock` (`stock`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='购物车'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='购物车'; -- ---------------------------- -- Table structure for `s_config` @@ -254,7 +254,7 @@ CREATE TABLE `s_config` ( -- Records of `s_config` -- ---------------------------- BEGIN; -INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1551173001'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1551173001'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1551173001'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1551173001'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1551935994'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1551935994'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1551935994'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1550547827'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1550547827'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1550547827'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1550547827'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1550547827'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1550547827'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1551935994'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1550547827'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1550547827'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1550547827'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1551935994'), ('31', '1', '用户注册开启审核', '开启后用户注册需要审核通过方可登录', '请选择用户注册开启审核', 'common', 'common_register_is_enable_audit', '1551173001'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1550547827'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1550547827'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1550547827'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1550547827'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1550547827'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1550547827'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1550547827'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1550547827'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1550547827'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1551174648'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1551174648'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1551174648'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1551174648'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1551174648'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1551174648'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1551173001'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1551173001'), ('63', '

    用户注册，你的验证码是  #code#

    ', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

    密码找回，你的验证码是  #code#

    ', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

    邮箱绑定，你的验证码是  #code#

    ', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1550547827'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1551173001'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1551173001'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1551173001'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1551173001'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1551935994'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); +INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1551173001'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1551173001'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1551173001'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1551173001'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1552635443'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1552635443'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1552635443'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1550547827'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1550547827'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1550547827'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1550547827'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1550547827'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1550547827'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1552635443'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1550547827'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1550547827'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1550547827'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1552635443'), ('31', '1', '用户注册开启审核', '开启后用户注册需要审核通过方可登录', '请选择用户注册开启审核', 'common', 'common_register_is_enable_audit', '1551173001'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1550547827'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1550547827'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1550547827'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1550547827'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1550547827'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1550547827'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1550547827'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1550547827'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1550547827'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1551174648'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1551174648'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1551174648'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1551174648'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1551174648'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1551174648'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1551173001'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1551173001'), ('63', '

    用户注册，你的验证码是  #code#

    ', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

    密码找回，你的验证码是  #code#

    ', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

    邮箱绑定，你的验证码是  #code#

    ', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1550547827'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1551173001'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1551173001'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1551173001'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1551173001'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1552635443'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); COMMIT; -- ---------------------------- @@ -285,7 +285,7 @@ CREATE TABLE `s_custom_view` ( -- Records of `s_custom_view` -- ---------------------------- BEGIN; -INSERT INTO `s_custom_view` VALUES ('1', '测试自定义页面22', '

    \"1.jpeg\"/

    ShopXO

    秀，身材苗条！

    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。


    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。



    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    ', '1', '0', '0', '0', '', '0', '766', '1484965691', '1545320526'); +INSERT INTO `s_custom_view` VALUES ('1', '测试自定义页面22', '

    \"1.jpeg\"/

    ShopXO

    秀，身材苗条！

    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。


    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。



    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    在欧美的排版业界中，使用 Arial 的作品意即是「不使用 Helvetica 的作品」，会被认為是设计师对字体的使用没有概念或是太容易妥协，基本上我大致也是同意。

    因為 Helvetica 只有 Mac 上才有內建，Windows 用戶除非花錢買，不然是沒有 Helvetica 能用，所以使用 Arial 的設計師往往被看成是不願意對 Typography 花錢，專業素養不到家的人。除了在確保網頁相容性等絕對必需的情況外，幾乎可以說是不應該使用的字體。


    ', '1', '0', '0', '0', '', '0', '767', '1484965691', '1545320526'); COMMIT; -- ---------------------------- @@ -358,7 +358,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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '12', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '2', '', '/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', '51', '', '/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', '154', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '320', '步', '/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', '53', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '66', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '15', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '118.00-128.00', '118.00', '128.00', '3', '1', '0', '1', '1', '1', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '15', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1551751113'); +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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '34', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '3', '', '/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', '59', '', '/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', '161', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '320', '步', '/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', '58', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '66', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '15', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/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', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '19', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1552467444'); COMMIT; -- ---------------------------- @@ -372,13 +372,13 @@ CREATE TABLE `s_goods_browse` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; -- ---------------------------- -- Records of `s_goods_browse` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552447538'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552461784'), ('6', '2', '77', '1552380261', '1552380261'); +INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552549400'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552461784'), ('6', '2', '77', '1552380261', '1552532934'), ('7', '12', '77', '1552467447', '1552615868'), ('8', '6', '77', '1552529609', '1552531565'), ('9', '3', '77', '1552532930', '1552532930'), ('10', '4', '77', '1552628919', '1552629076'); COMMIT; -- ---------------------------- @@ -425,13 +425,13 @@ CREATE TABLE `s_goods_category_join` ( PRIMARY KEY (`id`), KEY `goods_id` (`goods_id`), KEY `category_id` (`category_id`) -) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品分类关联'; +) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品分类关联'; -- ---------------------------- -- Records of `s_goods_category_join` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_category_join` VALUES ('6', '3', '68', '1547452007'), ('7', '3', '69', '1547452007'), ('8', '4', '68', '1547452553'), ('9', '4', '69', '1547452553'), ('10', '5', '68', '1547452798'), ('11', '5', '69', '1547452798'), ('14', '6', '68', '1547453157'), ('15', '6', '69', '1547453157'), ('18', '8', '195', '1547454269'), ('19', '8', '198', '1547454269'), ('21', '9', '363', '1547454828'), ('22', '10', '304', '1547455375'), ('23', '10', '318', '1547455375'), ('24', '10', '446', '1547455375'), ('25', '11', '304', '1547455700'), ('26', '11', '318', '1547455700'), ('29', '2', '68', '1547458880'), ('30', '2', '69', '1547458880'), ('37', '1', '68', '1547485917'), ('42', '7', '194', '1547540607'), ('43', '7', '196', '1547540607'), ('56', '12', '304', '1551064315'), ('57', '12', '318', '1551064315'); +INSERT INTO `s_goods_category_join` VALUES ('6', '3', '68', '1547452007'), ('7', '3', '69', '1547452007'), ('8', '4', '68', '1547452553'), ('9', '4', '69', '1547452553'), ('10', '5', '68', '1547452798'), ('11', '5', '69', '1547452798'), ('14', '6', '68', '1547453157'), ('15', '6', '69', '1547453157'), ('18', '8', '195', '1547454269'), ('19', '8', '198', '1547454269'), ('21', '9', '363', '1547454828'), ('22', '10', '304', '1547455375'), ('23', '10', '318', '1547455375'), ('24', '10', '446', '1547455375'), ('25', '11', '304', '1547455700'), ('26', '11', '318', '1547455700'), ('29', '2', '68', '1547458880'), ('30', '2', '69', '1547458880'), ('37', '1', '68', '1547485917'), ('42', '7', '194', '1547540607'), ('43', '7', '196', '1547540607'), ('58', '12', '304', '1552467444'), ('59', '12', '318', '1552467444'); COMMIT; -- ---------------------------- @@ -448,13 +448,13 @@ CREATE TABLE `s_goods_content_app` ( PRIMARY KEY (`id`), KEY `goods_id` (`goods_id`), KEY `sort` (`sort`) -) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品手机详情'; +) ENGINE=InnoDB AUTO_INCREMENT=106 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品手机详情'; -- ---------------------------- -- Records of `s_goods_content_app` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_content_app` VALUES ('10', '3', '/static/upload/images/goods/2019/01/14/1547451947383902.jpg', '', '0', '1547452007'), ('11', '3', '/static/upload/images/goods/2019/01/14/1547451947686990.jpg', '', '1', '1547452007'), ('12', '3', '/static/upload/images/goods/2019/01/14/1547451947676180.jpg', '', '2', '1547452007'), ('13', '3', '/static/upload/images/goods/2019/01/14/1547451947791154.jpg', '', '3', '1547452007'), ('14', '4', '/static/upload/images/goods/2019/01/14/1547452505568604.jpg', '', '0', '1547452553'), ('15', '4', '/static/upload/images/goods/2019/01/14/1547452505349986.jpg', '', '1', '1547452553'), ('16', '4', '/static/upload/images/goods/2019/01/14/1547452505184884.jpg', '', '2', '1547452553'), ('17', '5', '/static/upload/images/goods/2019/01/14/1547452760417982.jpg', '', '0', '1547452798'), ('18', '5', '/static/upload/images/goods/2019/01/14/1547452760984656.jpg', '', '1', '1547452798'), ('19', '5', '/static/upload/images/goods/2019/01/14/1547452760659259.jpg', '', '2', '1547452798'), ('23', '6', '/static/upload/images/goods/2019/01/14/1547453042405182.jpg', 'X5L/SL/V/M (5.0寸) X5max钢化膜(5.5寸) X5pro钢化膜(5.2寸)', '0', '1547453157'), ('24', '6', '/static/upload/images/goods/2019/01/14/1547453042614480.jpg', '', '1', '1547453157'), ('25', '6', '/static/upload/images/goods/2019/01/14/1547453042816509.jpg', '', '2', '1547453157'), ('29', '8', '/static/upload/images/goods/2019/01/14/1547454192301566.jpg', '', '0', '1547454269'), ('30', '8', '/static/upload/images/goods/2019/01/14/1547454192448116.jpg', '', '1', '1547454269'), ('31', '8', '/static/upload/images/goods/2019/01/14/1547454192474638.jpg', '', '2', '1547454269'), ('36', '9', '/static/upload/images/goods/2019/01/14/1547454712270511.jpg', '', '0', '1547454828'), ('37', '9', '/static/upload/images/goods/2019/01/14/1547454713556301.jpg', '', '1', '1547454828'), ('38', '9', '/static/upload/images/goods/2019/01/14/1547454713800333.jpg', '', '2', '1547454828'), ('39', '9', '/static/upload/images/goods/2019/01/14/1547454713456602.jpg', '', '3', '1547454828'), ('40', '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', '1547455375'), ('41', '10', '/static/upload/images/goods/2019/01/14/1547455266234658.jpg', '', '1', '1547455375'), ('42', '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', '1547455700'), ('43', '11', '/static/upload/images/goods/2019/01/14/1547455601168384.jpg', '', '1', '1547455700'), ('44', '11', '/static/upload/images/goods/2019/01/14/1547455601898622.jpg', '', '2', '1547455700'), ('45', '11', '/static/upload/images/goods/2019/01/14/1547455601528614.jpg', '', '3', '1547455700'), ('46', '2', '/static/upload/images/goods/2019/01/14/1547451595700972.jpg', '', '0', '1547458880'), ('47', '2', '/static/upload/images/goods/2019/01/14/1547451595528800.jpg', '', '1', '1547458880'), ('48', '2', '/static/upload/images/goods/2019/01/14/1547451595616298.jpg', '', '2', '1547458880'), ('61', '1', '/static/upload/images/goods/2019/01/14/1547450880620837.png', '', '0', '1547485917'), ('62', '1', '/static/upload/images/goods/2019/01/14/1547450880750687.png', '', '1', '1547485917'), ('63', '1', '/static/upload/images/goods/2019/01/14/1547450880917418.png', '', '2', '1547485917'), ('71', '7', '/static/upload/images/goods/2019/01/14/1547453910353340.jpg', '', '0', '1547540607'), ('72', '7', '/static/upload/images/goods/2019/01/14/1547453910505349.jpg', '', '1', '1547540607'), ('73', '7', '/static/upload/images/goods/2019/01/14/1547453910394886.jpg', '', '2', '1547540607'), ('98', '12', '/static/upload/images/goods/2019/01/14/1547456214155362.jpg', '', '0', '1551064315'), ('99', '12', '/static/upload/images/goods/2019/01/14/1547455907486857.jpg', '', '1', '1551064315'), ('100', '12', '/static/upload/images/goods/2019/01/14/1547455907256518.jpg', '', '2', '1551064315'), ('101', '12', '/static/upload/images/goods/2019/01/14/1547456228913731.jpg', '', '3', '1551064315'); +INSERT INTO `s_goods_content_app` VALUES ('10', '3', '/static/upload/images/goods/2019/01/14/1547451947383902.jpg', '', '0', '1547452007'), ('11', '3', '/static/upload/images/goods/2019/01/14/1547451947686990.jpg', '', '1', '1547452007'), ('12', '3', '/static/upload/images/goods/2019/01/14/1547451947676180.jpg', '', '2', '1547452007'), ('13', '3', '/static/upload/images/goods/2019/01/14/1547451947791154.jpg', '', '3', '1547452007'), ('14', '4', '/static/upload/images/goods/2019/01/14/1547452505568604.jpg', '', '0', '1547452553'), ('15', '4', '/static/upload/images/goods/2019/01/14/1547452505349986.jpg', '', '1', '1547452553'), ('16', '4', '/static/upload/images/goods/2019/01/14/1547452505184884.jpg', '', '2', '1547452553'), ('17', '5', '/static/upload/images/goods/2019/01/14/1547452760417982.jpg', '', '0', '1547452798'), ('18', '5', '/static/upload/images/goods/2019/01/14/1547452760984656.jpg', '', '1', '1547452798'), ('19', '5', '/static/upload/images/goods/2019/01/14/1547452760659259.jpg', '', '2', '1547452798'), ('23', '6', '/static/upload/images/goods/2019/01/14/1547453042405182.jpg', 'X5L/SL/V/M (5.0寸) X5max钢化膜(5.5寸) X5pro钢化膜(5.2寸)', '0', '1547453157'), ('24', '6', '/static/upload/images/goods/2019/01/14/1547453042614480.jpg', '', '1', '1547453157'), ('25', '6', '/static/upload/images/goods/2019/01/14/1547453042816509.jpg', '', '2', '1547453157'), ('29', '8', '/static/upload/images/goods/2019/01/14/1547454192301566.jpg', '', '0', '1547454269'), ('30', '8', '/static/upload/images/goods/2019/01/14/1547454192448116.jpg', '', '1', '1547454269'), ('31', '8', '/static/upload/images/goods/2019/01/14/1547454192474638.jpg', '', '2', '1547454269'), ('36', '9', '/static/upload/images/goods/2019/01/14/1547454712270511.jpg', '', '0', '1547454828'), ('37', '9', '/static/upload/images/goods/2019/01/14/1547454713556301.jpg', '', '1', '1547454828'), ('38', '9', '/static/upload/images/goods/2019/01/14/1547454713800333.jpg', '', '2', '1547454828'), ('39', '9', '/static/upload/images/goods/2019/01/14/1547454713456602.jpg', '', '3', '1547454828'), ('40', '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', '1547455375'), ('41', '10', '/static/upload/images/goods/2019/01/14/1547455266234658.jpg', '', '1', '1547455375'), ('42', '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', '1547455700'), ('43', '11', '/static/upload/images/goods/2019/01/14/1547455601168384.jpg', '', '1', '1547455700'), ('44', '11', '/static/upload/images/goods/2019/01/14/1547455601898622.jpg', '', '2', '1547455700'), ('45', '11', '/static/upload/images/goods/2019/01/14/1547455601528614.jpg', '', '3', '1547455700'), ('46', '2', '/static/upload/images/goods/2019/01/14/1547451595700972.jpg', '', '0', '1547458880'), ('47', '2', '/static/upload/images/goods/2019/01/14/1547451595528800.jpg', '', '1', '1547458880'), ('48', '2', '/static/upload/images/goods/2019/01/14/1547451595616298.jpg', '', '2', '1547458880'), ('61', '1', '/static/upload/images/goods/2019/01/14/1547450880620837.png', '', '0', '1547485917'), ('62', '1', '/static/upload/images/goods/2019/01/14/1547450880750687.png', '', '1', '1547485917'), ('63', '1', '/static/upload/images/goods/2019/01/14/1547450880917418.png', '', '2', '1547485917'), ('71', '7', '/static/upload/images/goods/2019/01/14/1547453910353340.jpg', '', '0', '1547540607'), ('72', '7', '/static/upload/images/goods/2019/01/14/1547453910505349.jpg', '', '1', '1547540607'), ('73', '7', '/static/upload/images/goods/2019/01/14/1547453910394886.jpg', '', '2', '1547540607'), ('102', '12', '/static/upload/images/goods/2019/01/14/1547456214155362.jpg', '', '0', '1552467444'), ('103', '12', '/static/upload/images/goods/2019/01/14/1547455907486857.jpg', '', '1', '1552467444'), ('104', '12', '/static/upload/images/goods/2019/01/14/1547455907256518.jpg', '', '2', '1552467444'), ('105', '12', '/static/upload/images/goods/2019/01/14/1547456228913731.jpg', '', '3', '1552467444'); COMMIT; -- ---------------------------- @@ -491,13 +491,13 @@ CREATE TABLE `s_goods_photo` ( KEY `goods_id` (`goods_id`), KEY `is_show` (`is_show`), KEY `sort` (`sort`) -) ENGINE=InnoDB AUTO_INCREMENT=78 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品相册图片'; +) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='商品相册图片'; -- ---------------------------- -- Records of `s_goods_photo` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_photo` VALUES ('7', '3', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '1', '0', '1547452007'), ('8', '3', '/static/upload/images/goods/2019/01/14/1547451936230948.jpg', '1', '1', '1547452007'), ('9', '4', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '1', '0', '1547452553'), ('10', '4', '/static/upload/images/goods/2019/01/14/1547452496713777.jpg', '1', '1', '1547452553'), ('11', '5', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '1', '0', '1547452798'), ('12', '5', '/static/upload/images/goods/2019/01/14/1547452752648264.jpg', '1', '1', '1547452798'), ('15', '6', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '1', '0', '1547453157'), ('16', '6', '/static/upload/images/goods/2019/01/14/1547453032949003.jpg', '1', '1', '1547453157'), ('19', '8', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '1', '0', '1547454269'), ('20', '8', '/static/upload/images/goods/2019/01/14/1547454172213779.jpg', '1', '1', '1547454269'), ('24', '9', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '1', '0', '1547454828'), ('25', '9', '/static/upload/images/goods/2019/01/14/1547454702272215.jpg', '1', '1', '1547454828'), ('26', '9', '/static/upload/images/goods/2019/01/14/1547454702814719.jpg', '1', '2', '1547454828'), ('27', '10', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '1', '0', '1547455375'), ('28', '10', '/static/upload/images/goods/2019/01/14/1547455240700820.jpg', '1', '1', '1547455375'), ('29', '11', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '1', '0', '1547455700'), ('30', '11', '/static/upload/images/goods/2019/01/14/1547455601168384.jpg', '1', '1', '1547455700'), ('31', '11', '/static/upload/images/goods/2019/01/14/1547455601898622.jpg', '1', '2', '1547455700'), ('32', '11', '/static/upload/images/goods/2019/01/14/1547455601528614.jpg', '1', '3', '1547455700'), ('35', '2', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '1', '0', '1547458880'), ('36', '2', '/static/upload/images/goods/2019/01/14/1547451576558478.jpg', '1', '1', '1547458880'), ('48', '1', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '1', '0', '1547485917'), ('49', '1', '/static/upload/images/goods/2019/01/14/1547450818141662.jpg', '1', '1', '1547485917'), ('55', '7', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '1', '0', '1547540607'), ('56', '7', '/static/upload/images/goods/2019/01/14/1547453895864876.jpg', '1', '1', '1547540607'), ('75', '12', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '1', '0', '1551064315'), ('76', '12', '/static/upload/images/goods/2019/01/14/1547455907256518.jpg', '1', '1', '1551064315'), ('77', '12', '/static/upload/images/goods/2019/01/14/1547455907486857.jpg', '1', '2', '1551064315'); +INSERT INTO `s_goods_photo` VALUES ('7', '3', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '1', '0', '1547452007'), ('8', '3', '/static/upload/images/goods/2019/01/14/1547451936230948.jpg', '1', '1', '1547452007'), ('9', '4', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '1', '0', '1547452553'), ('10', '4', '/static/upload/images/goods/2019/01/14/1547452496713777.jpg', '1', '1', '1547452553'), ('11', '5', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '1', '0', '1547452798'), ('12', '5', '/static/upload/images/goods/2019/01/14/1547452752648264.jpg', '1', '1', '1547452798'), ('15', '6', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '1', '0', '1547453157'), ('16', '6', '/static/upload/images/goods/2019/01/14/1547453032949003.jpg', '1', '1', '1547453157'), ('19', '8', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '1', '0', '1547454269'), ('20', '8', '/static/upload/images/goods/2019/01/14/1547454172213779.jpg', '1', '1', '1547454269'), ('24', '9', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '1', '0', '1547454828'), ('25', '9', '/static/upload/images/goods/2019/01/14/1547454702272215.jpg', '1', '1', '1547454828'), ('26', '9', '/static/upload/images/goods/2019/01/14/1547454702814719.jpg', '1', '2', '1547454828'), ('27', '10', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '1', '0', '1547455375'), ('28', '10', '/static/upload/images/goods/2019/01/14/1547455240700820.jpg', '1', '1', '1547455375'), ('29', '11', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '1', '0', '1547455700'), ('30', '11', '/static/upload/images/goods/2019/01/14/1547455601168384.jpg', '1', '1', '1547455700'), ('31', '11', '/static/upload/images/goods/2019/01/14/1547455601898622.jpg', '1', '2', '1547455700'), ('32', '11', '/static/upload/images/goods/2019/01/14/1547455601528614.jpg', '1', '3', '1547455700'), ('35', '2', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '1', '0', '1547458880'), ('36', '2', '/static/upload/images/goods/2019/01/14/1547451576558478.jpg', '1', '1', '1547458880'), ('48', '1', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '1', '0', '1547485917'), ('49', '1', '/static/upload/images/goods/2019/01/14/1547450818141662.jpg', '1', '1', '1547485917'), ('55', '7', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '1', '0', '1547540607'), ('56', '7', '/static/upload/images/goods/2019/01/14/1547453895864876.jpg', '1', '1', '1547540607'), ('78', '12', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '1', '0', '1552467444'), ('79', '12', '/static/upload/images/goods/2019/01/14/1547455907256518.jpg', '1', '1', '1552467444'), ('80', '12', '/static/upload/images/goods/2019/01/14/1547455907486857.jpg', '1', '2', '1552467444'); COMMIT; -- ---------------------------- @@ -516,13 +516,13 @@ CREATE TABLE `s_goods_spec_base` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `attribute_type_id` (`price`) -) ENGINE=InnoDB AUTO_INCREMENT=114 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='商品规格基础'; +) ENGINE=InnoDB AUTO_INCREMENT=119 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='商品规格基础'; -- ---------------------------- -- 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', '320', '0.00', '', '', '3200.00', '1547453157'), ('27', '8', '356.00', '35', '0.00', '', '', '672.00', '1547454269'), ('37', '9', '120.00', '12', '0.00', '', '', '160.00', '1547454828'), ('38', '9', '120.00', '87', '0.00', '', '', '160.00', '1547454828'), ('39', '9', '120.00', '13', '0.00', '', '', '160.00', '1547454828'), ('40', '9', '120.00', '76', '0.00', '', '', '160.00', '1547454828'), ('41', '9', '136.00', '43', '0.00', '', '', '188.00', '1547454828'), ('42', '9', '136.00', '56', '0.00', '', '', '188.00', '1547454828'), ('43', '9', '136.00', '21', '0.00', '', '', '188.00', '1547454828'), ('44', '9', '158.00', '243', '0.00', '', '', '216.00', '1547454828'), ('45', '9', '158.00', '45', '0.00', '', '', '216.00', '1547454828'), ('46', '10', '228.00', '36', '0.00', '', '', '568.00', '1547455375'), ('47', '11', '258.00', '367', '0.00', '', '', '268.00', '1547455700'), ('53', '2', '6050.00', '100', '0.00', '', '', '6800.00', '1547458880'), ('54', '2', '6600.00', '200', '0.00', '', '', '7200.00', '1547458880'), ('55', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('56', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1547458880'), ('57', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1547458880'), ('58', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('59', '2', '4500.00', '99', '0.00', '', '', '6800.00', '1547458880'), ('60', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1547458880'), ('61', '2', '5500.00', '61', '0.00', '', '', '6000.00', '1547458880'), ('71', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1547485917'), ('78', '7', '168.00', '320', '0.00', '', '', '760.00', '1547540607'), ('109', '12', '128.00', '12', '0.50', 'gg11', 'txm11', '188.00', '1551064315'), ('110', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1551064315'), ('111', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1551064315'), ('112', '12', '118.00', '46', '457.60', 'gg44', 'txm44', '150.00', '1551064315'), ('113', '12', '118.00', '81', '37.00', 'gg55', 'txm55', '150.00', '1551064315'); +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', '320', '0.00', '', '', '3200.00', '1547453157'), ('27', '8', '356.00', '35', '0.00', '', '', '672.00', '1547454269'), ('37', '9', '120.00', '12', '0.00', '', '', '160.00', '1547454828'), ('38', '9', '120.00', '87', '0.00', '', '', '160.00', '1547454828'), ('39', '9', '120.00', '13', '0.00', '', '', '160.00', '1547454828'), ('40', '9', '120.00', '76', '0.00', '', '', '160.00', '1547454828'), ('41', '9', '136.00', '43', '0.00', '', '', '188.00', '1547454828'), ('42', '9', '136.00', '56', '0.00', '', '', '188.00', '1547454828'), ('43', '9', '136.00', '21', '0.00', '', '', '188.00', '1547454828'), ('44', '9', '158.00', '243', '0.00', '', '', '216.00', '1547454828'), ('45', '9', '158.00', '45', '0.00', '', '', '216.00', '1547454828'), ('46', '10', '228.00', '36', '0.00', '', '', '568.00', '1547455375'), ('47', '11', '258.00', '367', '0.00', '', '', '268.00', '1547455700'), ('53', '2', '6050.00', '100', '0.00', '', '', '6800.00', '1547458880'), ('54', '2', '6600.00', '200', '0.00', '', '', '7200.00', '1547458880'), ('55', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('56', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1547458880'), ('57', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1547458880'), ('58', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('59', '2', '4500.00', '99', '0.00', '', '', '6800.00', '1547458880'), ('60', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1547458880'), ('61', '2', '5500.00', '61', '0.00', '', '', '6000.00', '1547458880'), ('71', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1547485917'), ('78', '7', '168.00', '320', '0.00', '', '', '760.00', '1547540607'), ('114', '12', '0.01', '12', '0.50', 'gg11', 'txm11', '188.00', '1552467444'), ('115', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1552467444'), ('116', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1552467444'), ('117', '12', '118.00', '46', '457.60', 'gg44', 'txm44', '150.00', '1552467444'), ('118', '12', '118.00', '81', '37.00', 'gg55', 'txm55', '150.00', '1552467444'); COMMIT; -- ---------------------------- @@ -537,13 +537,13 @@ CREATE TABLE `s_goods_spec_type` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `goods_id` (`goods_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='商品规格类型'; +) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='商品规格类型'; -- ---------------------------- -- Records of `s_goods_spec_type` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_spec_type` VALUES ('9', '9', '[{\"name\":\"\\u767d\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547454702543219.jpg\"},{\"name\":\"\\u7c89\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547454702272215.jpg\"},{\"name\":\"\\u9ed1\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547454702814719.jpg\"}]', '颜色', '1547454828'), ('10', '9', '[{\"name\":\"S\",\"images\":\"\"},{\"name\":\"M\",\"images\":\"\"},{\"name\":\"L\",\"images\":\"\"},{\"name\":\"XL\",\"images\":\"\"}]', '尺码', '1547454828'), ('13', '2', '[{\"name\":\"\\u5957\\u9910\\u4e00\",\"images\":\"\"},{\"name\":\"\\u5957\\u9910\\u4e8c\",\"images\":\"\"}]', '套餐', '1547458880'), ('14', '2', '[{\"name\":\"\\u91d1\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547451274847894.jpg\"},{\"name\":\"\\u94f6\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547451576558478.jpg\"}]', '颜色', '1547458880'), ('15', '2', '[{\"name\":\"32G\",\"images\":\"\"},{\"name\":\"64G\",\"images\":\"\"},{\"name\":\"128G\",\"images\":\"\"}]', '容量', '1547458880'), ('32', '12', '[{\"name\":\"\\u7c89\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547455907256518.jpg\"},{\"name\":\"\\u767d\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547455907486857.jpg\"}]', '颜色', '1551064315'), ('33', '12', '[{\"name\":\"M\",\"images\":\"\"},{\"name\":\"L\",\"images\":\"\"},{\"name\":\"XL\",\"images\":\"\"}]', '尺码', '1551064315'); +INSERT INTO `s_goods_spec_type` VALUES ('9', '9', '[{\"name\":\"\\u767d\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547454702543219.jpg\"},{\"name\":\"\\u7c89\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547454702272215.jpg\"},{\"name\":\"\\u9ed1\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547454702814719.jpg\"}]', '颜色', '1547454828'), ('10', '9', '[{\"name\":\"S\",\"images\":\"\"},{\"name\":\"M\",\"images\":\"\"},{\"name\":\"L\",\"images\":\"\"},{\"name\":\"XL\",\"images\":\"\"}]', '尺码', '1547454828'), ('13', '2', '[{\"name\":\"\\u5957\\u9910\\u4e00\",\"images\":\"\"},{\"name\":\"\\u5957\\u9910\\u4e8c\",\"images\":\"\"}]', '套餐', '1547458880'), ('14', '2', '[{\"name\":\"\\u91d1\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547451274847894.jpg\"},{\"name\":\"\\u94f6\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547451576558478.jpg\"}]', '颜色', '1547458880'), ('15', '2', '[{\"name\":\"32G\",\"images\":\"\"},{\"name\":\"64G\",\"images\":\"\"},{\"name\":\"128G\",\"images\":\"\"}]', '容量', '1547458880'), ('34', '12', '[{\"name\":\"\\u7c89\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547455907256518.jpg\"},{\"name\":\"\\u767d\\u8272\",\"images\":\"\\/static\\/upload\\/images\\/goods\\/2019\\/01\\/14\\/1547455907486857.jpg\"}]', '颜色', '1552467444'), ('35', '12', '[{\"name\":\"M\",\"images\":\"\"},{\"name\":\"L\",\"images\":\"\"},{\"name\":\"XL\",\"images\":\"\"}]', '尺码', '1552467444'); COMMIT; -- ---------------------------- @@ -559,13 +559,13 @@ CREATE TABLE `s_goods_spec_value` ( PRIMARY KEY (`id`), KEY `goods_id` (`goods_id`) USING BTREE, KEY `goods_spec_base_id` (`goods_spec_base_id`) -) ENGINE=InnoDB AUTO_INCREMENT=221 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='商品规格值'; +) ENGINE=InnoDB AUTO_INCREMENT=231 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='商品规格值'; -- ---------------------------- -- Records of `s_goods_spec_value` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_spec_value` VALUES ('76', '9', '37', '白色', '1547454828'), ('77', '9', '37', 'S', '1547454828'), ('78', '9', '38', '白色', '1547454828'), ('79', '9', '38', 'M', '1547454828'), ('80', '9', '39', '白色', '1547454828'), ('81', '9', '39', 'L', '1547454828'), ('82', '9', '40', '白色', '1547454828'), ('83', '9', '40', 'XL', '1547454828'), ('84', '9', '41', '粉色', '1547454828'), ('85', '9', '41', 'S', '1547454828'), ('86', '9', '42', '粉色', '1547454828'), ('87', '9', '42', 'M', '1547454828'), ('88', '9', '43', '粉色', '1547454828'), ('89', '9', '43', 'L', '1547454828'), ('90', '9', '44', '黑色', '1547454828'), ('91', '9', '44', 'S', '1547454828'), ('92', '9', '45', '黑色', '1547454828'), ('93', '9', '45', 'XL', '1547454828'), ('104', '2', '53', '套餐一', '1547458880'), ('105', '2', '53', '金色', '1547458880'), ('106', '2', '53', '32G', '1547458880'), ('107', '2', '54', '套餐一', '1547458880'), ('108', '2', '54', '金色', '1547458880'), ('109', '2', '54', '64G', '1547458880'), ('110', '2', '55', '套餐一', '1547458880'), ('111', '2', '55', '金色', '1547458880'), ('112', '2', '55', '128G', '1547458880'), ('113', '2', '56', '套餐一', '1547458880'), ('114', '2', '56', '银色', '1547458880'), ('115', '2', '56', '32G', '1547458880'), ('116', '2', '57', '套餐一', '1547458880'), ('117', '2', '57', '银色', '1547458880'), ('118', '2', '57', '64G', '1547458880'), ('119', '2', '58', '套餐一', '1547458880'), ('120', '2', '58', '银色', '1547458880'), ('121', '2', '58', '128G', '1547458880'), ('122', '2', '59', '套餐二', '1547458880'), ('123', '2', '59', '金色', '1547458880'), ('124', '2', '59', '32G', '1547458880'), ('125', '2', '60', '套餐二', '1547458880'), ('126', '2', '60', '金色', '1547458880'), ('127', '2', '60', '128G', '1547458880'), ('128', '2', '61', '套餐二', '1547458880'), ('129', '2', '61', '银色', '1547458880'), ('130', '2', '61', '64G', '1547458880'), ('211', '12', '109', '粉色', '1551064315'), ('212', '12', '109', 'M', '1551064315'), ('213', '12', '110', '粉色', '1551064315'), ('214', '12', '110', 'L', '1551064315'), ('215', '12', '111', '粉色', '1551064315'), ('216', '12', '111', 'XL', '1551064315'), ('217', '12', '112', '白色', '1551064315'), ('218', '12', '112', 'M', '1551064315'), ('219', '12', '113', '白色', '1551064315'), ('220', '12', '113', 'L', '1551064315'); +INSERT INTO `s_goods_spec_value` VALUES ('76', '9', '37', '白色', '1547454828'), ('77', '9', '37', 'S', '1547454828'), ('78', '9', '38', '白色', '1547454828'), ('79', '9', '38', 'M', '1547454828'), ('80', '9', '39', '白色', '1547454828'), ('81', '9', '39', 'L', '1547454828'), ('82', '9', '40', '白色', '1547454828'), ('83', '9', '40', 'XL', '1547454828'), ('84', '9', '41', '粉色', '1547454828'), ('85', '9', '41', 'S', '1547454828'), ('86', '9', '42', '粉色', '1547454828'), ('87', '9', '42', 'M', '1547454828'), ('88', '9', '43', '粉色', '1547454828'), ('89', '9', '43', 'L', '1547454828'), ('90', '9', '44', '黑色', '1547454828'), ('91', '9', '44', 'S', '1547454828'), ('92', '9', '45', '黑色', '1547454828'), ('93', '9', '45', 'XL', '1547454828'), ('104', '2', '53', '套餐一', '1547458880'), ('105', '2', '53', '金色', '1547458880'), ('106', '2', '53', '32G', '1547458880'), ('107', '2', '54', '套餐一', '1547458880'), ('108', '2', '54', '金色', '1547458880'), ('109', '2', '54', '64G', '1547458880'), ('110', '2', '55', '套餐一', '1547458880'), ('111', '2', '55', '金色', '1547458880'), ('112', '2', '55', '128G', '1547458880'), ('113', '2', '56', '套餐一', '1547458880'), ('114', '2', '56', '银色', '1547458880'), ('115', '2', '56', '32G', '1547458880'), ('116', '2', '57', '套餐一', '1547458880'), ('117', '2', '57', '银色', '1547458880'), ('118', '2', '57', '64G', '1547458880'), ('119', '2', '58', '套餐一', '1547458880'), ('120', '2', '58', '银色', '1547458880'), ('121', '2', '58', '128G', '1547458880'), ('122', '2', '59', '套餐二', '1547458880'), ('123', '2', '59', '金色', '1547458880'), ('124', '2', '59', '32G', '1547458880'), ('125', '2', '60', '套餐二', '1547458880'), ('126', '2', '60', '金色', '1547458880'), ('127', '2', '60', '128G', '1547458880'), ('128', '2', '61', '套餐二', '1547458880'), ('129', '2', '61', '银色', '1547458880'), ('130', '2', '61', '64G', '1547458880'), ('221', '12', '114', '粉色', '1552467444'), ('222', '12', '114', 'M', '1552467444'), ('223', '12', '115', '粉色', '1552467444'), ('224', '12', '115', 'L', '1552467444'), ('225', '12', '116', '粉色', '1552467444'), ('226', '12', '116', 'XL', '1552467444'), ('227', '12', '117', '白色', '1552467444'), ('228', '12', '117', 'M', '1552467444'), ('229', '12', '118', '白色', '1552467444'), ('230', '12', '118', 'L', '1552467444'); COMMIT; -- ---------------------------- @@ -612,13 +612,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=19 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; -- ---------------------------- -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552272529'), ('9', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552361991'), ('10', '77', '订单支付', '订单支付成功，金额2499元', '2', '1', '0', '0', '0', '0', '1552362074'), ('11', '77', '订单发货', '订单已发货', '2', '1', '0', '0', '0', '0', '1552362108'), ('12', '77', '订单支付', '订单支付成功，金额4500元', '3', '1', '0', '0', '0', '0', '1552380271'), ('13', '77', '订单发货', '订单已发货', '3', '1', '0', '0', '0', '0', '1552380288'), ('14', '77', '积分变动', '订单商品完成赠送积分增加56', '0', '0', '0', '0', '0', '0', '1552386780'), ('15', '77', '订单收货', '订单收货成功', '2', '1', '0', '0', '0', '0', '1552386780'); +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552272529'), ('9', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552361991'), ('10', '77', '订单支付', '订单支付成功，金额2499元', '2', '1', '0', '1', '0', '0', '1552362074'), ('11', '77', '订单发货', '订单已发货', '2', '1', '0', '1', '0', '0', '1552362108'), ('12', '77', '订单支付', '订单支付成功，金额4500元', '3', '1', '0', '1', '0', '0', '1552380271'), ('13', '77', '订单发货', '订单已发货', '3', '1', '0', '1', '0', '0', '1552380288'), ('14', '77', '积分变动', '订单商品完成赠送积分增加56', '0', '0', '0', '1', '0', '0', '1552386780'), ('15', '77', '订单收货', '订单收货成功', '2', '1', '0', '1', '0', '0', '1552386780'), ('16', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552464876'), ('17', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552529078'), ('18', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552628910'); COMMIT; -- ---------------------------- @@ -697,13 +697,13 @@ CREATE TABLE `s_order` ( KEY `shop_id` (`shop_id`), KEY `status` (`status`), KEY `pay_status` (`pay_status`) -) ENGINE=InnoDB AUTO_INCREMENT=4 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', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'), ('2', '20190312114031822173', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '73107853468716', '2', '4', '1', '0.00', '2499.00', '2499.00', '2499.00', '1552362074', '1552362031', '1552362108', '0', '1552386780', '0', '0', '0', '0', '0', '0', '1552362031', '1552386780'), ('3', '20190312164430579995', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '767', '2', '3', '1', '0.00', '4500.00', '4500.00', '4500.00', '1552380271', '1552380270', '1552380288', '0', '0', '0', '0', '0', '0', '0', '0', '1552380270', '1552380288'); +INSERT INTO `s_order` VALUES ('1', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'), ('2', '20190312114031822173', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '73107853468716', '2', '4', '1', '0.00', '2499.00', '2499.00', '2499.00', '1552362074', '1552362031', '1552362108', '0', '1552386780', '0', '0', '0', '0', '0', '0', '1552362031', '1552386780'), ('3', '20190312164430579995', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '767', '2', '3', '1', '0.00', '4500.00', '4500.00', '4500.00', '1552380271', '1552380270', '1552380288', '0', '0', '0', '0', '0', '0', '0', '0', '1552380270', '1552380288'), ('4', '20190313165746433360', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '3', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552467466', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552467466', '0'), ('5', '20190314164830100836', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '7', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552553310', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552553310', '0'), ('6', '20190315101124514911', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552615884', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552615884', '0'), ('7', '20190315101403128249', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552616043', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552616043', '0'), ('8', '20190315101650867423', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552616210', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552616210', '0'); COMMIT; -- ---------------------------- @@ -752,13 +752,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=5 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单详情'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单详情'; -- ---------------------------- -- Records of `s_order_detail` -- ---------------------------- BEGIN; -INSERT INTO `s_order_detail` VALUES ('1', '92', '1', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0', '', '', '1551239422', '0'), ('2', '92', '1', '9', '0', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '188.00', '136.00', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '2', '0', '', '', '1551239422', '0'), ('3', '77', '2', '5', '0', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '2499.00', '', '1', '0', '', '', '1552362031', '0'), ('4', '77', '3', '2', '0', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6800.00', '4500.00', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e8c\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"32G\"}]', '1', '0', '', '', '1552380270', '0'); +INSERT INTO `s_order_detail` VALUES ('1', '92', '1', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0', '', '', '1551239422', '0'), ('2', '92', '1', '9', '0', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '188.00', '136.00', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '2', '0', '', '', '1551239422', '0'), ('3', '77', '2', '5', '0', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '2499.00', '', '1', '0', '', '', '1552362031', '0'), ('4', '77', '3', '2', '0', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6800.00', '4500.00', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e8c\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"32G\"}]', '1', '0', '', '', '1552380270', '0'), ('5', '77', '4', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552467466', '0'), ('6', '77', '5', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552553310', '0'), ('7', '77', '6', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552615884', '0'), ('8', '77', '7', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552616043', '0'), ('9', '77', '8', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552616210', '0'); COMMIT; -- ---------------------------- @@ -868,14 +868,7 @@ CREATE TABLE `s_payment` ( PRIMARY KEY (`id`), UNIQUE KEY `payment` (`payment`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式'; - --- ---------------------------- --- Records of `s_payment` --- ---------------------------- -BEGIN; -INSERT INTO `s_payment` VALUES ('2', '货到付款', 'DeliveryPayment', '', '0.0.1', '不限', '送货上门后收取货款', 'Devil', 'http://shopxo.net/', '', '', '[\"pc\",\"h5\",\"app\",\"alipay\",\"weixin\",\"baidu\"]', '1', '1', '0', '1552362056', '1552362059'); -COMMIT; +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式'; -- ---------------------------- -- Table structure for `s_plugins` @@ -891,13 +884,13 @@ CREATE TABLE `s_plugins` ( PRIMARY KEY (`id`), UNIQUE KEY `plugins` (`plugins`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; +) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; -- ---------------------------- -- 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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1552463476'), ('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', '1552463173'), ('23', 'expressforkdn', '{\"ebid\":\"1301013\",\"appkey\":\"ab11f813-811b-4b4b-9fbd-5f79886ec840\",\"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', '1552385092'); +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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1552463476'), ('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', '1552463173'), ('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', '1552642312'), ('24', 'shopoauth', '{\"auth\":{\"qq\":{\"name\":\"QQ\\u767b\\u5f55\",\"app_key\":\"\",\"app_secret\":\"\",\"open\":\"1\"}},\"pluginsname\":\"shopoauth\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552627456', '1552642945'); COMMIT; -- ---------------------------- @@ -944,6 +937,27 @@ BEGIN; INSERT INTO `s_plugins_answers_slide` VALUES ('1', '品牌盛宴', '/static/upload/images/plugins_answers/2019/03/07/1551940388704924.jpg', 'https://ask.shopxo.net/', '1', '1', '1551865738', '1551940516'), ('2', '你想要的', '/static/upload/images/plugins_answers/2019/03/07/1551940388179648.jpg', 'https://ask.shopxo.net/article/6', '1', '3', '1551866754', '1551940526'), ('3', '爱上潮流名店', '/static/upload/images/plugins_answers/2019/03/07/1551940310193935.jpg', 'https://shopxo.net/', '1', '0', '1551940433', '1551940506'); COMMIT; +-- ---------------------------- +-- Table structure for `s_plugins_shopoauth_oauth` +-- ---------------------------- +DROP TABLE IF EXISTS `s_plugins_shopoauth_oauth`; +CREATE TABLE `s_plugins_shopoauth_oauth` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', + `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '会员ID', + `platform` varchar(30) NOT NULL DEFAULT '' COMMENT '第三方应用', + `openid` varchar(50) NOT NULL DEFAULT '' COMMENT '第三方唯一ID', + `openname` varchar(50) NOT NULL DEFAULT '' COMMENT '第三方会员昵称', + `access_token` varchar(255) NOT NULL DEFAULT '' COMMENT 'AccessToken', + `refresh_token` varchar(255) NOT NULL DEFAULT 'RefreshToken', + `expires_in` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '有效期', + `createtime` int(10) unsigned DEFAULT NULL COMMENT '创建时间', + `updatetime` int(10) unsigned DEFAULT NULL COMMENT '更新时间', + `logintime` int(10) unsigned DEFAULT NULL COMMENT '登录时间', + PRIMARY KEY (`id`), + UNIQUE KEY `platform` (`platform`,`openid`), + KEY `user_id` (`user_id`,`platform`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='第三方登录表'; + -- ---------------------------- -- Table structure for `s_power` -- ---------------------------- @@ -1115,13 +1129,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=45 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; +) ENGINE=InnoDB AUTO_INCREMENT=69 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; -- ---------------------------- -- Records of `s_search_history` -- ---------------------------- BEGIN; -INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'), ('41', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446286'), ('42', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446830'), ('43', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461592'), ('44', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461878'); +INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'), ('41', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446286'), ('42', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446830'), ('43', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461592'), ('44', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461878'), ('45', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552464847'), ('46', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552467418'), ('47', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190313', '1552467421'), ('48', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190313', '1552467423'), ('49', '0', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529646'), ('50', '77', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529650'), ('51', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552531528'), ('52', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532412'), ('53', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532430'), ('54', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532687'), ('55', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532711'), ('56', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532714'), ('57', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532836'), ('58', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532873'), ('59', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532888'), ('60', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532895'), ('61', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532913'), ('62', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532919'), ('63', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552533239'), ('64', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552549550'), ('65', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552553299'), ('66', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190314', '1552553300'), ('67', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190314', '1552553302'), ('68', '77', '0', '1', '', '0-0', 'default', 'asc', '20190315', '1552639821'); COMMIT; -- ---------------------------- @@ -1192,7 +1206,7 @@ CREATE TABLE `s_user` ( -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '749260', '92b6a30c6014c9eb880e837b7a68c536', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1068', '0', '0', '0', '0', '1552361991'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '0', '681141', '0461e68ca574a0d7622e7c078a1d73c3', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '10', '0', '0', '0', '1551173897', '1551239413'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '273485', '8b13e6c101f9b3110e97d7ef04fd4eaa', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1083', '0', '0', '0', '0', '1552642211'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '0', '681141', '0461e68ca574a0d7622e7c078a1d73c3', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '10', '0', '0', '0', '1551173897', '1551239413'); COMMIT; -- ---------------------------- @@ -1242,13 +1256,13 @@ CREATE TABLE `s_user_integral_log` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; -- ---------------------------- -- Records of `s_user_integral_log` -- ---------------------------- BEGIN; -INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'), ('6', '77', '1', '1007', '1012', '登录奖励积分', '0', '1552361991'), ('7', '77', '1', '1012', '1068', '订单商品完成赠送', '0', '1552386780'); +INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'), ('6', '77', '1', '1007', '1012', '登录奖励积分', '0', '1552361991'), ('7', '77', '1', '1012', '1068', '订单商品完成赠送', '0', '1552386780'), ('8', '77', '1', '1068', '1073', '登录奖励积分', '0', '1552464876'), ('9', '77', '1', '1073', '1078', '登录奖励积分', '0', '1552529078'), ('10', '77', '1', '1078', '1083', '登录奖励积分', '0', '1552628910'); COMMIT; SET FOREIGN_KEY_CHECKS = 1; diff --git a/public/static/plugins/css/shopoauth/admin.css b/public/static/plugins/css/shopoauth/admin.css new file mode 100644 index 000000000..cb5e4d9ad --- /dev/null +++ b/public/static/plugins/css/shopoauth/admin.css @@ -0,0 +1,11 @@ +/** + * 首页 + */ +.shopoauth-content .items { + margin: 10px 0 20px 0; + border-bottom: 1px dashed #f1f1f1; + padding-bottom: 20px; +} +.shopoauth-content .edit-submit { + margin-bottom: 20px; +} \ No newline at end of file diff --git a/public/static/upload/images/plugins_shopoauth/2019/03/13/1552472848865750.png b/public/static/upload/images/plugins_shopoauth/2019/03/13/1552472848865750.png new file mode 100644 index 0000000000000000000000000000000000000000..6b65c0c516c5bcc045ab73a41227ba53aa193d28 GIT binary patch literal 5186 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 Date: Sat, 16 Mar 2019 00:22:06 +0800 Subject: [PATCH 079/108] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E8=B4=AD=E4=B9=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Pluginsadmin.php | 8 +- application/index/controller/Common.php | 14 +- application/index/controller/Order.php | 2 +- .../index/view/default/order/index.html | 8 +- .../view/default/public/header_top_nav.html | 6 +- .../view/default/user/email_reg_info.html | 17 +- .../index/view/default/user/login_info.html | 16 +- .../view/default/user/modal_login_info.html | 16 +- .../index/view/default/user/reg_info.html | 14 + .../index/view/default/user/sms_reg_info.html | 17 +- application/plugins/shopoauth/Hook.php | 2 +- application/plugins/shopoauth/config.json | 2 +- application/plugins/touristbuy/Admin.php | 85 +++++ application/plugins/touristbuy/Hook.php | 171 ++++++++++ application/plugins/touristbuy/Index.php | 127 ++++++++ application/plugins/touristbuy/Service.php | 81 +++++ application/plugins/touristbuy/config.json | 39 +++ .../plugins/view/touristbuy/admin/index.html | 54 ++++ .../view/touristbuy/admin/saveinfo.html | 49 +++ .../plugins/view/touristbuy/index/detail.html | 299 ++++++++++++++++++ .../plugins/view/touristbuy/index/index.html | 55 ++++ application/tags.php | 20 +- .../static/plugins/css/touristbuy/admin.css | 11 + .../static/plugins/css/touristbuy/index.css | 7 + .../plugins/css/touristbuy/index.detail.css | 219 +++++++++++++ .../2019/03/15/1552656656517586.jpg | Bin 0 -> 2838 bytes 26 files changed, 1315 insertions(+), 24 deletions(-) create mode 100644 application/plugins/touristbuy/Admin.php create mode 100644 application/plugins/touristbuy/Hook.php create mode 100644 application/plugins/touristbuy/Index.php create mode 100644 application/plugins/touristbuy/Service.php create mode 100644 application/plugins/touristbuy/config.json create mode 100755 application/plugins/view/touristbuy/admin/index.html create mode 100755 application/plugins/view/touristbuy/admin/saveinfo.html create mode 100644 application/plugins/view/touristbuy/index/detail.html create mode 100644 application/plugins/view/touristbuy/index/index.html create mode 100755 public/static/plugins/css/touristbuy/admin.css create mode 100644 public/static/plugins/css/touristbuy/index.css create mode 100644 public/static/plugins/css/touristbuy/index.detail.css create mode 100644 public/static/upload/images/plugins_touristbuy/2019/03/15/1552656656517586.jpg diff --git a/application/admin/controller/Pluginsadmin.php b/application/admin/controller/Pluginsadmin.php index 44540479c..79eaa5d56 100755 --- a/application/admin/controller/Pluginsadmin.php +++ b/application/admin/controller/Pluginsadmin.php @@ -112,6 +112,7 @@ class Pluginsadmin extends Common $this->assign('params', $params); // 获取数据 + $data = []; if(!empty($params['id'])) { // 获取数据 @@ -120,10 +121,11 @@ class Pluginsadmin extends Common 'n' => 1, 'where' => ['id' => intval($params['id'])], ); - $data = PluginsAdminService::PluginsList($data_params); - $this->assign('data', $data['data'][0]); - $params['plugins'] = $data['data'][0]['plugins']; + $ret = PluginsAdminService::PluginsList($data_params); + $data = $ret['data'][0]; + $params['plugins'] = $ret['data'][0]['plugins']; } + $this->assign('data', $data); // 标记为空或等于view 并且 编辑数据为空则走第一步 if((empty($params['plugins']) || $params['plugins'] == 'view') && empty($data['data'][0])) diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index d3806cca0..79d5195ac 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -100,7 +100,19 @@ class Common extends Controller $this->assign('plugins_view_common_bottom_data', Hook::listen('plugins_view_common_bottom', ['hook_name'=>'plugins_view_common_bottom', 'is_backend'=>false, 'user'=>$this->user])); // 公共顶部小导航钩子-左侧 - $this->assign('plugins_service_header_navigation_top_left_data', Hook::listen('plugins_service_header_navigation_top_left', ['hook_name'=>'plugins_service_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); + $this->assign('plugins_view_header_navigation_top_left_data', Hook::listen('plugins_view_header_navigation_top_left', ['hook_name'=>'plugins_view_header_navigation_top_left', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户登录页面顶部钩子 + $this->assign('plugins_view_user_login_info_top_data', Hook::listen('plugins_view_user_login_info_top', ['hook_name'=>'plugins_view_user_login_info_top', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册页面钩子 + $this->assign('plugins_view_user_reg_info_data', Hook::listen('plugins_view_user_reg_info', ['hook_name'=>'plugins_view_user_reg_info', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册短信页面钩子 + $this->assign('plugins_view_user_sms_reg_info_data', Hook::listen('plugins_view_user_sms_reg_info', ['hook_name'=>'plugins_view_user_sms_reg_info', 'is_backend'=>false, 'user'=>$this->user])); + + // 用户注册邮箱页面钩子 + $this->assign('plugins_view_user_email_reg_info_data', Hook::listen('plugins_view_user_email_reg_info', ['hook_name'=>'plugins_view_user_email_reg_info', 'is_backend'=>false, 'user'=>$this->user])); } /** diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index d403f79d7..b0f1ff923 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -137,7 +137,7 @@ class Order extends Common } else { $this->assign('msg', '没有相关数据'); return $this->fetch('public/tips_error'); - } + } } /** diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html index d971298d5..5482557b4 100755 --- a/application/index/view/default/order/index.html +++ b/application/index/view/default/order/index.html @@ -41,21 +41,21 @@
    时间： - + ~ - + 价格： - + ~ - +
    + + + + + + + + + + {{foreach $data.items as $goods}} + + + + + + + {{/foreach}} + +
    商品信息单价数量金额
    +
    + + + +
    + {{$goods.title}} + {{if !empty($goods.spec)}} +
      + {{foreach $goods.spec as $spec}} +
    • {{$spec.type}}：{{$spec.value}}
      • + {{/foreach}} +
    + {{/if}} +
    +
    +
    + {{if $goods['original_price'] gt 0}} + ￥{{$goods.original_price}} + {{/if}} + ￥{{$goods.price}} + x{{$goods.buy_number}} +
    +     		+ {{if $goods['original_price'] gt 0}} +

    ￥{{$goods.original_price}}

    + {{/if}} +

    ￥{{$goods.price}}

    +     		+ x{{$goods.buy_number}} + + ￥{{$goods.total_price}} +
    +
    + +
    + {{if !empty($data.price)}} +
    +
    商品总价：
    +
    ￥{{$data.price}}
    +
    + {{/if}} + {{if !empty($data.preferential_price)}} +
    +
    优惠金额：
    +
    -￥{{$data.preferential_price}}
    +
    + {{/if}} + {{if !empty($data.total_price)}} +
    +
    订单总价：
    +
    ￥{{$data.total_price}}
    +
    + {{/if}} + {{if !empty($data.pay_price)}} +
    +
    支付金额：
    +
    + ￥{{$data.pay_price}} +
    +
    + {{/if}} +
    + {{/if}} +
    + + + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/touristbuy/index/index.html b/application/plugins/view/touristbuy/index/index.html new file mode 100644 index 000000000..9bd20e9e3 --- /dev/null +++ b/application/plugins/view/touristbuy/index/index.html @@ -0,0 +1,55 @@ +{{include file="public/header" /}} + + +{{include file="public/nav" /}} + + + +{{include file="public/header_top_nav" /}} + + +{{include file="public/nav_search" /}} + + +{{include file="public/header_nav" /}} + + +{{include file="public/goods_category" /}} + + +
    +
    +
    + +

    请输入订单号，收件人姓名，收件人电话即可查看订单详情

    +
    + + +
    +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + +
    +
    + +
    +
    + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/tags.php b/application/tags.php index ed88258ce..734d0ff25 100755 --- a/application/tags.php +++ b/application/tags.php @@ -44,7 +44,6 @@ return array ( 'plugins_service_user_login_end' => array ( 0 => 'app\\plugins\\userloginrewardintegral\\Hook', - 1 => 'app\\plugins\\shopoauth\\Hook', ), 'plugins_css' => array ( @@ -73,6 +72,7 @@ return array ( 'plugins_service_navigation_header_handle' => array ( 0 => 'app\\plugins\\answers\\Hook', + 1 => 'app\\plugins\\touristbuy\\Hook', ), 'plugins_admin_view_common_bottom' => array ( @@ -89,7 +89,7 @@ return array ( 'plugins_common_header' => array ( 0 => 'app\\plugins\\expressforkdn\\Hook', - 1 => 'app\\plugins\\shopoauth\\Hook', + 1 => 'app\\plugins\\touristbuy\\Hook', ), 'plugins_admin_common_header' => array ( @@ -99,13 +99,21 @@ return array ( array ( 0 => 'app\\plugins\\expressforkdn\\Hook', ), - 'plugins_service_header_navigation_top_left' => + 'plugins_view_header_navigation_top_left' => array ( - 0 => 'app\\plugins\\shopoauth\\Hook', + 0 => 'app\\plugins\\touristbuy\\Hook', ), - 'plugins_service_users_personal_show_field_list_handle' => + 'plugins_view_user_login_info_top' => array ( - 0 => 'app\\plugins\\shopoauth\\Hook', + 0 => 'app\\plugins\\touristbuy\\Hook', + ), + 'plugins_view_user_sms_reg_info' => + array ( + 0 => 'app\\plugins\\touristbuy\\Hook', + ), + 'plugins_view_user_email_reg_info' => + array ( + 0 => 'app\\plugins\\touristbuy\\Hook', ), ); ?> \ No newline at end of file diff --git a/public/static/plugins/css/touristbuy/admin.css b/public/static/plugins/css/touristbuy/admin.css new file mode 100755 index 000000000..e07c2caed --- /dev/null +++ b/public/static/plugins/css/touristbuy/admin.css @@ -0,0 +1,11 @@ +/** + * 首页 + */ +.touristbuy-content .items { + margin: 10px 0 20px 0; + border-bottom: 1px dashed #f1f1f1; + padding-bottom: 20px; +} +.touristbuy-content .edit-submit { + margin-bottom: 20px; +} \ No newline at end of file diff --git a/public/static/plugins/css/touristbuy/index.css b/public/static/plugins/css/touristbuy/index.css new file mode 100644 index 000000000..05bc22523 --- /dev/null +++ b/public/static/plugins/css/touristbuy/index.css @@ -0,0 +1,7 @@ +h1 { + font-size: 60px; +} +.msg { + font-size: 68px; + color: #4CAF50; +} \ No newline at end of file diff --git a/public/static/plugins/css/touristbuy/index.detail.css b/public/static/plugins/css/touristbuy/index.detail.css new file mode 100644 index 000000000..21b74169f --- /dev/null +++ b/public/static/plugins/css/touristbuy/index.detail.css @@ -0,0 +1,219 @@ +/** + * 进度 + */ +ul.progress { + margin: 20px 0; +} +ul.progress li { + position: relative; + } +ul.progress li i.step { + display: block; + background-color: #e1e1e1; +} + +ul.progress li .digital { + background-color: #f7f7f7; + border-radius: 50px; + width: 36px; + height: 36px; + line-height: 26px; + text-align: center; + color: #e1e1e1; + font-weight: 700; + border: 6px solid #e1e1e1; +} + +ul.progress li .base .title { + font-weight: 500; + color: #666; +} + +ul.progress li .base .date { + color: #999; +} + +ul.progress li.steps-success .digital { + border: 6px solid #4CAF50; + color: #fff; +} +ul.progress li.steps-success .digital { + background-color: #82cc85; +} +ul.progress li.steps-success i.step { + background-color: #4CAF50; +} +ul.progress li.current .title { + color: #4CAF50; +} + +.base-right .icon-tips, .base-right .icon-success { + font-size: 50px; +} +.base-right .icon-tips { + color: #6980d0; +} +.base-right .icon-success { + color: #28801c; +} + +@media only screen and (min-width: 641px) { + ul.progress { + overflow: hidden; + } + ul.progress li { + float: left; + width: 20%; + text-align: center; + } + ul.progress li i.step { + display: block; + height: 6px; + width: 100%; + position: absolute; + margin: 15px 0 0 -50%; + z-index: 1; + } + ul.progress li .digital { + position: absolute; + margin-left: calc(50% - 18px); + z-index: 2; + } + ul.progress li .base { + margin-top: 50px; + } +} + +@media only screen and (max-width: 641px) { + ul.progress li i.step { + height: 60px; + width: 6px; + margin-left: 15px; + } + + ul.progress li .base { + position: absolute; + left: 50px; + top: 0; + } + ul.progress li:not(:first-child) .base { + margin-top: 70px; + } +} + + +/** + * 文本列表 + */ +.items { + padding: 3px 0; + overflow: hidden; +} +.items-detail { + width: calc(100% - 62px); + color: #666; +} + + +/** + * 订单详情基础 + */ +.order-base .am-panel { + -webkit-box-shadow: none; + box-shadow: none; +} +.order-base .am-panel-bd, .order-base .base-right { + padding: 5px 10px; +} +.order-base, .order-base .status { + overflow: hidden; +} +.order-base .status-name { + line-height: 80px; +} +.order-base .operation .am-btn { + margin-left: 15px; +} +.order-base .logistics { + margin-top: 10px; +} +.order-base .am-btn-block { + width: auto; + padding-left: 1em; + padding-right: 1em; +} +@media only screen and (min-width: 641px) { + .order-base .base-left, .order-base .base-right { + width: 50%; + float: left; + } + .order-base { + border: 1px solid #ddd; + } + .order-base .am-panel-default { + border-color: #fff; + } + .order-base .am-panel { + border: 0; + margin: 0; + } + .order-base .base-left { + border-right: 1px solid #ddd; + } + .order-base .base-right { + padding-top: 0; + } +} +@media only screen and (max-width: 641px) { + .order-base .base-right { + border: 1px solid #ddd; + } +} + + +/** + * 支付弹窗 + */ +.business-item h3 { border-bottom: 3px solid #e3e3e3; margin-top:5px; font-size: 14px;font-weight: 700; } +.business-item ul { padding: 10px 3px 5px 5px; overflow: hidden; } +.business-item ul li { border:1px solid transparent ;overflow: hidden; float: left; cursor: pointer; padding: 5px; border: 1px solid #eee; margin: 0 10px 10px 0; } +.business-item ul li img { width: 36px; height: 36px; } +.business-item ul li.selected { border-color: #d2364c ; position: relative; } +.business-item ul li.selected i.icon-active { position: absolute; width: 10px; height: 10px; font-size: 0; line-height: 0; right: 0px; bottom: 0px; background: url(../images/sys_item_selected.gif) no-repeat right bottom; } +@media only screen and (min-width:640px) { + .business-item ul li {width:calc(33% - 5px); } + .business-item ul li:nth-child(3n) { margin-right: 0; } +} +@media only screen and (max-width:640px) { + .business-item ul li { width: calc(50% - 5px); } + .business-item ul li:nth-child(2n) { margin-right: 0; } +} + + +/** + * 商品列表 + */ +.order-goods { margin-top: 20px; } +.goods-detail img { width: 80px; height: 80px; position: absolute; } +.goods-detail { position: relative; min-height: 80px; } +.goods-title { display: block; max-height: 36px; overflow: hidden; text-overflow: ellipsis; } +.goods-title:hover { text-decoration: underline; } +.goods-base { float: left; top: 0; margin-left: 85px; } +.goods-attr { margin-top: 5px; } +.goods-attr li { color: #888; line-height: 16px; } +.original-price, .line-price { font-family: Verdana,Tahoma,arial; } +.original-price { color: #9c9c9c; text-decoration: line-through; } +.line-price { color: #3c3c3c; } +.line-price, strong.total-price-content, strong.total-price-content { font-weight: 700; font-family: Verdana,Tahoma,arial; } +strong.total-price-content { color: #d2364c; font-size: 16px; } +.am-table { margin-bottom: 10px; } +.am-table > tbody > tr > td { border-top: 1px solid #F5F5F5; } +.am-table > thead > tr > th { border-bottom: 1px solid #f7f7f7; } + +@media only screen and (min-width:640px) { + .cart-content table tr .base { width: 40%; } + .cart-content table tr .price { width: 20%; } + .cart-content table tr .number { width: 20%; } + .cart-content table tr .total-price { width: 20%; } + .cart-content { margin-top: 20px; } +} \ No newline at end of file diff --git a/public/static/upload/images/plugins_touristbuy/2019/03/15/1552656656517586.jpg b/public/static/upload/images/plugins_touristbuy/2019/03/15/1552656656517586.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6b2ba3143ffb09d4a51edea87129cfa65004d690 GIT binary patch literal 2838 zcmbW2c{J4f8^^z6jA4{@j4{MSF|tQxi7^TdX|iO9P`HC)$TEywNw~)@7e$sN%N1q4 zBF2(Xp{!+JB2zP{#?s8yy}xsB=l*r?@A;hf=X}ojJm)#j>pbVYAI>Oe8W1uw!J7ae z5CDL755QpqdMB)maW(`iT{Ou}#mm>7gbvbBRYzk2{XKn1XuO#z+U%^cDLP0;T~QhB z7kKfCXFv#AAFZtp<4gc203L1#4}_bC2f_n|^6SQy0V0AzL{A)r43_+Nmyz`OlIdHG=cy9u>I02c@h=HdoJAl%%$+2OnY z0JktiWWNTEN7V8nRMroEI6Ad}SI(%qP0VV5aX|CZ)fhe)LL4c9Iw-GzQ9Pt||LJtOm0)-TyP zg+;~pO753FD64t&xVEmop|Po**3sG3{jBHt;Lz(g!y}_(<1@2!^9zeh@0VAYYwH`I zzkFqFZhhwh0pLHecJDvI{=p@@%f-db4d#Y^=K^t2b_EvZhV0ki5y4qPFZzkf9**XP z8>JRhxADnoS~0{fT^)cS4rt9BWPV5cgY4gd#r$7ne}VnYH4f|ngLa1p76!1uW>NyC z$`EG^KMVR-0z`tBj%<+HrpCrEcnwe4F=-Z_B+L{dUt&xvfhr-$0KeDSvUzTHXjSkI z9N_{N!B2yRAKzuLYkludETeud`j$u{&nwY;D+x2i_RKYnV$ZK0I!Vap59#bLpvb;q z$S1nabSWP3rK$ggUIp)6Hraj~ub(1=e(Ryz`A~k&to3^2kU7P9QAulF+C+)Yj~(}K z)4WrEG^hXJare6>GDSI~G34v{2L9&`-_%Pwog$U?^E6dH2j$)ULB_VKr=acM zP^3-{Akto~eCjJ#;5j6>ZaHaPz9!L;ZYOBR+RJdINo%k?w(1(PM4TthmHqHi6|E## zPz>DnOvsW!=DI~kgw2}i?bS<-pF62CQ7y{Bw05>k7R_njE%}5MBXpnMLj2UVg?uZj zn>5uHn`9szT-4@k|CW_y5$aLJV}+A#*!#L%OkwY8q`-~aKDobvMccQoUN(>))atoV zl=S7JQg4_f z<5L&4C5eq;Oy(*%jAC=8+A{641^iKY4oLb`64jb5w{woE*1@l&q)&BludO9(xYj4S zP`ZxQE8G@+&qILgH7cp=5cWFv-(w}7Zmo@SbUgpgRLeJo@XPb3v2!E$s2qSU!BjZQ z46I8po@9A(0GyrRcs3a)C?__tHZPdrwmvl>)*JC+SS6B~PV9_4G1i`Es^Dwn>O+R_RXU^}Em&`2ui=n*%md0NHG!1AayDv{YvAtEK;Kmo+z8huv zuBpE;lFqogasaNm(IeDux;tZX?p%Fh7fMUso-VsqHH%x0{McYsaJ<^H|g?Rz4xq3XrX9%~%hSIh_)6z?VM&>o_bXuC!zrrhjkB(UW?oq`+-k zwbC6wdr33SI&~}B*^OmAHxk`!Usze6*ntWhuw0sOGIEa|rC7)CZa|?QhMOs0N*Tns z9mUxT21~R>J`hhZzQZP-W7b6QAl6+bP8@~E$0i0goIXYz2nq7jrkR4~8~4?_xQ>#Z1n1Mm z=CqqhOxYC&KJFav7=AqxG@dKXzPtL8-wIGw$N{`mD4n|4nB(~Z_S!=}xFj}P?pCy* zFc^iHvjCD`HX9g_KVnx~`AG(C$z>}0-ex+5#S=ZP){h$|qoOh4v}oNWGPkIbXOg&%xp5uPXDw zCGpp~Wu*>3oEN(MG5LCnVh!sFqiOM_)5%+_`)gho%5ixhavB6Q}I#D(_N`6Fp_k|SmHv&AS{08O`gGhddx+1VSmZG5_@uL4>gG1#J(+!-mV8k^bvvSj(03ffJ_L@pZ{ZkL)j zV;o`uw@z5F-Q7%ze>gAk*NDCrt$Idshf2DlS}T?R*)HNwo1VKSoa4<|Iyw5)4O4J Jg@QR_zXNDv*xUdB literal 0 HcmV?d00001 From a87e55e2146cbfa7f6cacb71ab2061eb6c2f657a Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 16 Mar 2019 16:36:34 +0800 Subject: [PATCH 080/108] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/commongobacktop/Hook.php | 45 +++++++------------ application/plugins/touristbuy/Hook.php | 32 ++++++------- application/plugins/touristbuy/Index.php | 20 +++++++-- application/plugins/touristbuy/Service.php | 31 +++++++++---- .../plugins/view/touristbuy/admin/index.html | 44 +++++++++++------- .../view/touristbuy/admin/saveinfo.html | 29 +++++------- .../plugins/view/touristbuy/index/detail.html | 13 ++++++ .../plugins/view/touristbuy/index/index.html | 14 +++--- .../static/plugins/css/touristbuy/index.css | 10 ++--- 9 files changed, 135 insertions(+), 103 deletions(-) diff --git a/application/plugins/commongobacktop/Hook.php b/application/plugins/commongobacktop/Hook.php index 4cc87dd7d..6ae036a64 100755 --- a/application/plugins/commongobacktop/Hook.php +++ b/application/plugins/commongobacktop/Hook.php @@ -32,41 +32,28 @@ class Hook extends Controller */ public function run($params = []) { - // 是否控制器钩子 - // is_backend 当前为后端业务处理 - // hook_name 钩子名称 - if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) + if(!empty($params['hook_name'])) { - // 参数一 描述 - // 参数二 0 为处理成功, 负数为失败 - // 参数三 返回数据 - return DataReturn('返回描述', 0); - - // 默认返回视图 - } else { - if(!empty($params['hook_name'])) + switch($params['hook_name']) { - switch($params['hook_name']) - { - case 'plugins_view_common_bottom' : - $ret = $this->html($params); - break; + case 'plugins_view_common_bottom' : + $ret = $this->html($params); + break; - case 'plugins_common_page_bottom' : - $ret = $this->js($params); - break; + case 'plugins_common_page_bottom' : + $ret = $this->js($params); + break; - case 'plugins_common_header' : - $ret = $this->css($params); - break; + case 'plugins_common_header' : + $ret = $this->css($params); + break; - default : - $ret = ''; - } - return $ret; - } else { - return ''; + default : + $ret = ''; } + return $ret; + } else { + return ''; } } diff --git a/application/plugins/touristbuy/Hook.php b/application/plugins/touristbuy/Hook.php index beee671a2..f487cc80a 100644 --- a/application/plugins/touristbuy/Hook.php +++ b/application/plugins/touristbuy/Hook.php @@ -84,7 +84,6 @@ class Hook extends Controller { // 获取应用数据 $ret = PluginsService::PluginsData('touristbuy'); - $ret['data']['application_name'] = '订单查询'; if($ret['code'] == 0 && !empty($ret['data']['application_name'])) { $params['header'][] = [ @@ -114,9 +113,6 @@ class Hook extends Controller return ''; } @@ -130,18 +126,24 @@ class Hook extends Controller */ public function UserLoginInfoHtml($params = []) { - // html - $html = ''; - // 获取已登录用户信息，已登录则不展示入口 $user = UserService::LoginUserInfo(); if(empty($user)) { - // 获取插件信息 + // 当前模块/控制器/方法 + $module_name = strtolower(request()->module()); + $controller_name = strtolower(request()->controller()); + $action_name = strtolower(request()->action()); + + // 当前窗口登录父级 + $is_parent = ($module_name.$controller_name.$action_name == 'indexusermodallogininfo') ? 1 : 0; + + // 获取应用数据 $ret = PluginsService::PluginsData('touristbuy'); - $html = ''; + $login_name = empty($ret['data']['login_name']) ? '游客登录' : $ret['data']['login_name']; + return ''; } - return $html; + return ''; } /** @@ -154,18 +156,16 @@ class Hook extends Controller */ public function LoginNavTopHtml($params = []) { - // html - $html = ''; - // 获取已登录用户信息，已登录则不展示入口 $user = UserService::LoginUserInfo(); if(empty($user)) { - // 获取插件信息 + // 获取应用数据 $ret = PluginsService::PluginsData('touristbuy'); - $html = '游客登录'; + $login_name = empty($ret['data']['login_name']) ? '游客登录' : $ret['data']['login_name']; + return ''.$login_name.''; } - return $html; + return ''; } } ?> \ No newline at end of file diff --git a/application/plugins/touristbuy/Index.php b/application/plugins/touristbuy/Index.php index bd7255c62..ae77a767b 100644 --- a/application/plugins/touristbuy/Index.php +++ b/application/plugins/touristbuy/Index.php @@ -14,6 +14,7 @@ use think\Controller; use app\plugins\touristbuy\Service; use app\service\SeoService; use app\service\OrderService; +use app\service\PluginsService; /** * 游客购买 - 前端独立页面入口 @@ -34,8 +35,15 @@ class Index extends Controller */ public function index($params = []) { - $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('订单查询', 1)); - return $this->fetch('../../../plugins/view/touristbuy/index/index'); + $ret = PluginsService::PluginsData('touristbuy'); + if($ret['code'] == 0) + { + $this->assign('data', $ret['data']); + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('订单查询', 1)); + return $this->fetch('../../../plugins/view/touristbuy/index/index'); + } else { + return $ret['msg']; + } } /** @@ -116,12 +124,16 @@ class Index extends Controller $ret = Service::TouristReg(); if($ret['code'] == 0) { - return $this->redirect(__MY_URL__); + if(isset($params['is_parent']) && $params['is_parent'] == 1) + { + return ''; + } else { + return $this->redirect(__MY_URL__); + } } else { $this->assign('msg', $ret['msg']); return $this->fetch('public/error'); } } - } ?> \ No newline at end of file diff --git a/application/plugins/touristbuy/Service.php b/application/plugins/touristbuy/Service.php index 5d81c46eb..1a9997950 100644 --- a/application/plugins/touristbuy/Service.php +++ b/application/plugins/touristbuy/Service.php @@ -12,6 +12,7 @@ namespace app\plugins\touristbuy; use think\Db; use app\service\UserService; +use app\service\PluginsService; /** * 问答系统服务层 @@ -40,23 +41,35 @@ class Service return DataReturn('已登录，请先退出', -1); } + // 获取应用数据 + $ret = PluginsService::PluginsData('touristbuy'); + $nickname = empty($ret['data']['nickname']) ? '游客' : $ret['data']['nickname']; + // 是否重复注册 $tourist_user_id = session('tourist_user_id'); if(!empty($tourist_user_id)) { - // 用户登录session纪录 - if(UserService::UserLoginRecord($tourist_user_id)) + // 更新用户信息 + $upd_data =[ + 'username' => $nickname, + 'nickname' => $nickname, + 'upd_time' => time(), + ]; + if(Db::name('User')->where(['id'=>$tourist_user_id])->update($upd_data)) { - return DataReturn('游客登录成功', 0); - } else { - session('tourist_user_id', null); + // 用户登录session纪录 + if(UserService::UserLoginRecord($tourist_user_id)) + { + return DataReturn($nickname.'登录成功', 0); + } } + session('tourist_user_id', null); } // 游客数据 $data = [ - 'username' => '游客', - 'nickname' => '游客', + 'username' => $nickname, + 'nickname' => $nickname, 'status' => 0, 'add_time' => time(), 'upd_time' => time(), @@ -72,10 +85,10 @@ class Service // 用户登录session纪录 if(UserService::UserLoginRecord($user_id)) { - return DataReturn('游客登录成功', 0); + return DataReturn($nickname.'登录成功', 0); } } - return DataReturn('游客登录失败', -100); + return DataReturn($nickname.'登录失败', -100); } } ?> \ No newline at end of file diff --git a/application/plugins/view/touristbuy/admin/index.html b/application/plugins/view/touristbuy/admin/index.html index 16402e479..3ae512bf3 100755 --- a/application/plugins/view/touristbuy/admin/index.html +++ b/application/plugins/view/touristbuy/admin/index.html @@ -10,39 +10,53 @@
    - +
    - {{if !empty($data['content'])}} - {{$data.content}} + {{if !empty($data['application_name'])}} + {{$data.application_name}} {{else /}} 无 {{/if}}
    - +
    - {{if isset($data['is_overall']) and $data['is_overall'] eq 1}} - 是 + {{if !empty($data['login_name'])}} + {{$data.login_name}} {{else /}} - 否 + 游客登录 {{/if}}
    - +
    - {{if !empty($data['time_start']) and !empty($data['time_end'])}} - {{$data.time_start}} ~ {{$data.time_end}} - {{elseif !empty($data['time_start']) and empty($data['time_end'])}} - {{$data.time_start}} ~ 长期有效 - {{elseif empty($data['time_start']) and !empty($data['time_end'])}} - 立即生效 ~ {{$data.time_end}} + {{if !empty($data['nickname'])}} + {{$data.nickname}} {{else /}} - 无限制 + 游客 {{/if}}
    +
    + +
    + {{if !empty($data['query_tips'])}} + {{$data.query_tips}} + {{else /}} + 无 + {{/if}} +
    +
    + +
    + + +
    + 编辑
    diff --git a/application/plugins/view/touristbuy/admin/saveinfo.html b/application/plugins/view/touristbuy/admin/saveinfo.html index 9fe21ae3e..24568104f 100755 --- a/application/plugins/view/touristbuy/admin/saveinfo.html +++ b/application/plugins/view/touristbuy/admin/saveinfo.html @@ -10,29 +10,24 @@ 返回 -
    - - +
    + +
    - -
    - {{foreach $is_whether_list as $v}} - - {{/foreach}} -
    + +
    - -
    - - ~ - -
    + + +
    + +
    + +
    diff --git a/application/plugins/view/touristbuy/index/detail.html b/application/plugins/view/touristbuy/index/detail.html index 87b558743..84d27d9eb 100644 --- a/application/plugins/view/touristbuy/index/detail.html +++ b/application/plugins/view/touristbuy/index/detail.html @@ -183,6 +183,19 @@
    + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
    + plugins_service_order_handle_operation_html +
    + {{/if}} + {{if !empty($data['plugins_service_order_handle_operation_html']) and is_array($data['plugins_service_order_handle_operation_html'])}} + {{foreach $data.plugins_service_order_handle_operation_html as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}}
    {{if in_array($data['status'], [3,4])}}
    diff --git a/application/plugins/view/touristbuy/index/index.html b/application/plugins/view/touristbuy/index/index.html index 9bd20e9e3..92150a001 100644 --- a/application/plugins/view/touristbuy/index/index.html +++ b/application/plugins/view/touristbuy/index/index.html @@ -19,10 +19,12 @@
    -
    - -

    请输入订单号，收件人姓名，收件人电话即可查看订单详情

    -
    + {{if !empty($data['query_tips'])}} +
    + +

    {{$data.query_tips}}

    +
    + {{/if}}
    @@ -32,12 +34,12 @@
    - +
    - +
    diff --git a/public/static/plugins/css/touristbuy/index.css b/public/static/plugins/css/touristbuy/index.css index 05bc22523..d846fed82 100644 --- a/public/static/plugins/css/touristbuy/index.css +++ b/public/static/plugins/css/touristbuy/index.css @@ -1,7 +1,3 @@ -h1 { - font-size: 60px; -} -.msg { - font-size: 68px; - color: #4CAF50; -} \ No newline at end of file +.plugins-touristbuy-index { margin-top: 5%; } +.plugins-touristbuy-index form.am-form { margin-top: 20px; } +.plugins-touristbuy-index form.am-form .am-form-group { padding: 0 !important; } \ No newline at end of file From f4c04d5a74210e5b88221a28f7db17940e888842 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 16 Mar 2019 16:38:42 +0800 Subject: [PATCH 081/108] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/answers/Hook.php | 56 ++++++++++++---------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/application/plugins/answers/Hook.php b/application/plugins/answers/Hook.php index d4e8ac633..9263af62d 100644 --- a/application/plugins/answers/Hook.php +++ b/application/plugins/answers/Hook.php @@ -22,46 +22,38 @@ use app\service\PluginsService; */ class Hook extends Controller { - // 应用响应入口 + /** + * 钩子入口 + * @author Guoguo + * @blog http://gadmin.cojz8.com + * @version 1.0.0 + * @datetime 2019年3月14日 + */ public function run($params = []) { - // 是否控制器钩子 - // is_backend 当前为后端业务处理 - // hook_name 钩子名称 - if(isset($params['is_backend']) && $params['is_backend'] === true && !empty($params['hook_name'])) + // 大导航前面添加问答地址 + if(!empty($params['hook_name']) && $params['hook_name'] == 'plugins_service_navigation_header_handle') { - // 参数一 描述 - // 参数二 0 为处理成功, 负数为失败 - // 参数三 返回数据 - return DataReturn('返回描述', 0); - - // 默认返回视图 - } else { - // 大导航前面添加问答地址 - if(!empty($params['hook_name']) && $params['hook_name'] == 'plugins_service_navigation_header_handle') + if(is_array($params['header'])) { - if(is_array($params['header'])) + // 获取应用数据 + $ret = PluginsService::PluginsData('answers', ['images']); + if($ret['code'] == 0 && !empty($ret['data']['application_name'])) { - // 获取应用数据 - $ret = PluginsService::PluginsData('answers', ['images']); - if($ret['code'] == 0 && !empty($ret['data']['application_name'])) - { - $nav = [ - 'id' => 0, - 'pid' => 0, - 'name' => $ret['data']['application_name'], - 'url' => PluginsHomeUrl('answers', 'index', 'index'), - 'data_type' => 'custom', - 'is_show' => 1, - 'is_new_window_open' => 0, - 'items' => [], - ]; - array_unshift($params['header'], $nav); - } + $nav = [ + 'id' => 0, + 'pid' => 0, + 'name' => $ret['data']['application_name'], + 'url' => PluginsHomeUrl('answers', 'index', 'index'), + 'data_type' => 'custom', + 'is_show' => 1, + 'is_new_window_open' => 0, + 'items' => [], + ]; + array_unshift($params['header'], $nav); } } } - return DataReturn('无需处理', 0); } } ?> \ No newline at end of file From 7858e1aec6a734ef50ed695841c72d398d23de7f Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 16 Mar 2019 16:40:13 +0800 Subject: [PATCH 082/108] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/shopxo.sql | 77 +++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 36 deletions(-) mode change 100755 => 100644 config/shopxo.sql diff --git a/config/shopxo.sql b/config/shopxo.sql old mode 100755 new mode 100644 index 0191748e5..cdf571d89 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -1,20 +1,18 @@ /* - Navicat Premium Data Transfer + Navicat MySQL Data Transfer Source Server : 本机 - Source Server Type : MySQL - Source Server Version : 50722 + Source Server Version : 50716 Source Host : localhost - Source Database : shopxo_test + Source Database : shopxo_ttt - Target Server Type : MySQL - Target Server Version : 50722 + Target Server Version : 50716 File Encoding : utf-8 - Date: 03/15/2019 17:46:18 PM + Date: 03/16/2019 16:39:42 PM */ -SET NAMES utf8mb4; +SET NAMES utf8; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- @@ -254,7 +252,7 @@ CREATE TABLE `s_config` ( -- Records of `s_config` -- ---------------------------- BEGIN; -INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1551173001'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1551173001'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1551173001'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1551173001'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1552635443'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1552635443'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1552635443'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1550547827'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1550547827'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1550547827'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1550547827'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1550547827'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1550547827'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1552635443'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1550547827'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1550547827'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1550547827'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1552635443'), ('31', '1', '用户注册开启审核', '开启后用户注册需要审核通过方可登录', '请选择用户注册开启审核', 'common', 'common_register_is_enable_audit', '1551173001'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1550547827'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1550547827'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1550547827'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1550547827'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1550547827'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1550547827'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1550547827'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1550547827'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1550547827'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1551174648'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1551174648'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1551174648'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1551174648'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1551174648'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1551174648'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1551173001'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1551173001'), ('63', '

    用户注册，你的验证码是  #code#

    ', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

    密码找回，你的验证码是  #code#

    ', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

    邮箱绑定，你的验证码是  #code#

    ', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1550547827'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1551173001'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1551173001'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1551173001'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1551173001'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1552635443'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); +INSERT INTO `s_config` VALUES ('15', '10', '分页数量', '分页显示数量', '分页不能超过3位数', 'admin', 'admin_page_number', '1551173001'), ('59', '1', '扣减库存规则', '需扣减库存开启方可有效，默认订单支付成功', '', 'common', 'common_deduction_inventory_rules', '1551173001'), ('60', '1', '是否扣减库存', '建议不要随意修改，以免造成库存数据错乱，关闭不影响库存回滚', '', 'common', 'common_is_deduction_inventory', '1551173001'), ('11', '0', 'Excel编码', 'excel模块编码选择', '请选择编码', 'admin', 'admin_excel_charset', '1551173001'), ('16', 'ShopXO企业级B2C电商系统提供商 - 演示站点', '站点标题', '浏览器标题，一般不超过80个字符', '站点标题不能为空', 'home', 'home_seo_site_title', '1552635443'), ('17', '商城系统,开源电商系统,免费电商系统,PHP电商系统,商城系统,B2C电商系统,B2B2C电商系统', '站点关键字', '一般不超过100个字符，多个关键字以半圆角逗号 [ , ] 隔开', '站点关键字不能为空', 'home', 'home_seo_site_keywords', '1552635443'), ('18', 'ShopXO是国内领先的商城系统提供商，为企业提供php商城系统、微信商城、小程序。', '站点描述', '站点描述，一般不超过200个字符', '站点描述不能为空', 'home', 'home_seo_site_description', '1552635443'), ('19', '黔ICP备15003530号', 'ICP证书号', 'ICP域名备案号', '', 'home', 'home_site_icp', '1552662554'), ('20', '', '底部统计代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_statistics_code', '0'), ('21', '1', '站点状态', '可暂时将站点关闭，其他人无法访问，但不影响管理员访问后台', '请选择站点状态', 'home', 'home_site_state', '1552662554'), ('22', '升级中...', '关闭原因', '支持html，当网站处于关闭状态时，关闭原因将显示在前台', '', 'home', 'home_site_close_reason', '1552662554'), ('23', 'Australia/Eucla', '默认时区', '默认 亚洲/上海 [标准时+8]', '请选择默认时区', 'common', 'common_timezone', '1552662554'), ('24', '', '底部代码', '支持html，可用于添加流量统计代码', '', 'home', 'home_footer_info', '1552662554'), ('28', 'ShopXO', '站点名称', '', '站点名称不能为空', 'home', 'home_site_name', '1552662554'), ('29', '0', '链接模式', '详情ThinkPHP官网5.1版本文档 [http://www.thinkphp.cn/]', '请选择url模式', 'home', 'home_seo_url_model', '1552635443'), ('25', '2048000', '图片最大限制', '单位B [上传图片还受到服务器空间PHP配置最大上传 20M 限制]', '请填写图片上传最大限制', 'home', 'home_max_limit_image', '1552662554'), ('26', '51200000', '文件最大限制', '单位B [上传文件还受到服务器空间PHP配置最大上传 20M 限制]', '请填写文件上传最大限制', 'home', 'home_max_limit_file', '1552662554'), ('27', '102400000', '视频最大限制', '单位B [上传视频还受到服务器空间PHP配置最大上传 20M 限制]', '请填写视频上传最大限制', 'home', 'home_max_limit_video', '1552662554'), ('30', 'html', '伪静态后缀', '链接后面的后缀别名，默认 [ html ]', '小写字母，不能超过8个字符', 'home', 'home_seo_url_html_suffix', '1552635443'), ('31', '1', '用户注册开启审核', '开启后用户注册需要审核通过方可登录', '请选择用户注册开启审核', 'common', 'common_register_is_enable_audit', '1551173001'), ('32', '/static/upload/images/common/2019/01/14/1547448748316693.png', '手机端logo', '支持 [jpg, png, gif]', '请上传手机端网站logo', 'home', 'home_site_logo_wap', '1552662554'), ('33', '/static/upload/images/common/2019/01/14/1547448705165706.png', '电脑端logo', '支持 [jpg, png, gif]', '请上传电脑端网站logo', 'home', 'home_site_logo', '1552662554'), ('34', '1200', '页面最大宽度', '页面最大宽度，单位px，0则100%', '请上传桌面图标', 'home', 'home_content_max_width', '1552662554'), ('35', '/static/upload/images/common/2019/01/14/1547448728921121.jpg', '桌面图标', '建议使用png格式', '图片比例值格式有误 0~100 之间，小数点后面最大两位', 'common', 'home_site_desktop_icon', '1552662554'), ('36', 'sms,email', '是否开启注册', '关闭注册后，前台站点将无法注册，可选择 [ 短信, 邮箱 ]', '请选择是否开启注册状态', 'home', 'home_user_reg_state', '1552662554'), ('37', '1', '是否开启登录', '关闭后，前端站点将无法登录', '请选择是否开启登录状态', 'home', 'home_user_login_state', '1552662554'), ('38', '1', '获取验证码-开启图片验证码', '防止短信轰炸', '请选择是否开启强制图片验证码', 'home', 'home_img_verify_state', '1552662554'), ('39', '60', '获取验证码时间间隔', '防止频繁获取验证码，一般在 30~120 秒之间，单位 [秒]', '请填写获取验证码时间间隔', 'home', 'common_verify_time_interval', '1552662554'), ('40', 'SMS_141025010', '用户注册-短信模板ID', '验证码code', '请填写用户注册短信模板内容', 'home', 'home_sms_user_reg', '1545099687'), ('41', '', '短信签名', '发送短信包含的签名', '短信签名 3~8 个的中英文字符', 'common', 'common_sms_sign', '1546059306'), ('42', '', '短信KeyID', 'Access Key ID', '请填写Access Key ID', 'common', 'common_sms_apikey', '1546059306'), ('43', 'SMS_141025009', '密码找回-短信模板ID', '验证码code', '请填写密码找回短信模板内容', 'home', 'home_sms_user_forget_pwd', '1545099687'), ('44', '600', '验证码有效时间', '验证码过期时间，一般10分钟左右，单位 [秒]', '请填写验证码有效时间', 'home', 'common_verify_expire_time', '1552662554'), ('45', '', 'SMTP服务器', '设置SMTP服务器的地址，如 smtp.163.com', '请填写SMTP服务器', 'common', 'common_email_smtp_host', '1551174648'), ('46', '', 'SMTP端口', '设置SMTP服务器的端口，默认为 25', '请填写SMTP端口号', 'common', 'common_email_smtp_port', '1551174648'), ('47', '', '发信人邮件地址', '发信人邮件地址，使用SMTP协议发送的邮件地址，如 shopxo@163.com', '请填写发信人邮件地址', 'common', 'common_email_smtp_account', '1551174648'), ('48', '', 'SMTP身份验证用户名', '如 ShopXO', '请填写SMTP身份验证用户名', 'common', 'common_email_smtp_name', '1551174648'), ('49', '', 'SMTP身份验证密码', 'shopxo@163.com邮件的密码', '请填写SMTP身份验证密码', 'common', 'common_email_smtp_pwd', '1551174648'), ('50', '', '发件人显示名称', '如 ShopXO', '', 'common', 'common_email_smtp_send_name', '1551174648'), ('51', '3', '分享赠送积分次数限制', '分享用户注册赠送积分次数限制 [ 0则不赠送，若要不限请加大数值 ]', '', 'common', 'common_share_giving_integral_frequency', '1542011644'), ('58', '', '短信KeySecret', 'Access Key Secret', '请填写Access Key Secret', 'common', 'common_sms_apisecret', '1546059306'), ('53', '021-88888888', '客服电话', '', '', 'common', 'common_customer_service_tel', '1551173001'), ('56', '10', '分享赠送积分', '分享用户注册后赠送积分 [ 0则不赠送 ]', '', 'common', 'common_share_giving_integral', '1542011644'), ('57', 'default', '默认模板', '前台默认模板', '请填写默认模板', 'common', 'common_default_theme', '1550113393'), ('62', '', '百度地图api密钥', '百度地图api密钥', '请填写百度地图api密钥', 'common', 'common_baidu_map_ak', '1551173001'), ('63', '

    用户注册，你的验证码是  #code#

    ', '用户注册-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_reg', '1533637393'), ('64', '

    密码找回，你的验证码是  #code#

    ', '密码找回-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_forget_pwd', '1533637393'), ('65', '

    邮箱绑定，你的验证码是  #code#

    ', '邮箱绑定-邮件模板', '验证码变量标识符 [ #code# ]', '', 'home', 'home_email_user_email_binding', '1533637393'), ('66', '20181012122', 'css/js版本标记', '用于css/js浏览器缓存版本识别', '', 'home', 'home_static_cache_version', '1552662554'), ('67', 'SMS_141025008', '手机号码绑定-短信模板ID', '验证码code', '请填写手机号码绑定短信模板内容', 'home', 'home_sms_user_mobile_binding', '1545099687'), ('68', '连衣裙,帐篷,iphone,小米,包包', '搜索关键字', '搜索框下热门关键字（输入回车）', '请填写关键字', 'home', 'home_search_keywords', '1551173001'), ('69', '2', '搜索关键字类型', '自定义需要配置以下关键字', '请选择关键字类型', 'home', 'home_search_keywords_type', '1551173001'), ('70', '0', '订单预约模式', '开启后用户提交订单需要管理员确认', '请选择是否开启预约模式', 'common', 'common_order_is_booking', '1551173001'), ('71', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_alipay_title', '1546962547'), ('72', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_alipay_describe', '1546962547'), ('73', '021-88888888', '客服电话', '', '请填写客服电话', 'common', 'common_app_customer_service_tel', '1550377653'), ('74', '', 'AppID', '小程序ID', '请填写AppID', 'common', 'common_app_mini_alipay_appid', '1546962547'), ('75', '', '应用公钥', '', '请填写应用公钥', 'common', 'common_app_mini_alipay_rsa_public', '1546962547'), ('76', '', '应用私钥', '', '请填写应用私钥', 'common', 'common_app_mini_alipay_rsa_private', '1546962547'), ('78', '1', '是否启用搜索', '', '', 'common', 'common_app_is_enable_search', '1550377653'), ('77', '', '支付宝公钥', '', '请填写支付宝公钥', 'common', 'common_app_mini_alipay_out_rsa_public', '1546962547'), ('79', '1', '是否启用留言', '', '', 'common', 'common_app_is_enable_answer', '1550377653'), ('80', '3', '商品可添加规格最大数量', '建议不超过3个规格', '请填写谷歌最大数', 'common', 'common_spec_add_max_number', '1551173001'), ('81', '-', '路由分隔符', '建议填写 [ - 或 / ] 默认 [ - ] ，仅PATHINFO模式+短地址模式下有效', '请填写路由分隔符', 'common', 'common_route_separator', '1552635443'), ('82', '', 'AppID', '小程序ID', '请填写appid', 'common', 'common_app_mini_weixin_appid', '1546962555'), ('83', '', 'AppSecret ', '小程序密钥', '请填写appsecret', 'common', 'common_app_mini_weixin_appsecret', '1546962555'), ('84', 'ShopXO', '名称', '', '请填写名称', 'common', 'common_app_mini_weixin_title', '1546962555'), ('85', '国内领先企业级B2C开源电商系统！', '描述', '', '请填写描述', 'common', 'common_app_mini_weixin_describe', '1546962555'), ('61', '用户中心公告文字，后台配置修改。', '用户中心公告', '空则不显示公告', '', 'common', 'common_user_center_notice', '1550377653'), ('8', '欢迎来到ShopXO企业级B2C开源电商系统、演示站点请勿发起支付、以免给您带来不必要的财产损失。', '商城公告', '空则不显示公告', '', 'common', 'common_shop_notice', '1550377653'); COMMIT; -- ---------------------------- @@ -358,7 +356,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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '34', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '3', '', '/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', '59', '', '/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', '161', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '320', '步', '/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', '58', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '66', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '15', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '7', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/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', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '19', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1552467444'); +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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '34', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '3', '', '/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', '59', '', '/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', '174', '', '/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', '61', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '68', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '15', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '9', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/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', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '19', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1552467444'); COMMIT; -- ---------------------------- @@ -372,13 +370,13 @@ CREATE TABLE `s_goods_browse` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; +) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; -- ---------------------------- -- Records of `s_goods_browse` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552549400'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552461784'), ('6', '2', '77', '1552380261', '1552532934'), ('7', '12', '77', '1552467447', '1552615868'), ('8', '6', '77', '1552529609', '1552531565'), ('9', '3', '77', '1552532930', '1552532930'), ('10', '4', '77', '1552628919', '1552629076'); +INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552549400'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552461784'), ('6', '2', '77', '1552380261', '1552532934'), ('7', '12', '77', '1552467447', '1552615868'), ('8', '6', '77', '1552529609', '1552531565'), ('9', '3', '77', '1552532930', '1552532930'), ('10', '4', '77', '1552628919', '1552629076'), ('11', '5', '0', '1552659057', '1552659073'), ('12', '5', '1', '1552659083', '1552659243'), ('13', '11', '1', '1552659292', '1552660274'), ('14', '5', '97', '1552660995', '1552660995'), ('15', '6', '97', '1552711349', '1552711351'); COMMIT; -- ---------------------------- @@ -522,7 +520,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', '320', '0.00', '', '', '3200.00', '1547453157'), ('27', '8', '356.00', '35', '0.00', '', '', '672.00', '1547454269'), ('37', '9', '120.00', '12', '0.00', '', '', '160.00', '1547454828'), ('38', '9', '120.00', '87', '0.00', '', '', '160.00', '1547454828'), ('39', '9', '120.00', '13', '0.00', '', '', '160.00', '1547454828'), ('40', '9', '120.00', '76', '0.00', '', '', '160.00', '1547454828'), ('41', '9', '136.00', '43', '0.00', '', '', '188.00', '1547454828'), ('42', '9', '136.00', '56', '0.00', '', '', '188.00', '1547454828'), ('43', '9', '136.00', '21', '0.00', '', '', '188.00', '1547454828'), ('44', '9', '158.00', '243', '0.00', '', '', '216.00', '1547454828'), ('45', '9', '158.00', '45', '0.00', '', '', '216.00', '1547454828'), ('46', '10', '228.00', '36', '0.00', '', '', '568.00', '1547455375'), ('47', '11', '258.00', '367', '0.00', '', '', '268.00', '1547455700'), ('53', '2', '6050.00', '100', '0.00', '', '', '6800.00', '1547458880'), ('54', '2', '6600.00', '200', '0.00', '', '', '7200.00', '1547458880'), ('55', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('56', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1547458880'), ('57', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1547458880'), ('58', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('59', '2', '4500.00', '99', '0.00', '', '', '6800.00', '1547458880'), ('60', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1547458880'), ('61', '2', '5500.00', '61', '0.00', '', '', '6000.00', '1547458880'), ('71', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1547485917'), ('78', '7', '168.00', '320', '0.00', '', '', '760.00', '1547540607'), ('114', '12', '0.01', '12', '0.50', 'gg11', 'txm11', '188.00', '1552467444'), ('115', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1552467444'), ('116', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1552467444'), ('117', '12', '118.00', '46', '457.60', 'gg44', 'txm44', '150.00', '1552467444'), ('118', '12', '118.00', '81', '37.00', 'gg55', 'txm55', '150.00', '1552467444'); +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'), ('27', '8', '356.00', '35', '0.00', '', '', '672.00', '1547454269'), ('37', '9', '120.00', '12', '0.00', '', '', '160.00', '1547454828'), ('38', '9', '120.00', '87', '0.00', '', '', '160.00', '1547454828'), ('39', '9', '120.00', '13', '0.00', '', '', '160.00', '1547454828'), ('40', '9', '120.00', '76', '0.00', '', '', '160.00', '1547454828'), ('41', '9', '136.00', '43', '0.00', '', '', '188.00', '1547454828'), ('42', '9', '136.00', '56', '0.00', '', '', '188.00', '1547454828'), ('43', '9', '136.00', '21', '0.00', '', '', '188.00', '1547454828'), ('44', '9', '158.00', '243', '0.00', '', '', '216.00', '1547454828'), ('45', '9', '158.00', '45', '0.00', '', '', '216.00', '1547454828'), ('46', '10', '228.00', '36', '0.00', '', '', '568.00', '1547455375'), ('47', '11', '258.00', '367', '0.00', '', '', '268.00', '1547455700'), ('53', '2', '6050.00', '100', '0.00', '', '', '6800.00', '1547458880'), ('54', '2', '6600.00', '200', '0.00', '', '', '7200.00', '1547458880'), ('55', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('56', '2', '6050.00', '300', '0.00', '', '', '6800.00', '1547458880'), ('57', '2', '6600.00', '300', '0.00', '', '', '7200.00', '1547458880'), ('58', '2', '6800.00', '300', '0.00', '', '', '7600.00', '1547458880'), ('59', '2', '4500.00', '99', '0.00', '', '', '6800.00', '1547458880'), ('60', '2', '4800.00', '50', '0.00', '', '', '6600.00', '1547458880'), ('61', '2', '5500.00', '61', '0.00', '', '', '6000.00', '1547458880'), ('71', '1', '2100.00', '125', '0.00', '', '', '3200.00', '1547485917'), ('78', '7', '168.00', '320', '0.00', '', '', '760.00', '1547540607'), ('114', '12', '0.01', '12', '0.50', 'gg11', 'txm11', '188.00', '1552467444'), ('115', '12', '128.00', '65', '0.10', 'gg22', 'txm22', '188.00', '1552467444'), ('116', '12', '128.00', '42', '1.90', 'gg33', 'txm33', '188.00', '1552467444'), ('117', '12', '118.00', '46', '457.60', 'gg44', 'txm44', '150.00', '1552467444'), ('118', '12', '118.00', '81', '37.00', 'gg55', 'txm55', '150.00', '1552467444'); COMMIT; -- ---------------------------- @@ -612,13 +610,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=19 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='消息'; -- ---------------------------- -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552272529'), ('9', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552361991'), ('10', '77', '订单支付', '订单支付成功，金额2499元', '2', '1', '0', '1', '0', '0', '1552362074'), ('11', '77', '订单发货', '订单已发货', '2', '1', '0', '1', '0', '0', '1552362108'), ('12', '77', '订单支付', '订单支付成功，金额4500元', '3', '1', '0', '1', '0', '0', '1552380271'), ('13', '77', '订单发货', '订单已发货', '3', '1', '0', '1', '0', '0', '1552380288'), ('14', '77', '积分变动', '订单商品完成赠送积分增加56', '0', '0', '0', '1', '0', '0', '1552386780'), ('15', '77', '订单收货', '订单收货成功', '2', '1', '0', '1', '0', '0', '1552386780'), ('16', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552464876'), ('17', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552529078'), ('18', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552628910'); +INSERT INTO `s_message` VALUES ('1', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551174252'), ('2', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551192116'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551233397'), ('4', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1551234579'), ('5', '92', '订单支付', '订单支付成功，金额3270.9元', '1', '1', '0', '0', '0', '0', '1551239424'), ('6', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551855214'), ('7', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1551952686'), ('8', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552272529'), ('9', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552361991'), ('10', '77', '订单支付', '订单支付成功，金额2499元', '2', '1', '0', '1', '0', '0', '1552362074'), ('11', '77', '订单发货', '订单已发货', '2', '1', '0', '1', '0', '0', '1552362108'), ('12', '77', '订单支付', '订单支付成功，金额4500元', '3', '1', '0', '1', '0', '0', '1552380271'), ('13', '77', '订单发货', '订单已发货', '3', '1', '0', '1', '0', '0', '1552380288'), ('14', '77', '积分变动', '订单商品完成赠送积分增加56', '0', '0', '0', '1', '0', '0', '1552386780'), ('15', '77', '订单收货', '订单收货成功', '2', '1', '0', '1', '0', '0', '1552386780'), ('16', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552464876'), ('17', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552529078'), ('18', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1552628910'), ('19', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1552711204'), ('20', '97', '订单支付', '订单支付成功，金额2998.9元', '9', '1', '0', '0', '0', '0', '1552711407'); COMMIT; -- ---------------------------- @@ -697,13 +695,13 @@ CREATE TABLE `s_order` ( KEY `shop_id` (`shop_id`), KEY `status` (`status`), KEY `pay_status` (`pay_status`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单'; -- ---------------------------- -- Records of `s_order` -- ---------------------------- BEGIN; -INSERT INTO `s_order` VALUES ('1', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'), ('2', '20190312114031822173', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '73107853468716', '2', '4', '1', '0.00', '2499.00', '2499.00', '2499.00', '1552362074', '1552362031', '1552362108', '0', '1552386780', '0', '0', '0', '0', '0', '0', '1552362031', '1552386780'), ('3', '20190312164430579995', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '767', '2', '3', '1', '0.00', '4500.00', '4500.00', '4500.00', '1552380271', '1552380270', '1552380288', '0', '0', '0', '0', '0', '0', '0', '0', '1552380270', '1552380288'), ('4', '20190313165746433360', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '3', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552467466', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552467466', '0'), ('5', '20190314164830100836', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '7', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552553310', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552553310', '0'), ('6', '20190315101124514911', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552615884', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552615884', '0'), ('7', '20190315101403128249', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552616043', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552616043', '0'), ('8', '20190315101650867423', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552616210', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552616210', '0'); +INSERT INTO `s_order` VALUES ('1', '20190227115022051094', '92', '0', '1', '2323', '17602128368', '1', '37', '567', '23', '', '0', '', '1', '2', '1', '0.00', '3270.90', '3270.90', '3270.90', '1551239424', '1551239422', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1551239422', '1551239424'), ('2', '20190312114031822173', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '73107853468716', '2', '4', '1', '0.00', '2499.00', '2499.00', '2499.00', '1552362074', '1552362031', '1552362108', '0', '1552386780', '0', '0', '0', '0', '0', '0', '1552362031', '1552386780'), ('3', '20190312164430579995', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '4', '767', '2', '3', '1', '0.00', '4500.00', '4500.00', '4500.00', '1552380271', '1552380270', '1552380288', '0', '0', '0', '0', '0', '0', '0', '0', '1552380270', '1552380288'), ('4', '20190313165746433360', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '3', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552467466', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552467466', '0'), ('5', '20190314164830100836', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '7', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552553310', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552553310', '0'), ('6', '20190315101124514911', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552615884', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552615884', '0'), ('7', '20190315101403128249', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552616043', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552616043', '0'), ('8', '20190315101650867423', '77', '0', '2', '绿色校园', '13222333333', '1', '38', '577', '333', '', '0', '', '8', '1', '0', '0.00', '0.01', '0.01', '0.00', '0', '1552616210', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552616210', '0'), ('9', '20190316124326778146', '97', '0', '3', 'sky', '13222333333', '1', '38', '578', '33', '', '0', '', '9', '2', '1', '0.00', '2998.90', '2998.90', '2998.90', '1552711407', '1552711406', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1552711406', '1552711407'); COMMIT; -- ---------------------------- @@ -752,13 +750,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=10 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单详情'; +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单详情'; -- ---------------------------- -- Records of `s_order_detail` -- ---------------------------- BEGIN; -INSERT INTO `s_order_detail` VALUES ('1', '92', '1', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0', '', '', '1551239422', '0'), ('2', '92', '1', '9', '0', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '188.00', '136.00', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '2', '0', '', '', '1551239422', '0'), ('3', '77', '2', '5', '0', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '2499.00', '', '1', '0', '', '', '1552362031', '0'), ('4', '77', '3', '2', '0', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6800.00', '4500.00', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e8c\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"32G\"}]', '1', '0', '', '', '1552380270', '0'), ('5', '77', '4', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552467466', '0'), ('6', '77', '5', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552553310', '0'), ('7', '77', '6', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552615884', '0'), ('8', '77', '7', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552616043', '0'), ('9', '77', '8', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552616210', '0'); +INSERT INTO `s_order_detail` VALUES ('1', '92', '1', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0', '', '', '1551239422', '0'), ('2', '92', '1', '9', '0', '睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装', '/static/upload/images/goods/2019/01/14/1547454702543219.jpg', '188.00', '136.00', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"L\"}]', '2', '0', '', '', '1551239422', '0'), ('3', '77', '2', '5', '0', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '2499.00', '', '1', '0', '', '', '1552362031', '0'), ('4', '77', '3', '2', '0', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6800.00', '4500.00', '[{\"type\":\"\\u5957\\u9910\",\"value\":\"\\u5957\\u9910\\u4e8c\"},{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u91d1\\u8272\"},{\"type\":\"\\u5bb9\\u91cf\",\"value\":\"32G\"}]', '1', '0', '', '', '1552380270', '0'), ('5', '77', '4', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552467466', '0'), ('6', '77', '5', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552553310', '0'), ('7', '77', '6', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552615884', '0'), ('8', '77', '7', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552616043', '0'), ('9', '77', '8', '12', '0', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '188.00', '0.01', '[{\"type\":\"\\u989c\\u8272\",\"value\":\"\\u7c89\\u8272\"},{\"type\":\"\\u5c3a\\u7801\",\"value\":\"M\"}]', '1', '1', 'gg11', 'txm11', '1552616210', '0'), ('10', '97', '9', '6', '0', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '2998.90', '', '1', '0', '', '', '1552711406', '0'); COMMIT; -- ---------------------------- @@ -779,13 +777,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=5 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单商品库存变更日志'; +) ENGINE=InnoDB AUTO_INCREMENT=6 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', '6', '2', '321', '320', '0', '0', '1551239424'), ('2', '1', '9', '2', '598', '596', '0', '0', '1551239424'), ('3', '2', '5', '2', '436', '435', '0', '0', '1552362074'), ('4', '3', '2', '2', '1711', '1710', '0', '0', '1552380271'); +INSERT INTO `s_order_goods_inventory_log` VALUES ('1', '1', '6', '2', '321', '320', '0', '0', '1551239424'), ('2', '1', '9', '2', '598', '596', '0', '0', '1551239424'), ('3', '2', '5', '2', '436', '435', '0', '0', '1552362074'), ('4', '3', '2', '2', '1711', '1710', '0', '0', '1552380271'), ('5', '9', '6', '2', '320', '319', '0', '0', '1552711408'); COMMIT; -- ---------------------------- @@ -805,13 +803,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=7 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='订单状态历史纪录'; +) ENGINE=InnoDB AUTO_INCREMENT=8 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', '系统', '1551239424'), ('2', '2', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552362074'), ('3', '2', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552362108'), ('4', '3', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552380271'), ('5', '3', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552380288'), ('6', '2', '3', '4', '收货[待收货-已完成]', '77', '龚哥哥', '1552386780'); +INSERT INTO `s_order_status_history` VALUES ('1', '1', '1', '2', '支付[待付款-待发货]', '0', '系统', '1551239424'), ('2', '2', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552362074'), ('3', '2', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552362108'), ('4', '3', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552380271'), ('5', '3', '2', '3', '收货[待发货-待收货]', '1', 'admin', '1552380288'), ('6', '2', '3', '4', '收货[待收货-已完成]', '77', '龚哥哥', '1552386780'), ('7', '9', '1', '2', '支付[待付款-待发货]', '0', '系统', '1552711407'); COMMIT; -- ---------------------------- @@ -834,13 +832,13 @@ CREATE TABLE `s_pay_log` ( PRIMARY KEY (`id`), KEY `pay_type` (`payment`), KEY `order_id` (`order_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付日志'; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付日志'; -- ---------------------------- -- Records of `s_pay_log` -- ---------------------------- BEGIN; -INSERT INTO `s_pay_log` VALUES ('1', '92', '1', '', '用户-fux***com', '3270.90', '3270.90', '订单支付', 'DeliveryPayment', '货到付款', '1', '1551239424'), ('2', '77', '2', '', '用户-龚哥哥', '2499.00', '2499.00', '订单支付', 'DeliveryPayment', '货到付款', '1', '1552362074'), ('3', '77', '3', '', '用户-龚哥哥', '4500.00', '4500.00', '订单支付', 'DeliveryPayment', '货到付款', '1', '1552380271'); +INSERT INTO `s_pay_log` VALUES ('1', '92', '1', '', '用户-fux***com', '3270.90', '3270.90', '订单支付', 'DeliveryPayment', '货到付款', '1', '1551239424'), ('2', '77', '2', '', '用户-龚哥哥', '2499.00', '2499.00', '订单支付', 'DeliveryPayment', '货到付款', '1', '1552362074'), ('3', '77', '3', '', '用户-龚哥哥', '4500.00', '4500.00', '订单支付', 'DeliveryPayment', '货到付款', '1', '1552380271'), ('4', '97', '9', '', '用户-游客', '2998.90', '2998.90', '订单支付', 'CashPayment', '现金支付', '1', '1552711407'); COMMIT; -- ---------------------------- @@ -868,7 +866,14 @@ CREATE TABLE `s_payment` ( PRIMARY KEY (`id`), UNIQUE KEY `payment` (`payment`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='支付方式'; + +-- ---------------------------- +-- Records of `s_payment` +-- ---------------------------- +BEGIN; +INSERT INTO `s_payment` VALUES ('9', '现金支付', 'CashPayment', '', '0.0.1', '不限', '现金方式支付货款', 'Devil', 'http://shopxo.net/', '', '', '[\"pc\",\"h5\",\"app\",\"alipay\",\"weixin\",\"baidu\"]', '1', '1', '0', '1552711390', '1552711396'); +COMMIT; -- ---------------------------- -- Table structure for `s_plugins` @@ -884,13 +889,13 @@ CREATE TABLE `s_plugins` ( PRIMARY KEY (`id`), UNIQUE KEY `plugins` (`plugins`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; +) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; -- ---------------------------- -- 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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1552463476'), ('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', '1552463173'), ('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', '1552642312'), ('24', 'shopoauth', '{\"auth\":{\"qq\":{\"name\":\"QQ\\u767b\\u5f55\",\"app_key\":\"\",\"app_secret\":\"\",\"open\":\"1\"}},\"pluginsname\":\"shopoauth\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552627456', '1552642945'); +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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1552463476'), ('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', '1552642312'), ('24', 'shopoauth', '{\"auth\":{\"qq\":{\"name\":\"QQ\\u767b\\u5f55\",\"app_key\":\"\",\"app_secret\":\"\",\"open\":\"1\"}},\"pluginsname\":\"shopoauth\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1552627456', '1552724547'), ('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\",\"pluginsname\":\"touristbuy\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552656743', '1552724447'); COMMIT; -- ---------------------------- @@ -1129,13 +1134,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=69 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; +) ENGINE=InnoDB AUTO_INCREMENT=74 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; -- ---------------------------- -- Records of `s_search_history` -- ---------------------------- BEGIN; -INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'), ('41', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446286'), ('42', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446830'), ('43', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461592'), ('44', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461878'), ('45', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552464847'), ('46', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552467418'), ('47', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190313', '1552467421'), ('48', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190313', '1552467423'), ('49', '0', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529646'), ('50', '77', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529650'), ('51', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552531528'), ('52', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532412'), ('53', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532430'), ('54', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532687'), ('55', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532711'), ('56', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532714'), ('57', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532836'), ('58', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532873'), ('59', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532888'), ('60', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532895'), ('61', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532913'), ('62', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532919'), ('63', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552533239'), ('64', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552549550'), ('65', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552553299'), ('66', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190314', '1552553300'), ('67', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190314', '1552553302'), ('68', '77', '0', '1', '', '0-0', 'default', 'asc', '20190315', '1552639821'); +INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'), ('41', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446286'), ('42', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446830'), ('43', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461592'), ('44', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461878'), ('45', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552464847'), ('46', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552467418'), ('47', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190313', '1552467421'), ('48', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190313', '1552467423'), ('49', '0', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529646'), ('50', '77', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529650'), ('51', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552531528'), ('52', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532412'), ('53', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532430'), ('54', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532687'), ('55', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532711'), ('56', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532714'), ('57', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532836'), ('58', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532873'), ('59', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532888'), ('60', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532895'), ('61', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532913'), ('62', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532919'), ('63', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552533239'), ('64', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552549550'), ('65', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552553299'), ('66', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190314', '1552553300'), ('67', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190314', '1552553302'), ('68', '77', '0', '1', '', '0-0', 'default', 'asc', '20190315', '1552639821'), ('69', '97', '0', '0', '', '0-0', 'default', 'asc', '20190315', '1552661032'), ('70', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724523'), ('71', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724538'), ('72', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724539'), ('73', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724540'); COMMIT; -- ---------------------------- @@ -1200,13 +1205,13 @@ CREATE TABLE `s_user` ( KEY `weixin_openid` (`weixin_openid`), KEY `mobile` (`mobile`), KEY `username` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=93 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户'; +) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户'; -- ---------------------------- -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '273485', '8b13e6c101f9b3110e97d7ef04fd4eaa', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1083', '0', '0', '0', '0', '1552642211'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('92', '', '', '', '0', '681141', '0461e68ca574a0d7622e7c078a1d73c3', '', '', '', 'fuxiang.gong@qq.com', '0', '', '', '', '0', '', '10', '0', '0', '0', '1551173897', '1551239413'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '102132', '32b496a315a44e4e4e347d916353644a', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1088', '0', '0', '0', '0', '1552711204'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('97', '', '', '', '0', '', '', '游客', '游客', '', '', '0', '', '', '', '0', '', '0', '0', '0', '0', '1552660927', '1552725449'); COMMIT; -- ---------------------------- @@ -1232,13 +1237,13 @@ CREATE TABLE `s_user_address` ( PRIMARY KEY (`id`), KEY `user_id` (`user_id`), KEY `is_enable` (`is_delete_time`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户地址'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户地址'; -- ---------------------------- -- Records of `s_user_address` -- ---------------------------- BEGIN; -INSERT INTO `s_user_address` VALUES ('1', '92', '', '2323', '17602128368', '1', '37', '567', '23', '116.4113820000', '39.9184710000', '0', '0', '1551238222', '0'), ('2', '77', '', '绿色校园', '13222333333', '1', '38', '577', '333', '116.3911060000', '39.9422140000', '1', '0', '1552362027', '0'); +INSERT INTO `s_user_address` VALUES ('1', '92', '', '2323', '17602128368', '1', '37', '567', '23', '116.4113820000', '39.9184710000', '0', '0', '1551238222', '0'), ('2', '77', '', '绿色校园', '13222333333', '1', '38', '577', '333', '116.3911060000', '39.9422140000', '1', '0', '1552362027', '0'), ('3', '97', '', 'sky', '13222333333', '1', '38', '578', '33', '116.3513820000', '39.9401890000', '0', '0', '1552711371', '0'); COMMIT; -- ---------------------------- @@ -1256,13 +1261,13 @@ CREATE TABLE `s_user_integral_log` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', PRIMARY KEY (`id`), KEY `user_id` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户积分日志'; -- ---------------------------- -- Records of `s_user_integral_log` -- ---------------------------- BEGIN; -INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'), ('6', '77', '1', '1007', '1012', '登录奖励积分', '0', '1552361991'), ('7', '77', '1', '1012', '1068', '订单商品完成赠送', '0', '1552386780'), ('8', '77', '1', '1068', '1073', '登录奖励积分', '0', '1552464876'), ('9', '77', '1', '1073', '1078', '登录奖励积分', '0', '1552529078'), ('10', '77', '1', '1078', '1083', '登录奖励积分', '0', '1552628910'); +INSERT INTO `s_user_integral_log` VALUES ('1', '77', '1', '987', '992', '登录奖励积分', '0', '1551233397'), ('2', '92', '1', '5', '10', '登录奖励积分', '0', '1551234579'), ('3', '77', '1', '992', '997', '登录奖励积分', '0', '1551855214'), ('4', '77', '1', '997', '1002', '登录奖励积分', '0', '1551952686'), ('5', '77', '1', '1002', '1007', '登录奖励积分', '0', '1552272529'), ('6', '77', '1', '1007', '1012', '登录奖励积分', '0', '1552361991'), ('7', '77', '1', '1012', '1068', '订单商品完成赠送', '0', '1552386780'), ('8', '77', '1', '1068', '1073', '登录奖励积分', '0', '1552464876'), ('9', '77', '1', '1073', '1078', '登录奖励积分', '0', '1552529078'), ('10', '77', '1', '1078', '1083', '登录奖励积分', '0', '1552628910'), ('11', '77', '1', '1083', '1088', '登录奖励积分', '0', '1552711204'); COMMIT; SET FOREIGN_KEY_CHECKS = 1; From c2b09ce4e646d5c0ba26cf6b9ae59972dcc1e1fe Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 16 Mar 2019 16:47:47 +0800 Subject: [PATCH 083/108] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/default/css/pluginsadmin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/static/admin/default/css/pluginsadmin.css b/public/static/admin/default/css/pluginsadmin.css index 0f046adca..434ce4bc0 100755 --- a/public/static/admin/default/css/pluginsadmin.css +++ b/public/static/admin/default/css/pluginsadmin.css @@ -10,7 +10,7 @@ width: 80px; height: 80px; border-radius: 10px; - box-shadow: 0px 10px 10px -6px rgba(0,0,0,.4); + box-shadow: 0px 3px 6px 0px rgba(0,0,0,.4); } .content ul.am-gallery-bordered.am-gallery-bordered .am-gallery-item { box-shadow: none; From e39a0673948241faf73c8aaac56e8431ed97d1c5 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sat, 16 Mar 2019 17:00:58 +0800 Subject: [PATCH 084/108] log --- changelog.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 2f4046c99..6661d210d 100755 --- a/changelog.txt +++ b/changelog.txt @@ -6,8 +6,10 @@ 2. 新增商品价格配置显隐应用 3. 新增问答增强版应用 4. 新增物流查询应用 - 5. 新增码支付模块 - 开发中 - 6. 新增游客购物应用 - 开发中 + 5. 新增码支付模块 + 6. 新增游客购物应用 + 7. 新增QQ登录应用 + 8. 新增运费模块应用 - 开发中 前端功能列表 1. 新增商品价格配置显隐应用 From b0058d73db1daa436e2a6af9887cade32eda77b7 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Mon, 18 Mar 2019 13:52:52 +0800 Subject: [PATCH 085/108] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E6=B8=B8=E5=AE=A2=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Common.php | 18 ++++++ application/index/controller/Common.php | 18 ++++++ application/plugins/touristbuy/Hook.php | 26 ++++++++ application/plugins/touristbuy/config.json | 3 + .../plugins/view/touristbuy/admin/index.html | 11 ++++ .../view/touristbuy/admin/saveinfo.html | 11 ++++ application/service/SystemService.php | 62 +++++++++++++++++++ application/tags.php | 5 ++ 8 files changed, 154 insertions(+) create mode 100644 application/service/SystemService.php diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index 1a8da279d..a7528d181 100755 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -11,6 +11,7 @@ namespace app\api\controller; use think\Controller; +use app\service\SystemService; use app\service\ConfigService; use app\service\UserService; @@ -47,6 +48,9 @@ class Common extends Controller { parent::__construct(); + // 系统运行开始 + SystemService::SystemBegin(); + // 输入参数 $this->data_post = input('post.'); $this->data_get = input('get.'); @@ -62,6 +66,20 @@ class Common extends Controller $this->CommonInit(); } + /** + * 析构函数 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-18 + * @desc description + */ + public function __destruct() + { + // 系统运行结束 + SystemService::SystemEnd(); + } + /** * 系统初始化 * @author Devil diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 79d5195ac..67a1a8d20 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -12,6 +12,7 @@ namespace app\index\controller; use think\facade\Hook; use think\Controller; +use app\service\SystemService; use app\service\GoodsService; use app\service\NavigationService; use app\service\BuyService; @@ -52,6 +53,9 @@ class Common extends Controller { parent::__construct(); + // 系统运行开始 + SystemService::SystemBegin(); + // 系统初始化 $this->SystemInit(); @@ -71,6 +75,20 @@ class Common extends Controller $this->CommonPluginsInit(); } + /** + * 析构函数 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-18 + * @desc description + */ + public function __destruct() + { + // 系统运行结束 + SystemService::SystemEnd(); + } + /** * 公共钩子初始化 * @author Devil diff --git a/application/plugins/touristbuy/Hook.php b/application/plugins/touristbuy/Hook.php index f487cc80a..902f29bf4 100644 --- a/application/plugins/touristbuy/Hook.php +++ b/application/plugins/touristbuy/Hook.php @@ -11,6 +11,7 @@ namespace app\plugins\touristbuy; use think\Controller; +use app\plugins\touristbuy\Service; use app\service\PluginsService; use app\service\UserService; @@ -59,6 +60,11 @@ class Hook extends Controller $ret = $this->NavTitle($params); break; + // 系统运行开始 + case 'plugins_service_system_begin' : + $ret = $this->SystemBegin($params); + break; + default : $ret = DataReturn('无需处理', 0); } @@ -70,6 +76,26 @@ class Hook extends Controller } } + /** + * 系统运行开始 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-18 + * @desc description + * @param [array] $params [输入参数] + */ + public function SystemBegin($params = []) + { + // 是否开启默认游客 + $ret = PluginsService::PluginsData('touristbuy'); + if($ret['code'] == 0 && isset($ret['data']['is_default_tourist']) && $ret['data']['is_default_tourist'] == 1) + { + return Service::TouristReg(); + } + return DataReturn('无需处理', 0); + } + /** * css * @author Devil diff --git a/application/plugins/touristbuy/config.json b/application/plugins/touristbuy/config.json index 97f25f2e2..c61090e48 100644 --- a/application/plugins/touristbuy/config.json +++ b/application/plugins/touristbuy/config.json @@ -17,6 +17,9 @@ "is_home":true }, "hook":{ + "plugins_service_system_begin":[ + "app\\plugins\\touristbuy\\Hook" + ], "plugins_common_header":[ "app\\plugins\\touristbuy\\Hook" ], diff --git a/application/plugins/view/touristbuy/admin/index.html b/application/plugins/view/touristbuy/admin/index.html index 3ae512bf3..44c362849 100755 --- a/application/plugins/view/touristbuy/admin/index.html +++ b/application/plugins/view/touristbuy/admin/index.html @@ -50,6 +50,17 @@
    +
    + +
    + {{if isset($data['is_default_tourist']) and $data['is_default_tourist'] eq 1}} + 是 + {{else /}} + 否 + {{/if}} +
    +
    +
    diff --git a/application/plugins/view/touristbuy/admin/saveinfo.html b/application/plugins/view/touristbuy/admin/saveinfo.html index 24568104f..9cba80a60 100755 --- a/application/plugins/view/touristbuy/admin/saveinfo.html +++ b/application/plugins/view/touristbuy/admin/saveinfo.html @@ -30,6 +30,17 @@
    +
    + +
    + {{foreach $is_whether_list as $v}} + + {{/foreach}} +
    +
    +
    diff --git a/application/service/SystemService.php b/application/service/SystemService.php new file mode 100644 index 000000000..5a191482d --- /dev/null +++ b/application/service/SystemService.php @@ -0,0 +1,62 @@ + $hook_name, + 'is_backend' => true, + 'params' => &$params, + ]); + } + + /** + * 系统运行结束 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-18 + * @desc description + * @param [array] $params [输入参数] + */ + public static function SystemEnd($params = []) + { + $hook_name = 'plugins_service_system_end'; + $ret = Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + ]); + } +} +?> \ No newline at end of file diff --git a/application/tags.php b/application/tags.php index 734d0ff25..cad187d4c 100755 --- a/application/tags.php +++ b/application/tags.php @@ -13,6 +13,7 @@ return array ( 'app_init' => array ( + 0 => 'app\\plugins\\touristbuy\\Hook', ), 'app_begin' => array ( @@ -99,6 +100,10 @@ return array ( array ( 0 => 'app\\plugins\\expressforkdn\\Hook', ), + 'plugins_service_system_begin' => + array ( + 0 => 'app\\plugins\\touristbuy\\Hook', + ), 'plugins_view_header_navigation_top_left' => array ( 0 => 'app\\plugins\\touristbuy\\Hook', From dbab7d3282970f5251f852c195925a84f1123e78 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Mon, 18 Mar 2019 14:06:00 +0800 Subject: [PATCH 086/108] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E6=B8=B8=E5=AE=A2=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/touristbuy/Hook.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/plugins/touristbuy/Hook.php b/application/plugins/touristbuy/Hook.php index 902f29bf4..15a46cb21 100644 --- a/application/plugins/touristbuy/Hook.php +++ b/application/plugins/touristbuy/Hook.php @@ -89,7 +89,7 @@ class Hook extends Controller { // 是否开启默认游客 $ret = PluginsService::PluginsData('touristbuy'); - if($ret['code'] == 0 && isset($ret['data']['is_default_tourist']) && $ret['data']['is_default_tourist'] == 1) + if($ret['code'] == 0 && isset($ret['data']['is_default_tourist']) && $ret['data']['is_default_tourist'] == 1 && strtolower(request()->module()) == 'index') { return Service::TouristReg(); } From 4c932eab13040b3c8c5894ff444c9300f56b2a3b Mon Sep 17 00:00:00 2001 From: devil_gong Date: Mon, 18 Mar 2019 16:21:25 +0800 Subject: [PATCH 087/108] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/freightfee/Admin.php | 85 ++++++++++++++++++ application/plugins/freightfee/Hook.php | 34 +++++++ application/plugins/freightfee/config.json | 26 ++++++ .../plugins/view/freightfee/admin/index.html | 79 ++++++++++++++++ .../view/freightfee/admin/saveinfo.html | 72 +++++++++++++++ config/shopxo.sql | 32 +++---- .../static/plugins/css/freightfee/admin.css | 11 +++ .../2019/03/18/1552894366387964.jpg | Bin 0 -> 3370 bytes 8 files changed, 324 insertions(+), 15 deletions(-) create mode 100644 application/plugins/freightfee/Admin.php create mode 100644 application/plugins/freightfee/Hook.php create mode 100644 application/plugins/freightfee/config.json create mode 100644 application/plugins/view/freightfee/admin/index.html create mode 100644 application/plugins/view/freightfee/admin/saveinfo.html create mode 100755 public/static/plugins/css/freightfee/admin.css create mode 100644 public/static/upload/images/plugins_freightfee/2019/03/18/1552894366387964.jpg diff --git a/application/plugins/freightfee/Admin.php b/application/plugins/freightfee/Admin.php new file mode 100644 index 000000000..eb2585de9 --- /dev/null +++ b/application/plugins/freightfee/Admin.php @@ -0,0 +1,85 @@ +assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/freightfee/admin/index'); + } else { + return $ret['msg']; + } + } + + /** + * 编辑页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function saveinfo($params = []) + { + $ret = PluginsService::PluginsData('freightfee'); + if($ret['code'] == 0) + { + // 是否 + $is_whether_list = [ + 0 => array('id' => 0, 'name' => '按件数', 'checked' => true), + 1 => array('id' => 1, 'name' => '按重量'), + ]; + + $this->assign('is_whether_list', $is_whether_list); + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/freightfee/admin/saveinfo'); + } else { + return $ret['msg']; + } + } + + /** + * 数据保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + return PluginsService::PluginsDataSave(['plugins'=>'freightfee', 'data'=>$params]); + } +} +?> \ No newline at end of file diff --git a/application/plugins/freightfee/Hook.php b/application/plugins/freightfee/Hook.php new file mode 100644 index 000000000..178b9e7be --- /dev/null +++ b/application/plugins/freightfee/Hook.php @@ -0,0 +1,34 @@ + \ No newline at end of file diff --git a/application/plugins/freightfee/config.json b/application/plugins/freightfee/config.json new file mode 100644 index 000000000..02b60c8f2 --- /dev/null +++ b/application/plugins/freightfee/config.json @@ -0,0 +1,26 @@ +{ + "base":{ + "plugins":"freightfee", + "name":"运费设置", + "logo":"\/static\/upload\/images\/plugins_freightfee\/2019\/03\/18\/1552894366387964.jpg", + "author":"Devil", + "author_url":"https:\/\/shopxo.net\/", + "version":"1.0.0", + "desc":"快递运费设置", + "apply_terminal":[ + "pc", + "h5", + "app", + "alipay", + "weixin", + "baidu" + ], + "apply_version":[ + "1.4.0" + ], + "is_home":false + }, + "hook":{ + + } +} \ No newline at end of file diff --git a/application/plugins/view/freightfee/admin/index.html b/application/plugins/view/freightfee/admin/index.html new file mode 100644 index 000000000..28f92ed03 --- /dev/null +++ b/application/plugins/view/freightfee/admin/index.html @@ -0,0 +1,79 @@ +{{include file="public/header" /}} + + +
    +
    + + 运费设置 + 返回 + + +
    +
    + +
    + {{if !empty($data['application_name'])}} + {{$data.application_name}} + {{else /}} + 无 + {{/if}} +
    +
    +
    + +
    + {{if !empty($data['login_name'])}} + {{$data.login_name}} + {{else /}} + 游客登录 + {{/if}} +
    +
    +
    + +
    + {{if !empty($data['nickname'])}} + {{$data.nickname}} + {{else /}} + 游客 + {{/if}} +
    +
    +
    + +
    + {{if !empty($data['query_tips'])}} + {{$data.query_tips}} + {{else /}} + 无 + {{/if}} +
    +
    + +
    + +
    + {{if isset($data['is_default_tourist']) and $data['is_default_tourist'] eq 1}} + 是 + {{else /}} + 否 + {{/if}} +
    +
    + +
    + + +
    + + 编辑 +
    +
    +
    + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/freightfee/admin/saveinfo.html b/application/plugins/view/freightfee/admin/saveinfo.html new file mode 100644 index 000000000..eadd8545b --- /dev/null +++ b/application/plugins/view/freightfee/admin/saveinfo.html @@ -0,0 +1,72 @@ +{{include file="public/header" /}} + + +
    +
    + + + + 运费设置 + 返回 + + +
    + +
    + {{foreach $is_whether_list as $v}} + + {{/foreach}} +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    运送到首件数(件)首费(元)续件数(件)续费(元)操作
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    +
    + +
    + +
    + + +
    +
    + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/config/shopxo.sql b/config/shopxo.sql index cdf571d89..8c59c70c3 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -1,18 +1,20 @@ /* - Navicat MySQL Data Transfer + Navicat Premium Data Transfer Source Server : 本机 - Source Server Version : 50716 + Source Server Type : MySQL + Source Server Version : 50722 Source Host : localhost - Source Database : shopxo_ttt + Source Database : shopxo_test - Target Server Version : 50716 + Target Server Type : MySQL + Target Server Version : 50722 File Encoding : utf-8 - Date: 03/16/2019 16:39:42 PM + Date: 03/18/2019 16:21:05 PM */ -SET NAMES utf8; +SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- @@ -356,7 +358,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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '34', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '3', '', '/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', '59', '', '/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', '174', '', '/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', '61', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '68', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '15', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '9', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/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', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '19', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1552467444'); +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', '22', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1549959519'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1710', '步', '/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', '34', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1547458880'), ('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', '3', '', '/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', '59', '', '/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', '176', '', '/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', '61', '', '/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', '5', '', '/static/upload/images/goods/2019/01/15/1547540603500383.jpg', '0', '1547453967', '1547540607'), ('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', '8', '', '/static/upload/images/goods/2019/01/14/1547454145355962.jpg', '0', '1547454269', '1547454269'), ('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', '69', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1547454828'), ('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', '15', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1547455375'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '367', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '268.00', '268.00', '268.00', '258.00', '258.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', '0', '9', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1547455700'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '246', '件', '/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', '

    \"d-1.jpg\"/

    \"d-2.jpg\"/

    ', '3', '0', '19', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1552467444'); COMMIT; -- ---------------------------- @@ -370,13 +372,13 @@ CREATE TABLE `s_goods_browse` ( `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; +) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; -- ---------------------------- -- Records of `s_goods_browse` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552549400'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552461784'), ('6', '2', '77', '1552380261', '1552532934'), ('7', '12', '77', '1552467447', '1552615868'), ('8', '6', '77', '1552529609', '1552531565'), ('9', '3', '77', '1552532930', '1552532930'), ('10', '4', '77', '1552628919', '1552629076'), ('11', '5', '0', '1552659057', '1552659073'), ('12', '5', '1', '1552659083', '1552659243'), ('13', '11', '1', '1552659292', '1552660274'), ('14', '5', '97', '1552660995', '1552660995'), ('15', '6', '97', '1552711349', '1552711351'); +INSERT INTO `s_goods_browse` VALUES ('1', '5', '77', '1551233739', '1552549400'), ('2', '6', '92', '1551234590', '1551239151'), ('3', '9', '92', '1551239156', '1551239429'), ('4', '5', '92', '1551239374', '1551239374'), ('5', '10', '77', '1552287523', '1552461784'), ('6', '2', '77', '1552380261', '1552532934'), ('7', '12', '77', '1552467447', '1552615868'), ('8', '6', '77', '1552529609', '1552531565'), ('9', '3', '77', '1552532930', '1552532930'), ('10', '4', '77', '1552628919', '1552629076'), ('11', '5', '0', '1552659057', '1552659073'), ('12', '5', '1', '1552659083', '1552659243'), ('13', '11', '1', '1552659292', '1552660274'), ('14', '5', '97', '1552660995', '1552660995'), ('15', '6', '97', '1552711349', '1552711351'), ('16', '9', '99', '1552888092', '1552888092'), ('17', '5', '99', '1552889094', '1552889094'); COMMIT; -- ---------------------------- @@ -889,13 +891,13 @@ CREATE TABLE `s_plugins` ( PRIMARY KEY (`id`), UNIQUE KEY `plugins` (`plugins`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; +) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; -- ---------------------------- -- 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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1551191925'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1552463476'), ('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', '1552642312'), ('24', 'shopoauth', '{\"auth\":{\"qq\":{\"name\":\"QQ\\u767b\\u5f55\",\"app_key\":\"\",\"app_secret\":\"\",\"open\":\"1\"}},\"pluginsname\":\"shopoauth\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1552627456', '1552724547'), ('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\",\"pluginsname\":\"touristbuy\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552656743', '1552724447'); +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\"}', '1', '1550222925', '1551191927'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|386392432\\n\\u552e\\u540e|386392432\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550393304', '1552888774'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\\u767b\\u5f55\\u53ef\\u89c1\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1551184852', '1552463476'), ('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', '1552642312'), ('24', 'shopoauth', '{\"auth\":{\"qq\":{\"name\":\"QQ\\u767b\\u5f55\",\"app_key\":\"\",\"app_secret\":\"\",\"open\":\"1\"}},\"pluginsname\":\"shopoauth\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1552627456', '1552724547'), ('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', '1552889422'), ('26', 'freightfee', null, '0', '1552894438', '0'); COMMIT; -- ---------------------------- @@ -1134,13 +1136,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=74 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; +) ENGINE=InnoDB AUTO_INCREMENT=83 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; -- ---------------------------- -- Records of `s_search_history` -- ---------------------------- BEGIN; -INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'), ('41', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446286'), ('42', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446830'), ('43', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461592'), ('44', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461878'), ('45', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552464847'), ('46', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552467418'), ('47', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190313', '1552467421'), ('48', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190313', '1552467423'), ('49', '0', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529646'), ('50', '77', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529650'), ('51', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552531528'), ('52', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532412'), ('53', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532430'), ('54', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532687'), ('55', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532711'), ('56', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532714'), ('57', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532836'), ('58', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532873'), ('59', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532888'), ('60', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532895'), ('61', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532913'), ('62', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532919'), ('63', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552533239'), ('64', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552549550'), ('65', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552553299'), ('66', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190314', '1552553300'), ('67', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190314', '1552553302'), ('68', '77', '0', '1', '', '0-0', 'default', 'asc', '20190315', '1552639821'), ('69', '97', '0', '0', '', '0-0', 'default', 'asc', '20190315', '1552661032'), ('70', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724523'), ('71', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724538'), ('72', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724539'), ('73', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724540'); +INSERT INTO `s_search_history` VALUES ('1', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233729'), ('2', '77', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233736'), ('3', '0', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551233824'), ('4', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260421'), ('5', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260423'), ('6', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260432'), ('7', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260448'), ('8', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260575'), ('9', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260885'), ('10', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551260887'), ('11', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261001'), ('12', '92', '0', '0', '', '0-0', 'default', 'asc', '20190227', '1551261934'), ('13', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343490'), ('14', '0', '0', '0', '', '0-0', 'default', 'asc', '20190228', '1551343927'), ('15', '77', '0', '0', '', '0-0', 'default', 'asc', '20190306', '1551858508'), ('16', '0', '0', '0', '', '0-0', 'default', 'asc', '20190307', '1551952616'), ('17', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037213'), ('18', '0', '0', '0', '', '0-0', 'default', 'asc', '20190308', '1552037324'), ('19', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282877'), ('20', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552282891'), ('21', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284595'), ('22', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552284988'), ('23', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287518'), ('24', '77', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552287529'), ('25', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292501'), ('26', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292564'), ('27', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292570'), ('28', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552292573'), ('29', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552292801'), ('30', '0', '0', '53', '', '0-0', 'default', 'asc', '20190311', '1552292806'), ('31', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293119'), ('32', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293150'), ('33', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293153'), ('34', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293210'), ('35', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293238'), ('36', '0', '0', '0', '', '0-0', 'default', 'asc', '20190311', '1552293258'), ('37', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295698'), ('38', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552295701'), ('39', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296970'), ('40', '0', '0', '1', '', '0-0', 'default', 'asc', '20190311', '1552296971'), ('41', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446286'), ('42', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552446830'), ('43', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461592'), ('44', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552461878'), ('45', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552464847'), ('46', '77', '0', '0', '', '0-0', 'default', 'asc', '20190313', '1552467418'), ('47', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190313', '1552467421'), ('48', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190313', '1552467423'), ('49', '0', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529646'), ('50', '77', '0', '1', '', '0-0', 'default', 'asc', '20190314', '1552529650'), ('51', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552531528'), ('52', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532412'), ('53', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532430'), ('54', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532687'), ('55', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532711'), ('56', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532714'), ('57', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532836'), ('58', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532873'), ('59', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532888'), ('60', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532895'), ('61', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532913'), ('62', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552532919'), ('63', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552533239'), ('64', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552549550'), ('65', '77', '0', '0', '', '0-0', 'default', 'asc', '20190314', '1552553299'), ('66', '77', '0', '0', '', '0-0', 'min_price', 'desc', '20190314', '1552553300'), ('67', '77', '0', '0', '', '0-0', 'min_price', 'asc', '20190314', '1552553302'), ('68', '77', '0', '1', '', '0-0', 'default', 'asc', '20190315', '1552639821'), ('69', '97', '0', '0', '', '0-0', 'default', 'asc', '20190315', '1552661032'), ('70', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724523'), ('71', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724538'), ('72', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724539'), ('73', '0', '0', '0', '', '0-0', 'default', 'asc', '20190316', '1552724540'), ('74', '0', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552887206'), ('75', '0', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552887332'), ('76', '0', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552887333'), ('77', '0', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552887521'), ('78', '98', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552887907'), ('79', '98', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552887909'), ('80', '99', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552887951'), ('81', '99', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552888090'), ('82', '99', '0', '0', '', '0-0', 'default', 'asc', '20190318', '1552888249'); COMMIT; -- ---------------------------- @@ -1205,13 +1207,13 @@ CREATE TABLE `s_user` ( KEY `weixin_openid` (`weixin_openid`), KEY `mobile` (`mobile`), KEY `username` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户'; +) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户'; -- ---------------------------- -- Records of `s_user` -- ---------------------------- BEGIN; -INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '102132', '32b496a315a44e4e4e347d916353644a', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1088', '0', '0', '0', '0', '1552711204'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('97', '', '', '', '0', '', '', '游客', '游客', '', '', '0', '', '', '', '0', '', '0', '0', '0', '0', '1552660927', '1552725449'); +INSERT INTO `s_user` VALUES ('77', '', '', '', '0', '102132', '32b496a315a44e4e4e347d916353644a', '', '龚哥哥', '13250814883', '', '2', 'https://tfs.alipayobjects.com/images/partner/T10d8lXm4dXXXXXXXX', '上海', '上海市', '1540915200', '', '1088', '0', '0', '0', '0', '1552711204'), ('90', '2088502175420842', '', '', '0', '208731', '9fff3059357fafcb709b6288a412e54a', '', '魔鬼', '17688888888', '', '2', '', '上海', '上海市', '666201600', '', '45', '0', '0', '0', '1539167253', '1551174265'), ('97', '', '', '', '0', '', '', '游客', '游客', '', '', '0', '', '', '', '0', '', '0', '0', '0', '0', '1552660927', '1552725449'), ('98', '', '', '', '0', '', '', '游客', '游客', '', '', '0', '', '', '', '0', '', '0', '0', '0', '0', '1552887906', '1552887911'), ('99', '', '', '', '0', '', '', '游客', '游客', '', '', '0', '', '', '', '0', '', '0', '0', '0', '0', '1552887911', '1552889417'); COMMIT; -- ---------------------------- diff --git a/public/static/plugins/css/freightfee/admin.css b/public/static/plugins/css/freightfee/admin.css new file mode 100755 index 000000000..62214c747 --- /dev/null +++ b/public/static/plugins/css/freightfee/admin.css @@ -0,0 +1,11 @@ +/** + * 首页 + */ +.freightfee-content .items { + margin: 10px 0 20px 0; + border-bottom: 1px dashed #f1f1f1; + padding-bottom: 20px; +} +.freightfee-content .edit-submit { + margin-bottom: 20px; +} \ No newline at end of file diff --git a/public/static/upload/images/plugins_freightfee/2019/03/18/1552894366387964.jpg b/public/static/upload/images/plugins_freightfee/2019/03/18/1552894366387964.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dc87d5fc9d41788d39cbd09b13278ce98ae3efb2 GIT binary patch literal 3370 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 L|N75_f}j2ZK`}YH literal 0 HcmV?d00001 From 6c622fcdaae757f603c62e820fbe831c475ea28e Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 19 Mar 2019 17:47:02 +0800 Subject: [PATCH 088/108] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/freightfee/Admin.php | 15 + .../view/freightfee/admin/saveinfo.html | 77 ++++-- application/service/RegionService.php | 11 +- public/static/common/css/common.css | 2 +- .../static/plugins/css/freightfee/admin.css | 76 +++++ public/static/plugins/js/freightfee/admin.js | 260 ++++++++++++++++++ 6 files changed, 413 insertions(+), 28 deletions(-) create mode 100644 public/static/plugins/js/freightfee/admin.js diff --git a/application/plugins/freightfee/Admin.php b/application/plugins/freightfee/Admin.php index eb2585de9..20f4237f5 100644 --- a/application/plugins/freightfee/Admin.php +++ b/application/plugins/freightfee/Admin.php @@ -12,6 +12,7 @@ namespace app\plugins\freightfee; use think\Controller; use app\service\PluginsService; +use app\service\RegionService; /** * 运费设置 - 管理 @@ -61,6 +62,20 @@ class Admin extends Controller 1 => array('id' => 1, 'name' => '按重量'), ]; + // 地区 + $region = RegionService::RegionItems(['pid'=>0, 'field'=>'id,name']); + if(!empty($region)) + { + $region = array_map(function($v) + { + $v['items'] = RegionService::RegionItems(['pid'=>$v['id'], 'field'=>'id,name']); + return $v; + }, $region); + } + + //print_r($ret['data']); + + $this->assign('region_list', $region); $this->assign('is_whether_list', $is_whether_list); $this->assign('data', $ret['data']); return $this->fetch('../../../plugins/view/freightfee/admin/saveinfo'); diff --git a/application/plugins/view/freightfee/admin/saveinfo.html b/application/plugins/view/freightfee/admin/saveinfo.html index eadd8545b..cb0836067 100644 --- a/application/plugins/view/freightfee/admin/saveinfo.html +++ b/application/plugins/view/freightfee/admin/saveinfo.html @@ -21,8 +21,8 @@
    -
    - +
    +
    @@ -35,34 +35,67 @@ - - - - - - - - - - - - - - - - - - - + + + + + + +
    运送到
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    Amaze UIhttp://amazeui.org2012-10-01
    +
    默认运费 + +     		+ + + + + + + +
    + +为指定地区城市设置运费
    - +
    + + +
    +
    +
    +

    选择区域

    + × +
    +
    + {{if !empty($region_list)}} +
      + {{foreach $region_list as $v}} +
    • +

      {{$v.name}}

      + {{if !empty($v['items'])}} +
        + {{foreach $v.items as $vs}} +
      • + {{$vs.name}} +
        • + {{/foreach}} +
      + {{/if}} +
      • + {{/foreach}} +
    + {{else /}} +
    没有相关数据
    + {{/if}} + +
    +
    +
    diff --git a/application/service/RegionService.php b/application/service/RegionService.php index 366a805d6..684d3c9f4 100755 --- a/application/service/RegionService.php +++ b/application/service/RegionService.php @@ -36,17 +36,18 @@ class RegionService } /** - * 获取地区idx下列表 + * 获取地区id下列表 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 * @datetime 2018-12-09T00:13:02+0800 - * @param [array] $param [输入参数] + * @param [array] $params [输入参数] */ - public static function RegionItems($param = []) + public static function RegionItems($params = []) { - $pid = isset($param['pid']) ? intval($param['pid']) : 0; - return Db::name('Region')->where(['pid'=>$pid, 'is_enable'=>1])->select(); + $pid = isset($params['pid']) ? intval($params['pid']) : 0; + $field = empty($params['field']) ? '*' : $params['field']; + return Db::name('Region')->field($field)->where(['pid'=>$pid, 'is_enable'=>1])->select(); } /** diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 5e663252e..05acfef6b 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -80,7 +80,7 @@ iframe { width: 100%; height: 100%; border: 0; } form.am-form .am-form-group:hover, .plug-file-upload-view:hover { background: #f6f9fc; } - form.am-form .am-form-group, .plug-images-list, .goods-specifications, .content-app-items, .plug-file-upload-view { + form.am-form .am-form-group, .plug-images-list, .goods-specifications, .content-app-items, .plug-file-upload-view, .business-form-block { border-bottom: 1px dashed #ccc; padding: 10px 20% 10px 5px; } diff --git a/public/static/plugins/css/freightfee/admin.css b/public/static/plugins/css/freightfee/admin.css index 62214c747..8562ba949 100755 --- a/public/static/plugins/css/freightfee/admin.css +++ b/public/static/plugins/css/freightfee/admin.css @@ -8,4 +8,80 @@ } .freightfee-content .edit-submit { margin-bottom: 20px; +} + +/** + * 编辑页面 + */ +.freightfee-rules table.am-table { + margin-bottom: 10px; +} +.freightfee-rules table.am-table tr td input { + max-width: 100px; + display: -webkit-inline-box; +} +.freightfee-rules table.am-table tr th, .freightfee-rules table.am-table tr td, .freightfee-rules table.am-table tr td input { + text-align: center; +} +.freightfee-rules table.am-table tr td.first +{ + width: 30%; +} +.freightfee-rules table.am-table tr td .region-td { + border: 1px solid #bee5c0; + padding: 5px; + background: #f0fff0; + margin-bottom: 5px; +} +.freightfee-rules table.am-table td.first input { + position: absolute; + margin-left: -1000000px; +} + +/** + * 弹窗 + */ +#freightfee-region-popup ul { + margin: 0; + padding: 0; +} +#freightfee-region-popup ul li { + list-style-type: none; + border-bottom: 1px solid #eee; + margin-bottom: 15px; +} +#freightfee-region-popup ul.city-list { + overflow: hidden; + margin-top: 5px; +} +#freightfee-region-popup ul .province-name { + border-bottom: 1px solid #e7e7e7; + background: #f5f5f5; + margin: 0; +} +#freightfee-region-popup ul .province-name.selected-may { + background: #eaf7eb; + border-bottom: 1px solid #d2efd3; +} +#freightfee-region-popup ul .province-name.selected { + background: #4CAF50; + border-bottom: 1px solid #409643; + color: #fff; +} +#freightfee-region-popup ul.city-list li { + float: left; + background: #e9e8e8; + margin: 0 10px 10px 0; + border-radius: 3px; + border: 1px solid #d6d6d6; +} +#freightfee-region-popup ul li .province-name, #freightfee-region-popup ul li .city-name +{ + cursor: pointer; + padding: 2px 5px; +} +#freightfee-region-popup ul.city-list li.selected { + background: #4CAF50; + color: #fff; + border: 1px solid #409643; } \ No newline at end of file diff --git a/public/static/plugins/js/freightfee/admin.js b/public/static/plugins/js/freightfee/admin.js new file mode 100644 index 000000000..06682fd9d --- /dev/null +++ b/public/static/plugins/js/freightfee/admin.js @@ -0,0 +1,260 @@ +$(function() +{ + // 计费方式切换 + $('form.am-form input[name=valuation]').on('click', function() + { + var $this = $(this); + var valuation = parseInt($this.val()); + if($(this).parents('.am-form-group').attr('data-value') != valuation) + { + AMUI.dialog.confirm({ + title: '温馨提示', + content: '切换计价方式后，所设置当前模板的运输信息将被清空，确定继续么？', + onConfirm: function(e) + { + // 内容 + var valuation_unit = ['件', 'kg']; + var unit = valuation_unit[valuation] || null; + if(unit == null) + { + Prompt('配置有误'); + return false; + } + + $this.parents('.am-form-group').attr('data-value', valuation); + var thead = ''; + thead += '运送到'; + thead += '首件数('+unit+')'; + thead += '首费(元)'; + thead += '续件数('+unit+')'; + thead += '续费(元)'; + thead += '操作'; + thead += ''; + + var html = ''; + switch(valuation) + { + // 按件 + case 0 : + html += ''; + html += '
    默认运费'; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + break; + + // 按重量 + case 1 : + html += ''; + html += '
    默认运费'; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + break; + + default : + Prompt('配置有误'); + } + $('.freightfee-rules table.am-table thead').html(thead); + $('.freightfee-rules table.am-table tbody').html(html); + }, + onCancel: function() + { + $('form.am-form input[name=valuation]').eq(valuation).uCheck('uncheck'); + $('form.am-form input[name=valuation]').eq(valuation == 1 ? 0 : 1).uCheck('check'); + $this.parents('.am-form-group').attr('data-value', valuation == 1 ? 0 : 1); + } + }); + } + }); + + // 元素添加 + $('.rules-submit-add').on('click', function() + { + // 唯一索引 + var index = parseInt(Math.random()*1000001); + + // 元素html + var html = $('.freightfee-rules table.am-table').find('tbody tr:first').prop('outerHTML'); + if(html.indexOf('默认运费') >= 0) + { + html = html.replace(/默认运费/ig, '添加地区'); + } + if(html.indexOf('') >= 0) + { + html = html.replace(//ig, '删除'); + } + $('.freightfee-rules table.am-table').append(html); + + // 值赋空 + $('.freightfee-rules table.am-table').find('tbody tr:last').find('input').each(function(k, v) + { + $(this).attr('value', ''); + }); + $('.freightfee-rules table.am-table').find('tbody tr:last .region-td').text('').addClass('none'); + + // 移除原来的class新增新的class + $('.freightfee-rules table.am-table').find('tbody tr:last').removeClass().addClass('data-list-'+index); + + // name名称设置 + $('.freightfee-rules table.am-table').find('tbody tr:last .region-name').attr('name', 'region_name['+index+'][\'region\']'); + $('.freightfee-rules table.am-table').find('tbody tr:last .first-name').attr('name', 'first_name['+index+'][\'first\']'); + $('.freightfee-rules table.am-table').find('tbody tr:last .first-price-name').attr('name', 'first_price_name['+index+'][\'first_price\']'); + $('.freightfee-rules table.am-table').find('tbody tr:last .continue-name').attr('name', 'continue_name['+index+'][\'continue\']'); + $('.freightfee-rules table.am-table').find('tbody tr:last .continue-price-name').attr('name', 'continue_price_name['+index+'][\'continue_price\']'); + }); + + // 行移除 + $(document).on('click', '.freightfee-rules table.am-table .line-remove', function() + { + $(this).parents('tr').remove(); + }); + + // 地区编辑 + $(document).on('click', '.freightfee-rules table.am-table .line-edit', function() + { + var index = $(this).data('index'); + $('#freightfee-region-popup').modal(); + $('#freightfee-region-popup').attr('data-index', index); + + // 清楚选中 + $('#freightfee-region-popup').find('.province-name').removeClass('selected').removeClass('selected-may'); + $('#freightfee-region-popup').find('.city-name').parent('li').removeClass('selected'); + + // 地区选中 + var ids = $('.data-list-'+index).find('td.first input').val() || null; + + if(ids != null) + { + var ids_all = ids.split('-'); + for(var i in ids_all) + { + $('.region-node-'+ids_all[i]).parent('li').addClass('selected'); + } + + // 父级选择处理 + $('#freightfee-region-popup .city-list').each(function(k, v) + { + var items_count = $(this).find('.city-name').length; + var selected_count = $(this).find('.selected').length; + if(selected_count >= items_count) + { + $(this).prev('.province-name').removeClass('selected-may').addClass('selected'); + } else if(selected_count > 0 && selected_count < items_count) + { + $(this).prev('.province-name').removeClass('selected').addClass('selected-may'); + } else { + $(this).prev('.province-name').removeClass('selected-may').removeClass('selected'); + } + }); + } + }); + + // 地区选择事件 - 省 + $('#freightfee-region-popup .province-name').on('click', function() + { + if($(this).hasClass('selected-may') || $(this).hasClass('selected')) + { + $(this).next('.city-list').find('li').removeClass('selected'); + $(this).removeClass('selected-may').removeClass('selected'); + } else { + $(this).next('.city-list').find('li').addClass('selected'); + $(this).addClass('selected'); + } + }); + + // 地区选择事件 - 城市 + $('#freightfee-region-popup .city-name').on('click', function() + { + if($(this).parent('li').hasClass('selected')) + { + $(this).parent('li').removeClass('selected'); + } else { + $(this).parent('li').addClass('selected'); + } + + // 父级处理 + var items_count = $(this).parents('.city-list').find('.city-name').length; + var selected_count = $(this).parents('.city-list').find('.selected').length; + if(selected_count >= items_count) + { + $(this).parents('.city-list').prev('.province-name').removeClass('selected-may').addClass('selected'); + } else if(selected_count > 0 && selected_count < items_count) + { + $(this).parents('.city-list').prev('.province-name').removeClass('selected').addClass('selected-may'); + } else { + $(this).parents('.city-list').prev('.province-name').removeClass('selected-may').removeClass('selected'); + } + }); + + // 地区选择确认 + $('#freightfee-region-popup button[type="submit"]').on('click', function() + { + var name_all = []; + var ids_all = []; + var city_index = 0; + var province_index = 0; + var province_id = 0; + $('#freightfee-region-popup .city-list li').each(function(k, v) + { + if($(this).parent('.city-list').prev('.province-name').hasClass('selected')) + { + var temp_province_id = $(this).parent('.city-list').prev('.province-name').data('id'); + console.log(temp_province_id) + if(province_id != temp_province_id) + { + province_id = temp_province_id; + name_all[province_index] = $(this).parent('.city-list').prev('.province-name').text(); + province_index++; + } + } else { + if($(this).hasClass('selected')) + { + name_all[province_index] = $(this).find('.city-name').text(); + province_index++; + } + } + if($(this).hasClass('selected')) + { + ids_all[city_index] = $(this).find('.city-name').data('city-id'); + city_index++; + } + }); + var $content = $('.data-list-'+$('#freightfee-region-popup').attr('data-index')+' .region-td'); + $content.text(name_all.join('、')); + if(name_all.length > 0) + { + $content.removeClass('none'); + } else { + $content.addClass('none'); + } + + $('.data-list-'+$('#freightfee-region-popup').attr('data-index')+' td.first input').val(ids_all.join('-')); + + $('#freightfee-region-popup').modal('close'); + }); +}); \ No newline at end of file From 4905972568d7afe3049230582b1cc18c03217c4d Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 20 Mar 2019 11:26:44 +0800 Subject: [PATCH 089/108] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/freightfee/Admin.php | 19 +- .../plugins/view/freightfee/admin/index.html | 98 +++++------ .../view/freightfee/admin/saveinfo.html | 163 ++++++++++++++---- .../static/plugins/css/freightfee/admin.css | 2 +- public/static/plugins/js/freightfee/admin.js | 47 +++-- 5 files changed, 229 insertions(+), 100 deletions(-) diff --git a/application/plugins/freightfee/Admin.php b/application/plugins/freightfee/Admin.php index 20f4237f5..f86af745f 100644 --- a/application/plugins/freightfee/Admin.php +++ b/application/plugins/freightfee/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\plugins\freightfee; +use think\Db; use think\Controller; use app\service\PluginsService; use app\service\RegionService; @@ -36,6 +37,15 @@ class Admin extends Controller $ret = PluginsService::PluginsData('freightfee'); if($ret['code'] == 0) { + // 数据处理 + if(!empty($ret['data']['data'])) + { + foreach($ret['data']['data'] as &$v) + { + $v['region_names'] = empty($v['region_show']) ? '' : implode('、', Db::name('Region')->where('id', 'in', explode('-', $v['region_show']))->column('name')); + } + } + $this->assign('data', $ret['data']); return $this->fetch('../../../plugins/view/freightfee/admin/index'); } else { @@ -73,7 +83,14 @@ class Admin extends Controller }, $region); } - //print_r($ret['data']); + // 数据处理 + if(!empty($ret['data']['data'])) + { + foreach($ret['data']['data'] as &$v) + { + $v['region_names'] = empty($v['region_show']) ? '' : implode('、', Db::name('Region')->where('id', 'in', explode('-', $v['region_show']))->column('name')); + } + } $this->assign('region_list', $region); $this->assign('is_whether_list', $is_whether_list); diff --git a/application/plugins/view/freightfee/admin/index.html b/application/plugins/view/freightfee/admin/index.html index 28f92ed03..78672b219 100644 --- a/application/plugins/view/freightfee/admin/index.html +++ b/application/plugins/view/freightfee/admin/index.html @@ -10,61 +10,63 @@
    - +
    - {{if !empty($data['application_name'])}} - {{$data.application_name}} + {{if isset($data['valuation']) and $data['valuation'] eq 0}} + 按件数 {{else /}} - 无 - {{/if}} -
    -
    -
    - -
    - {{if !empty($data['login_name'])}} - {{$data.login_name}} - {{else /}} - 游客登录 - {{/if}} -
    -
    -
    - -
    - {{if !empty($data['nickname'])}} - {{$data.nickname}} - {{else /}} - 游客 - {{/if}} -
    -
    -
    - -
    - {{if !empty($data['query_tips'])}} - {{$data.query_tips}} - {{else /}} - 无 + 按重量 {{/if}}
    - -
    - {{if isset($data['is_default_tourist']) and $data['is_default_tourist'] eq 1}} - 是 - {{else /}} - 否 - {{/if}} -
    -
    - -
    - -
    - {{:PluginsHomeUrl('freightfee', 'index', 'index')}} + +
    + + {{if empty($data['data'])}} + 没有配置 + {{else /}} + {{if isset($data['valuation']) and $data['valuation'] eq 0}} + + + + + + + + + + {{else /}} + + + + + + + + + + {{/if}} + + {{foreach $data.data as $k=>$v}} + + + + + + + + {{/foreach}} + + {{/if}} +
    运送到首件数(件)首费(元)续件数(件)续费(元)
    运送到首件数(kg)首费(元)续件数(kg)续费(元)
    + {{if $v['region'] eq 'default'}} + 默认运费 + {{else /}} +
    {{$v.region_names}}
    + {{/if}} +     		{{$v.first}}{{$v.first_price}}{{$v.continue}}{{$v.continue_price}}
    diff --git a/application/plugins/view/freightfee/admin/saveinfo.html b/application/plugins/view/freightfee/admin/saveinfo.html index cb0836067..360ff057d 100644 --- a/application/plugins/view/freightfee/admin/saveinfo.html +++ b/application/plugins/view/freightfee/admin/saveinfo.html @@ -23,37 +23,138 @@
    - - - - - - - - - - - - - - - - - - - - + {{if empty($data['data'])}} + + + + + + + + + + + + + + + + + + + + + {{else /}} + {{if isset($data['valuation']) and $data['valuation'] eq 0}} + + + + + + + + + + + + {{foreach $data.data as $k=>$v}} + + + + + + + {{if $v['region'] eq 'default'}} + + {{else /}} + + {{/if}} + + {{/foreach}} + + {{else /}} + + + + + + + + + + + + {{foreach $data.data as $k=>$v}} + + + + + + + {{if $v['region'] eq 'default'}} + + {{else /}} + + {{/if}} + + {{/foreach}} + + {{/if}} + {{/if}}
    运送到首件数(件)首费(元)续件数(件)续费(元)操作
    -
    默认运费 - -     		- - - - - - - -
    运送到首件数(件)首费(元)续件数(件)续费(元)操作
    +
    默认运费 + + +     		+ + + + + + + +
    运送到首件数(件)首费(元)续件数(件)续费(元)操作
    + {{if $v['region'] eq 'default'}} +
    默认运费 + + + {{else /}} +
    {{$v.region_names}}
    + 添加地区 + + + {{/if}} +     		+ + + + + + + + + 删除 +
    运送到首件数(kg)首费(元)续件数(kg)续费(元)操作
    + {{if $v['region'] eq 'default'}} +
    默认运费 + + + {{else /}} +
    {{$v.region_names}}
    + 添加地区 + + + {{/if}} +     		+ + + + + + + + + 删除 +
    +为指定地区城市设置运费
    diff --git a/public/static/plugins/css/freightfee/admin.css b/public/static/plugins/css/freightfee/admin.css index 8562ba949..e185ea510 100755 --- a/public/static/plugins/css/freightfee/admin.css +++ b/public/static/plugins/css/freightfee/admin.css @@ -11,7 +11,7 @@ } /** - * 编辑页面 + * 运费模板 */ .freightfee-rules table.am-table { margin-bottom: 10px; diff --git a/public/static/plugins/js/freightfee/admin.js b/public/static/plugins/js/freightfee/admin.js index 06682fd9d..7ee36f2b9 100644 --- a/public/static/plugins/js/freightfee/admin.js +++ b/public/static/plugins/js/freightfee/admin.js @@ -38,18 +38,20 @@ $(function() case 0 : html += ''; html += '
    默认运费'; - html += ''; - html += ''; - html += ''; + html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; + html += ''; + html += ''; + html += ''; html += ''; html += ''; html += ''; @@ -59,18 +61,20 @@ $(function() case 1 : html += ''; html += '
    默认运费'; - html += ''; - html += ''; - html += ''; + html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += ''; + html += ''; + html += ''; + html += ''; + html += ''; html += ''; html += ''; html += ''; @@ -121,11 +125,12 @@ $(function() $('.freightfee-rules table.am-table').find('tbody tr:last').removeClass().addClass('data-list-'+index); // name名称设置 - $('.freightfee-rules table.am-table').find('tbody tr:last .region-name').attr('name', 'region_name['+index+'][\'region\']'); - $('.freightfee-rules table.am-table').find('tbody tr:last .first-name').attr('name', 'first_name['+index+'][\'first\']'); - $('.freightfee-rules table.am-table').find('tbody tr:last .first-price-name').attr('name', 'first_price_name['+index+'][\'first_price\']'); - $('.freightfee-rules table.am-table').find('tbody tr:last .continue-name').attr('name', 'continue_name['+index+'][\'continue\']'); - $('.freightfee-rules table.am-table').find('tbody tr:last .continue-price-name').attr('name', 'continue_price_name['+index+'][\'continue_price\']'); + $('.freightfee-rules table.am-table').find('tbody tr:last .region-name').attr('name', 'data['+index+'][region]'); + $('.freightfee-rules table.am-table').find('tbody tr:last .region-name-show').attr('name', 'data['+index+'][region_show]'); + $('.freightfee-rules table.am-table').find('tbody tr:last .first-name').attr('name', 'data['+index+'][first]'); + $('.freightfee-rules table.am-table').find('tbody tr:last .first-price-name').attr('name', 'data['+index+'][first_price]'); + $('.freightfee-rules table.am-table').find('tbody tr:last .continue-name').attr('name', 'data['+index+'][continue]'); + $('.freightfee-rules table.am-table').find('tbody tr:last .continue-price-name').attr('name', 'data['+index+'][continue_price]'); }); // 行移除 @@ -141,7 +146,7 @@ $(function() $('#freightfee-region-popup').modal(); $('#freightfee-region-popup').attr('data-index', index); - // 清楚选中 + // 清除选中 $('#freightfee-region-popup').find('.province-name').removeClass('selected').removeClass('selected-may'); $('#freightfee-region-popup').find('.city-name').parent('li').removeClass('selected'); @@ -216,6 +221,7 @@ $(function() { var name_all = []; var ids_all = []; + var show_ids_all = []; var city_index = 0; var province_index = 0; var province_id = 0; @@ -229,12 +235,14 @@ $(function() { province_id = temp_province_id; name_all[province_index] = $(this).parent('.city-list').prev('.province-name').text(); + show_ids_all[province_index] = temp_province_id; province_index++; } } else { if($(this).hasClass('selected')) { name_all[province_index] = $(this).find('.city-name').text(); + show_ids_all[province_index] = $(this).find('.city-name').data('city-id'); province_index++; } } @@ -253,7 +261,8 @@ $(function() $content.addClass('none'); } - $('.data-list-'+$('#freightfee-region-popup').attr('data-index')+' td.first input').val(ids_all.join('-')); + $('.data-list-'+$('#freightfee-region-popup').attr('data-index')+' td.first input.region-name').val(ids_all.join('-')); + $('.data-list-'+$('#freightfee-region-popup').attr('data-index')+' td.first input.region-name-show').val(show_ids_all.join('-')); $('#freightfee-region-popup').modal('close'); }); From 1e51ee8ed30cc1709bf6775069bd9a42ec5a37fe Mon Sep 17 00:00:00 2001 From: devil_gong Date: Wed, 20 Mar 2019 17:14:44 +0800 Subject: [PATCH 090/108] =?UTF-8?q?=E4=B8=8B=E8=AE=A2=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Buy.php | 24 +---- application/index/controller/Buy.php | 14 +-- application/index/view/default/buy/index.html | 2 +- application/service/BuyService.php | 59 ++++++++++- application/service/UserService.php | 2 +- public/appmini/old/alipay/pages/buy/buy.axml | 4 +- public/appmini/old/alipay/pages/buy/buy.js | 4 +- public/appmini/old/weixin/pages/buy/buy.js | 4 +- public/appmini/old/weixin/pages/buy/buy.wxml | 4 +- .../old/weixin/pages/web-view/web-view.json | 2 +- public/static/common/js/common.js | 76 +++++++++++++- public/static/index/default/js/buy.js | 98 +++++-------------- 12 files changed, 177 insertions(+), 116 deletions(-) diff --git a/application/api/controller/Buy.php b/application/api/controller/Buy.php index 739a65828..c24eaa17c 100755 --- a/application/api/controller/Buy.php +++ b/application/api/controller/Buy.php @@ -57,34 +57,18 @@ class Buy extends Common // 商品校验 if(isset($ret['code']) && $ret['code'] == 0) { - // 用户默认地址 - $address = UserService::UserDefaultAddress(['user'=>$this->user]); - - // 商品/基础信息 - $base = [ - 'total_price' => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'total_price')), - 'total_stock' => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'stock')), - 'address' => empty($address['data']) ? null : $address['data'], - ]; - // 支付方式 $payment_list = PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]); - // 扩展展示数据 - $extension_list = [ - // ['name'=>'感恩节9折', 'tips'=>'-￥23元'], - // ['name'=>'运费', 'tips'=>'+￥10元'], - ]; - // 数据返回组装 $result = [ - 'goods_list' => $ret['data'], + 'goods_list' => $ret['data']['goods'], 'payment_list' => $payment_list, - 'base' => $base, - 'extension_list' => $extension_list, + 'base' => $ret['data']['base'], + 'extension_data' => $ret['data']['extension_data'], 'common_order_is_booking' => (int) MyC('common_order_is_booking', 0), ]; - return DataReturn('success', 0, $result); + return DataReturn('操作成功', 0, $result); } return $ret; } diff --git a/application/index/controller/Buy.php b/application/index/controller/Buy.php index 6d74692c6..44140c364 100755 --- a/application/index/controller/Buy.php +++ b/application/index/controller/Buy.php @@ -55,7 +55,7 @@ class Buy extends Common return redirect(MyUrl('index/buy/index')); } else { // 获取商品列表 - $params = session('buy_post_data'); + $params = array_merge(input(), session('buy_post_data')); $params['user'] = $this->user; $ret = BuyService::BuyTypeGoodsList($params); @@ -68,15 +68,9 @@ class Buy extends Common // 支付方式 $this->assign('payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1])); - // 商品/基础信息 - $base = [ - 'total_price' => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'total_price')), - 'total_stock' => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'stock')), - 'address' => UserService::UserDefaultAddress(['user'=>$this->user])['data'], - ]; - $this->assign('base', $base); - $this->assign('goods_list', $ret['data']); - + $this->assign('base', $ret['data']['base']); + $this->assign('goods_list', $ret['data']['goods']); + $this->assign('extension_data', $ret['data']['extension_data']); $this->assign('params', $params); return $this->fetch(); } else { diff --git a/application/index/view/default/buy/index.html b/application/index/view/default/buy/index.html index c1d7a298d..c52a520c2 100755 --- a/application/index/view/default/buy/index.html +++ b/application/index/view/default/buy/index.html @@ -26,7 +26,7 @@ {{if !empty($user_address_list)}}
      {{foreach $user_address_list as $address}} -
    • +
    • {{if !empty($address.alias)}} diff --git a/application/service/BuyService.php b/application/service/BuyService.php index d1ccd7f1d..1a00289dc 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -509,6 +509,61 @@ class BuyService } else { $ret = DataReturn('参数有误', -1); } + + // 数据组装 + if($ret['code'] == 0) + { + // 商品数据 + $goods = $ret['data']; + + // 用户默认地址 + $address_params = [ + 'user' => $params['user'], + ]; + if(!empty($params['address_id'])) + { + $address_params['where'] = ['id' => $params['address_id']]; + } + $address = UserService::UserDefaultAddress($address_params); + + // 商品/基础信息 + $total_price = empty($goods) ? 0 : array_sum(array_column($goods, 'total_price')); + $base = [ + 'total_price' => $total_price, + 'actual_price' => $total_price, + 'total_stock' => empty($goods) ? 0 : array_sum(array_column($goods, 'stock')), + 'address' => empty($address['data']) ? null : $address['data'], + ]; + + // 扩展展示数据 + // name 名称 + // price 金额 + // type 类型（0减少, 1增加） + // tips 提示信息 + $extension_data = [ + [ + 'name' => '感恩节9折', + 'price' => 23, + 'type' => 0, + 'tips' => '-￥23元' + ], + [ + 'name' => '运费', + 'price' => 10, + 'type' => 1, + 'tips' => '+￥10元' + ], + ]; + + // 返回数据 + $result = [ + 'goods' => $goods, + 'base' => $base, + 'extension_data' => $extension_data, + ]; + return DataReturn('操作成功', 0, $result); + } + return $ret; } @@ -638,7 +693,7 @@ class BuyService { return $goods; } - $check = self::BuyGoodsCheck(['goods'=>$goods['data']]); + $check = self::BuyGoodsCheck(['goods'=>$goods['data']['goods']]); if(!isset($check['code']) || $check['code'] != 0) { return $check; @@ -689,7 +744,7 @@ class BuyService $order_id = Db::name('Order')->insertGetId($order); if($order_id > 0) { - foreach($goods['data'] as $v) + foreach($goods['data']['goods'] as $v) { $detail = [ 'order_id' => $order_id, diff --git a/application/service/UserService.php b/application/service/UserService.php index 3a601a61c..0f8159124 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -466,7 +466,7 @@ class UserService } // 获取用户地址 - $params['where'] = ['is_default'=>1]; + $params['where'] = empty($params['where']) ? ['is_default'=>1] : $params['where']; $ret = self::UserAddressList($params); if(!empty($ret['data'][0])) { diff --git a/public/appmini/old/alipay/pages/buy/buy.axml b/public/appmini/old/alipay/pages/buy/buy.axml index 84c60d2aa..e54ce9681 100755 --- a/public/appmini/old/alipay/pages/buy/buy.axml +++ b/public/appmini/old/alipay/pages/buy/buy.axml @@ -46,8 +46,8 @@