diff --git a/application/admin/controller/Plugins.php b/application/admin/controller/Plugins.php index 009c35c08feb66843efc552cd83fabc6f4dab9e9..03b2df7a28a79fdf481147e8b182587e762235b0 100755 --- a/application/admin/controller/Plugins.php +++ b/application/admin/controller/Plugins.php @@ -121,6 +121,11 @@ class Plugins extends Common */ public function PluginsViewInit($plugins_name, $plugins_control, $plugins_action) { + // 应用名称/控制器/方法 + $this->assign('plugins_name', $plugins_name); + $this->assign('plugins_control', $plugins_control); + $this->assign('plugins_action', $plugins_action); + // 当前操作名称 $module_name = 'plugins'; diff --git a/application/index/controller/Plugins.php b/application/index/controller/Plugins.php index 7c1acf8db0f08e56e799ebe8b3d9649490a3a5a9..2ccc9982e87aaca63041ec9892f9e22fd26f71ca 100755 --- a/application/index/controller/Plugins.php +++ b/application/index/controller/Plugins.php @@ -115,6 +115,11 @@ class Plugins extends Common */ public function PluginsViewInit($plugins_name, $plugins_control, $plugins_action) { + // 应用名称/控制器/方法 + $this->assign('plugins_name', $plugins_name); + $this->assign('plugins_control', $plugins_control); + $this->assign('plugins_action', $plugins_action); + // 当前操作名称 $module_name = 'plugins'; diff --git a/application/index/view/default/userintegral/index.html b/application/index/view/default/userintegral/index.html index 36dd1c2cc4d35aeb7d2ffb95ba6950921ea7c78a..56c191a1b02eaf7825f36897851f5649373ec82c 100755 --- a/application/index/view/default/userintegral/index.html +++ b/application/index/view/default/userintegral/index.html @@ -24,13 +24,15 @@
- 可用积分 + 正常可用 {{$user.integral}} - 正常可以使用的积分 + 积分 + 可以正常使用的积分
- 锁定积分 + 当前锁定 {{$user.locking_integral}} + 积分 一般积分交易中，交易并未完成、锁定相应的积分
diff --git a/application/plugins/petscms/Hook.php b/application/plugins/petscms/Hook.php index a7fbcbb02ab5fda85473d64a225429a5f4b296e3..19a71abdb9942fdb374a4d144c35d96378fa8b49 100755 --- a/application/plugins/petscms/Hook.php +++ b/application/plugins/petscms/Hook.php @@ -41,7 +41,7 @@ class Hook extends Controller $ret = $this->UserCenterLeftMenuHandle($params); break; - // 顶部小导航右侧-我的业务 + // 顶部小导航右侧-我的商城 case 'plugins_service_header_navigation_top_right_handle' : $ret = $this->CommonTopNavRightMenuHandle($params); break; @@ -64,25 +64,17 @@ class Hook extends Controller */ public function UserCenterLeftMenuHandle($params = []) { - $menu = [[ - 'name' => '宠物管理', + $params['data']['business']['item'][] = [ + 'name' => '我的宠物', + 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), + 'contains' => ['petsindex', 'petssaveinfo', 'petshelp'], 'is_show' => 1, - 'icon' => 'am-icon-drupal', - 'item' => [ - [ - 'name' => '我的宠物', - 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), - 'contains' => ['petsindex', 'petssaveinfo', 'petshelp'], - 'is_show' => 1, - 'icon' => 'am-icon-github-alt', - ], - ] - ]]; - array_splice($params['data'], 2, 0, $menu); + 'icon' => 'am-icon-github-alt', + ]; } /** - * 顶部小导航右侧-我的业务 + * 顶部小导航右侧-我的商城 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -92,11 +84,10 @@ class Hook extends Controller */ public function CommonTopNavRightMenuHandle($params = []) { - $menu = [ + array_push($params['data'][1]['items'], [ 'name' => '我的宠物', 'url' => PluginsHomeUrl('petscms', 'pets', 'index'), - ]; - array_push($params['data'][1]['items'], $menu); + ]); } } ?> \ No newline at end of file diff --git a/application/plugins/view/wallet/admin/index.html b/application/plugins/view/wallet/admin/index.html new file mode 100755 index 0000000000000000000000000000000000000000..18cb63145928fc3ba45aa83abf5528df8656a097 --- /dev/null +++ b/application/plugins/view/wallet/admin/index.html @@ -0,0 +1,56 @@ +{{include file="public/header" /}} + + +
+
+ + 会员等级 + 返回 + + +
+ +
+
+ 基础数据 + 编辑 +
+
+
+ +
+ {{if isset($data['level_rules']) and isset($members_level_rules_list[$data['level_rules']])}} + {{:$members_level_rules_list[$data['level_rules']]['name']}} + {{else /}} + 未设置，默认[ 积分（可用积分）] + {{/if}} +
+
+ +
+ +
+ +
+
+
+
+ + +
+
+ 会员等级 + 编辑 +
+
+ +
+
+
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/wallet/admin/saveinfo.html b/application/plugins/view/wallet/admin/saveinfo.html new file mode 100755 index 0000000000000000000000000000000000000000..653055f9ff8462eb965c195c1a3fd56d6156bbee --- /dev/null +++ b/application/plugins/view/wallet/admin/saveinfo.html @@ -0,0 +1,49 @@ +{{include file="public/header" /}} + + +
+
+ +
+ + 会员等级 + 返回 + + +
+ +
+ {{foreach $members_level_rules_list as $v}} + + {{/foreach}} +
+
+ +
+ +
    + {{if !empty($data['default_level_images'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图片
+
+ +
+ +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/wallet/level/index.html b/application/plugins/view/wallet/level/index.html new file mode 100755 index 0000000000000000000000000000000000000000..2423df59934280e188d5801f844f6e79031d57d8 --- /dev/null +++ b/application/plugins/view/wallet/level/index.html @@ -0,0 +1,92 @@ +{{include file="public/header" /}} + + +
+
+ {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}} + + 会员等级 + 返回 + + {{/if}} + +
+ {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}} + +
+ 新增 +
+ + {{/if}} + + + + + + + + + + + + {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}} + + {{/if}} + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + {{if !isset($params['is_admin_index']) or $params['is_admin_index'] neq 1}} + + {{/if}} + + {{/foreach}} + {{else /}} + + {{/if}} + +
名称图标规则值优惠信息是否启用操作时间操作
{{$v.name}} + {{if !empty($v['images_url'])}} + + + + {{else /}} + 暂无图片 + {{/if}} + {{$v.rules_min}}~{{$v.rules_max}} + 满减：{{if $v['order_price'] gt 0 and $v['full_reduction_price'] gt 0}} + 满{{$v.order_price}}元 减{{$v.full_reduction_price}}元 + {{else /}} + 无满减 + {{/if}} +
+ 折扣：{{if $v['discount_rate']}} + {{$v.discount_rate}}折 + {{else /}} + 无折扣 + {{/if}} + 		+ + {{$v.operation_time_time}} + + + + +
没有相关数据
+ +
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/wallet/level/saveinfo.html b/application/plugins/view/wallet/level/saveinfo.html new file mode 100755 index 0000000000000000000000000000000000000000..d76b37557e8d0a3c19f6712816b99dbf4675e68a --- /dev/null +++ b/application/plugins/view/wallet/level/saveinfo.html @@ -0,0 +1,99 @@ +{{include file="public/header" /}} + + +
+
+ + + {{if empty($data['id'])}} + 会员等级添加 + {{else /}} + 会员等级编辑 + {{/if}} + + 返回 + + +
+ +
+
+ + +
+ +
+ +
    + {{if !empty($data['images_url'])}} +
  • + + + × +
    • + {{/if}} +
+
+上传图标
+
+ +
+ +

+ 规则举例
+ 最小规则0 - 最大规则100 则是小于100 +
最小规则1000 - 最大规则0 则是大于1000 +
最小规则100 - 最大规则500 则是大于等于100并且小于500 + +

+
+
+ +
+ + ~ + +
+
+ +
+ +

+ 优惠说明
+ + 满减优惠 与 折扣率可叠加使用，如需只使用其中一项优惠，则请注意只需配置该优惠项即可！！！ + +

+
+
+ +
+ 满 + + 减 + +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/wallet/wallet/cash.html b/application/plugins/view/wallet/wallet/cash.html new file mode 100755 index 0000000000000000000000000000000000000000..8bc67efed09722b5ad7146daf59b7d9b163ef973 --- /dev/null +++ b/application/plugins/view/wallet/wallet/cash.html @@ -0,0 +1,112 @@ +{{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" /}} + + +
+ + + {{include file="public/user_menu" /}} + + + +
+
+ + {{include file="../../../plugins/view/wallet/wallet/nav" /}} + + +
+
+
+ + + + +
+ +
+ + + + + + + +
+ 状态： + + + + 清除条件 +
+
+ + +
+ + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + {{/foreach}} + {{/if}} + {{if empty($data_list)}} + + + + {{/if}} + +
操作类型描述原始积分最新积分时间
{{$v.type_name}}{{$v.msg}}{{$v.original_integral}}{{$v.new_integral}}{{$v.add_time_time}}
+
没有相关数据
+
+
+ + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
+
+ +
+ + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/wallet/wallet/index.html b/application/plugins/view/wallet/wallet/index.html new file mode 100755 index 0000000000000000000000000000000000000000..43800cdf87ebc6cfcb67d9917e043694940e177e --- /dev/null +++ b/application/plugins/view/wallet/wallet/index.html @@ -0,0 +1,99 @@ +{{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" /}} + + +
+ + + {{include file="public/user_menu" /}} + + + +
+
+ + {{include file="../../../plugins/view/wallet/wallet/nav" /}} + + +
+ + + + + + + +
+ 类型： + + + + 清除条件 +
+
+ + +
+ + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + {{/foreach}} + {{/if}} + {{if empty($data_list)}} + + + + {{/if}} + +
操作类型描述原始积分最新积分时间
{{$v.type_name}}{{$v.msg}}{{$v.original_integral}}{{$v.new_integral}}{{$v.add_time_time}}
+
没有相关数据
+
+
+ + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
+
+ +
+ + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/view/wallet/wallet/nav.html b/application/plugins/view/wallet/wallet/nav.html new file mode 100755 index 0000000000000000000000000000000000000000..ebe3bd401090031563157d7f57ec58a8b7c75499 --- /dev/null +++ b/application/plugins/view/wallet/wallet/nav.html @@ -0,0 +1,85 @@ + + + + +
+
+ 可用金额 + {{$user.integral}} + 元 + 正常可以使用的金额 +
+
+ 冻结金额 + {{$user.locking_integral}} + 元 + 一般积分交易中、提现、交易并未完成，锁定相应的积分 +
+
+ + +
+
+
+

充值

+ × +
+
+
+ +
+

选择支付

+ {{if !empty($buy_payment_list)}} +
    + {{foreach $buy_payment_list as $payment}} +
  • + {{if !empty($payment.logo)}} + + {{/if}} + {{$payment.name}} +
    • + {{/foreach}} +
+ {{/if}} + {{if empty($buy_payment_list)}} +
没有支付方式
+ {{/if}} + +
+ +
+ +
+ + + + +
+
+ +
+ +
+
+
+
+
\ No newline at end of file diff --git a/application/plugins/view/wallet/wallet/recharge.html b/application/plugins/view/wallet/wallet/recharge.html new file mode 100755 index 0000000000000000000000000000000000000000..0e16a412212bcbcf17d6b362e934603ec19dde1b --- /dev/null +++ b/application/plugins/view/wallet/wallet/recharge.html @@ -0,0 +1,86 @@ +{{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" /}} + + +
+ + + {{include file="public/user_menu" /}} + + + +
+
+ + {{include file="../../../plugins/view/wallet/wallet/nav" /}} + + +
+
+
+ + + + +
+
+
+ + +
+ + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + {{/foreach}} + {{/if}} + {{if empty($data_list)}} + + + + {{/if}} + +
操作类型描述原始积分最新积分时间
{{$v.type_name}}{{$v.msg}}{{$v.original_integral}}{{$v.new_integral}}{{$v.add_time_time}}
+
没有相关数据
+
+
+ + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
+
+ +
+ + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/plugins/wallet/Admin.php b/application/plugins/wallet/Admin.php new file mode 100755 index 0000000000000000000000000000000000000000..b065c1594dceeb34541778e2999e250266d6d1a3 --- /dev/null +++ b/application/plugins/wallet/Admin.php @@ -0,0 +1,87 @@ +assign('members_level_rules_list', Service::$members_level_rules_list); + + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/wallet/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('wallet', Service::$base_config_attachment_field, false); + if($ret['code'] == 0) + { + // 等级规则 + $this->assign('members_level_rules_list', Service::$members_level_rules_list); + + $this->assign('data', $ret['data']); + return $this->fetch('../../../plugins/view/wallet/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 = []) + { + $level = Service::LevelDataList(); + $params['level_list'] = $level['data']; + return PluginsService::PluginsDataSave(['plugins'=>'wallet', 'data'=>$params]); + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/Hook.php b/application/plugins/wallet/Hook.php new file mode 100755 index 0000000000000000000000000000000000000000..ce2e84e15a432211e6b11f9fbcf19ea3356e4ad4 --- /dev/null +++ b/application/plugins/wallet/Hook.php @@ -0,0 +1,93 @@ +UserCenterLeftMenuHandle($params); + break; + + // 顶部小导航右侧-我的商城 + case 'plugins_service_header_navigation_top_right_handle' : + $ret = $this->CommonTopNavRightMenuHandle($params); + break; + + default : + $ret = ''; + } + return $ret; + } + } + + /** + * 用户中心左侧菜单处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-11 + * @desc description + * @param array $params [description] + */ + public function UserCenterLeftMenuHandle($params = []) + { + $params['data']['property']['item'][] = [ + 'name' => '我的钱包', + 'url' => PluginsHomeUrl('wallet', 'wallet', 'index'), + 'contains' => ['walletindex'], + 'is_show' => 1, + 'icon' => 'am-icon-github-alt', + ]; + } + + /** + * 顶部小导航右侧-我的商城 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-11 + * @desc description + * @param array $params [description] + */ + public function CommonTopNavRightMenuHandle($params = []) + { + array_push($params['data'][1]['items'], [ + 'name' => '我的钱包', + 'url' => PluginsHomeUrl('wallet', 'wallet', 'index'), + ]); + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/Level.php b/application/plugins/wallet/Level.php new file mode 100755 index 0000000000000000000000000000000000000000..1eeff5e2055ded802ed08e8d2ac80a954eb09a56 --- /dev/null +++ b/application/plugins/wallet/Level.php @@ -0,0 +1,135 @@ +assign('data_list', $ret['data']); + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/membershiplevel/level/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 = []) + { + // 数据 + $data = []; + if(!empty($params['id'])) + { + $data_params = [ + 'get_id' => $params['id'], + ]; + $ret = Service::LevelDataList($data_params); + $data = empty($ret['data']) ? [] : $ret['data']; + } + $this->assign('data', $data); + + return $this->fetch('../../../plugins/view/membershiplevel/level/saveinfo'); + } + + /** + * 等级保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-07T08:21:54+0800 + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始处理 + return Service::LevelDataSave($params); + } + + /** + * 等级状态更新 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2017-01-12T22:23:06+0800 + * @param [array] $params [输入参数] + */ + public function statusupdate($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始处理 + $params['data_field'] = 'level_list'; + return Service::DataStatusUpdate($params); + } + + /** + * 等级删除 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-15T11:03:30+0800 + * @param [array] $params [输入参数] + */ + public function delete($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 开始处理 + $params['data_field'] = 'level_list'; + return Service::DataDelete($params); + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/Service.php b/application/plugins/wallet/Service.php new file mode 100755 index 0000000000000000000000000000000000000000..d6bb81bae8bd63d9c7941ebe085239c5e2eed045 --- /dev/null +++ b/application/plugins/wallet/Service.php @@ -0,0 +1,457 @@ + ['value' => 0, 'name' => '积分（可用积分）', 'checked' => true], + 1 => ['value' => 1, 'name' => '消费总额（已完成订单）'], + ]; + + /** + * 获取等级数据列表 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-22 + * @desc description + * @param [array] $params [输入参数] + */ + public static function LevelDataList($params = []) + { + // 数据字段 + $data_field = 'level_list'; + + // 获取数据 + $ret = PluginsService::PluginsData('wallet', self::$base_config_attachment_field); + $data = (empty($ret['data']) || empty($ret['data'][$data_field])) ? [] : $ret['data'][$data_field]; + + // 数据处理 + return self::LevelDataHandle($data, $params); + } + + /** + * 用户等级数据列表处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-04-27T01:08:23+0800 + * @param [array] $data [等级数据] + * @param [array] $params [输入参数] + */ + public static function LevelDataHandle($data, $params = []) + { + if(!empty($data)) + { + $common_is_enable_tips = lang('common_is_enable_tips'); + foreach($data as &$v) + { + // 是否启用 + $v['is_enable_text'] = $common_is_enable_tips[$v['is_enable']]['name']; + + // 图片地址 + $v['images_url_old'] = $v['images_url']; + $v['images_url'] = ResourcesService::AttachmentPathViewHandle($v['images_url']); + + // 时间 + $v['operation_time_time'] = empty($v['operation_time']) ? '' : date('Y-m-d H:i:s', $v['operation_time']); + $v['operation_time_date'] = empty($v['operation_time']) ? '' : date('Y-m-d', $v['operation_time']); + } + } + + // 是否读取单条 + if(!empty($params['get_id']) && isset($data[$params['get_id']])) + { + $data = $data[$params['get_id']]; + } + + return DataReturn('处理成功', 0, $data); + } + + /** + * 获取等级数据保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-22 + * @desc description + * @param [array] $params [输入参数] + */ + public static function LevelDataSave($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'length', + 'key_name' => 'name', + 'checked_data' => '1,30', + 'error_msg' => '名称长度 1~30 个字符', + ], + [ + 'checked_type' => 'isset', + 'key_name' => 'rules_min', + 'error_msg' => '请填写规则最小值', + ], + [ + 'checked_type' => 'isset', + 'key_name' => 'rules_max', + 'error_msg' => '请填写规则最大值', + ], + [ + 'checked_type' => 'max', + 'key_name' => 'discount_rate', + 'checked_data' => 0.99, + 'is_checked' => 1, + 'error_msg' => '折扣率应输入 0.00~0.99 的数字,小数保留两位', + ], + [ + 'checked_type' => 'fun', + 'key_name' => 'order_price', + 'checked_data' => 'CheckPrice', + 'is_checked' => 1, + 'error_msg' => '请输入有效的订单满金额', + ], + [ + 'checked_type' => 'fun', + 'key_name' => 'full_reduction_price', + 'checked_data' => 'CheckPrice', + 'is_checked' => 1, + 'error_msg' => '请输入有效的满减金额', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 请求参数 + $p = [ + [ + 'checked_type' => 'eq', + 'key_name' => 'rules_min', + 'checked_data' => $params['rules_max'], + 'error_msg' => '规则最小值不能最大值相等', + ], + [ + 'checked_type' => 'eq', + 'key_name' => 'rules_max', + 'checked_data' => $params['rules_min'], + 'error_msg' => '规则最大值不能最小值相等', + ], + ]; + if(intval($params['rules_max']) > 0) + { + $p[] = [ + 'checked_type' => 'max', + 'key_name' => 'rules_min', + 'checked_data' => intval($params['rules_max']), + 'error_msg' => '规则最小值不能大于最大值['.intval($params['rules_max']).']', + ]; + $p[] = [ + 'checked_type' => 'min', + 'key_name' => 'rules_max', + 'checked_data' => intval($params['rules_min']), + 'error_msg' => '规则最大值不能小于最小值['.intval($params['rules_min']).']', + ]; + } + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 数据字段 + $data_field = 'level_list'; + + // 附件 + $data_fields = ['images_url']; + $attachment = ResourcesService::AttachmentParams($params, $data_fields); + + // 数据 + $data = [ + 'name' => $params['name'], + 'rules_min' => $params['rules_min'], + 'rules_max' => $params['rules_max'], + 'images_url' => $attachment['data']['images_url'], + 'is_enable' => isset($params['is_enable']) ? intval($params['is_enable']) : 0, + 'discount_rate' => isset($params['discount_rate']) ? $params['discount_rate'] : 0, + 'order_price' => empty($params['order_price']) ? 0.00 : PriceNumberFormat($params['order_price']), + 'full_reduction_price' => empty($params['full_reduction_price']) ? 0.00 : PriceNumberFormat($params['full_reduction_price']), + 'operation_time' => time(), + ]; + + // 原有数据 + $ret = PluginsService::PluginsData('wallet', self::$base_config_attachment_field, false); + + // 数据id + $data['id'] = (empty($params['id']) || empty($ret['data']) || empty($ret['data'][$data_field][$params['id']])) ? date('YmdHis').GetNumberCode(6) : $params['id']; + $ret['data'][$data_field][$data['id']] = $data; + + // 保存 + return PluginsService::PluginsDataSave(['plugins'=>'wallet', 'data'=>$ret['data']]); + } + + /** + * 数据删除 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-18 + * @desc description + * @param [array] $params [输入参数] + */ + public static function DataDelete($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '操作id有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 数据字段 + $data_field = empty($params['data_field']) ? 'data_list' : $params['data_field']; + + // 原有数据 + $ret = PluginsService::PluginsData('wallet', self::$base_config_attachment_field, false); + $ret['data'][$data_field] = (empty($ret['data']) || empty($ret['data'][$data_field])) ? [] : $ret['data'][$data_field]; + + // 删除操作 + if(isset($ret['data'][$data_field][$params['id']])) + { + unset($ret['data'][$data_field][$params['id']]); + } + + // 保存 + return PluginsService::PluginsDataSave(['plugins'=>'wallet', 'data'=>$ret['data']]); + } + + /** + * 数据状态更新 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-12-18 + * @desc description + * @param [array] $params [输入参数] + */ + public static function DataStatusUpdate($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '操作id有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'field', + 'error_msg' => '操作字段有误', + ], + [ + 'checked_type' => 'in', + 'key_name' => 'state', + 'checked_data' => [0,1], + 'error_msg' => '状态有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 数据字段 + $data_field = empty($params['data_field']) ? 'data_list' : $params['data_field']; + + // 原有数据 + $ret = PluginsService::PluginsData('wallet', self::$base_config_attachment_field, false); + $ret['data'][$data_field] = (empty($ret['data']) || empty($ret['data'][$data_field])) ? [] : $ret['data'][$data_field]; + + // 删除操作 + if(isset($ret['data'][$data_field][$params['id']]) && is_array($ret['data'][$data_field][$params['id']])) + { + $ret['data'][$data_field][$params['id']][$params['field']] = intval($params['state']); + $ret['data'][$data_field][$params['id']]['operation_time'] = time(); + } + + // 保存 + return PluginsService::PluginsDataSave(['plugins'=>'wallet', 'data'=>$ret['data']]); + } + + /** + * 优惠价格计算 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-26 + * @desc description + * @param [string] $price [商品展示金额] + * @param [int] $plugins_discount [折扣系数] + * @param [int] $plugins_price [减金额] + */ + public static function PriceCalculate($price, $plugins_discount = 0, $plugins_price = 0) + { + if($plugins_discount <= 0 && $plugins_price <= 0) + { + return $price; + } + + // 折扣 + if($plugins_discount > 0) + { + if(stripos($price, '-') !== false) + { + $text = explode('-', $price); + $min_price = $text[0]*$plugins_discount; + $max_price = $text[1]*$plugins_discount; + $price = ($min_price <= 0) ? '0.00' : PriceNumberFormat($min_price); + $price .= '-'.(($max_price <= 0) ? '0.00' : PriceNumberFormat($max_price)); + } else { + $price = (float) $price *$plugins_discount; + $price = ($price <= 0) ? '0.00' : PriceNumberFormat($price); + } + } + + // 减金额 + if($plugins_price > 0) + { + if(stripos($price, '-') !== false) + { + $text = explode('-', $price); + $min_price = $text[0]-$plugins_price; + $max_price = $text[1]-$plugins_price; + $price = ($min_price <= 0) ? '0.00' : PriceNumberFormat($min_price); + $price .= '-'.(($max_price <= 0) ? '0.00' : PriceNumberFormat($max_price)); + } else { + $price = (float) $price-$plugins_price; + $price = ($price <= 0) ? '0.00' : PriceNumberFormat($price); + } + } + return $price; + } + + /** + * 用户等级匹配 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-04-28 + * @desc description + * @param [array] $user [用户信息] + */ + public static function UserLevelMatching($user = []) + { + // 未指定用户信息，则从服务层读取 + if(empty($user)) + { + $user = UserService::LoginUserInfo(); + } + if(!empty($user)) + { + // 缓存key + $key = 'plugins_wallet_cache_user_level_'.$user['id']; + $level = cache($key); + + // 应用配置 + if(empty($level) || config('app_debug') == true) + { + $base = PluginsService::PluginsData('wallet', Service::$base_config_attachment_field); + if(!empty($base['data']['level_list'])) + { + // 匹配类型 + $value = 0; + switch($base['data']['level_rules']) + { + // 积分（可用积分） + case 0 : + $value = isset($user['integral']) ? intval($user['integral']) : 0; + break; + + // 消费总额（已完成订单） + // 订单状态（0待确认, 1已确认/待支付, 2已支付/待发货, 3已发货/待收货, 4已完成, 5已取消, 6已关闭） + case 1 : + $where = ['user_id'=>$user['id'], 'status'=>4]; + $value = (float) Db::name('Order')->where($where)->sum('total_price'); + break; + } + + // 匹配相应的等级 + $level_list = self::LevelDataHandle($base['data']['level_list']); + foreach($level_list['data'] as $rules) + { + if(isset($rules['is_enable']) && $rules['is_enable'] == 1) + { + // 0-* + if($rules['rules_min'] <= 0 && $rules['rules_max'] > 0 && $value < $rules['rules_max']) + { + $level = $rules; + break; + } + + // *-* + if($rules['rules_min'] > 0 && $rules['rules_max'] > 0 && $value >= $rules['rules_min'] && $value < $rules['rules_max']) + { + $level = $rules; + break; + } + + // *-0 + if($rules['rules_max'] <= 0 && $rules['rules_min'] > 0 && $value > $rules['rules_min']) + { + $level = $rules; + break; + } + } + } + + // 等级icon + if(!empty($level) && empty($level['images_url'])) + { + $level['images_url'] = empty($base['data']['default_level_images']) ? config('shopxo.attachment_host').'/static/plugins/images/wallet/level-default-images.png' : $base['data']['default_level_images']; + } + cache($key, $level); + } + } + return $level; + } + return []; + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/Wallet.php b/application/plugins/wallet/Wallet.php new file mode 100755 index 0000000000000000000000000000000000000000..8e478b5eb4fbaad5a3181f4ae8fa2ce369b761c3 --- /dev/null +++ b/application/plugins/wallet/Wallet.php @@ -0,0 +1,273 @@ +user = UserService::LoginUserInfo(); + + // 登录校验 + if(empty($this->user)) + { + if(IS_AJAX) + { + exit(json_encode(DataReturn('登录失效，请重新登录', -400))); + } else { + return $this->redirect('index/user/logininfo'); + } + } + + // 发起支付 - 支付方式 + $this->assign('buy_payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1])); + } + + /** + * 钱包明细 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function index($params = []) + { + // 参数 + $params = input(); + $params['user'] = $this->user; + + // 分页 + $number = 10; + + // 条件 + $where = IntegralService::UserIntegralLogListWhere($params); + + // 获取总数 + $total = IntegralService::UserIntegralLogTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => MyUrl('index/userintegral/index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + ); + $data = IntegralService::UserIntegralLogList($data_params); + $this->assign('data_list', $data['data']); + + // 操作类型 + $this->assign('common_integral_log_type_list', lang('common_integral_log_type_list')); + + // 参数 + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/wallet/wallet/index'); + } + + /** + * 充值明细 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function recharge($params = []) + { + // 参数 + $params = input(); + $params['user'] = $this->user; + + $this->assign('data_list', []); + + // 参数 + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/wallet/wallet/recharge'); + } + + /** + * 余额提现 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function cash($params = []) + { + // 参数 + $params = input(); + $params['user'] = $this->user; + + $this->assign('data_list', []); + + + // 参数 + $this->assign('params', $params); + return $this->fetch('../../../plugins/view/wallet/wallet/cash'); + } + + /** + * 宠物添加/编辑页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function saveinfo($params = []) + { + // 是否绑定 + if(!empty($params['pest_no'])) + { + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['pest_no' => $params['pest_no']], + ); + $ret = Service::PetsList($data_params); + if(!empty($ret['data'][0]['user_id'])) + { + $this->assign('msg', '该宠物已被绑定'); + return $this->fetch('public/tips_error'); + } + $this->assign('pest_no', $params['pest_no']); + unset($params['pest_no']); + } + + // 获取数据 + $data = []; + if(!empty($params['id'])) + { + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => ['id' => intval($params['id'])], + ); + $ret = Service::PetsList($data_params); + if(!empty($ret['data'][0])) + { + $ret['data'][0]['lose_features'] = str_replace('
', "\n", $ret['data'][0]['lose_features']); + $data = $ret['data'][0]; + } + unset($params['id']); + } + + $this->assign('params', $params); + $this->assign('data', $data); + $this->assign('pets_attribute_status_list', Service::$pets_attribute_status_list); + $this->assign('pets_attribute_is_text_list', Service::$pets_attribute_is_text_list); + $this->assign('pets_attribute_gender_list', Service::$pets_attribute_gender_list); + $this->assign('pets_attribute_type_list', Service::$pets_attribute_type_list); + return $this->fetch('../../../plugins/view/wallet/pets/saveinfo'); + } + + /** + * 宠物添加/编辑 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function save($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 用户 + $params['user_id'] = $this->user['id']; + return Service::PetsSave($params); + } + + /** + * 宠物解绑 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-15T11:03:30+0800 + */ + public function untying($params = []) + { + // 是否ajax + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 用户 + $params['user_id'] = $this->user['id']; + return Service::PetsUntying($params); + } + + /** + * 丢失提供信息添加/编辑 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-03-15T23:51:50+0800 + * @param [array] $params [输入参数] + */ + public function helpsave($params = []) + { + // 是否ajax请求 + if(!IS_AJAX) + { + return $this->error('非法访问'); + } + + // 用户 + $params['user_id'] = $this->user['id']; + return Service::HelpSave($params); + } +} +?> \ No newline at end of file diff --git a/application/plugins/wallet/config.json b/application/plugins/wallet/config.json new file mode 100755 index 0000000000000000000000000000000000000000..2adbccba35ba81499315ff25a2d0f2bfa1a80deb --- /dev/null +++ b/application/plugins/wallet/config.json @@ -0,0 +1,31 @@ +{ + "base":{ + "plugins":"wallet", + "name":"钱包", + "logo":"\/static\/upload\/images\/plugins_wallet\/2019\/04\/28\/1556447296647734.jpg", + "author":"Devil", + "author_url":"https:\/\/shopxo.net\/", + "version":"1.0.0", + "desc":"用户钱包，在线充值，提现", + "apply_terminal":[ + "pc", + "h5", + "app", + "alipay", + "weixin", + "baidu" + ], + "apply_version":[ + "1.5.0" + ], + "is_home":false + }, + "hook":{ + "plugins_service_users_center_left_menu_handle":[ + "app\\plugins\\wallet\\Hook" + ], + "plugins_service_header_navigation_top_right_handle":[ + "app\\plugins\\wallet\\Hook" + ] + } +} \ No newline at end of file diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index f2f8286932efae3e24dc6d4b12515e41e672f34f..0f0d030f26f24da67d7f2c46c89b50b56a60c27d 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -515,7 +515,7 @@ class NavigationService 'items' => [], ], [ - 'name' => '我的业务', + 'name' => '我的商城', 'is_login' => 1, 'badge' => null, 'icon' => 'am-icon-cube', @@ -691,15 +691,15 @@ class NavigationService // 菜单列表 $data = [ - [ + 'center' => [ 'name' => '个人中心', 'url' => MyUrl('index/user/index'), 'is_show' => 1, 'contains' => ['userindex'], 'icon' => 'am-icon-home', ], - [ - 'name' => '交易管理', + 'business' => [ + 'name' => '业务管理', 'is_show' => 1, 'icon' => 'am-icon-cube', 'item' => [ @@ -719,7 +719,7 @@ class NavigationService ], ] ], - [ + 'base' => [ 'name' => '资料管理', 'is_show' => 1, 'icon' => 'am-icon-user', @@ -768,7 +768,7 @@ class NavigationService ], ] ], - [ + 'property' => [ 'name' => '财产中心', 'is_show' => 1, 'icon' => 'am-icon-trophy', @@ -782,7 +782,7 @@ class NavigationService ], ] ], - [ + 'logout' => [ 'name' => '安全退出', 'url' => MyUrl('index/user/logout'), 'contains' => ['userlogout'], diff --git a/application/tags.php b/application/tags.php index b0e7cbbb16688ef0b80b92b07a9b84b59cf5cb73..d418694a7bfeb832662508758045b1802887d0af 100755 --- a/application/tags.php +++ b/application/tags.php @@ -122,10 +122,12 @@ return array ( 'plugins_service_users_center_left_menu_handle' => array ( 0 => 'app\\plugins\\petscms\\Hook', + 1 => 'app\\plugins\\wallet\\Hook', ), 'plugins_service_header_navigation_top_right_handle' => array ( 0 => 'app\\plugins\\petscms\\Hook', + 1 => 'app\\plugins\\wallet\\Hook', ), 'plugins_js' => array ( diff --git a/config/shopxo.sql b/config/shopxo.sql index 969feec01cba046377b75345dd71e8373d81880a..4c7d261f75f6064ee8795a6fe2cc1f6cc3fe375c 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -11,7 +11,7 @@ Target Server Version : 50722 File Encoding : utf-8 - Date: 04/28/2019 15:27:26 PM + Date: 04/28/2019 18:31:22 PM */ SET NAMES utf8mb4; @@ -366,7 +366,7 @@ CREATE TABLE `s_goods` ( -- Records of `s_goods` -- ---------------------------- BEGIN; -INSERT INTO `s_goods` VALUES ('1', '1', 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE（4G）/TD-SCD', '', '', '0', '125', '步', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '3200.00', '3200.00', '3200.00', '2100.00', '2100.00', '2100.00', '10', '1', '0', '1', '1', '1', '


', '2', '0', '27', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1554556830'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1699', '步', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6000.00-7600.00', '6000.00', '7600.00', '4500.00-6800.00', '4500.00', '6800.00', '30', '1', '0', '1', '1', '1', '


', '2', '0', '156', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1554555460'), ('3', '2', 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '0', '235', '步', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '6866.00', '6866.00', '6866.00', '3888.00', '3888.00', '3888.00', '20', '1', '0', '1', '1', '1', '


', '2', '0', '33', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '537', '步', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '2300.00', '2300.00', '1999.00', '1999.00', '1999.00', '19', '1', '0', '1', '1', '1', '


', '2', '0', '78', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '435', '步', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '3200.00', '3200.00', '2499.00', '2499.00', '2499.00', '56', '1', '0', '1', '1', '1', '


', '2', '1', '233', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '318', '步', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '3200.00', '3200.00', '2998.90', '2998.90', '2998.90', '65', '1', '0', '1', '1', '1', '

 X5L/SL/V/M (5.0寸)  X5max钢化膜(5.5寸)  X5pro钢化膜(5.2寸) 



', '2', '0', '243', '', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '0', '1547453135', '1547453157'), ('7', '1', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '0', '319', '件', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '760.00', '760.00', '168.00', '168.00', '168.00', '11', '1', '0', '1', '1', '1', '


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


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


', '3', '0', '107', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1554555420'), ('10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '0', '33', '件', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '568.00', '568.00', '228.00', '228.00', '228.00', '28', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】涤棉拼接蕾丝  后中拉链 有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦


XS码尺寸: 悬挂衣长81CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 悬挂衣长82CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 悬挂衣长83CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 悬挂衣长84CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~

蕾丝花是手工修剪出来的，每件都有不同和不规则的哦，有小线头和节点是正常现象哦~请亲们谅解哦~


', '2', '0', '145', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1554555406'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '36665977', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '0.00-268.00', '0.00', '268.00', '160.00-258.00', '160.00', '258.00', '1', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】网纱绣花钉珠拼接蕾丝 有拉链有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸那考虑撑开因素哦 微弹的哦


XS码尺寸: 衣长82CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 衣长83CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 衣长84CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 衣长85CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型，如果腰粗可以适当考虑大1号哦~

大圆领，每个人的身材曲线不同，领口不会很平的哦，请谅解~

肩膀那有暗扣哦，可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~



', '4', '1', '77', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1556157100'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '117', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '0.01-128.00', '0.01', '128.00', '3', '1', '0', '1', '1', '1', '

\"d-1.jpg\"/

\"d-2.jpg\"/

', '3', '0', '295', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1556156928'); +INSERT INTO `s_goods` VALUES ('1', '1', 'MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE（4G）/TD-SCD', '', '', '0', '125', '步', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '3200.00', '3200.00', '3200.00', '2100.00', '2100.00', '2100.00', '10', '1', '0', '1', '1', '1', '


', '2', '0', '27', '', '/static/upload/images/goods/2019/01/14/1547450781101144.jpg', '0', '1547450921', '1554556830'), ('2', '2', '苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G', '', 'iPhone 6 Plus', '0', '1699', '步', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '6000.00-7600.00', '6000.00', '7600.00', '4500.00-6800.00', '4500.00', '6800.00', '30', '1', '0', '1', '1', '1', '


', '2', '0', '157', '/static/upload/video/goods/2019/01/14/1547458876723311.mp4', '/static/upload/images/goods/2019/01/14/1547451274847894.jpg', '0', '1547451624', '1554555460'), ('3', '2', 'Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白', '', '', '0', '235', '步', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '6866.00', '6866.00', '6866.00', '3888.00', '3888.00', '3888.00', '20', '1', '0', '1', '1', '1', '


', '2', '0', '34', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '537', '步', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '2300.00', '2300.00', '2300.00', '1999.00', '1999.00', '1999.00', '19', '1', '0', '1', '1', '1', '


', '2', '0', '78', '', '/static/upload/images/goods/2019/01/14/1547452474332334.jpg', '0', '1547452553', '1547452553'), ('5', '2', 'Meizu/魅族 MX4 Pro移动版 八核大屏智能手机 黑色 16G', '', '', '0', '435', '步', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '3200.00', '3200.00', '3200.00', '2499.00', '2499.00', '2499.00', '56', '1', '0', '1', '1', '1', '


', '2', '1', '233', '', '/static/upload/images/goods/2019/01/14/1547452714324599.jpg', '0', '1547452798', '1547452798'), ('6', '1', 'vivo X5MAX L 移动4G 八核超薄大屏5.5吋双卡手机vivoX5max', '', '', '0', '318', '步', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '3200.00', '3200.00', '3200.00', '2998.90', '2998.90', '2998.90', '65', '1', '0', '1', '1', '1', '

 X5L/SL/V/M (5.0寸)  X5max钢化膜(5.5寸)  X5pro钢化膜(5.2寸) 



', '2', '0', '243', '', '/static/upload/images/goods/2019/01/14/1547453000703308.jpg', '0', '1547453135', '1547453157'), ('7', '1', '纽芝兰包包女士2018新款潮百搭韩版时尚单肩斜挎包少女小挎包链条', '', '', '0', '319', '件', '/static/upload/images/goods/2019/01/14/1547453895416529.jpg', '760.00', '760.00', '760.00', '168.00', '168.00', '168.00', '11', '1', '0', '1', '1', '1', '


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


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


', '3', '0', '107', '', '/static/upload/images/goods/2019/01/14/1547454567172116.jpg', '0', '1547454786', '1554555420'), ('10', '0', '夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服', '', '', '0', '33', '件', '/static/upload/images/goods/2019/01/14/1547455240794230.jpg', '568.00', '568.00', '568.00', '228.00', '228.00', '228.00', '28', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】涤棉拼接蕾丝  后中拉链 有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦


XS码尺寸: 悬挂衣长81CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 悬挂衣长82CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 悬挂衣长83CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 悬挂衣长84CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~

蕾丝花是手工修剪出来的，每件都有不同和不规则的哦，有小线头和节点是正常现象哦~请亲们谅解哦~


', '2', '0', '145', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '0', '1547455375', '1554555406'), ('11', '0', '夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙', '', '', '0', '36665977', '件', '/static/upload/images/goods/2019/01/14/1547455601314107.jpg', '0.00-268.00', '0.00', '268.00', '160.00-258.00', '160.00', '258.00', '1', '1', '0', '1', '1', '1', '

【品牌】欧单 学媛风 猫咪良品

【吊牌】xueyuanfeng 猫咪良品

【面料质地】网纱绣花钉珠拼接蕾丝 有拉链有内衬（非专业机构鉴定，介意请慎拍）

好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~

【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦

【商品尺寸】XS/S/M/L 小高腰设计 胸那考虑撑开因素哦 微弹的哦


XS码尺寸: 衣长82CM.胸围80内合适.腰围63CM.臀围86CM


S码尺寸: 衣长83CM.胸围84内合适.腰围67CM.臀围90CM

M码尺寸: 衣长84CM.胸围88内合适.腰围71CM.臀围94CM

L码尺寸: 衣长85CM.胸围92内合适.腰围75CM.臀围98CM


（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）

PS：常规码数，可按平时号选择哦。修身版型，如果腰粗可以适当考虑大1号哦~

大圆领，每个人的身材曲线不同，领口不会很平的哦，请谅解~

肩膀那有暗扣哦，可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~



', '4', '1', '77', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '0', '1547455700', '1556157100'), ('12', '2', 'ZK星星绣花雪纺连衣裙中长款sukol裙少女心温柔超仙女chic裙子夏', '', 'xxxxhhhhhh商品型号', '0', '117', '件', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '150.00-188.00', '150.00', '188.00', '0.01-128.00', '0.01', '128.00', '3', '1', '0', '1', '1', '1', '

\"d-1.jpg\"/

\"d-2.jpg\"/

', '3', '0', '328', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '0', '1547456230', '1556156928'); COMMIT; -- ---------------------------- @@ -386,7 +386,7 @@ CREATE TABLE `s_goods_browse` ( -- Records of `s_goods_browse` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_browse` VALUES ('1', '7', '91', '1554803230', '1554805470'), ('2', '11', '90', '1554966398', '1556431485'), ('3', '10', '90', '1555048568', '1556431429'), ('4', '9', '90', '1555058265', '1556156966'), ('5', '2', '90', '1555157678', '1556432058'), ('6', '12', '90', '1555159096', '1556431497'), ('7', '5', '90', '1555402359', '1556262794'), ('8', '7', '90', '1555406985', '1556431381'), ('9', '4', '90', '1555491079', '1556258601'), ('10', '6', '90', '1555494278', '1556432606'), ('11', '8', '91', '1556075952', '1556075952'), ('12', '3', '90', '1556077528', '1556432040'), ('13', '8', '90', '1556431218', '1556431371'); +INSERT INTO `s_goods_browse` VALUES ('1', '7', '91', '1554803230', '1554805470'), ('2', '11', '90', '1554966398', '1556431485'), ('3', '10', '90', '1555048568', '1556431429'), ('4', '9', '90', '1555058265', '1556156966'), ('5', '2', '90', '1555157678', '1556445751'), ('6', '12', '90', '1555159096', '1556441161'), ('7', '5', '90', '1555402359', '1556262794'), ('8', '7', '90', '1555406985', '1556431381'), ('9', '4', '90', '1555491079', '1556258601'), ('10', '6', '90', '1555494278', '1556432606'), ('11', '8', '91', '1556075952', '1556075952'), ('12', '3', '90', '1556077528', '1556440406'), ('13', '8', '90', '1556431218', '1556445747'); COMMIT; -- ---------------------------- @@ -901,13 +901,13 @@ CREATE TABLE `s_plugins` ( PRIMARY KEY (`id`), UNIQUE KEY `plugins` (`plugins`), KEY `is_enable` (`is_enable`) -) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='应用'; +) ENGINE=InnoDB AUTO_INCREMENT=38 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\",\"alipay_mini_qrcode_images\":\"\",\"alipay_fuwu_qrcode_images\":\"\",\"weixin_fuwu_qrcode_images\":\"\"}', '0', '1550222925', '1556007360'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|12345678\\n\\u552e\\u540e|12345678\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550393304', '1556007348'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1551184852', '1553591863'), ('21', 'answers', '{\"application_name\":\"\\u95ee\\u7b54\",\"images\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/07\\/1551942704326624.jpg\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"images_bottom\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/13\\/1552463137211834.png\",\"url_bottom\":\"https:\\/\\/test.shopxo.net\",\"is_new_window_open_bottom\":\"1\",\"right_top_rec_name\":\"\",\"middle_new_name\":\"\",\"right_top_goods_name\":\"\",\"middle_new_page_number\":\"15\",\"search_page_number\":\"28\",\"home_new_goods_number\":\"12\",\"category_ids\":\"12,7,6,4,3,2,1\",\"pluginsname\":\"answers\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"basesave\"}', '1', '1551853705', '1552724209'), ('23', 'expressforkdn', '{\"ebid\":\"\",\"appkey\":\"\",\"express_ids\":{\"1\":\"\",\"2\":\"\",\"3\":\"\",\"4\":\"ZTO\",\"5\":\"\",\"6\":\"\",\"7\":\"\",\"8\":\"\",\"9\":\"\",\"10\":\"\",\"11\":\"\",\"12\":\"\",\"13\":\"\",\"14\":\"\"},\"pluginsname\":\"expressforkdn\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552358826', '1553161103'), ('25', 'touristbuy', '{\"application_name\":\"\\u8ba2\\u5355\\u67e5\\u8be2\",\"login_name\":\"\\u6e38\\u5ba2\\u767b\\u5f55\",\"nickname\":\"\\u6e38\\u5ba2\",\"query_tips\":\"\\u8bf7\\u8f93\\u5165\\u8ba2\\u5355\\u53f7\\uff0c\\u6536\\u4ef6\\u4eba\\u59d3\\u540d\\uff0c\\u6536\\u4ef6\\u4eba\\u7535\\u8bdd\\u5373\\u53ef\\u67e5\\u770b\\u8ba2\\u5355\\u8be6\\u60c5\",\"is_default_tourist\":\"0\",\"pluginsname\":\"touristbuy\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552656743', '1553486026'), ('26', 'freightfee', '{\"show_name\":\"\\u8fd0\\u8d39\",\"goods_ids\":\"2\",\"valuation\":\"0\",\"data\":[{\"region\":\"default\",\"region_show\":\"default\",\"first\":\"1\",\"first_price\":\"10\",\"continue\":\"1\",\"continue_price\":\"5\",\"free_shipping_price\":\"228\"}],\"pluginsname\":\"freightfee\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552894438', '1556432057'), ('27', 'newuserreduction', '{\"show_name\":\"\\u65b0\\u7528\\u6237\\u7acb\\u51cf\",\"full_amount\":\"\",\"price\":\"3\",\"is_random\":\"1\",\"pluginsname\":\"newuserreduction\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1553483809', '1553593711'), ('30', 'ucenter', '{\"login_sync_url\":\"\",\"login_async_url\":\"\",\"register_sync_url\":\"\",\"register_async_url\":\"\",\"logout_sync_url\":\"\",\"logout_async_url\":\"\",\"loginpwdupdate_async_url\":\"\",\"accounts_async_url\":\"\",\"pluginsname\":\"ucenter\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1554186010', '1554349799'), ('31', 'petscms', '{\"not_bind_desc\":\"\\u8be5\\u5ba0\\u7269\\u8fd8\\u6ca1\\u6709\\u4e3b\\u4eba\\u9886\\u53d6\\uff0c\\u7acb\\u5373\\u9886\\u53d6\\u53ef\\u7231\\u7684\\u5ba0\\u7269\\u5b9d\\u5b9d\\u54e6\\uff01\\uff01\\uff01\",\"pets_take\":\"\\u6211\\u8981\\u9886\\u53d6\",\"lose_provide\":\"\\u6211\\u8981\\u63d0\\u4f9b\\u4fe1\\u606f\",\"alipay_qrcode_name\":\"\",\"weixin_qrcode_name\":\"\",\"pluginsname\":\"petscms\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1554186010', '1555662725'), ('33', 'share', null, '1', '1555667312', '1555668223'), ('34', 'homemiddleadv', '{\"time_start\":\"2019-04-22 23:34:00\",\"time_end\":\"\",\"pluginsname\":\"homemiddleadv\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190422180652622612\":{\"name\":\"\\u667a\\u80fdPad\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400479636.jpg\",\"is_enable\":1,\"is_new_window_open\":1,\"operation_time\":1556182596,\"id\":\"20190422180652622612\"},\"20190422183713735111\":{\"name\":\"\\u667a\\u80fd\\u624b\\u673a\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400237551.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555988047,\"id\":\"20190422183713735111\"},\"20190422183742153442\":{\"name\":\"\\u667a\\u80fd\\u7535\\u8f6c\\u63a5\\u5934\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400780646.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948369,\"id\":\"20190422183742153442\"},\"20190422183756326575\":{\"name\":\"\\u65b0\\u4e00\\u4ee3\\u667a\\u80fd\\u5e73\\u677f\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400647560.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948385,\"id\":\"20190422183756326575\"}}}', '1', '1555917493', '1556182596'), ('35', 'footercustomerservice', '{\"is_only_home\":\"0\",\"pluginsname\":\"footercustomerservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190423101219612886\":{\"name\":\"\\u7269\\u884c\\u5929\\u4e0b\",\"desc\":\"\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\\u9001\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891552781.png\",\"is_enable\":1,\"operation_time\":1556182603,\"id\":\"20190423101219612886\"},\"20190423101429924371\":{\"name\":\"\\u7cbe\\u81f4\\u670d\\u52a1\",\"desc\":\"\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891827973.png\",\"is_enable\":1,\"operation_time\":1555990919,\"id\":\"20190423101429924371\"},\"20190423101441929067\":{\"name\":\"\\u9000\\u6362\\u65e0\\u5fe7\",\"desc\":\"\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891594648.png\",\"is_enable\":1,\"operation_time\":1555990931,\"id\":\"20190423101441929067\"},\"20190423101454021035\":{\"name\":\"\\u6ee1\\u51cf\\u6d3b\\u52a8\",\"desc\":\"\\u6ee1500\\u5143\\u7acb\\u51cf90\\uff0c\\u65b0\\u7528\\u6237\\u7acb\\u51cf200\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555991139659862.png\",\"is_enable\":1,\"operation_time\":1555991141,\"id\":\"20190423101454021035\"}}}', '1', '1555984266', '1556263194'), ('36', 'membershiplevel', '{\"level_rules\":\"0\",\"pluginsname\":\"membershiplevel\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"level_list\":{\"20190425155935996197\":{\"name\":\"VIP1\",\"rules_min\":\"0\",\"rules_max\":\"100\",\"images_url\":\"\",\"is_enable\":1,\"discount_rate\":\"0.9\",\"order_price\":\"100.00\",\"full_reduction_price\":\"10.00\",\"operation_time\":1556419988,\"id\":\"20190425155935996197\"},\"20190425160645024007\":{\"name\":\"VIP2\",\"rules_min\":\"100\",\"rules_max\":\"300\",\"images_url\":\"\",\"is_enable\":1,\"discount_rate\":\"0.8\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556419992,\"id\":\"20190425160645024007\"},\"20190425161453658835\":{\"name\":\"VIP3\",\"rules_min\":\"300\",\"rules_max\":\"0\",\"images_url\":\"\",\"is_enable\":1,\"discount_rate\":\"0.7\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556433455,\"id\":\"20190425161453658835\"}}}', '1', '1555984266', '1556433455'); +INSERT INTO `s_plugins` VALUES ('1', 'commontopmaxpicture', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commontopmaxpicture\\/2019\\/02\\/09\\/1549671733978860.jpg\",\"bg_color\":\"#ce0000\",\"url\":\"https:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopmaxpicture\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550145321', '1551345727'), ('2', 'commontopnotice', '{\"content\":\"\\u6b22\\u8fce\\u6765\\u5230ShopXO\\u4f01\\u4e1a\\u7ea7B2C\\u5f00\\u6e90\\u7535\\u5546\\u7cfb\\u7edf\\u3001\\u6f14\\u793a\\u7ad9\\u70b9\\u8bf7\\u52ff\\u53d1\\u8d77\\u652f\\u4ed8\\u3001\\u4ee5\\u514d\\u7ed9\\u60a8\\u5e26\\u6765\\u4e0d\\u5fc5\\u8981\\u7684\\u8d22\\u4ea7\\u635f\\u5931\\u3002\",\"is_overall\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"commontopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550156571', '1551345882'), ('3', 'usercentertopnotice', '{\"content\":\"\\u7528\\u6237\\u4e2d\\u5fc3\\u516c\\u544a\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"usercentertopnotice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550157860', '1551191932'), ('14', 'userloginrewardintegral', '{\"give_integral\":\"5\",\"is_day_once\":\"1\",\"time_start\":\"\",\"time_end\":\"\",\"pluginsname\":\"userloginrewardintegral\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1550151175', '1551191930'), ('15', 'commongobacktop', '{\"images\":\"\\/static\\/upload\\/images\\/plugins_commongobacktop\\/2019\\/02\\/15\\/1550210425433304.png\",\"is_overall\":\"1\",\"pluginsname\":\"commongobacktop\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550200998', '1551191928'), ('16', 'commonrightnavigation', '{\"weixin_mini_qrcode_images\":\"\\/static\\/upload\\/images\\/plugins_commonrightnavigation\\/2019\\/02\\/17\\/1550375588899802.jpeg\",\"is_new_window_open\":\"0\",\"is_overall\":\"1\",\"is_goods_page_show_cart\":\"1\",\"pluginsname\":\"commonrightnavigation\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"alipay_mini_qrcode_images\":\"\",\"alipay_fuwu_qrcode_images\":\"\",\"weixin_fuwu_qrcode_images\":\"\"}', '0', '1550222925', '1556007360'), ('17', 'commononlineservice', '{\"title\":\"ShopXO\\u5728\\u7ebf\\u5ba2\\u670d\",\"online_service\":\"\\u552e\\u524d|12345678\\n\\u552e\\u540e|12345678\",\"tel\":\"021-88888888\",\"is_overall\":\"1\",\"bg_color\":\"\",\"distance_top\":\"3\",\"pluginsname\":\"commononlineservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1550393304', '1556007348'), ('20', 'usernotloginhidegoodsprice', '{\"original_price_placeholder\":\"\",\"price_placeholder\":\"\",\"pluginsname\":\"usernotloginhidegoodsprice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1551184852', '1553591863'), ('21', 'answers', '{\"application_name\":\"\\u95ee\\u7b54\",\"images\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/07\\/1551942704326624.jpg\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"is_new_window_open\":\"1\",\"images_bottom\":\"\\/static\\/upload\\/images\\/plugins_answers\\/2019\\/03\\/13\\/1552463137211834.png\",\"url_bottom\":\"https:\\/\\/test.shopxo.net\",\"is_new_window_open_bottom\":\"1\",\"right_top_rec_name\":\"\",\"middle_new_name\":\"\",\"right_top_goods_name\":\"\",\"middle_new_page_number\":\"15\",\"search_page_number\":\"28\",\"home_new_goods_number\":\"12\",\"category_ids\":\"12,7,6,4,3,2,1\",\"pluginsname\":\"answers\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"basesave\"}', '1', '1551853705', '1552724209'), ('23', 'expressforkdn', '{\"ebid\":\"\",\"appkey\":\"\",\"express_ids\":{\"1\":\"\",\"2\":\"\",\"3\":\"\",\"4\":\"ZTO\",\"5\":\"\",\"6\":\"\",\"7\":\"\",\"8\":\"\",\"9\":\"\",\"10\":\"\",\"11\":\"\",\"12\":\"\",\"13\":\"\",\"14\":\"\"},\"pluginsname\":\"expressforkdn\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552358826', '1553161103'), ('25', 'touristbuy', '{\"application_name\":\"\\u8ba2\\u5355\\u67e5\\u8be2\",\"login_name\":\"\\u6e38\\u5ba2\\u767b\\u5f55\",\"nickname\":\"\\u6e38\\u5ba2\",\"query_tips\":\"\\u8bf7\\u8f93\\u5165\\u8ba2\\u5355\\u53f7\\uff0c\\u6536\\u4ef6\\u4eba\\u59d3\\u540d\\uff0c\\u6536\\u4ef6\\u4eba\\u7535\\u8bdd\\u5373\\u53ef\\u67e5\\u770b\\u8ba2\\u5355\\u8be6\\u60c5\",\"is_default_tourist\":\"0\",\"pluginsname\":\"touristbuy\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552656743', '1553486026'), ('26', 'freightfee', '{\"show_name\":\"\\u8fd0\\u8d39\",\"goods_ids\":\"2\",\"valuation\":\"0\",\"data\":[{\"region\":\"default\",\"region_show\":\"default\",\"first\":\"1\",\"first_price\":\"10\",\"continue\":\"1\",\"continue_price\":\"5\",\"free_shipping_price\":\"228\"}],\"pluginsname\":\"freightfee\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1552894438', '1556432057'), ('27', 'newuserreduction', '{\"show_name\":\"\\u65b0\\u7528\\u6237\\u7acb\\u51cf\",\"full_amount\":\"\",\"price\":\"3\",\"is_random\":\"1\",\"pluginsname\":\"newuserreduction\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1553483809', '1553593711'), ('30', 'ucenter', '{\"login_sync_url\":\"\",\"login_async_url\":\"\",\"register_sync_url\":\"\",\"register_async_url\":\"\",\"logout_sync_url\":\"\",\"logout_async_url\":\"\",\"loginpwdupdate_async_url\":\"\",\"accounts_async_url\":\"\",\"pluginsname\":\"ucenter\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '0', '1554186010', '1554349799'), ('31', 'petscms', '{\"not_bind_desc\":\"\\u8be5\\u5ba0\\u7269\\u8fd8\\u6ca1\\u6709\\u4e3b\\u4eba\\u9886\\u53d6\\uff0c\\u7acb\\u5373\\u9886\\u53d6\\u53ef\\u7231\\u7684\\u5ba0\\u7269\\u5b9d\\u5b9d\\u54e6\\uff01\\uff01\\uff01\",\"pets_take\":\"\\u6211\\u8981\\u9886\\u53d6\",\"lose_provide\":\"\\u6211\\u8981\\u63d0\\u4f9b\\u4fe1\\u606f\",\"alipay_qrcode_name\":\"\",\"weixin_qrcode_name\":\"\",\"pluginsname\":\"petscms\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\"}', '1', '1554186010', '1555662725'), ('33', 'share', null, '1', '1555667312', '1555668223'), ('34', 'homemiddleadv', '{\"time_start\":\"2019-04-22 23:34:00\",\"time_end\":\"\",\"pluginsname\":\"homemiddleadv\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190422180652622612\":{\"name\":\"\\u667a\\u80fdPad\",\"url\":\"http:\\/\\/shopxo.net\\/\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400479636.jpg\",\"is_enable\":1,\"is_new_window_open\":1,\"operation_time\":1556182596,\"id\":\"20190422180652622612\"},\"20190422183713735111\":{\"name\":\"\\u667a\\u80fd\\u624b\\u673a\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400237551.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555988047,\"id\":\"20190422183713735111\"},\"20190422183742153442\":{\"name\":\"\\u667a\\u80fd\\u7535\\u8f6c\\u63a5\\u5934\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400780646.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948369,\"id\":\"20190422183742153442\"},\"20190422183756326575\":{\"name\":\"\\u65b0\\u4e00\\u4ee3\\u667a\\u80fd\\u5e73\\u677f\",\"url\":\"\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_homemiddleadv\\/2019\\/04\\/22\\/1555929400647560.jpg\",\"is_enable\":1,\"is_new_window_open\":0,\"operation_time\":1555948385,\"id\":\"20190422183756326575\"}}}', '1', '1555917493', '1556182596'), ('35', 'footercustomerservice', '{\"is_only_home\":\"0\",\"pluginsname\":\"footercustomerservice\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"data_list\":{\"20190423101219612886\":{\"name\":\"\\u7269\\u884c\\u5929\\u4e0b\",\"desc\":\"\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\\u9001\\u591a\\u4ed3\\u76f4\\u53d1 \\u6781\\u901f\\u914d\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891552781.png\",\"is_enable\":1,\"operation_time\":1556182603,\"id\":\"20190423101219612886\"},\"20190423101429924371\":{\"name\":\"\\u7cbe\\u81f4\\u670d\\u52a1\",\"desc\":\"\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\\u7cbe\\u81f4\\u670d\\u52a1 \\u552e\\u540e\\u4fdd\\u969c\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891827973.png\",\"is_enable\":1,\"operation_time\":1555990919,\"id\":\"20190423101429924371\"},\"20190423101441929067\":{\"name\":\"\\u9000\\u6362\\u65e0\\u5fe7\",\"desc\":\"\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\\u653e\\u5fc3\\u8d2d\\u7269 \\u9000\\u8fd8\\u65e0\\u5fe7\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555990891594648.png\",\"is_enable\":1,\"operation_time\":1555990931,\"id\":\"20190423101441929067\"},\"20190423101454021035\":{\"name\":\"\\u6ee1\\u51cf\\u6d3b\\u52a8\",\"desc\":\"\\u6ee1500\\u5143\\u7acb\\u51cf90\\uff0c\\u65b0\\u7528\\u6237\\u7acb\\u51cf200\",\"images_url\":\"\\/static\\/upload\\/images\\/plugins_footercustomerservice\\/2019\\/04\\/23\\/1555991139659862.png\",\"is_enable\":1,\"operation_time\":1555991141,\"id\":\"20190423101454021035\"}}}', '1', '1555984266', '1556263194'), ('36', 'membershiplevel', '{\"level_rules\":\"0\",\"pluginsname\":\"membershiplevel\",\"pluginscontrol\":\"admin\",\"pluginsaction\":\"save\",\"level_list\":{\"20190425155935996197\":{\"name\":\"VIP1\",\"rules_min\":\"0\",\"rules_max\":\"100\",\"images_url\":\"\",\"is_enable\":1,\"discount_rate\":\"0.9\",\"order_price\":\"100.00\",\"full_reduction_price\":\"10.00\",\"operation_time\":1556419988,\"id\":\"20190425155935996197\"},\"20190425160645024007\":{\"name\":\"VIP2\",\"rules_min\":\"100\",\"rules_max\":\"300\",\"images_url\":\"\",\"is_enable\":1,\"discount_rate\":\"0.8\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556419992,\"id\":\"20190425160645024007\"},\"20190425161453658835\":{\"name\":\"VIP3\",\"rules_min\":\"300\",\"rules_max\":\"0\",\"images_url\":\"\",\"is_enable\":1,\"discount_rate\":\"0.7\",\"order_price\":0,\"full_reduction_price\":0,\"operation_time\":1556433455,\"id\":\"20190425161453658835\"}}}', '1', '1555984266', '1556433455'), ('37', 'wallet', null, '1', '1555984266', '1556437481'); COMMIT; -- ---------------------------- diff --git a/public/static/admin/default/css/order.css b/public/static/admin/default/css/order.css index cdad8aa8b33371ecac70d144f1d1fc34114ad61e..b90e8752ebf969bf12bf74e305eae6237c74d689 100755 --- a/public/static/admin/default/css/order.css +++ b/public/static/admin/default/css/order.css @@ -33,7 +33,7 @@ form.am-form .am-form-group { padding-right: 5px; } /** - * 快递弹窗 + * 业务弹窗 */ .business-item h3 { border-bottom: 3px solid #e3e3e3; margin:5px 0 0 0; font-size: 14px;font-weight: 700; } .business-item ul { padding: 10px 3px 5px 5px; overflow: hidden; } diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index b59734ed4a7641c9b675ef95df66f120f4f5551e..8c494fa8b9f915c3a3258614eecdfda7663a26be 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -60,19 +60,6 @@ input.add,input.min{width:15px} .last{border-right:none !important;} .am-container { margin: 0 auto; } -/*选项卡样式定义*/ -.am-nav-tabs,.am-tabs-bd{border-color:transparent ;} -.am-nav-tabs > li.am-active > a, .am-nav-tabs > li.am-active > a:hover, .am-nav-tabs > li.am-active > a:focus,.am-nav-tabs > li > a:hover ,.am-nav-tabs > li > a:focus { -color: #555555;background:none;border-color:transparent;cursor: default;} -.am-nav-tabs > li{border-bottom:2px solid transparent;} -.am-nav-tabs > li.am-active {border-bottom:2px solid #d2364c;} -.am-tabs-nav li {height:36px;font-size:14px;line-height:36px ;} -.am-tabs-nav li a,.am-tabs-nav li.am-active a, .am-tabs-nav li{cursor: pointer;} - -/*选项卡样式*/ -.am-nav-tabs > li span{font-size:14px;font-weight:500;} -.am-nav-tabs > li.am-active span{color: #E4393C;} - /* 商品分类 */ #goods-category { position: relative; top: -45px; } diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index 0ba44a5b1e7781c09d8974a4891515fed69ae41f..ad51054a7100c8cadded84dce0580c8254138aad 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -133,8 +133,22 @@ fieldset legend{margin-left:15px;padding-left:3px;padding-right:3px;color:#333;} .introduce-main .am-nav-tabs > li.am-active { border-bottom: 2px solid #F03726; } -/*导航固定*/ -ul.am-tabs-nav.am-nav.am-nav-tabs {background: #F5F5F5;} +/*导航*/ +.introduce ul.am-tabs-nav.am-nav.am-nav-tabs {background: #F5F5F5;} +.introduce .am-nav-tabs, .introduce .am-tabs-bd{border-color:transparent ;} +.introduce .am-nav-tabs > li.am-active > a, +.introduce .am-nav-tabs > li.am-active > a:hover, +.introduce .am-nav-tabs > li.am-active > a:focus, +.introduce .am-nav-tabs > li > a:hover, +.introduce .am-nav-tabs > li > a:focus { color: #555555;background:none;border-color:transparent;cursor: default;} +.introduce .am-nav-tabs > li{border-bottom:2px solid transparent;} +.introduce .am-nav-tabs > li.am-active {border-bottom:2px solid #d2364c;} +.introduce .am-tabs-nav li {height:36px;font-size:14px;line-height:36px ;} +.introduce .am-tabs-nav li a, +.introduce .am-tabs-nav li.am-active a, +.introduce .am-tabs-nav li{cursor: pointer;} +.introduce .am-nav-tabs > li span{font-size:14px;font-weight:500;} +.introduce .am-nav-tabs > li.am-active span{color: #E4393C;} /*tab*/ diff --git a/public/static/index/default/css/userintegral.css b/public/static/index/default/css/userintegral.css index 8e7f8eebf5c33c8ba96910dc3e224957f9e2c8f8..50b927b5591f41e7e5414592752726b10c93a043 100755 --- a/public/static/index/default/css/userintegral.css +++ b/public/static/index/default/css/userintegral.css @@ -49,5 +49,5 @@ background: #e7e3d9; padding: 3px 6px; border: 1px solid #e7d8c2; - margin-left: 5px; + margin-left: 10px; } \ No newline at end of file diff --git a/public/static/plugins/css/wallet/wallet.css b/public/static/plugins/css/wallet/wallet.css new file mode 100644 index 0000000000000000000000000000000000000000..b35ef73a0c48925ae8b6e9d5a8b9ff64eeb19ce1 --- /dev/null +++ b/public/static/plugins/css/wallet/wallet.css @@ -0,0 +1,110 @@ +/* 筛选 */ +.thin, .pay-list { overflow:hidden; } +.thin .so { width:66%; } +.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; } +.so-list { width:100%; margin-top: 20px; } +.so-list * { font-size:1.2rem !important; } +.so-list input { height:28px; display:inline !important; } +.time input, .so-list .chosen-container { background:#FFF !important; } +.time input { width:100px !important; } +.time i { position:absolute; margin:4px 0px 0px -15px; } +.price input { width:101px !important; } +.time, .time { width:50%; } +.so-list tr+tr>td { padding-top:10px; } +.so-list .chosen-container { border-radius:2px; } +.text-grey { color: #999; } +.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; } +.reset-submit { margin-left: 20px; } +.so-list select { padding: 0 0 0 8px; } +@media only screen and (min-width: 641px){ + .so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; } + .thin_sub:hover { color:#F60; } +} +@media only screen and (max-width: 641px){ + .so-list input { width:40% !important; } + .so-list td { width:100%; display:block; } + .so-list tr td:last-child { margin-top:10px; } + .so-list .chosen-container { width:85%; } + .so-list .chosen-container { width:100%; } + .so-list tr td:last-child { padding-top:0px !important; } + .chosen-container-single .chosen-search input[type="text"] { width: 100% !important; } + .so-list select { width: calc(100% - 44px); display: -webkit-inline-box; } +} + +/** + * 账户信息 + */ +.user-content-body .available .integral-value { + color: #4CAF50; +} +.user-content-body .locking { + margin-top: 5px; +} +.user-content-body .locking .integral-value { + color: #FF9800; +} +.user-content-body .integral-value { + font-size: 18px; + font-weight: 700; +} +.user-content-body .integral-tips { + color: #c27300; + background: #e7e3d9; + padding: 3px 6px; + border: 1px solid #e7d8c2; + margin-left: 10px; +} + +/** + * 导航 + */ +.user-content-body .am-nav { + border-bottom: 1px solid #eee; +} +.user-content-body .am-nav li { + margin-bottom: -1px; +} +.user-content-body .am-nav li a { + font-size: 14px; +} +.user-content-body .am-nav .am-active { + border-bottom: 2px solid #ed5565; + +} +.user-content-body .am-nav > li > a:hover, .user-content-body .am-nav > li > a:focus { + background: transparent; +} +.user-content-body .am-nav .am-topbar-right { + margin-right: 0; +} +.user-content-body .am-nav .am-topbar-right .am-btn:not(:last-child) { + margin-right: 5px; +} +.user-content-body .am-nav .am-topbar-right .am-topbar-btn { + margin-top: 0; +} + +/** + * 业务弹窗 + */ +.user-content-body .business-item h3 { font-weight: 700; } +.user-content-body .business-item ul { padding: 5px 1px; overflow: hidden; } +.user-content-body .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; background: #fff; } +.user-content-body .business-item ul li img { width: 36px; height: 36px; } +.user-content-body .business-item ul li:hover, .user-content-body .business-item ul li.selected { border-color: #e23f36 ; position: relative; box-shadow: 0px 0 0px 1px #e23f36; } +@media only screen and (min-width:640px) { + .user-content-body .business-item ul li {width:calc(33% - 5px); } + .user-content-body .business-item ul li:nth-child(3n) { margin-right: 0; } +} +@media only screen and (max-width:640px) { + .user-content-body .business-item ul li { width: calc(50% - 5px); } + .user-content-body .business-item ul li:nth-child(2n) { margin-right: 0; } +} + +/** + * 充值窗口 + */ +#plugins-recharge-pay-modal-popup input[name="payment_id"] { + margin-left: -10000px; + position: absolute; +} \ No newline at end of file diff --git a/public/static/plugins/js/wallet/wallet.js b/public/static/plugins/js/wallet/wallet.js new file mode 100644 index 0000000000000000000000000000000000000000..3dc108a8953aaf731dc9e4865e4ee994d46050b9 --- /dev/null +++ b/public/static/plugins/js/wallet/wallet.js @@ -0,0 +1,18 @@ +$(function() +{ + // 支付操作表单 + FromInit('form.form-validation-plugins-recharge-pay'); + + // 混合列表选择 + $('.business-item ul li').on('click', function() + { + if($(this).hasClass('selected')) + { + $('form.form-validation-plugins-recharge-pay input[name='+$(this).parent().data('type')+'_id]').val(0); + $(this).removeClass('selected'); + } else { + $('form.form-validation-plugins-recharge-pay input[name='+$(this).parent().data('type')+'_id]').val($(this).data('value')); + $(this).addClass('selected').siblings('li').removeClass('selected'); + } + }); +}); \ No newline at end of file diff --git a/public/static/upload/images/plugins_wallet/2019/04/28/1556447296647734.jpg b/public/static/upload/images/plugins_wallet/2019/04/28/1556447296647734.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a91aedb98d6022ea852f9cf516d062b5df097769 Binary files /dev/null and b/public/static/upload/images/plugins_wallet/2019/04/28/1556447296647734.jpg differ