diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index 88e712187..49c95213c 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -13,7 +13,6 @@ namespace app\index\controller; use app\service\OrderService; use app\service\PaymentService; use app\service\GoodsCommentsService; -use app\service\OrderAftersaleService; /** * 订单管理 @@ -200,85 +199,6 @@ class Order extends Common } } - /** - * 售后页面 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-05-21 - * @desc description - */ - public function Aftersale() - { - // 参数 - $params = input(); - $order_id = isset($params['id']) ? intval($params['id']) : 0; - $goods_id = isset($params['gid']) ? intval($params['gid']) : 0; - $ret = OrderAftersaleService::OrdferGoodsRow($order_id, $goods_id, $this->user['id']); - if($ret['code'] == 0) - { - $this->assign('goods', $ret['data']['items']); - $this->assign('order', $ret['data']); - - // 仅退款原因 - $return_only_money_reason = MyC('home_order_aftersale_return_only_money_reason'); - $this->assign('return_only_money_reason_list', empty($return_only_money_reason) ? [] : explode("\n", $return_only_money_reason)); - - // 退款退货原因 - $return_money_goods_reason = MyC('home_order_aftersale_return_money_goods_reason'); - $this->assign('return_money_goods_reason_list', empty($return_money_goods_reason) ? [] : explode("\n", $return_money_goods_reason)); - - // 获取当前订单商品售后最新的一条纪录 - $data_params = [ - 'm' => 0, - 'n' => 1, - 'where' => [ - ['order_id', '=', $order_id], - ['goods_id', '=', $goods_id], - ['user_id', '=', $this->user['id']], - ], - ]; - $new_aftersale = OrderAftersaleService::OrderGoodsAftersaleList($data_params); - $this->assign('new_aftersale_data', empty($new_aftersale['data'][0]) ? [] : $new_aftersale['data'][0]); - - $this->assign('params', $params); - return $this->fetch(); - } else { - $this->assign('msg', $ret['msg']); - return $this->fetch('public/tips_error'); - } - } - - /** - * 申请售后创建 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-05-23 - * @desc description - */ - public function AftersaleCreate() - { - $params = input(); - $params['user'] = $this->user; - return OrderAftersaleService::AftersaleCreate($params); - } - - /** - * 申请售后-用户发货 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-05-23 - * @desc description - */ - public function AftersaleDelivery() - { - $params = input(); - $params['user'] = $this->user; - return OrderAftersaleService::AftersaleDelivery($params); - } - /** * 订单支付 * @author Devil diff --git a/application/index/controller/Orderaftersale.php b/application/index/controller/Orderaftersale.php new file mode 100644 index 000000000..849d9a48b --- /dev/null +++ b/application/index/controller/Orderaftersale.php @@ -0,0 +1,240 @@ +IsLogin(); + } + + /** + * 订单列表 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-28 + * @desc description + */ + public function Index() + { + // 参数 + $params = input(); + $params['user'] = $this->user; + $params['user_type'] = 'user'; + + // 分页 + $number = 10; + + // 条件 + $where = OrderAftersaleService::OrderAftersaleListWhere($params); + + // 获取总数 + $total = OrderAftersaleService::OrderAftersaleTotal($where); + + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => MyUrl('index/orderaftersale/index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, + ); + $data = OrderAftersaleService::OrderAftersaleList($data_params); + $this->assign('data_list', $data['data']); + + // 静态数据 + $this->assign('common_order_aftersale_type_list', lang('common_order_aftersale_type_list')); + $this->assign('common_order_aftersale_status_list', lang('common_order_aftersale_status_list')); + $this->assign('common_order_aftersale_refundment_list', lang('common_order_aftersale_refundment_list')); + + // 参数 + $this->assign('params', $params); + return $this->fetch(); + } + + /** + * 订单详情 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-08 + * @desc description + */ + public function Detail() + { + // 参数 + $params = input(); + $params['user'] = $this->user; + $params['user_type'] = 'user'; + + // 条件 + $where = OrderService::OrderListWhere($params); + + // 获取列表 + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => $where, + ); + $data = OrderService::OrderList($data_params); + if(!empty($data['data'][0])) + { + // 发起支付 - 支付方式 + $this->assign('buy_payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1])); + + $this->assign('data', $data['data'][0]); + + // 参数 + $this->assign('params', $params); + return $this->fetch(); + } else { + $this->assign('msg', '没有相关数据'); + return $this->fetch('public/tips_error'); + } + } + + /** + * 售后页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-05-21 + * @desc description + */ + public function Aftersale() + { + // 参数 + $params = input(); + $order_id = isset($params['id']) ? intval($params['id']) : 0; + $goods_id = isset($params['gid']) ? intval($params['gid']) : 0; + $ret = OrderAftersaleService::OrdferGoodsRow($order_id, $goods_id, $this->user['id']); + if($ret['code'] == 0) + { + $this->assign('goods', $ret['data']['items']); + $this->assign('order', $ret['data']); + + // 仅退款原因 + $return_only_money_reason = MyC('home_order_aftersale_return_only_money_reason'); + $this->assign('return_only_money_reason_list', empty($return_only_money_reason) ? [] : explode("\n", $return_only_money_reason)); + + // 退款退货原因 + $return_money_goods_reason = MyC('home_order_aftersale_return_money_goods_reason'); + $this->assign('return_money_goods_reason_list', empty($return_money_goods_reason) ? [] : explode("\n", $return_money_goods_reason)); + + // 获取当前订单商品售后最新的一条纪录 + $data_params = [ + 'm' => 0, + 'n' => 1, + 'where' => [ + ['order_id', '=', $order_id], + ['goods_id', '=', $goods_id], + ['user_id', '=', $this->user['id']], + ], + ]; + $new_aftersale = OrderAftersaleService::OrderAftersaleList($data_params); + $this->assign('new_aftersale_data', empty($new_aftersale['data'][0]) ? [] : $new_aftersale['data'][0]); + + // 静态数据 + $this->assign('common_order_aftersale_type_list', lang('common_order_aftersale_type_list')); + + $this->assign('params', $params); + return $this->fetch(); + } else { + $this->assign('msg', $ret['msg']); + return $this->fetch('public/tips_error'); + } + } + + /** + * 申请售后创建 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-05-23 + * @desc description + */ + public function Create() + { + $params = input(); + $params['user'] = $this->user; + return OrderAftersaleService::AftersaleCreate($params); + } + + /** + * 用户退货 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-05-23 + * @desc description + */ + public function Delivery() + { + $params = input(); + $params['user'] = $this->user; + return OrderAftersaleService::AftersaleDelivery($params); + } + + /** + * 订单取消 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-30 + * @desc description + */ + public function Cancel() + { + if(input('post.')) + { + $params = input('post.'); + $params['user'] = $this->user; + return OrderAftersaleService::AftersaleCancel($params); + } else { + $this->assign('msg', '非法访问'); + return $this->fetch('public/tips_error'); + } + } +} +?> \ No newline at end of file diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php index 611cf51b4..64ed17bd2 100755 --- a/application/index/controller/Search.php +++ b/application/index/controller/Search.php @@ -47,7 +47,7 @@ class Search extends Common $this->params['screening_price_id'] = intval(input('screening_price_id', 0)); // 搜索关键字 - $this->params['keywords'] = str_replace(['?', ' ', '+', '-'], '', trim(input('keywords'))); + $this->params['wd'] = str_replace(['?', ' ', '+', '-'], '', trim(input('wd'))); // 排序方式 $this->params['order_by_field'] = input('order_by_field', 'default'); @@ -68,11 +68,11 @@ class Search extends Common { if(input('post.')) { - $p = empty($this->params['keywords']) ? [] : ['keywords'=>$this->params['keywords']]; + $p = empty($this->params['wd']) ? [] : ['wd'=>$this->params['wd']]; return redirect(MyUrl('index/search/index', $p)); } else { // 品牌列表 - $this->assign('brand_list', BrandService::CategoryBrandList(['category_id'=>$this->params['category_id'], 'keywords'=>$this->params['keywords']])); + $this->assign('brand_list', BrandService::CategoryBrandList(['category_id'=>$this->params['category_id'], 'keywords'=>$this->params['wd']])); // 商品分类 $this->assign('category_list', SearchService::GoodsCategoryList(['category_id'=>$this->params['category_id']])); @@ -99,8 +99,9 @@ class Search extends Common * @desc description */ public function GoodsList() - { + { // 获取商品列表 + $this->params['keywords'] = $this->params['wd']; $ret = SearchService::GoodsList($this->params); if(empty($ret['data']['data'])) { diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html index 4023ac7d1..62302dac2 100755 --- a/application/index/view/default/order/index.html +++ b/application/index/view/default/order/index.html @@ -185,7 +185,7 @@ {{if in_array($order['status'], [2,3,4])}} - 申请售后 + 申请售后 {{/if}} {{if $keys eq 0}} diff --git a/application/index/view/default/order/aftersale.html b/application/index/view/default/orderaftersale/aftersale.html similarity index 80% rename from application/index/view/default/order/aftersale.html rename to application/index/view/default/orderaftersale/aftersale.html index 688ce1522..034627c2c 100644 --- a/application/index/view/default/order/aftersale.html +++ b/application/index/view/default/orderaftersale/aftersale.html @@ -120,64 +120,63 @@
-
-
-
- + {{foreach $common_order_aftersale_type_list as $v}} +
+
+
+ +
+

{{$v.name}}

+

{{$v.desc}}

-

仅退款

-

未收到货(未签收),协商同意前提下

-
-
-
-
- -
-

退货退款

-

已收到货,需要退换已收到的货物

-
-
+ {{/foreach}}
- {{include file="order/aftersale_step" /}} + {{include file="orderaftersale/step" /}}
- {{include file="order/aftersale_create" /}} + {{include file="orderaftersale/create" /}}
{{else /}} - {{include file="order/aftersale_step" /}} + {{include file="orderaftersale/step" /}} {{switch $new_aftersale_data.status}} {{case 0}}
- 当前订单商品售后已提交申请，等待管理员确认中！详情查看 + 当前订单商品售后已提交申请，等待管理员确认中！详情查看
{{/case}} {{case 1}} -
-
- {{include file="order/aftersale_delivery" /}} + {{if $new_aftersale_data['type'] eq 1}} +
+
+ {{include file="orderaftersale/delivery" /}} +
-
+ {{else /}} +
+ 当前订单商品售后已提交申请，等待管理员确认中！详情查看 +
+ {{/if}} {{/case}} {{case 2}}
- 当前订单商品售后已退货，等待管理员审核中！详情查看 + 当前订单商品售后已退货，等待管理员审核中！详情查看
{{/case}} {{case 3}}
- 当前订单商品售后已处理结束！详情查看 + 当前订单商品售后已处理结束！详情查看
{{/case}} {{/switch}} diff --git a/application/index/view/default/order/aftersale_create.html b/application/index/view/default/orderaftersale/create.html similarity index 97% rename from application/index/view/default/order/aftersale_create.html rename to application/index/view/default/orderaftersale/create.html index b2e59ad77..e46517d31 100644 --- a/application/index/view/default/order/aftersale_create.html +++ b/application/index/view/default/orderaftersale/create.html @@ -1,4 +1,4 @@ -
+
diff --git a/application/index/view/default/orderaftersale/index.html b/application/index/view/default/orderaftersale/index.html new file mode 100644 index 000000000..3185bb699 --- /dev/null +++ b/application/index/view/default/orderaftersale/index.html @@ -0,0 +1,174 @@ +{{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" /}} + + + +
+
+ + +
+
+ + + + +
+ +
+ + + + + + + + + + + +
+ 类型： + + + 状态： + +
+ 退款： + + + + 清除条件 +
+ + + + +
+ + + + + + + + + + + + {{if !empty($data_list)}} + {{foreach $data_list as $v}} + + + + + + + + {{/foreach}} + {{/if}} + +
申请信息凭证状态快递信息操作
+ 类型：{{$v.type_text}}
+ 原因：{{$v.reason}}
+ 数量：{{$v.number}}
+ 金额：{{$v.price}}
+ 说明：{{$v.msg}}
+ 时间：{{$v.apply_time_time}} + 		+ {{if !empty($v['images'])}} +
+
    + {{foreach $v.images as $img}} +
  • + +
    • + {{/foreach}} +
+
+ {{/if}} + 		+

{{$v.status_text}}

+ {{if $v['status'] eq 3 and !empty($v['refundment_text'])}} + {{$v.refundment_text}} + {{/if}} + {{if $v['status'] eq 4 and !empty($v['refuse_reason'])}} + {{$v.refuse_reason}} + {{/if}} + 		+ {{if $v['type'] eq 1 and in_array($v['status'], [2,3])}} + 快递：{{$v.express_name}}
+ 单号：{{$v.express_number}}
+ 时间：{{$v.delivery_time_time}} + {{/if}} + 		+ {{if in_array($v['status'], [0,3])}} + + {{/if}} + 详情 +
+ + {{if empty($data_list)}} +
没有相关数据
+ {{/if}} +
+ + + {{if !empty($data_list)}} + {{$page_html|raw}} + {{/if}} +
+
+ +
+ + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/index/view/default/order/aftersale_step.html b/application/index/view/default/orderaftersale/step.html similarity index 97% rename from application/index/view/default/order/aftersale_step.html rename to application/index/view/default/orderaftersale/step.html index 0b90567bf..0752f03d5 100644 --- a/application/index/view/default/order/aftersale_step.html +++ b/application/index/view/default/orderaftersale/step.html @@ -5,7 +5,7 @@ -
  • +
  • 2 管理员审核 {{if isset($new_aftersale_data['status']) and $new_aftersale_data['status'] elt 3 and $new_aftersale_data['status'] egt 0}} diff --git a/application/index/view/default/public/footer_nav.html b/application/index/view/default/public/footer_nav.html index 43c3d202e..594083834 100755 --- a/application/index/view/default/public/footer_nav.html +++ b/application/index/view/default/public/footer_nav.html @@ -90,7 +90,7 @@ {{$Think.APPLICATION_VERSION}}

    - {{:MyC('home_site_icp')}} + {{:MyC('home_site_icp')}}

    • diff --git a/application/index/view/default/public/nav_search.html b/application/index/view/default/public/nav_search.html index 1ab20fb06..07d22a787 100755 --- a/application/index/view/default/public/nav_search.html +++ b/application/index/view/default/public/nav_search.html @@ -14,13 +14,13 @@
    - +
    {{if !empty($home_search_keywords)}}
      {{foreach $home_search_keywords as $v}} -
    • {{$v}}
      • +
    • {{$v}}
      • {{/foreach}}
    {{/if}} diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php index 2e1c3ccad..0741587ec 100755 --- a/application/lang/zh-cn.php +++ b/application/lang/zh-cn.php @@ -294,6 +294,29 @@ return array( 4 => array('value' => 4, 'name' => '拨打电话'), ), + // 订单售后类型 + 'common_order_aftersale_type_list' => array( + 0 => array('value' => 0, 'name' => '仅退款', 'desc' => '未收到货(未签收),协商同意前提下', 'icon' => 'am-icon-random', 'class' => 'am-fl'), + 1 => array('value' => 1, 'name' => '退款退货', 'desc' => '已收到货,需要退换已收到的货物', 'icon' => 'am-icon-retweet', 'class' => 'am-fr'), + ), + + // 订单售后状态 + 'common_order_aftersale_status_list' => array( + 0 => array('value' => 0, 'name' => '待确认'), + 1 => array('value' => 1, 'name' => '待退货'), + 2 => array('value' => 2, 'name' => '待审核'), + 3 => array('value' => 3, 'name' => '已完成'), + 4 => array('value' => 4, 'name' => '已拒绝'), + 5 => array('value' => 5, 'name' => '已取消'), + ), + + // 订单售后退款方式 + 'common_order_aftersale_refundment_list' => array( + 0 => array('value' => 0, 'name' => '原路退回'), + 1 => array('value' => 1, 'name' => '退至钱包'), + 2 => array('value' => 2, 'name' => '手动处理'), + ), + // 色彩值 'common_color_list' => array( diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index 0f0d030f2..1ab5e9558 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -710,6 +710,13 @@ class NavigationService 'contains' => ['orderindex', 'orderdetail', 'ordercomments'], 'icon' => 'am-icon-th-list', ], + [ + 'name' => '订单售后', + 'url' => MyUrl('index/orderaftersale/index'), + 'is_show' => 1, + 'contains' => ['orderaftersaleindex', 'orderaftersaleaftersale'], + 'icon' => 'am-icon-puzzle-piece', + ], [ 'name' => '我的收藏', 'url' => MyUrl('index/userfavor/goods'), diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php index 82e4a6a2f..b1aadfae3 100644 --- a/application/service/OrderAftersaleService.php +++ b/application/service/OrderAftersaleService.php @@ -24,22 +24,6 @@ use app\service\ResourcesService; */ class OrderAftersaleService { - // 订单售后类型 - public static $order_aftersale_type_list = [ - 0 => '仅退款', - 1 => '退款退货', - ]; - - // 订单售后状态 - public static $order_aftersale_status_list = [ - 0 => '待确认', - 1 => '待退货', - 2 => '待审核', - 3 => '已完成', - 4 => '已拒绝', - 5 => '已取消', - ]; - /** * 获取一条订单,附带一条指定商品 * @author Devil @@ -166,7 +150,7 @@ class OrderAftersaleService ['order_id', '=', intval($params['order_id'])], ['goods_id', '=', intval($params['goods_id'])], ['user_id', '=', $params['user']['id']], - ['status', '<=', 1], + ['status', '<=', 2], ]; $count = (int) Db::name('OrderAftersale')->where($where)->count(); if($count > 0) @@ -177,9 +161,8 @@ class OrderAftersaleService // 获取历史申请售后条件 $where = [ ['order_id', '=', intval($params['order_id'])], - ['goods_id', '=', intval($params['goods_id'])], ['user_id', '=', $params['user']['id']], - ['status', '<=', 2], + ['status', '<=', 3], ]; // 退款金额 @@ -196,6 +179,7 @@ class OrderAftersaleService $number = isset($params['number']) ? intval($params['number']) : 0; // 历史退货数量 + $where[] = ['goods_id', '=', intval($params['goods_id'])]; $history_number = (int) Db::name('OrderAftersale')->where($where)->sum('number'); if($params['type'] == 1) { @@ -217,6 +201,7 @@ class OrderAftersaleService // 数据 $data = [ + 'order_no' => $order['data']['order_no'], 'type' => intval($params['type']), 'order_id' => intval($params['order_id']), 'goods_id' => intval($params['goods_id']), @@ -226,6 +211,7 @@ class OrderAftersaleService 'reason' => $params['reason'], 'msg' => $params['msg'], 'images' => json_encode($images), + 'status' => ($params['type'] == 0) ? 2 : 0, 'add_time' => time(), 'apply_time' => time(), ]; @@ -296,7 +282,8 @@ class OrderAftersaleService } if($aftersale['status'] != 1) { - return DataReturn('该售后订单状态不可操作['.self::$order_aftersale_status_list[$aftersale['status']].']', -10); + $common_order_aftersale_status_list = lang('common_order_aftersale_status_list'); + return DataReturn('该售后订单状态不可操作['.$common_order_aftersale_status_list[$aftersale['status']]['name'].']', -10); } // 数据 @@ -315,7 +302,7 @@ class OrderAftersaleService } /** - * 获取订单商品售后纪录列表 + * 获取订单售后纪录列表 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -323,7 +310,7 @@ class OrderAftersaleService * @desc description * @param [array] $params [输入参数] */ - public static function OrderGoodsAftersaleList($params = []) + public static function OrderAftersaleList($params = []) { $where = empty($params['where']) ? [] : $params['where']; $m = isset($params['m']) ? intval($params['m']) : 0; @@ -335,6 +322,9 @@ class OrderAftersaleService $data = Db::name('OrderAftersale')->field($field)->where($where)->limit($m, $n)->order($order_by)->select(); if(!empty($data)) { + $common_order_aftersale_type_list = lang('common_order_aftersale_type_list'); + $common_order_aftersale_status_list = lang('common_order_aftersale_status_list'); + $common_order_aftersale_refundment_list = lang('common_order_aftersale_refundment_list'); foreach($data as &$v) { // 用户信息 @@ -347,10 +337,13 @@ class OrderAftersaleService } // 类型 - $v['type_text'] = self::$order_aftersale_type_list[$v['type']]; + $v['type_text'] = $common_order_aftersale_type_list[$v['type']]['name']; // 状态 - $v['status_text'] = self::$order_aftersale_status_list[$v['status']]; + $v['status_text'] = $common_order_aftersale_status_list[$v['status']]['name']; + + // 退款方式 + $v['refundment_text'] = $common_order_aftersale_refundment_list[$v['refundment']]['name']; // 图片 if(!empty($v['images'])) @@ -381,6 +374,10 @@ class OrderAftersaleService $v['audit_time_time'] = empty($v['audit_time']) ? null : date('Y-m-d H:i:s', $v['audit_time']); $v['audit_time_date'] = empty($v['audit_time']) ? null : date('Y-m-d', $v['audit_time']); + // 取消时间 + $v['cancel_time_time'] = empty($v['cancel_time']) ? null : date('Y-m-d H:i:s', $v['cancel_time']); + $v['cancel_time_date'] = empty($v['cancel_time']) ? null : date('Y-m-d', $v['cancel_time']); + // 添加时间 $v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']); $v['add_time_date'] = date('Y-m-d', $v['add_time']); @@ -393,5 +390,150 @@ class OrderAftersaleService } return DataReturn('获取成功', 0, $data); } + + /** + * 订单售后列表条件 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-29 + * @desc description + * @param [array] $params [输入参数] + */ + public static function OrderAftersaleListWhere($params = []) + { + // 用户类型 + $user_type = isset($params['user_type']) ? $params['user_type'] : 'user'; + + // 条件初始化 + $where = []; + + // id + if(!empty($params['id'])) + { + $where[] = ['id', '=', intval($params['id'])]; + } + + // 用户类型 + if(isset($params['user_type']) && $params['user_type'] == 'user') + { + // 用户id + if(!empty($params['user'])) + { + $where[] = ['user_id', '=', $params['user']['id']]; + } + } + + // 关键字根据用户筛选 + if(!empty($params['keywords'])) + { + if(empty($params['user'])) + { + $user_ids = Db::name('User')->where('username|nickname|mobile|email', '=', $params['keywords'])->column('id'); + if(!empty($user_ids)) + { + $where[] = ['user_id', 'in', $user_ids]; + } else { + // 无数据条件，走单号条件 + $where[] = ['order_no', '=', $params['keywords']]; + } + } else { + // 用户走关键字 + $where[] = ['order_no', '=', $params['keywords']]; + } + } + + // 是否更多条件 + if(isset($params['is_more']) && $params['is_more'] == 1) + { + // 等值 + if(isset($params['type']) && $params['type'] > -1) + { + $where[] = ['type', '=', intval($params['type'])]; + } + if(isset($params['refundment']) && $params['refundment'] > -1) + { + $where[] = ['refundment', '=', intval($params['refundment'])]; + } + if(isset($params['status']) && $params['status'] > -1) + { + $where[] = ['status', '=', intval($params['status'])]; + } + if(!empty($params['express_number'])) + { + $where[] = ['express_number', '=', $params['express_number']]; + } + + // 时间 + if(!empty($params['time_start'])) + { + $where[] = ['add_time', '>', strtotime($params['time_start'])]; + } + if(!empty($params['time_end'])) + { + $where[] = ['add_time', '<', strtotime($params['time_end'])]; + } + } + return $where; + } + + /** + * 订单售后总数 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-29 + * @desc description + * @param [array] $where [条件] + */ + public static function OrderAftersaleTotal($where = []) + { + return (int) Db::name('OrderAftersale')->where($where)->count(); + } + + /** + * 订单售后取消 + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + * @param [array] $params [输入参数] + */ + public static function AftersaleCancel($params = []) + { + // 请求参数 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'id', + 'error_msg' => '操作id有误', + ], + [ + 'checked_type' => 'empty', + 'is_checked' => 2, + 'key_name' => 'user', + 'error_msg' => '用户信息有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 数据更新 + $where = [ + 'id' => intval($params['id']), + ]; + if(!empty($params['user']['id'])) + { + $where['user_id'] = $params['user']['id']; + } + if(Db::name('OrderAftersale')->where($where)->update(['status'=>5, 'cancel_time'=>time(), 'upd_time'=>time()])) + { + return DataReturn('取消成功'); + } + return DataReturn('取消失败', -100); + } } ?> \ No newline at end of file diff --git a/application/service/SearchService.php b/application/service/SearchService.php index 615c6ea35..a03a466ba 100755 --- a/application/service/SearchService.php +++ b/application/service/SearchService.php @@ -163,14 +163,19 @@ class SearchService $screening_price = $price['min_price'].'-'.$price['max_price']; } - // 参数 - $params['screening_price'] = $screening_price; - $params['ymd'] = date('Ymd'); - $params['add_time'] = time(); - unset($params['screening_price_id'], $params['page'], $params['max_price'], $params['min_price']); - // 添加日志 - Db::name('SearchHistory')->insert($params); + $data = [ + 'user_id' => isset($params['user_id']) ? intval($params['user_id']) : 0, + 'brand_id' => isset($params['brand_id']) ? intval($params['brand_id']) : 0, + 'category_id' => isset($params['category_id']) ? intval($params['category_id']) : 0, + 'keywords' => empty($params['keywords']) ? '' : $params['keywords'], + 'order_by_field' => empty($params['order_by_field']) ? '' : $params['order_by_field'], + 'order_by_type' => empty($params['order_by_type']) ? '' : $params['order_by_type'], + 'screening_price' => $screening_price, + 'ymd' => date('Ymd'), + 'add_time' => time(), + ]; + Db::name('SearchHistory')->insert($data); } /** diff --git a/config/shopxo.sql b/config/shopxo.sql index b98aa015f..3f989906b 100644 --- a/config/shopxo.sql +++ b/config/shopxo.sql @@ -11,7 +11,7 @@ Target Server Version : 50722 File Encoding : utf-8 - Date: 05/23/2019 17:56:46 PM + Date: 05/24/2019 13:56:51 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', '1693', '步', '/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', '7', '365', '/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', '38', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '', '', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '534', '步', '/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', '169', '', '/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', '278', '', '/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', '1', '253', '', '/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', '1', '141', '', '/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', '35', '', '/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', '108', '', '/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', '203', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '', '', '0', '1547455375', '1557027030'), ('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', '104', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '', '', '0', '1547455700', '1558596805'), ('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', '414', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '连衣裙,裙子', '夏季连衣裙，瘦身裙子', '0', '1547456230', '1557740037'); +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', '28', '', '/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', '1693', '步', '/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', '7', '365', '/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', '38', '', '/static/upload/images/goods/2019/01/14/1547451909951171.jpg', '', '', '0', '1547452007', '1547452007'), ('4', '1', 'Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓', '', '', '0', '534', '步', '/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', '169', '', '/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', '278', '', '/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', '1', '253', '', '/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', '1', '141', '', '/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', '35', '', '/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', '108', '', '/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', '203', '', '/static/upload/images/goods/2019/01/14/1547455222990904.jpg', '', '', '0', '1547455375', '1557027030'), ('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', '104', '', '/static/upload/images/goods/2019/01/14/1547455566118614.jpg', '', '', '0', '1547455700', '1558596805'), ('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', '414', '', '/static/upload/images/goods/2019/01/14/1547455890402147.jpg', '连衣裙,裙子', '夏季连衣裙，瘦身裙子', '0', '1547456230', '1557740037'); COMMIT; -- ---------------------------- @@ -380,13 +380,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=24 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; +) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='用户商品浏览'; -- ---------------------------- -- Records of `s_goods_browse` -- ---------------------------- BEGIN; -INSERT INTO `s_goods_browse` VALUES ('1', '7', '91', '1554803230', '1554805470'), ('2', '11', '90', '1554966398', '1558596810'), ('3', '10', '90', '1555048568', '1558491367'), ('4', '9', '90', '1555058265', '1556156966'), ('5', '2', '90', '1555157678', '1558604747'), ('6', '12', '90', '1555159096', '1558596699'), ('7', '5', '90', '1555402359', '1557909925'), ('8', '7', '90', '1555406985', '1557909972'), ('9', '4', '90', '1555491079', '1556517497'), ('10', '6', '90', '1555494278', '1558425258'), ('11', '8', '91', '1556075952', '1556075952'), ('12', '3', '90', '1556077528', '1558081801'), ('13', '8', '90', '1557209457', '1558081999'), ('14', '4', '92', '1557818775', '1557818778'), ('15', '7', '92', '1557826700', '1557892156'), ('16', '2', '92', '1557828258', '1557888725'), ('17', '11', '92', '1557884597', '1557886554'), ('18', '5', '92', '1557887694', '1557887694'), ('19', '6', '93', '1558080598', '1558080598'), ('20', '7', '93', '1558081594', '1558081594'), ('21', '4', '96', '1558601285', '1558601622'), ('22', '7', '96', '1558601655', '1558601710'), ('23', '2', '96', '1558601713', '1558601713'); +INSERT INTO `s_goods_browse` VALUES ('1', '7', '91', '1554803230', '1554805470'), ('2', '11', '90', '1554966398', '1558596810'), ('3', '10', '90', '1555048568', '1558491367'), ('4', '9', '90', '1555058265', '1556156966'), ('5', '2', '90', '1555157678', '1558604747'), ('6', '12', '90', '1555159096', '1558596699'), ('7', '5', '90', '1555402359', '1557909925'), ('8', '7', '90', '1555406985', '1557909972'), ('9', '4', '90', '1555491079', '1556517497'), ('10', '6', '90', '1555494278', '1558425258'), ('11', '8', '91', '1556075952', '1556075952'), ('12', '3', '90', '1556077528', '1558081801'), ('13', '8', '90', '1557209457', '1558081999'), ('14', '4', '92', '1557818775', '1557818778'), ('15', '7', '92', '1557826700', '1557892156'), ('16', '2', '92', '1557828258', '1557888725'), ('17', '11', '92', '1557884597', '1557886554'), ('18', '5', '92', '1557887694', '1557887694'), ('19', '6', '93', '1558080598', '1558080598'), ('20', '7', '93', '1558081594', '1558081594'), ('21', '4', '96', '1558601285', '1558601622'), ('22', '7', '96', '1558601655', '1558601710'), ('23', '2', '96', '1558601713', '1558601713'), ('24', '1', '90', '1558605496', '1558605496'); COMMIT; -- ---------------------------- @@ -659,7 +659,7 @@ CREATE TABLE `s_message` ( -- Records of `s_message` -- ---------------------------- BEGIN; -INSERT INTO `s_message` VALUES ('1', '100', '订单支付', '订单支付成功，金额7.02元', '2', '1', '0', '0', '0', '0', '1553826950'), ('2', '100', '订单支付', '订单支付成功，金额10.01元', '3', '1', '0', '0', '0', '0', '1553827061'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554188629'), ('4', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554195345'), ('5', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554256553'), ('6', '108', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554270624'), ('7', '114', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554343971'), ('8', '115', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554344687'), ('9', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554962882'), ('10', '90', '订单支付', '订单支付成功，金额267.74元', '1', '1', '0', '1', '0', '0', '1554966442'), ('11', '90', '订单发货', '订单已发货', '1', '1', '0', '1', '0', '0', '1554966457'), ('12', '90', '积分变动', '订单商品完成赠送积分增加1', '0', '0', '0', '1', '0', '0', '1554966464'), ('13', '90', '订单收货', '订单收货成功', '1', '1', '0', '1', '0', '0', '1554966464'), ('14', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555244676'), ('15', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555903059'), ('16', '90', '订单支付', '订单支付成功，金额9231.9元', '3', '1', '0', '1', '0', '0', '1556258500'), ('17', '90', '订单支付', '订单支付成功，金额6600元', '4', '1', '0', '1', '0', '0', '1556258528'), ('18', '90', '订单支付', '订单支付成功，金额248元', '5', '1', '0', '1', '0', '0', '1556258552'), ('19', '90', '订单支付', '订单支付成功，金额466元', '6', '1', '0', '1', '0', '0', '1556259546'), ('20', '90', '订单支付', '订单支付成功，金额238元', '7', '1', '0', '1', '0', '0', '1556260768'), ('21', '90', '订单支付', '订单支付成功，金额228元', '8', '1', '0', '1', '0', '0', '1556260794'), ('22', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1556415732'), ('23', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1556603278'), ('24', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557022304'), ('25', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557138595'), ('26', '90', '账户余额变动', '管理员操作[ 赠送金额增加1.00元 ]', '1', '0', '0', '1', '0', '0', '1557282760'), ('27', '90', '账户余额变动', '管理员操作[ 赠送金额增加1.00元 ]', '1', '0', '0', '1', '0', '0', '1557282981'), ('28', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557298489'), ('29', '90', '账户余额变动', '用户提现申请[ 减少有效金额1.00元 ]', '2', '0', '0', '1', '0', '0', '1557308295'), ('30', '90', '账户余额变动', '管理员操作[ 赠送金额增加2.00元 ]', '1', '0', '0', '1', '0', '0', '1557310710'), ('31', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少0.80元 ]', '2', '3', '0', '1', '0', '0', '1557470171'), ('32', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 有效金额退回0.20元 ]', '2', '3', '0', '1', '0', '0', '1557470171'), ('33', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少0.89元 ]', '2', '3', '0', '1', '0', '0', '1557470385'), ('34', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 有效金额退回0.11元 ]', '2', '3', '0', '1', '0', '0', '1557470385'), ('35', '90', '账户余额变动', '管理员操作[ 冻结金额增加0.80元 ]', '1', '0', '0', '1', '0', '0', '1557470491'), ('36', '90', '账户余额变动', '管理员操作[ 有效金额增加0.69元 ]', '1', '0', '0', '1', '0', '0', '1557470501'), ('37', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少0.79元 ]', '2', '3', '0', '1', '0', '0', '1557470562'), ('38', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 冻结金额退回至有效金额0.21元 ]', '2', '3', '0', '1', '0', '0', '1557470562'), ('39', '90', '账户余额变动', '管理员操作[ 有效金额减少0.21元 ]', '1', '0', '0', '1', '0', '0', '1557470649'), ('40', '90', '账户余额变动', '管理员操作[ 冻结金额增加1.00元 ]', '1', '0', '0', '1', '0', '0', '1557470649'), ('41', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470683'), ('42', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 冻结金额退回至有效金额0.01元 ]', '2', '3', '0', '1', '0', '0', '1557470683'), ('43', '90', '账户余额变动', '管理员操作[ 冻结金额增加10.00元 ]', '1', '0', '0', '1', '0', '0', '1557470736'), ('44', '90', '账户余额变动', ' [ 提现申请失败 , 有效金额退回1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470799'), ('45', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额释放 1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470799'), ('46', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额退回至有效金额1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470902'), ('47', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额释放 1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470902'), ('48', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额释放 1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470975'), ('49', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额退回至有效金额1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470975'), ('50', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557725295'), ('51', '90', '订单发货', '订单已发货', '3', '1', '0', '1', '0', '0', '1557739690'), ('52', '90', '积分变动', '订单商品完成赠送积分增加11', '0', '0', '0', '1', '0', '0', '1557740031'), ('53', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557740031'), ('54', '90', '积分变动', '订单商品完成赠送积分增加65', '0', '0', '0', '1', '0', '0', '1557740031'), ('55', '90', '订单收货', '订单收货成功', '3', '1', '0', '1', '0', '0', '1557740031'), ('56', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557899840'), ('57', '90', '订单支付', '订单支付成功，金额5280元', '12', '1', '0', '1', '0', '0', '1557905231'), ('58', '90', '订单发货', '订单已发货', '12', '1', '0', '1', '0', '0', '1557905242'), ('59', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905246'), ('60', '90', '订单收货', '订单收货成功', '12', '1', '0', '1', '0', '0', '1557905246'), ('61', '90', '订单发货', '订单已发货', '4', '1', '0', '1', '0', '0', '1557905259'), ('62', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905263'), ('63', '90', '订单收货', '订单收货成功', '4', '1', '0', '1', '0', '0', '1557905263'), ('64', '90', '订单支付', '订单支付成功，金额4400元', '13', '1', '0', '1', '0', '0', '1557905410'), ('65', '90', '订单发货', '订单已发货', '13', '1', '0', '1', '0', '0', '1557905420'), ('66', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905423'), ('67', '90', '订单收货', '订单收货成功', '13', '1', '0', '1', '0', '0', '1557905423'), ('68', '90', '订单支付', '订单支付成功，金额3840元', '14', '1', '0', '1', '0', '0', '1557905450'), ('69', '90', '订单发货', '订单已发货', '14', '1', '0', '1', '0', '0', '1557905464'), ('70', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905469'), ('71', '90', '订单收货', '订单收货成功', '14', '1', '0', '1', '0', '0', '1557905469'), ('72', '90', '订单支付', '订单支付成功，金额5280元', '15', '1', '0', '1', '0', '0', '1557905494'), ('73', '90', '订单发货', '订单已发货', '15', '1', '0', '1', '0', '0', '1557905501'), ('74', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905506'), ('75', '90', '订单收货', '订单收货成功', '15', '1', '0', '1', '0', '0', '1557905506'), ('76', '90', '订单支付', '订单支付成功，金额5280元', '16', '1', '0', '1', '0', '0', '1557905531'), ('77', '90', '订单发货', '订单已发货', '16', '1', '0', '1', '0', '0', '1557905536'), ('78', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905539'), ('79', '90', '订单收货', '订单收货成功', '16', '1', '0', '1', '0', '0', '1557905539'), ('80', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1557985469'), ('81', '93', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558002429'), ('82', '93', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558059358'), ('83', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558081617'), ('84', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558346372'), ('85', '96', '订单支付', '订单支付成功，金额1998.23元', '17', '1', '0', '0', '0', '0', '1558601451'), ('86', '96', '订单支付', '订单支付成功，金额1997.22元', '18', '1', '0', '0', '0', '0', '1558601540'), ('87', '96', '订单支付', '订单支付成功，金额1997.84元', '19', '1', '0', '0', '0', '0', '1558601636'), ('88', '96', '订单支付', '订单支付成功，金额5937.39元', '20', '1', '0', '0', '0', '0', '1558601785'), ('89', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1558602460'); +INSERT INTO `s_message` VALUES ('1', '100', '订单支付', '订单支付成功，金额7.02元', '2', '1', '0', '0', '0', '0', '1553826950'), ('2', '100', '订单支付', '订单支付成功，金额10.01元', '3', '1', '0', '0', '0', '0', '1553827061'), ('3', '77', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554188629'), ('4', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554195345'), ('5', '104', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554256553'), ('6', '108', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554270624'), ('7', '114', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554343971'), ('8', '115', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1554344687'), ('9', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1554962882'), ('10', '90', '订单支付', '订单支付成功，金额267.74元', '1', '1', '0', '1', '0', '0', '1554966442'), ('11', '90', '订单发货', '订单已发货', '1', '1', '0', '1', '0', '0', '1554966457'), ('12', '90', '积分变动', '订单商品完成赠送积分增加1', '0', '0', '0', '1', '0', '0', '1554966464'), ('13', '90', '订单收货', '订单收货成功', '1', '1', '0', '1', '0', '0', '1554966464'), ('14', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555244676'), ('15', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1555903059'), ('16', '90', '订单支付', '订单支付成功，金额9231.9元', '3', '1', '0', '1', '0', '0', '1556258500'), ('17', '90', '订单支付', '订单支付成功，金额6600元', '4', '1', '0', '1', '0', '0', '1556258528'), ('18', '90', '订单支付', '订单支付成功，金额248元', '5', '1', '0', '1', '0', '0', '1556258552'), ('19', '90', '订单支付', '订单支付成功，金额466元', '6', '1', '0', '1', '0', '0', '1556259546'), ('20', '90', '订单支付', '订单支付成功，金额238元', '7', '1', '0', '1', '0', '0', '1556260768'), ('21', '90', '订单支付', '订单支付成功，金额228元', '8', '1', '0', '1', '0', '0', '1556260794'), ('22', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1556415732'), ('23', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1556603278'), ('24', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557022304'), ('25', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557138595'), ('26', '90', '账户余额变动', '管理员操作[ 赠送金额增加1.00元 ]', '1', '0', '0', '1', '0', '0', '1557282760'), ('27', '90', '账户余额变动', '管理员操作[ 赠送金额增加1.00元 ]', '1', '0', '0', '1', '0', '0', '1557282981'), ('28', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557298489'), ('29', '90', '账户余额变动', '用户提现申请[ 减少有效金额1.00元 ]', '2', '0', '0', '1', '0', '0', '1557308295'), ('30', '90', '账户余额变动', '管理员操作[ 赠送金额增加2.00元 ]', '1', '0', '0', '1', '0', '0', '1557310710'), ('31', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少0.80元 ]', '2', '3', '0', '1', '0', '0', '1557470171'), ('32', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 有效金额退回0.20元 ]', '2', '3', '0', '1', '0', '0', '1557470171'), ('33', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少0.89元 ]', '2', '3', '0', '1', '0', '0', '1557470385'), ('34', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 有效金额退回0.11元 ]', '2', '3', '0', '1', '0', '0', '1557470385'), ('35', '90', '账户余额变动', '管理员操作[ 冻结金额增加0.80元 ]', '1', '0', '0', '1', '0', '0', '1557470491'), ('36', '90', '账户余额变动', '管理员操作[ 有效金额增加0.69元 ]', '1', '0', '0', '1', '0', '0', '1557470501'), ('37', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少0.79元 ]', '2', '3', '0', '1', '0', '0', '1557470562'), ('38', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 冻结金额退回至有效金额0.21元 ]', '2', '3', '0', '1', '0', '0', '1557470562'), ('39', '90', '账户余额变动', '管理员操作[ 有效金额减少0.21元 ]', '1', '0', '0', '1', '0', '0', '1557470649'), ('40', '90', '账户余额变动', '管理员操作[ 冻结金额增加1.00元 ]', '1', '0', '0', '1', '0', '0', '1557470649'), ('41', '90', '账户余额变动', ' [ 提现申请成功 , 冻结金额减少1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470683'), ('42', '90', '账户余额变动', ' [ 提现申请成功 , 部分金额未打款 , 冻结金额退回至有效金额0.01元 ]', '2', '3', '0', '1', '0', '0', '1557470683'), ('43', '90', '账户余额变动', '管理员操作[ 冻结金额增加10.00元 ]', '1', '0', '0', '1', '0', '0', '1557470736'), ('44', '90', '账户余额变动', ' [ 提现申请失败 , 有效金额退回1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470799'), ('45', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额释放 1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470799'), ('46', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额退回至有效金额1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470902'), ('47', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额释放 1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470902'), ('48', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额释放 1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470975'), ('49', '90', '账户余额变动', ' [ 提现申请失败 , 冻结金额退回至有效金额1.00元 ]', '2', '3', '0', '1', '0', '0', '1557470975'), ('50', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557725295'), ('51', '90', '订单发货', '订单已发货', '3', '1', '0', '1', '0', '0', '1557739690'), ('52', '90', '积分变动', '订单商品完成赠送积分增加11', '0', '0', '0', '1', '0', '0', '1557740031'), ('53', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557740031'), ('54', '90', '积分变动', '订单商品完成赠送积分增加65', '0', '0', '0', '1', '0', '0', '1557740031'), ('55', '90', '订单收货', '订单收货成功', '3', '1', '0', '1', '0', '0', '1557740031'), ('56', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1557899840'), ('57', '90', '订单支付', '订单支付成功，金额5280元', '12', '1', '0', '1', '0', '0', '1557905231'), ('58', '90', '订单发货', '订单已发货', '12', '1', '0', '1', '0', '0', '1557905242'), ('59', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905246'), ('60', '90', '订单收货', '订单收货成功', '12', '1', '0', '1', '0', '0', '1557905246'), ('61', '90', '订单发货', '订单已发货', '4', '1', '0', '1', '0', '0', '1557905259'), ('62', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905263'), ('63', '90', '订单收货', '订单收货成功', '4', '1', '0', '1', '0', '0', '1557905263'), ('64', '90', '订单支付', '订单支付成功，金额4400元', '13', '1', '0', '1', '0', '0', '1557905410'), ('65', '90', '订单发货', '订单已发货', '13', '1', '0', '1', '0', '0', '1557905420'), ('66', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905423'), ('67', '90', '订单收货', '订单收货成功', '13', '1', '0', '1', '0', '0', '1557905423'), ('68', '90', '订单支付', '订单支付成功，金额3840元', '14', '1', '0', '1', '0', '0', '1557905450'), ('69', '90', '订单发货', '订单已发货', '14', '1', '0', '1', '0', '0', '1557905464'), ('70', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905469'), ('71', '90', '订单收货', '订单收货成功', '14', '1', '0', '1', '0', '0', '1557905469'), ('72', '90', '订单支付', '订单支付成功，金额5280元', '15', '1', '0', '1', '0', '0', '1557905494'), ('73', '90', '订单发货', '订单已发货', '15', '1', '0', '1', '0', '0', '1557905501'), ('74', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905506'), ('75', '90', '订单收货', '订单收货成功', '15', '1', '0', '1', '0', '0', '1557905506'), ('76', '90', '订单支付', '订单支付成功，金额5280元', '16', '1', '0', '1', '0', '0', '1557905531'), ('77', '90', '订单发货', '订单已发货', '16', '1', '0', '1', '0', '0', '1557905536'), ('78', '90', '积分变动', '订单商品完成赠送积分增加30', '0', '0', '0', '1', '0', '0', '1557905539'), ('79', '90', '订单收货', '订单收货成功', '16', '1', '0', '1', '0', '0', '1557905539'), ('80', '92', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '0', '0', '0', '1557985469'), ('81', '93', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558002429'), ('82', '93', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558059358'), ('83', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558081617'), ('84', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558346372'), ('85', '96', '订单支付', '订单支付成功，金额1998.23元', '17', '1', '0', '0', '0', '0', '1558601451'), ('86', '96', '订单支付', '订单支付成功，金额1997.22元', '18', '1', '0', '0', '0', '0', '1558601540'), ('87', '96', '订单支付', '订单支付成功，金额1997.84元', '19', '1', '0', '0', '0', '0', '1558601636'), ('88', '96', '订单支付', '订单支付成功，金额5937.39元', '20', '1', '0', '0', '0', '0', '1558601785'), ('89', '90', '积分变动', '登录奖励积分积分增加5', '0', '0', '0', '1', '0', '0', '1558602460'); COMMIT; -- ---------------------------- @@ -755,11 +755,13 @@ COMMIT; DROP TABLE IF EXISTS `s_order_aftersale`; CREATE TABLE `s_order_aftersale` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id', + `order_no` char(60) NOT NULL DEFAULT '' COMMENT '订单号', `order_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '订单id', `goods_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '商品id', `user_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '用户id', - `status` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '状态（0待确认/待审核, 1已发货/用户退货, 2已结束/已完成, 3已拒绝, 4已取消）', - `type` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '类型（0仅退款, 1退货退款）', + `status` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '状态（0待确认, 1待退货, 2待审核, 3已完成, 4已拒绝, 5已取消）', + `type` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '业务类型（0仅退款, 1退货退款）', + `refundment` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '退款类型（0原路退回, 1退至钱包, 2手动处理）', `reason` char(180) NOT NULL DEFAULT '' COMMENT '申请原因', `number` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '退货数量', `price` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '退款金额', @@ -770,8 +772,9 @@ CREATE TABLE `s_order_aftersale` ( `express_number` char(60) NOT NULL DEFAULT '' COMMENT '快递单号', `apply_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '申请时间', `confirm_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '确认时间', - `delivery_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '发货时间', - `end_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '结束时间', + `delivery_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '退货时间', + `audit_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '审核时间', + `cancel_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '取消时间', `add_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', `upd_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`), @@ -779,13 +782,13 @@ CREATE TABLE `s_order_aftersale` ( KEY `goods_id` (`goods_id`), KEY `user_id` (`user_id`), KEY `status` (`status`) -) 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_order_aftersale` -- ---------------------------- BEGIN; -INSERT INTO `s_order_aftersale` VALUES ('1', '15', '2', '90', '2', '1', '不喜欢/不想要', '0', '5280.00', '我也不知道为什么、就是不行买了哦', '[\"\\/static\\/upload\\/images\\/common\\/2019\\/05\\/17\\/1558073623641199.jpg\",\"\\/static\\/upload\\/images\\/common\\/2019\\/05\\/17\\/1558073623385520.jpg\",\"\\/static\\/upload\\/images\\/common\\/2019\\/05\\/17\\/1558072588843696.jpg\"]', '', '顺丰快递', '顺丰快递', '1558602526', '0', '1558604654', '0', '1558602526', '1558604654'); +INSERT INTO `s_order_aftersale` VALUES ('2', '20190515153132795081', '15', '2', '90', '2', '0', '0', '物流显示签收但实际未收到货', '0', '5280.00', 'gdgdf的风格梵蒂冈大\n对方古典风格对方古典风格', '[]', '', '', '', '1558676752', '0', '0', '0', '0', '1558676752', '0'); COMMIT; -- ---------------------------- @@ -1428,13 +1431,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=120 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; +) ENGINE=InnoDB AUTO_INCREMENT=144 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='搜索日志'; -- ---------------------------- -- Records of `s_search_history` -- ---------------------------- BEGIN; -INSERT INTO `s_search_history` VALUES ('1', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555048567'), ('2', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555058264'), ('3', '90', '0', '1', '', '0-0', 'default', 'asc', '20190413', '1555157671'), ('4', '90', '0', '0', '', '0-0', 'default', 'asc', '20190414', '1555222450'), ('5', '90', '0', '1', '', '0-0', 'default', 'asc', '20190414', '1555222522'), ('6', '90', '0', '0', '', '0-0', 'default', 'asc', '20190415', '1555293685'), ('7', '90', '0', '53', '', '0-0', 'default', 'asc', '20190416', '1555400228'), ('8', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555402358'), ('9', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407340'), ('10', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407342'), ('11', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('12', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('13', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407367'), ('14', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407378'), ('15', '90', '0', '0', '', '0-0', 'default', 'asc', '20190422', '1555915151'), ('16', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915154'), ('17', '90', '0', '0', '', '0-0', 'min_price', 'asc', '20190422', '1555915155'), ('18', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915156'), ('19', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190422', '1555915157'), ('20', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915159'), ('21', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915159'), ('22', '90', '0', '0', '', '0-0', 'default', 'desc', '20190422', '1555915160'), ('23', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006494'), ('24', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006499'), ('25', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556008575'), ('26', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556009343'), ('27', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009712'), ('28', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009715'), ('29', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009787'), ('30', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014897'), ('31', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014939'), ('32', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016061'), ('33', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016064'), ('34', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016066'), ('35', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016067'), ('36', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016069'), ('37', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016070'), ('38', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016072'), ('39', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016073'), ('40', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016079'), ('41', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016083'), ('42', '90', '0', '0', '包包', '0-0', 'default', 'asc', '20190423', '1556016107'), ('43', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016131'), ('44', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016139'), ('45', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016141'), ('46', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016144'), ('47', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016146'), ('48', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016162'), ('49', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016163'), ('50', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016176'), ('51', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016655'), ('52', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016656'), ('53', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016658'), ('54', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016660'), ('55', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016717'), ('56', '90', '0', '0', '', '0-0', 'default', 'asc', '20190424', '1556069360'), ('57', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160619'), ('58', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160716'), ('59', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160717'), ('60', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160734'), ('61', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('62', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('63', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161001'), ('64', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161077'), ('65', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161078'), ('66', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161079'), ('67', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161089'), ('68', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161091'), ('69', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161092'), ('70', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161099'), ('71', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161118'), ('72', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161120'), ('73', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161174'), ('74', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161180'), ('75', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161235'), ('76', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161266'), ('77', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161272'), ('78', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161423'), ('79', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190425', '1556161425'), ('80', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190425', '1556161425'), ('81', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161441'), ('82', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161449'), ('83', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161453'), ('84', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161454'), ('85', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161481'), ('86', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161482'), ('87', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161483'), ('88', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161527'), ('89', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556249993'), ('90', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556262777'), ('91', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556262793'), ('92', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263175'), ('93', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263188'), ('94', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263196'), ('95', '90', '0', '0', '', '0-0', 'default', 'asc', '20190428', '1556429081'), ('96', '90', '0', '2', '', '0-0', 'default', 'asc', '20190428', '1556429339'), ('97', '90', '0', '0', '', '0-0', 'default', 'asc', '20190428', '1556430376'), ('98', '90', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516547'), ('99', '90', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516616'), ('100', '90', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516670'), ('101', '0', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516838'), ('102', '0', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190429', '1556516855'), ('103', '90', '0', '0', '', '0-0', 'default', 'asc', '20190430', '1556588513'), ('104', '90', '0', '0', '', '0-0', 'default', 'asc', '20190505', '1557022315'), ('105', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190505', '1557022610'), ('106', '90', '0', '2', '连衣裙', '0-0', 'default', 'asc', '20190505', '1557022612'), ('107', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190505', '1557022615'), ('108', '90', '0', '0', '', '0-0', 'default', 'asc', '20190505', '1557022621'), ('109', '90', '0', '0', '', '0-0', 'default', 'asc', '20190505', '1557022628'), ('110', '0', '0', '305', '', '0-0', 'default', 'asc', '20190506', '1557124802'), ('111', '0', '0', '304', '', '0-0', 'default', 'asc', '20190506', '1557124806'), ('112', '0', '0', '0', '', '0-0', 'default', 'asc', '20190506', '1557131540'), ('113', '0', '0', '0', '', '0-0', 'default', 'asc', '20190506', '1557131543'), ('114', '0', '0', '0', '', '0-0', 'default', 'asc', '20190506', '1557135948'), ('115', '0', '0', '2', '', '0-0', 'default', 'asc', '20190506', '1557135967'), ('116', '90', '0', '0', '', '0-0', 'default', 'asc', '20190507', '1557199970'), ('117', '0', '0', '0', '', '0-0', 'default', 'asc', '20190516', '1558022071'), ('118', '0', '0', '0', '', '0-0', 'default', 'asc', '20190517', '1558084654'), ('119', '90', '0', '3', '', '0-0', 'default', 'asc', '20190523', '1558592357'); +INSERT INTO `s_search_history` VALUES ('1', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555048567'), ('2', '90', '0', '0', '', '0-0', 'default', 'asc', '20190412', '1555058264'), ('3', '90', '0', '1', '', '0-0', 'default', 'asc', '20190413', '1555157671'), ('4', '90', '0', '0', '', '0-0', 'default', 'asc', '20190414', '1555222450'), ('5', '90', '0', '1', '', '0-0', 'default', 'asc', '20190414', '1555222522'), ('6', '90', '0', '0', '', '0-0', 'default', 'asc', '20190415', '1555293685'), ('7', '90', '0', '53', '', '0-0', 'default', 'asc', '20190416', '1555400228'), ('8', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555402358'), ('9', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407340'), ('10', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407342'), ('11', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('12', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407348'), ('13', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407367'), ('14', '90', '0', '0', '', '0-0', 'default', 'asc', '20190416', '1555407378'), ('15', '90', '0', '0', '', '0-0', 'default', 'asc', '20190422', '1555915151'), ('16', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915154'), ('17', '90', '0', '0', '', '0-0', 'min_price', 'asc', '20190422', '1555915155'), ('18', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915156'), ('19', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190422', '1555915157'), ('20', '90', '0', '0', '', '0-0', 'min_price', 'desc', '20190422', '1555915159'), ('21', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190422', '1555915159'), ('22', '90', '0', '0', '', '0-0', 'default', 'desc', '20190422', '1555915160'), ('23', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006494'), ('24', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556006499'), ('25', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556008575'), ('26', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556009343'), ('27', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009712'), ('28', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009715'), ('29', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556009787'), ('30', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014897'), ('31', '90', '0', '0', '11', '0-0', 'default', 'asc', '20190423', '1556014939'), ('32', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016061'), ('33', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016064'), ('34', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016066'), ('35', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016067'), ('36', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016069'), ('37', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016070'), ('38', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016072'), ('39', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016073'), ('40', '90', '0', '1', '', '0-0', 'default', 'asc', '20190423', '1556016079'), ('41', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016083'), ('42', '90', '0', '0', '包包', '0-0', 'default', 'asc', '20190423', '1556016107'), ('43', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016131'), ('44', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016139'), ('45', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016141'), ('46', '90', '0', '58', '', '0-0', 'default', 'asc', '20190423', '1556016144'), ('47', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016146'), ('48', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016162'), ('49', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016163'), ('50', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016176'), ('51', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016655'), ('52', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016656'), ('53', '90', '0', '2', '', '0-0', 'default', 'asc', '20190423', '1556016658'), ('54', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016660'), ('55', '90', '0', '0', '', '0-0', 'default', 'asc', '20190423', '1556016717'), ('56', '90', '0', '0', '', '0-0', 'default', 'asc', '20190424', '1556069360'), ('57', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160619'), ('58', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160716'), ('59', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160717'), ('60', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160734'), ('61', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('62', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556160998'), ('63', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161001'), ('64', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161077'), ('65', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161078'), ('66', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161079'), ('67', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161089'), ('68', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161091'), ('69', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161092'), ('70', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161099'), ('71', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161118'), ('72', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161120'), ('73', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161174'), ('74', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161180'), ('75', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161235'), ('76', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161266'), ('77', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161272'), ('78', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161423'), ('79', '90', '0', '0', '', '0-0', 'sales_count', 'desc', '20190425', '1556161425'), ('80', '90', '0', '0', '', '0-0', 'sales_count', 'asc', '20190425', '1556161425'), ('81', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161441'), ('82', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161449'), ('83', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161453'), ('84', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161454'), ('85', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161481'), ('86', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161482'), ('87', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161483'), ('88', '90', '0', '0', '', '0-0', 'default', 'asc', '20190425', '1556161527'), ('89', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556249993'), ('90', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556262777'), ('91', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556262793'), ('92', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263175'), ('93', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263188'), ('94', '90', '0', '0', '', '0-0', 'default', 'asc', '20190426', '1556263196'), ('95', '90', '0', '0', '', '0-0', 'default', 'asc', '20190428', '1556429081'), ('96', '90', '0', '2', '', '0-0', 'default', 'asc', '20190428', '1556429339'), ('97', '90', '0', '0', '', '0-0', 'default', 'asc', '20190428', '1556430376'), ('98', '90', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516547'), ('99', '90', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516616'), ('100', '90', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516670'), ('101', '0', '0', '0', '', '0-0', 'default', 'asc', '20190429', '1556516838'), ('102', '0', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190429', '1556516855'), ('103', '90', '0', '0', '', '0-0', 'default', 'asc', '20190430', '1556588513'), ('104', '90', '0', '0', '', '0-0', 'default', 'asc', '20190505', '1557022315'), ('105', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190505', '1557022610'), ('106', '90', '0', '2', '连衣裙', '0-0', 'default', 'asc', '20190505', '1557022612'), ('107', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190505', '1557022615'), ('108', '90', '0', '0', '', '0-0', 'default', 'asc', '20190505', '1557022621'), ('109', '90', '0', '0', '', '0-0', 'default', 'asc', '20190505', '1557022628'), ('110', '0', '0', '305', '', '0-0', 'default', 'asc', '20190506', '1557124802'), ('111', '0', '0', '304', '', '0-0', 'default', 'asc', '20190506', '1557124806'), ('112', '0', '0', '0', '', '0-0', 'default', 'asc', '20190506', '1557131540'), ('113', '0', '0', '0', '', '0-0', 'default', 'asc', '20190506', '1557131543'), ('114', '0', '0', '0', '', '0-0', 'default', 'asc', '20190506', '1557135948'), ('115', '0', '0', '2', '', '0-0', 'default', 'asc', '20190506', '1557135967'), ('116', '90', '0', '0', '', '0-0', 'default', 'asc', '20190507', '1557199970'), ('117', '0', '0', '0', '', '0-0', 'default', 'asc', '20190516', '1558022071'), ('118', '0', '0', '0', '', '0-0', 'default', 'asc', '20190517', '1558084654'), ('119', '90', '0', '3', '', '0-0', 'default', 'asc', '20190523', '1558592357'), ('120', '90', '0', '3', '', '0-0', 'default', 'asc', '20190524', '1558665920'), ('121', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675186'), ('122', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675189'), ('123', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675207'), ('124', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675212'), ('125', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675220'), ('126', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675221'), ('127', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675221'), ('128', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675229'), ('129', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675232'), ('130', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675233'), ('131', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675239'), ('132', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675261'), ('133', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675324'), ('134', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675327'), ('135', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675362'), ('136', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675394'), ('137', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675449'), ('138', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675457'), ('139', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675511'), ('140', '90', '0', '0', '', '0-0', 'default', 'asc', '20190524', '1558675513'), ('141', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675548'), ('142', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675612'), ('143', '90', '0', '0', '连衣裙', '0-0', 'default', 'asc', '20190524', '1558675612'); COMMIT; -- ---------------------------- diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 92a4eac11..40be75567 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -307,6 +307,7 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a } .footer-about li { text-align: left; + line-height: 24px; } .footer-about li span, .footer-about li a { font-size: 14px; diff --git a/public/static/index/default/css/order.aftersale.css b/public/static/index/default/css/orderaftersale.aftersale.css similarity index 100% rename from public/static/index/default/css/order.aftersale.css rename to public/static/index/default/css/orderaftersale.aftersale.css diff --git a/public/static/index/default/css/orderaftersale.index.css b/public/static/index/default/css/orderaftersale.index.css new file mode 100644 index 000000000..d217ddd6d --- /dev/null +++ b/public/static/index/default/css/orderaftersale.index.css @@ -0,0 +1,8 @@ +.data-list .am-slider { + width: 130px; + max-height: 108px; + overflow: hidden; +} +.data-list .operation { + width: 100px; +} \ No newline at end of file diff --git a/public/static/index/default/js/order.aftersale.js b/public/static/index/default/js/orderaftersale.aftersale.js similarity index 100% rename from public/static/index/default/js/order.aftersale.js rename to public/static/index/default/js/orderaftersale.aftersale.js diff --git a/public/static/index/default/js/search.js b/public/static/index/default/js/search.js index bb20310a0..1d8a1eac5 100755 --- a/public/static/index/default/js/search.js +++ b/public/static/index/default/js/search.js @@ -152,7 +152,7 @@ $(function() // 请求参数处理 var data = { category_id: $('.search-content').data('category-id') || 0, - keywords: $('#search-input').val() || '', + wd: $('#search-input').val() || '', page: page || parseInt($('.search-pages-submit').attr('data-page')) || 1, order_by_field: $('.sort-nav li.active').attr('data-field') || 'default', order_by_type: $('.sort-nav li.active').attr('data-type') == 'asc' ? 'desc' : 'asc',