Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/api/controller/Goods.php

@@ -196,16 +196,20 @@ class Goods extends Controller
     public function recommended(): Json
     {
         $service = new GoodsService;
-        $cache_key = "goods_recommended".$this->storeId;
-        if(Cache::has($cache_key)) {
-            $goodsList = Cache::get($cache_key);
-            return $this->renderSuccess(compact('goodsList'));
-        }
+//        $cache_key = "goods_recommended".$this->storeId;
+//        if(Cache::has($cache_key)) {
+//            $goodsList = Cache::get($cache_key);
+//            return $this->renderSuccess(compact('goodsList'));
+//        }
         $goodsList = $service->recommended();
-        Cache::set($cache_key, $goodsList, 60*60);
+//        Cache::set($cache_key, $goodsList, 60*60);
         return $this->renderSuccess(compact('goodsList'));
     }
 
+    /**
+     * 商品大牌和新品
+     * @return Json
+     */
     public function brandList(): Json
     {
         $service = new GoodsService;
@@ -231,6 +235,10 @@ class Goods extends Controller
         return $this->renderSuccess($goodsList);
     }
 
+    /**
+     * 排行行查看更多
+     * @return Json
+     */
     public function chartsGoodsList(): Json
     {
         $service = new GoodsService;
@@ -239,6 +247,10 @@ class Goods extends Controller
         return $this->renderSuccess($goodsList);
     }
 
+    /**
+     * 首页分类商品排行榜 默认返回3条
+     * @return Json
+     */
     public function chartsGoodsJing(): Json
     {
         $service = new GoodsService;

app/store/controller/Presale.php

@@ -21,7 +21,7 @@ class Presale extends Controller
         // 店员列表
         $model = new PreSaleModel;
         $goodsModel = new \app\common\model\Goods();
-        $list = $model->where('store_id', $this->storeId)->select();
+        $list = $model->where('store_id', $this->storeId)->paginate(15);
         foreach ($list as &$row) {
             $row['goods_list'] = $goodsModel->whereIn('goods_id', explode(',', $row['goods_list']))->select()->toArray();
         }
@@ -48,7 +48,7 @@ class Presale extends Controller
         $list = $model->with(['goods'])
             ->where('store_id', $this->storeId)
             ->where('pre_id', $pre_id)
-            ->select();
+            ->paginate(15);
         return $this->renderSuccess(compact('list'));
     }
 

app/store/controller/Store.php

@@ -54,8 +54,9 @@ class Store extends Controller
      */
     public function settleList(): Json {
         $list = StoreSettle::where('store_id', '=', $this->storeId)
+            ->order('created_at','desc')
             ->paginate(10);
-        return $this->renderSuccess($list->toArray());
+        return $this->renderSuccess(compact('list'));
     }
 
     /**

public/store/css/server.1583280e.css

@@ -1 +0,0 @@
-.ant-card-body[data-v-1c40d8f5]{padding:22px 29px 25px}.tab-list[data-v-1c40d8f5]{margin-right:20px}.ant-card-body[data-v-6f3c98ac]{padding:22px 29px 25px}.tab-list[data-v-6f3c98ac]{margin-right:20px}.ant-card-body[data-v-11a6367c]{padding:22px 29px 25px}.tab-list[data-v-11a6367c]{margin-right:20px}

public/store/css/server.9cc07855.css

@@ -1 +1 @@
-.ant-card-body[data-v-60ed0ecf]{padding:22px 29px 25px}.tab-list[data-v-60ed0ecf]{margin-right:20px}.ant-card-body[data-v-7f1725a0]{padding:22px 29px 25px}.tab-list[data-v-7f1725a0]{margin-right:20px}.ant-card-body[data-v-3d9ae90d]{padding:22px 29px 25px}.tab-list[data-v-3d9ae90d]{margin-right:20px}.ant-card-body[data-v-11a6367c]{padding:22px 29px 25px}.tab-list[data-v-11a6367c]{margin-right:20px}
+.ant-card-body[data-v-60ed0ecf]{padding:22px 29px 25px}.tab-list[data-v-60ed0ecf]{margin-right:20px}.ant-card-body[data-v-275f1ee4]{padding:22px 29px 25px}.tab-list[data-v-275f1ee4]{margin-right:20px}.ant-card-body[data-v-3d9ae90d]{padding:22px 29px 25px}.tab-list[data-v-3d9ae90d]{margin-right:20px}.ant-card-body[data-v-11a6367c]{padding:22px 29px 25px}.tab-list[data-v-11a6367c]{margin-right:20px}

public/store/css/server.b0dd26bd.css

@@ -1 +0,0 @@
-.ant-card-body[data-v-60ed0ecf]{padding:22px 29px 25px}.tab-list[data-v-60ed0ecf]{margin-right:20px}.ant-card-body[data-v-6f3c98ac]{padding:22px 29px 25px}.tab-list[data-v-6f3c98ac]{margin-right:20px}.ant-card-body[data-v-11a6367c]{padding:22px 29px 25px}.tab-list[data-v-11a6367c]{margin-right:20px}

public/store/css/server.e26bc788.css

@@ -1 +0,0 @@
-.ant-card-body[data-v-60ed0ecf]{padding:22px 29px 25px}.tab-list[data-v-60ed0ecf]{margin-right:20px}.ant-card-body[data-v-3d9ae90d]{padding:22px 29px 25px}.tab-list[data-v-3d9ae90d]{margin-right:20px}.ant-card-body[data-v-11a6367c]{padding:22px 29px 25px}.tab-list[data-v-11a6367c]{margin-right:20px}

public/store/css/user.936ef1ed.css

@@ -1 +0,0 @@
-.ant-form-item{margin-bottom:15px}.ant-modal-body[data-v-2bace808]{padding-top:0!important}.ant-form-item[data-v-2bace808]{margin-bottom:15px}.ant-tabs-nav .ant-tabs-tab[data-v-2bace808]{padding:10px 16px}.ant-card-body[data-v-12162ada]{padding:22px 29px 25px}

public/store/css/user.bfbf32dd.css

@@ -1 +0,0 @@
-.ant-form-item{margin-bottom:15px}.ant-modal-body[data-v-2bace808]{padding-top:0!important}.ant-form-item[data-v-2bace808]{margin-bottom:15px}.ant-tabs-nav .ant-tabs-tab[data-v-2bace808]{padding:10px 16px}.ant-card-body[data-v-12162ada]{padding:22px 29px 25px}

public/store/index.html

@@ -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/bargain.aaf513d0.css" rel="prefetch"><link href="css/bargain~client~collector~content~dealer~eorder~goods~groupon~live~manage~market~order~page~server~se~a0a5d3c7.8e8dd5a1.css" rel="prefetch"><link href="css/client.a6cbdfac.css" rel="prefetch"><link href="css/collector.b0b45274.css" rel="prefetch"><link href="css/content.949483f8.css" rel="prefetch"><link href="css/dealer.33c053df.css" rel="prefetch"><link href="css/eorder.af369ba5.css" rel="prefetch"><link href="css/goods.df12bc83.css" rel="prefetch"><link href="css/groupon.d7e493ca.css" rel="prefetch"><link href="css/index.65686232.css" rel="prefetch"><link href="css/market.31bebd3b.css" rel="prefetch"><link href="css/order.34562fba.css" rel="prefetch"><link href="css/page.5cf12993.css" rel="prefetch"><link href="css/passport.27257d2f.css" rel="prefetch"><link href="css/server.f08cb353.css" rel="prefetch"><link href="css/setting.be935862.css" rel="prefetch"><link href="css/sharp.0237f2d1.css" rel="prefetch"><link href="css/statistics.6d805d57.css" rel="prefetch"><link href="css/store.b31f3a03.css" rel="prefetch"><link href="css/user.d41c82eb.css" rel="prefetch"><link href="js/bargain.027c2e96.js" rel="prefetch"><link href="js/bargain~client~collector~content~dealer~eorder~goods~groupon~live~manage~market~order~page~server~se~a0a5d3c7.f7e902c4.js" rel="prefetch"><link href="js/client.f9b450e7.js" rel="prefetch"><link href="js/collector.5afe6707.js" rel="prefetch"><link href="js/content.119a99dc.js" rel="prefetch"><link href="js/dealer.46441193.js" rel="prefetch"><link href="js/dealer~page~store.c1e7aeb9.js" rel="prefetch"><link href="js/eorder.6901a2af.js" rel="prefetch"><link href="js/exception.4f918b59.js" rel="prefetch"><link href="js/goods.1997cc93.js" rel="prefetch"><link href="js/groupon.ca1a1258.js" rel="prefetch"><link href="js/index.bb016803.js" rel="prefetch"><link href="js/index~statistics.5ed2ab05.js" rel="prefetch"><link href="js/lang-zh-CN.8c571402.js" rel="prefetch"><link href="js/live.ab3fb0ef.js" rel="prefetch"><link href="js/manage.80527b44.js" rel="prefetch"><link href="js/market.5f17bc8e.js" rel="prefetch"><link href="js/order.8b016981.js" rel="prefetch"><link href="js/page.e2ad1a4a.js" rel="prefetch"><link href="js/passport.54223076.js" rel="prefetch"><link href="js/server.341d5837.js" rel="prefetch"><link href="js/setting.8281d8f9.js" rel="prefetch"><link href="js/sharp.bd4c7d3f.js" rel="prefetch"><link href="js/statistics.5cc66089.js" rel="prefetch"><link href="js/store.55c7feba.js" rel="prefetch"><link href="js/user.5056b55d.js" rel="prefetch"><link href="css/app.0bf46b1d.css" rel="preload" as="style"><link href="css/chunk-vendors.35626c22.css" rel="preload" as="style"><link href="js/app.10307a80.js" rel="preload" as="script"><link href="js/chunk-vendors.87848c69.js" rel="preload" as="script"><link href="css/chunk-vendors.35626c22.css" rel="stylesheet"><link href="css/app.0bf46b1d.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.87848c69.js"></script><script src="js/app.10307a80.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/bargain.aaf513d0.css" rel="prefetch"><link href="css/bargain~client~collector~content~dealer~eorder~goods~groupon~live~manage~market~order~page~server~se~a0a5d3c7.8e8dd5a1.css" rel="prefetch"><link href="css/client.a6cbdfac.css" rel="prefetch"><link href="css/collector.b0b45274.css" rel="prefetch"><link href="css/content.949483f8.css" rel="prefetch"><link href="css/dealer.33c053df.css" rel="prefetch"><link href="css/eorder.af369ba5.css" rel="prefetch"><link href="css/goods.df12bc83.css" rel="prefetch"><link href="css/groupon.d7e493ca.css" rel="prefetch"><link href="css/index.65686232.css" rel="prefetch"><link href="css/market.31bebd3b.css" rel="prefetch"><link href="css/order.34562fba.css" rel="prefetch"><link href="css/page.5cf12993.css" rel="prefetch"><link href="css/passport.27257d2f.css" rel="prefetch"><link href="css/server.9cc07855.css" rel="prefetch"><link href="css/setting.be935862.css" rel="prefetch"><link href="css/sharp.0237f2d1.css" rel="prefetch"><link href="css/statistics.6d805d57.css" rel="prefetch"><link href="css/store.b31f3a03.css" rel="prefetch"><link href="css/user.d41c82eb.css" rel="prefetch"><link href="js/bargain.027c2e96.js" rel="prefetch"><link href="js/bargain~client~collector~content~dealer~eorder~goods~groupon~live~manage~market~order~page~server~se~a0a5d3c7.f7e902c4.js" rel="prefetch"><link href="js/client.f9b450e7.js" rel="prefetch"><link href="js/collector.5afe6707.js" rel="prefetch"><link href="js/content.119a99dc.js" rel="prefetch"><link href="js/dealer.46441193.js" rel="prefetch"><link href="js/dealer~page~store.c1e7aeb9.js" rel="prefetch"><link href="js/eorder.6901a2af.js" rel="prefetch"><link href="js/exception.4f918b59.js" rel="prefetch"><link href="js/goods.1997cc93.js" rel="prefetch"><link href="js/groupon.ca1a1258.js" rel="prefetch"><link href="js/index.bb016803.js" rel="prefetch"><link href="js/index~statistics.5ed2ab05.js" rel="prefetch"><link href="js/lang-zh-CN.8c571402.js" rel="prefetch"><link href="js/live.ab3fb0ef.js" rel="prefetch"><link href="js/manage.80527b44.js" rel="prefetch"><link href="js/market.144b43f6.js" rel="prefetch"><link href="js/order.8b016981.js" rel="prefetch"><link href="js/page.e2ad1a4a.js" rel="prefetch"><link href="js/passport.54223076.js" rel="prefetch"><link href="js/server.0da3de94.js" rel="prefetch"><link href="js/setting.8281d8f9.js" rel="prefetch"><link href="js/sharp.bd4c7d3f.js" rel="prefetch"><link href="js/statistics.5cc66089.js" rel="prefetch"><link href="js/store.55c7feba.js" rel="prefetch"><link href="js/user.5056b55d.js" rel="prefetch"><link href="css/app.0bf46b1d.css" rel="preload" as="style"><link href="css/chunk-vendors.35626c22.css" rel="preload" as="style"><link href="js/app.26da0bf7.js" rel="preload" as="script"><link href="js/chunk-vendors.87848c69.js" rel="preload" as="script"><link href="css/chunk-vendors.35626c22.css" rel="stylesheet"><link href="css/app.0bf46b1d.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.87848c69.js"></script><script src="js/app.26da0bf7.js"></script></body></html>