wangmingchuan
/
yanzong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
v1.0
lqmac 8 months ago
parent ceeedb6fa4
commit b8b38c6e9b
12 changed files with 45 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      app/admin/controller/Goods.php
  2. 6
      app/admin/controller/Store.php
  3. 1
      app/admin/service/admin/User.php
  4. 2
      app/common/model/Goods.php
  5. 1
      public/admin/css/app.e613361a.css
  6. 1
      public/admin/css/goods.0284e48a.css
  7. 1
      public/admin/css/menu.a51b889c.css
  8. 2
      public/admin/index.html
  9. 1
      public/admin/js/app.05f68837.js
  10. 3
      public/admin/js/goods.a50046a8.js
  11. 3
      public/admin/js/menu.b0330e60.js
  12. 3
      public/admin/js/store.f45b7791.js

22
app/admin/controller/Goods.php
Unescape View File

@ -151,6 +151,7 @@ class Goods extends Controller
} }
return $this->renderSuccess('操作成功'); return $this->renderSuccess('操作成功');
} }
/** /**
* 修改商品状态(上下架) * 修改商品状态(上下架)
* @param array $goodsIds 商品id集 * @param array $goodsIds 商品id集
@ -180,4 +181,25 @@ class Goods extends Controller
} }
return $this->renderSuccess('删除成功'); return $this->renderSuccess('删除成功');
} }
public function export(){
$model = new GoodsModel;
$params = $this->request->param();
$params['store_id'] = 0;
$list= $model->getAdminList($params);
return $this->renderSuccess(compact('list'));
}
public function addPrice(array $categoryIds, int $rate){
return $this->renderSuccess('加价成功');
}
} }

6
app/admin/controller/Store.php
Unescape View File

@ -162,7 +162,13 @@ class Store extends Controller
*/ */
public function platformList(): Json public function platformList(): Json
{ {
if ($this->admin['user']['role'] == 1) {
$list = Channel::where('status', 1)->whereIn('code',['jd','sn','zy'])->select();
} else {
$list = Channel::where('status', 1)->select(); $list = Channel::where('status', 1)->select();
}
$platformList = []; $platformList = [];
foreach ($list as $key => $value) { foreach ($list as $key => $value) {
$platformList[$value['code']] = $value['name']; $platformList[$value['code']] = $value['name'];

1
app/admin/service/admin/User.php
Unescape View File

@ -50,6 +50,7 @@ class User extends BaseService
'user' => [ 'user' => [
'admin_user_id' => (int)$userInfo['admin_user_id'], 'admin_user_id' => (int)$userInfo['admin_user_id'],
'user_name' => $userInfo['user_name'], 'user_name' => $userInfo['user_name'],
'role' => $userInfo['role'],
], ],
'is_login' => true, 'is_login' => true,
], 86400 * 7); ], 86400 * 7);

2
app/common/model/Goods.php
Unescape View File

@ -358,7 +358,7 @@ class Goods extends BaseModel
$GoodsCategoryRelName = (new GoodsCategoryRelModel())->getName(); $GoodsCategoryRelName = (new GoodsCategoryRelModel())->getName();
$query->join($GoodsCategoryRelName, "{$GoodsCategoryRelName}.goods_id = {$this->name}.goods_id"); $query->join($GoodsCategoryRelName, "{$GoodsCategoryRelName}.goods_id = {$this->name}.goods_id");
// 设置分类ID条件 // 设置分类ID条件
$query->where('goods_category_rel.category_id', 'in', explode(",", $params['categoryId'])); $query->where('goods_category_rel.category_id', 'in', explode(",", (string)$params['categoryId']));
// $query->where([ // $query->where([
// 'goods_category_rel.category_id' => (int)$params['categoryId'], // 'goods_category_rel.category_id' => (int)$params['categoryId'],
// //'goods.store_id' => (int)$params['store_id'], // //'goods.store_id' => (int)$params['store_id'],

1
public/admin/css/app.e613361a.css
View File

File diff suppressed because one or more lines are too long

1
public/admin/css/goods.0284e48a.css
View File

File diff suppressed because one or more lines are too long

1
public/admin/css/menu.a51b889c.css
Unescape View File

@ -0,0 +1 @@
.ant-tag[data-v-8418186a]{cursor:pointer}.ant-tag[data-v-8418186a]:hover{border:1px solid #fb9a9a;color:#fb9a9a}

2
public/admin/index.html
Unescape View File

@ -1 +1 @@
<!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/cloud.a47f0029.css" rel="prefetch"><link href="css/goods.b2f8659e.css" rel="prefetch"><link href="css/menu.ea2422ad.css" rel="prefetch"><link href="css/setting.acf5c21b.css" rel="prefetch"><link href="css/store.14ef162f.css" rel="prefetch"><link href="css/user.6c29834d.css" rel="prefetch"><link href="js/cloud.5250d74c.js" rel="prefetch"><link href="js/fail.9f520b72.js" rel="prefetch"><link href="js/goods.f3765674.js" rel="prefetch"><link href="js/menu.532798eb.js" rel="prefetch"><link href="js/setting.9458c846.js" rel="prefetch"><link href="js/store.e9aaa387.js" rel="prefetch"><link href="js/user.8c820957.js" rel="prefetch"><link href="css/app.23d37387.css" rel="preload" as="style"><link href="css/chunk-vendors.f1c5ffe0.css" rel="preload" as="style"><link href="js/app.5ad464ae.js" rel="preload" as="script"><link href="js/chunk-vendors.deec1c57.js" rel="preload" as="script"><link href="css/chunk-vendors.f1c5ffe0.css" rel="stylesheet"><link href="css/app.23d37387.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.deec1c57.js"></script><script src="js/app.5ad464ae.js"></script></body></html> <!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/cloud.a47f0029.css" rel="prefetch"><link href="css/goods.0284e48a.css" rel="prefetch"><link href="css/menu.a51b889c.css" rel="prefetch"><link href="css/setting.acf5c21b.css" rel="prefetch"><link href="css/store.14ef162f.css" rel="prefetch"><link href="css/user.6c29834d.css" rel="prefetch"><link href="js/cloud.5250d74c.js" rel="prefetch"><link href="js/fail.9f520b72.js" rel="prefetch"><link href="js/goods.a50046a8.js" rel="prefetch"><link href="js/menu.b0330e60.js" rel="prefetch"><link href="js/setting.9458c846.js" rel="prefetch"><link href="js/store.f45b7791.js" rel="prefetch"><link href="js/user.8c820957.js" rel="prefetch"><link href="css/app.e613361a.css" rel="preload" as="style"><link href="css/chunk-vendors.f1c5ffe0.css" rel="preload" as="style"><link href="js/app.05f68837.js" rel="preload" as="script"><link href="js/chunk-vendors.deec1c57.js" rel="preload" as="script"><link href="css/chunk-vendors.f1c5ffe0.css" rel="stylesheet"><link href="css/app.e613361a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.deec1c57.js"></script><script src="js/app.05f68837.js"></script></body></html>

1
public/admin/js/app.05f68837.js
View File

File diff suppressed because one or more lines are too long

3
public/admin/js/goods.a50046a8.js
View File

File diff suppressed because one or more lines are too long

3
public/admin/js/menu.b0330e60.js
View File

File diff suppressed because one or more lines are too long

3
public/admin/js/store.f45b7791.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save