diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php b/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php index dd6b405f0..ff4de7ddb 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php @@ -307,6 +307,9 @@ class SystemConfig extends AuthController return app('json')->fail(400763); } } + if (isset($post['uni_brokerage_price']) && preg_match('/\.[0-9]{2,}[1-9][0-9]*$/', (string)$post['uni_brokerage_price']) > 0) { + return app('json')->fail(500029); + } //支付接口类型选择，如果有订单就不能再进行切换 // if (isset($post['pay_wechat_type'])) { diff --git a/crmeb/app/adminapi/controller/v1/user/User.php b/crmeb/app/adminapi/controller/v1/user/User.php index f6da30cb6..0502aa336 100644 --- a/crmeb/app/adminapi/controller/v1/user/User.php +++ b/crmeb/app/adminapi/controller/v1/user/User.php @@ -123,20 +123,19 @@ class User extends AuthController if ($data['card_id']) { if (!check_card($data['card_id'])) return app('json')->fail(400315); } - if ($data['pwd']) { - if (!$data['true_pwd']) { - return app('json')->fail(400263); - } - if ($data['pwd'] != $data['true_pwd']) { - return app('json')->fail(400264); - } - if (strlen($data['pwd']) < 6 || strlen($data['pwd']) > 32) { - return app('json')->fail(400762); - } - $data['pwd'] = md5($data['pwd']); - } else { - unset($data['pwd']); + if (!$data['pwd']) { + return app('json')->fail(400256); } + if (!$data['true_pwd']) { + return app('json')->fail(400263); + } + if ($data['pwd'] != $data['true_pwd']) { + return app('json')->fail(400264); + } + if (strlen($data['pwd']) < 6 || strlen($data['pwd']) > 32) { + return app('json')->fail(400762); + } + $data['pwd'] = md5($data['pwd']); unset($data['true_pwd']); $data['avatar'] = sys_config('h5_avatar'); $data['adminId'] = $this->adminId; diff --git a/crmeb/app/listener/admin/AdminLoginListener.php b/crmeb/app/listener/admin/AdminLoginListener.php index 049fa17c7..1297a4f81 100644 --- a/crmeb/app/listener/admin/AdminLoginListener.php +++ b/crmeb/app/listener/admin/AdminLoginListener.php @@ -35,13 +35,11 @@ class AdminLoginListener } try { - $timerPath = root_path('runtime') . '.timer'; $timer = file_get_contents($timerPath); - if ($timer && $timer <= time() && $timer > (time() - 10)) { + if ($timer && $timer <= time() && $timer > (time() - 70)) { $res1 = true; } - } catch (\Throwable $e) { } diff --git a/crmeb/app/services/agent/AgentLevelServices.php b/crmeb/app/services/agent/AgentLevelServices.php index ba9258ae0..fe63abc80 100644 --- a/crmeb/app/services/agent/AgentLevelServices.php +++ b/crmeb/app/services/agent/AgentLevelServices.php @@ -66,6 +66,10 @@ class AgentLevelServices extends BaseServices $query->field('count(*) as sum'); }], $page, $limit); $count = $this->dao->count($where); + foreach ($list as &$item) { + $item['one_brokerage_ratio'] = bcdiv(bcmul((string)sys_config('store_brokerage_ratio'), bcadd('100', (string)$item['one_brokerage'], 2), 2), '100', 2); + $item['two_brokerage_ratio'] = bcdiv(bcmul((string)sys_config('store_brokerage_two'), bcadd('100', (string)$item['two_brokerage'], 2), 2), '100', 2); + } return compact('count', 'list'); } @@ -259,8 +263,16 @@ class AgentLevelServices extends BaseServices $field[] = Form::input('name', '等级名称')->maxlength(8)->col(24); $field[] = Form::number('grade', '等级', 0)->min(0)->precision(0); $field[] = Form::frameImage('image', '背景图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')))->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); - $field[] = Form::number('one_brokerage', '一级上浮', 0)->info('在分销一级佣金基础上浮（0-1000之间整数）百分比')->min(0)->max(1000)->precision(0); - $field[] = Form::number('two_brokerage', '二级上浮', 0)->info('在分销二级佣金基础上浮（0-1000之间整数）百分比')->min(0)->max(1000)->precision(0); + $field[] = Form::number('one_brokerage', '一级上浮', 0)->appendRule('suffix', [ + 'type' => 'div', + 'class' => 'tips-info', + 'domProps' => ['innerHTML' => '在分销一级佣金基础上浮（0-1000之间整数）百分比，目前一级返佣比率：10%，上浮5%，则返佣比率：一级返佣比率 * (1 + 一级上浮比率) = 10.50%'] + ])->max(1000)->precision(0); + $field[] = Form::number('two_brokerage', '二级上浮', 0)->appendRule('suffix', [ + 'type' => 'div', + 'class' => 'tips-info', + 'domProps' => ['innerHTML' => '在分销二级佣金基础上浮（0-1000之间整数）百分比，目前二级返佣比率：10%，上浮2%，则返佣比率：二级返佣比率 * (1 + 二级上浮比率) = 5.10%'] + ])->min(0)->max(1000)->precision(0); $field[] = Form::radio('status', '是否显示', 1)->options([['value' => 1, 'label' => '显示'], ['value' => 0, 'label' => '隐藏']]); return create_form('添加分销员等级', $field, Url::buildUrl('/agent/level'), 'POST'); } @@ -281,8 +293,16 @@ class AgentLevelServices extends BaseServices $field[] = Form::input('name', '等级名称', $levelInfo['name'])->maxlength(8)->col(24); $field[] = Form::number('grade', '等级', $levelInfo['grade'])->min(0)->precision(0); $field[] = Form::frameImage('image', '背景图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'image')), $levelInfo['image'])->icon('ios-add')->width('950px')->height('505px')->modal(['footer-hide' => true]); - $field[] = Form::number('one_brokerage', '一级上浮', $levelInfo['one_brokerage'])->info('在分销一级佣金基础上浮（0-1000之间整数）百分比')->min(0)->max(1000)->precision(0); - $field[] = Form::number('two_brokerage', '二级上浮', $levelInfo['two_brokerage'])->info('在分销二级佣金基础上浮（0-1000之间整数）百分比')->min(0)->max(1000)->precision(0); + $field[] = Form::number('one_brokerage', '一级上浮', $levelInfo['one_brokerage'])->appendRule('suffix', [ + 'type' => 'div', + 'class' => 'tips-info', + 'domProps' => ['innerHTML' => '在分销一级佣金基础上浮（0-1000之间整数）百分比，目前一级返佣比率：10%，上浮5%，则返佣比率：一级返佣比率 * (1 + 一级上浮比率) = 10.50%'] + ])->min(0)->max(1000)->precision(0); + $field[] = Form::number('two_brokerage', '二级上浮', $levelInfo['two_brokerage'])->appendRule('suffix', [ + 'type' => 'div', + 'class' => 'tips-info', + 'domProps' => ['innerHTML' => '在分销二级佣金基础上浮（0-1000之间整数）百分比，目前二级返佣比率：10%，上浮2%，则返佣比率：二级返佣比率 * (1 + 二级上浮比率) = 5.10%'] + ])->min(0)->max(1000)->precision(0); $field[] = Form::radio('status', '是否显示', $levelInfo['status'])->options([['value' => 1, 'label' => '显示'], ['value' => 0, 'label' => '隐藏']]); return create_form('编辑分销员等级', $field, Url::buildUrl('/agent/level/' . $id), 'PUT'); diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index 3dc91b255..241f71f28 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -988,10 +988,46 @@ HTML; ] ]] ]; + $series3 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#69cdff' + ], + [ + 'offset' => 0.5, + 'color' => '#3eb3f7' + ], + [ + 'offset' => 1, + 'color' => '#1495eb' + ] + ] + ]] + ]; + $series4 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#6fdeab' + ], + [ + 'offset' => 0.5, + 'color' => '#44d693' + ], + [ + 'offset' => 1, + 'color' => '#2cc981' + ] + ] + ]] + ]; $chartdata['series'][] = ['name' => $chartdata['legend'][0], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['pre']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['now']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 - $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series2, 'data' => $data['now']['price']];//分类1值 + $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series3, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series4, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 //统计总数上期 $pre_total = $this->dao->preTotalFind($datebefor, $dateafter); @@ -1109,10 +1145,46 @@ HTML; ] ]] ]; + $series3 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#69cdff' + ], + [ + 'offset' => 0.5, + 'color' => '#3eb3f7' + ], + [ + 'offset' => 1, + 'color' => '#1495eb' + ] + ] + ]] + ]; + $series4 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#6fdeab' + ], + [ + 'offset' => 0.5, + 'color' => '#44d693' + ], + [ + 'offset' => 1, + 'color' => '#2cc981' + ] + ] + ]] + ]; $chartdata['series'][] = ['name' => $chartdata['legend'][0], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['pre']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['now']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 - $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series2, 'data' => $data['now']['price']];//分类1值 + $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series3, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series4, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 //统计总数上期 $pre_total = $this->dao->preTotalFind($datebefor, $dateafter); @@ -1228,10 +1300,46 @@ HTML; ] ]] ]; + $series3 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#69cdff' + ], + [ + 'offset' => 0.5, + 'color' => '#3eb3f7' + ], + [ + 'offset' => 1, + 'color' => '#1495eb' + ] + ] + ]] + ]; + $series4 = ['normal' => ['color' => [ + 'x' => 0, 'y' => 0, 'x2' => 0, 'y2' => 1, + 'colorStops' => [ + [ + 'offset' => 0, + 'color' => '#6fdeab' + ], + [ + 'offset' => 0.5, + 'color' => '#44d693' + ], + [ + 'offset' => 1, + 'color' => '#2cc981' + ] + ] + ]] + ]; $chartdata['series'][] = ['name' => $chartdata['legend'][0], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['pre']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series1, 'data' => $data['now']['price']];//分类1值 - $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 - $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series2, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][1], 'type' => 'bar', 'itemStyle' => $series2, 'data' => $data['now']['price']];//分类1值 + $chartdata['series'][] = ['name' => $chartdata['legend'][2], 'type' => 'line', 'itemStyle' => $series3, 'data' => $data['pre']['count'], 'yAxisIndex' => 1];//分类2值 + $chartdata['series'][] = ['name' => $chartdata['legend'][3], 'type' => 'line', 'itemStyle' => $series4, 'data' => $data['now']['count'], 'yAxisIndex' => 1];//分类2值 //统计总数上期 $pre_total = $this->dao->preTotalFind($datebefor, $dateafter); @@ -1323,24 +1431,24 @@ HTML; $yesterday_sales = $this->dao->todaySales('yesterday'); //日同比 $sales_today_ratio = $this->growth($today_sales, $yesterday_sales); - //周销售额 - //本周 - $this_week_sales = $this->dao->thisWeekSales('week'); - //上周 - $last_week_sales = $this->dao->thisWeekSales('last week'); - //周同比 - $sales_week_ratio = $this->growth($this_week_sales, $last_week_sales); +// //周销售额 +// //本周 +// $this_week_sales = $this->dao->thisWeekSales('week'); +// //上周 +// $last_week_sales = $this->dao->thisWeekSales('last week'); +// //周同比 +// $sales_week_ratio = $this->growth($this_week_sales, $last_week_sales); //总销售额 $total_sales = $this->dao->totalSales('month'); $sales = [ 'today' => $today_sales, 'yesterday' => $yesterday_sales, 'today_ratio' => $sales_today_ratio, - 'week' => $this_week_sales, - 'last_week' => $last_week_sales, - 'week_ratio' => $sales_week_ratio, +// 'week' => $this_week_sales, +// 'last_week' => $last_week_sales, +// 'week_ratio' => $sales_week_ratio, 'total' => $total_sales . '元', - 'date' => '昨日' + 'date' => '今日' ]; //TODO:用户访问量 //今日访问量 @@ -1349,23 +1457,23 @@ HTML; $yesterday_visits = $productLogServices->count(['time' => 'yesterday', 'type' => 'visit']); //日同比 $visits_today_ratio = $this->growth($today_visits, $yesterday_visits); - //本周访问量 - $this_week_visits = $productLogServices->count(['time' => 'week', 'type' => 'visit']); - //上周访问量 - $last_week_visits = $productLogServices->count(['time' => 'last week', 'type' => 'visit']); - //周同比 - $visits_week_ratio = $this->growth($this_week_visits, $last_week_visits); +// //本周访问量 +// $this_week_visits = $productLogServices->count(['time' => 'week', 'type' => 'visit']); +// //上周访问量 +// $last_week_visits = $productLogServices->count(['time' => 'last week', 'type' => 'visit']); +// //周同比 +// $visits_week_ratio = $this->growth($this_week_visits, $last_week_visits); //总访问量 $total_visits = $productLogServices->count(['time' => 'month', 'type' => 'visit']); $visits = [ 'today' => $today_visits, 'yesterday' => $yesterday_visits, 'today_ratio' => $visits_today_ratio, - 'week' => $this_week_visits, - 'last_week' => $last_week_visits, - 'week_ratio' => $visits_week_ratio, +// 'week' => $this_week_visits, +// 'last_week' => $last_week_visits, +// 'week_ratio' => $visits_week_ratio, 'total' => $total_visits . 'Pv', - 'date' => '昨日' + 'date' => '今日' ]; //TODO 订单量 //今日订单量 @@ -1374,23 +1482,23 @@ HTML; $yesterday_order = $this->dao->todayOrderVisit('yesterday', 1); //订单日同比 $order_today_ratio = $this->growth($today_order, $yesterday_order); - //本周订单量 - $this_week_order = $this->dao->todayOrderVisit('week', 2); - //上周订单量 - $last_week_order = $this->dao->todayOrderVisit('last week', 2); - //订单周同比 - $order_week_ratio = $this->growth($this_week_order, $last_week_order); +// //本周订单量 +// $this_week_order = $this->dao->todayOrderVisit('week', 2); +// //上周订单量 +// $last_week_order = $this->dao->todayOrderVisit('last week', 2); +// //订单周同比 +// $order_week_ratio = $this->growth($this_week_order, $last_week_order); //总订单量 $total_order = $this->dao->count(['time' => 'month', 'paid' => 1, 'refund_status' => 0, 'pid' => 0]); $order = [ 'today' => $today_order, 'yesterday' => $yesterday_order, 'today_ratio' => $order_today_ratio, - 'week' => $this_week_order, - 'last_week' => $last_week_order, - 'week_ratio' => $order_week_ratio, +// 'week' => $this_week_order, +// 'last_week' => $last_week_order, +// 'week_ratio' => $order_week_ratio, 'total' => $total_order . '单', - 'date' => '昨日' + 'date' => '今日' ]; //TODO 用户 //今日新增用户 @@ -1399,23 +1507,23 @@ HTML; $yesterday_user = $uSercice->todayAddVisits('yesterday', 1); //新增用户日同比 $user_today_ratio = $this->growth($today_user, $yesterday_user); - //本周新增用户 - $this_week_user = $uSercice->todayAddVisits('week', 2); - //上周新增用户 - $last_week_user = $uSercice->todayAddVisits('last week', 2); - //新增用户周同比 - $user_week_ratio = $this->growth($this_week_user, $last_week_user); +// //本周新增用户 +// $this_week_user = $uSercice->todayAddVisits('week', 2); +// //上周新增用户 +// $last_week_user = $uSercice->todayAddVisits('last week', 2); +// //新增用户周同比 +// $user_week_ratio = $this->growth($this_week_user, $last_week_user); //所有用户 $total_user = $uSercice->count(['time' => 'month']); $user = [ 'today' => $today_user, 'yesterday' => $yesterday_user, 'today_ratio' => $user_today_ratio, - 'week' => $this_week_user, - 'last_week' => $last_week_user, - 'week_ratio' => $user_week_ratio, +// 'week' => $this_week_user, +// 'last_week' => $last_week_user, +// 'week_ratio' => $user_week_ratio, 'total' => $total_user . '人', - 'date' => '昨日' + 'date' => '今日' ]; $info = array_values(compact('sales', 'visits', 'order', 'user')); $info[0]['title'] = '销售额'; diff --git a/crmeb/app/services/product/product/StoreCategoryServices.php b/crmeb/app/services/product/product/StoreCategoryServices.php index d7bde1e0c..82c3d88a2 100644 --- a/crmeb/app/services/product/product/StoreCategoryServices.php +++ b/crmeb/app/services/product/product/StoreCategoryServices.php @@ -118,7 +118,6 @@ class StoreCategoryServices extends BaseServices throw new AdminException(100005); } else { $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); } } @@ -206,7 +205,6 @@ class StoreCategoryServices extends BaseServices if (!$res) throw new AdminException(100006); $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); return (int)$res->id; } @@ -246,7 +244,6 @@ class StoreCategoryServices extends BaseServices }); $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); } /** @@ -262,7 +259,6 @@ class StoreCategoryServices extends BaseServices if (!$res) throw new AdminException(100008); $this->cacheDriver()->clear(); - $this->cacheDriver()->set('category_version', uniqid()); } /** diff --git a/crmeb/app/services/user/UserAuthServices.php b/crmeb/app/services/user/UserAuthServices.php index b864e2fb9..7e1b1db82 100644 --- a/crmeb/app/services/user/UserAuthServices.php +++ b/crmeb/app/services/user/UserAuthServices.php @@ -50,7 +50,7 @@ class UserAuthServices extends BaseServices if ($token === 'undefined') { throw new AuthException(110002); } - if (!$token || !$tokenData = CacheService::get($md5Token, '', NULL, 'api')) + if (!$token || !$tokenData = CacheService::get($md5Token)) throw new AuthException(110002); if (!is_array($tokenData) || empty($tokenData) || !isset($tokenData['uid'])) { diff --git a/crmeb/app/services/wechat/WechatQrcodeServices.php b/crmeb/app/services/wechat/WechatQrcodeServices.php index 2cf187f4d..8e3db0072 100644 --- a/crmeb/app/services/wechat/WechatQrcodeServices.php +++ b/crmeb/app/services/wechat/WechatQrcodeServices.php @@ -49,6 +49,7 @@ class WechatQrcodeServices extends BaseServices $item['stop'] = $item['end_time'] ? $item['end_time'] > time() ? 1 : -1 : 0; $item['label_name'] = $userLabel->getColumn([['id', 'in', $item['label_id']]], 'label_name'); $item['end_time'] = date('Y-m-d H:i:s', $item['end_time']); + $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']); } $count = $this->dao->count($where); return compact('list', 'count'); diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index a8a6ace13..6d84ca6d8 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -26520,7 +26520,17 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (24977, 7, '500028', '请填写邀请码', '초대 코드를 입력하십시오.', 1), (24978, 8, '500028', '请填写邀请码', 'Урилгын кодыг бөглөнө үү', 1), (24979, 9, '500028', '请填写邀请码', 'กรุณากรอกรหัสเชิญ', 1), -(24980, 10, '500028', '请填写邀请码', 'Vui lòng điền mã mời', 1); +(24980, 10, '500028', '请填写邀请码', 'Vui lòng điền mã mời', 1), +(24981, 1, '500029', '金额最多两位小数', '金额最多两位小数', 1), +(24982, 2, '500029', '金额最多两位小数', 'Amount Up to two decimal places', 1), +(24983, 3, '500029', '金额最多两位小数', '金額最多兩位小數', 1), +(24984, 4, '500029', '金额最多两位小数', 'Montant Jusquà deux décimales', 1), +(24985, 5, '500029', '金额最多两位小数', 'Importo Fino a due decimali', 1), +(24986, 6, '500029', '金额最多两位小数', '金額は小数点以下2桁まで', 1), +(24987, 7, '500029', '金额最多两位小数', '양 소수점 이하 두 자리까지', 1), +(24988, 8, '500029', '金额最多两位小数', 'Хэмжээ Хоёр аравтын бутархай газар хүртэл', 1), +(24989, 9, '500029', '金额最多两位小数', 'จำนวนทศนิยมสูงสุดสองตำแหน่ง', 1), +(24990, 10, '500029', '金额最多两位小数', 'Số tiền tối đa hai chữ số thập phân', 1); -- -------------------------------------------------------- @@ -33839,7 +33849,7 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (26, 0, 'ios-people', '分销', 'admin', 'agent', '', '', '', '[]', 104, 1, 0, 1, '/agent', '', 1, 'user', 1, 'admin-agent', 0), (27, 0, 'ios-paper-plane', '营销', 'admin', 'marketing', '', '', '', '[]', 110, 1, 0, 1, '/marketing', '', 1, 'home', 1, 'admin-marketing', 0), (28, 26, '', '分销设置', 'admin', 'setting.system_config', '', '', '', '[]', 1, 1, 0, 1, '/setting/system_config_retail/2/9', '', 1, 'setting', 0, 'setting-system-config', 0), -(29, 26, '', '分销员管理', 'admin', 'agent.agent_manage', 'index', '', '', '[]', 1, 1, 0, 1, '/agent/agent_manage/index', '', 1, 'user', 0, 'agent-agent-manage', 0), +(29, 26, '', '分销员管理', 'admin', 'agent.agent_manage', 'index', '', '', '[]', 99, 1, 0, 1, '/agent/agent_manage/index', '', 1, 'user', 0, 'agent-agent-manage', 0), (30, 27, '', '优惠券', 'admin', 'marketing.store_coupon', '', '', '', '[]', 100, 1, 0, 1, '/marketing/store_coupon', '27', 1, 'marketing', 0, 'marketing-store_coupon-index', 0), (31, 27, '', '砍价管理', 'admin', 'marketing.store_bargain', '', '', '', '[]', 85, 1, 0, 1, '/marketing/store_bargain', '27', 1, 'marketing', 0, 'marketing-store_bargain-index', 0), (32, 27, '', '拼团管理', 'admin', 'marketing.store_combination', '', '', '', '[]', 80, 1, 0, 1, '/marketing/store_combination', '27', 1, 'marketing', 0, 'marketing-store_combination-index', 0), diff --git a/template/admin/src/components/main/components/header-notice/index.vue b/template/admin/src/components/main/components/header-notice/index.vue index c49b7f56f..f553b229c 100644 --- a/template/admin/src/components/main/components/header-notice/index.vue +++ b/template/admin/src/components/main/components/header-notice/index.vue @@ -16,6 +16,15 @@ + diff --git a/template/admin/src/main.js b/template/admin/src/main.js index bd75649a7..46aa6b325 100644 --- a/template/admin/src/main.js +++ b/template/admin/src/main.js @@ -199,7 +199,6 @@ new Vue({ let menus = this.$store.state.menus.menusName; const menuSider = menus; const headerName = getHeaderName(to, menuSider); - if (headerName !== null) { this.$store.commit('menu/setActivePath', path); const openNames = getSiderSubmenu(to, menuSider); @@ -216,9 +215,11 @@ new Vue({ this.$store.commit('menu/setSider', filterMenuSider[0]?.children || []); } else { //子路由给默认 如果你没有使用顶部菜单，则设置为默认的（一般为 home）名称即可 - // this.$store.commit('menu/setHeaderName', 'home'); + this.$store.commit('menu/setHeaderName', settings.routePre + '/home/'); + if (to.name == 'home_index') { + this.$store.commit('menu/setSider', []); + } // 指定当前显示的侧边菜单 - // this.$store.commit('menu/setSider', menuSider); } if (to.meta.kefu) { diff --git a/template/admin/src/pages/agent/agentManage.vue b/template/admin/src/pages/agent/agentManage.vue index 4a2e29c54..9683bf8ab 100644 --- a/template/admin/src/pages/agent/agentManage.vue +++ b/template/admin/src/pages/agent/agentManage.vue @@ -81,11 +81,11 @@ 推广订单 - 推广方式 - - - - 赠送分销等级 + 推广二维码 + 修改上级推广人 + 清除上级推广人 + 取消推广资格 + 修改分销等级 @@ -104,7 +104,7 @@ - +
@@ -367,21 +367,25 @@ export default { changeMenu(row, name, index) { switch (name) { case '1': - this.promoters(row, 'order'); + this.promoters(row, 'order');//推广人订单 break; case '2': - this.spreadQR(row); + this.spreadQR(row);//推广方式二维码 break; case '3': - this.editS(row); + this.editS(row);//修改上级推广人 break; - case '4': - this.del(row, '解除【 ' + row.nickname + ' 】的上级推广人', index); - case '5': + case '4'://清除上级推广人 + this.del_parent(row, '清除【 ' + row.nickname + ' 】的上级推广人', index); + break; + case '5'://取消推广资格 + this.del_agent(row, '取消【 ' + row.nickname + ' 】的推广资格', index); + break; + case '6'://修改推广等级 this.$modalForm(membershipDataAddApi({ uid: row.uid }, '/agent/get_level_form')).then(() => this.getList()); break; default: - this.del_open(row, '解除【 ' + row.nickname + ' 】的推广资格', index); + break; } }, @@ -397,16 +401,16 @@ export default { this.formInline.spread_uid = e.uid; this.formInline.image = e.image; }, - // 删除 - del(row, tit, num) { - let delfromData = { - title: tit, + // 清除上级关系 + del_parent(rows, titile, num) { + let delfromDatap = { + title: titile, num: num, - url: `agent/stair/delete_spread/${row.uid}`, + url: `agent/stair/delete_spread/${rows.uid}`, method: 'PUT', ids: '', }; - this.$modalSure(delfromData) + this.$modalSure(delfromDatap) .then((res) => { this.$Message.success(res.msg); this.getList(); @@ -415,8 +419,8 @@ export default { this.$Message.error(res.msg); }); }, - // 删除 - del_open(row, tit, num) { + // 取消自己推广资格 + del_agent(row, tit, num) { let delfromData = { title: tit, num: num, diff --git a/template/admin/src/pages/cms/articleCategory/index.vue b/template/admin/src/pages/cms/articleCategory/index.vue index bc3ba2c13..bf296f1a1 100644 --- a/template/admin/src/pages/cms/articleCategory/index.vue +++ b/template/admin/src/pages/cms/articleCategory/index.vue @@ -36,9 +36,9 @@ - +
- +
- + {{ item.date }}
-
{{ item.yesterday }}
+
{{ item.today }}
- + 昨日 {{ item.yesterday }} + 日环比 {{ Number(item.today_ratio) }}% - - +
@@ -95,7 +96,8 @@ export default { } .ivu-mr { - margin-right: 16px !important; + display: inline-block; + margin-left: 16px !important; } .ivu-text-right { diff --git a/template/admin/src/pages/marketing/point_record/index.vue b/template/admin/src/pages/marketing/point_record/index.vue index 24621b271..c87679487 100644 --- a/template/admin/src/pages/marketing/point_record/index.vue +++ b/template/admin/src/pages/marketing/point_record/index.vue @@ -1,12 +1,11 @@ @@ -76,7 +75,6 @@ export default { title: '操作', slot: 'action', align: 'center', - fixed: 'right', minWidth: 100, }, ], diff --git a/template/admin/src/pages/user/grade/record/index.vue b/template/admin/src/pages/user/grade/record/index.vue index cb09c039b..4453a97ef 100644 --- a/template/admin/src/pages/user/grade/record/index.vue +++ b/template/admin/src/pages/user/grade/record/index.vue @@ -61,7 +61,6 @@ :columns="thead" :data="tbody" ref="table" - class="mt25" :loading="loading" highlight-row no-userFrom-text="暂无数据" diff --git a/template/admin/src/pages/user/level/index.vue b/template/admin/src/pages/user/level/index.vue index 284cc87b1..2076b5e1d 100644 --- a/template/admin/src/pages/user/level/index.vue +++ b/template/admin/src/pages/user/level/index.vue @@ -101,8 +101,8 @@