lqmac 10 months ago
parent 13b2d41b9d
commit ea62a814bb
  1. 6
      app/common/model/Goods.php
  2. 1
      public/admin/css/app.8cd9120c.css
  3. 1
      public/admin/css/user.a0162045.css
  4. 2
      public/admin/index.html
  5. 1
      public/admin/js/app.2bbfd09a.js
  6. 1
      public/admin/js/user.a95c6a23.js

@ -461,6 +461,12 @@ class Goods extends BaseModel
if (isset($param['is_pool']) && $param['is_pool'] !== '') {
$filter[] = ['goods.is_pool', '=', $params['is_pool']];
}
if (isset($param['start_time']) && $param['start_time'] !== '') {
$filter[] = ['goods.create_time', '>=', strtotime($params['start_time'])];
}
if (isset($param['end_time']) && $param['end_time'] !== '') {
$filter[] = ['goods.create_time', '>=', strtotime($params['end_time'])];
}
if (isset($param['goods_price_min']) && $param['goods_price_min'] !== '') {
$filter[] = ['goods.goods_price_min', '>=', $params['goods_price_min']];
}

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
.container[data-v-a800ae36]{width:100%!important;margin:0!important}.header[data-v-a800ae36]{height:44px;line-height:44px;margin-bottom:40px;text-align:center}.header .badge[data-v-a800ae36]{position:absolute;display:inline-block;line-height:1;vertical-align:middle;margin-left:-12px;margin-top:-10px;opacity:.8}.header .logo[data-v-a800ae36]{height:44px;vertical-align:top;margin-right:10px;margin-left:-12px;border-style:none}.header .title[data-v-a800ae36]{font-size:30px;color:rgba(0,0,0,.85);font-family:Avenir,Helvetica Neue,Arial,Helvetica,sans-serif;font-weight:600;position:relative;top:2px}.user-layout-login label[data-v-a800ae36]{font-size:14px}.user-layout-login button.login-button[data-v-a800ae36]{padding:0 15px;font-size:16px;height:40px;width:100%}

@ -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.5fa67419.css" rel="prefetch"><link href="css/goods.1bf5c5b9.css" rel="prefetch"><link href="css/menu.0391ed9c.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.e7212c27.js" rel="prefetch"><link href="js/fail.d5f9b5f1.js" rel="prefetch"><link href="js/goods.9635e53a.js" rel="prefetch"><link href="js/menu.09e52eec.js" rel="prefetch"><link href="js/setting.c2a3636d.js" rel="prefetch"><link href="js/store.8dd9f7ee.js" rel="prefetch"><link href="js/user.b8f45791.js" rel="prefetch"><link href="css/app.c853be39.css" rel="preload" as="style"><link href="css/chunk-vendors.7582a57f.css" rel="preload" as="style"><link href="js/app.7e029485.js" rel="preload" as="script"><link href="js/chunk-vendors.5c6b133e.js" rel="preload" as="script"><link href="css/chunk-vendors.7582a57f.css" rel="stylesheet"><link href="css/app.c853be39.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.5c6b133e.js"></script><script src="js/app.7e029485.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.5fa67419.css" rel="prefetch"><link href="css/goods.1bf5c5b9.css" rel="prefetch"><link href="css/menu.0391ed9c.css" rel="prefetch"><link href="css/setting.acf5c21b.css" rel="prefetch"><link href="css/store.14ef162f.css" rel="prefetch"><link href="css/user.a0162045.css" rel="prefetch"><link href="js/cloud.e7212c27.js" rel="prefetch"><link href="js/fail.d5f9b5f1.js" rel="prefetch"><link href="js/goods.9635e53a.js" rel="prefetch"><link href="js/menu.09e52eec.js" rel="prefetch"><link href="js/setting.c2a3636d.js" rel="prefetch"><link href="js/store.8dd9f7ee.js" rel="prefetch"><link href="js/user.a95c6a23.js" rel="prefetch"><link href="css/app.8cd9120c.css" rel="preload" as="style"><link href="css/chunk-vendors.7582a57f.css" rel="preload" as="style"><link href="js/app.2bbfd09a.js" rel="preload" as="script"><link href="js/chunk-vendors.5c6b133e.js" rel="preload" as="script"><link href="css/chunk-vendors.7582a57f.css" rel="stylesheet"><link href="css/app.8cd9120c.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.5c6b133e.js"></script><script src="js/app.2bbfd09a.js"></script></body></html>

File diff suppressed because one or more lines are too long

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