Browse Source

feat: 优化后台

xiansin 2 years ago
parent
commit
a9dfe5681d

+ 1 - 1
mini/pages/product/detail.vue

@@ -18,7 +18,7 @@
           @click="handlePreview(detail.cases, index)"
           @click="handlePreview(detail.cases, index)"
         />
         />
       </view>
       </view>
-      <!--  只有VIP用户和设计师才能查看 价格     -->
+      <!--  只有VIP用户和设计师才能查看 资料下载     -->
       <template v-if="userInfo.account.type === $const.ACCOUNT_DESIGN || userInfo.account.type === $const.ACCOUNT_VIP">
       <template v-if="userInfo.account.type === $const.ACCOUNT_DESIGN || userInfo.account.type === $const.ACCOUNT_VIP">
         <u-divider />
         <u-divider />
         <!-- 资料下载  -->
         <!-- 资料下载  -->

+ 13 - 2
server/app/Admin/Controllers/DashBoardController.php

@@ -2,7 +2,6 @@
 
 
 namespace App\Admin\Controllers;
 namespace App\Admin\Controllers;
 
 
-use App\Admin\Metrics\Examples;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Controller;
 use App\Models\Account;
 use App\Models\Account;
 use App\Models\ProductCategory;
 use App\Models\ProductCategory;
@@ -45,6 +44,7 @@ class DashBoardController extends Controller
 
 
     public function download(Content $content)
     public function download(Content $content)
     {
     {
+        $this->reload();
         if(request()->isMethod('post')){
         if(request()->isMethod('post')){
             return $this->queryData('download');
             return $this->queryData('download');
         }
         }
@@ -59,6 +59,7 @@ class DashBoardController extends Controller
 
 
     private function viewerShowroom()
     private function viewerShowroom()
     {
     {
+        $this->reload();
         if(request()->isMethod('post')){
         if(request()->isMethod('post')){
             return $this->queryData('product');
             return $this->queryData('product');
         }
         }
@@ -72,13 +73,14 @@ class DashBoardController extends Controller
 
 
     private function viewerProduct()
     private function viewerProduct()
     {
     {
+        $this->reload();
         if(request()->isMethod('post')){
         if(request()->isMethod('post')){
             return $this->queryData('product');
             return $this->queryData('product');
         }
         }
         static::loadJS('product');
         static::loadJS('product');
         $categories = ProductCategory::with(['products:id,name,cate_id'])->get();
         $categories = ProductCategory::with(['products:id,name,cate_id'])->get();
         $data = [
         $data = [
-            'categories' => $categories
+            'categories' => $categories,
         ];
         ];
         return view('admin.dashboard.product', $data);
         return view('admin.dashboard.product', $data);
     }
     }
@@ -158,6 +160,15 @@ class DashBoardController extends Controller
 
 
     }
     }
 
 
+    private function reload()
+    {
+        $pjax = request()->input('_pjax', 0);
+        if($pjax){
+            header('location:'.request()->url());
+            exit;
+        }
+    }
+
     private static function getDays($startAt, $endAt): array
     private static function getDays($startAt, $endAt): array
     {
     {
         $startAt = $startAt ?: Carbon::today()->subDays(30)->toDateString();
         $startAt = $startAt ?: Carbon::today()->subDays(30)->toDateString();

+ 1 - 1
server/app/Admin/Controllers/ProductCategoryController.php

@@ -51,7 +51,7 @@ class ProductCategoryController extends AdminController
                 ->options(config('global.cat_level'))
                 ->options(config('global.cat_level'))
                 ->default(1);
                 ->default(1);
             $form->text('name')->required();
             $form->text('name')->required();
-            $form->image('cover_img')->saveFullUrl()
+            $form->image('cover_img','封面图(宽高比 1.4:1)')->saveFullUrl()
                 ->uniqueName()->autoUpload()
                 ->uniqueName()->autoUpload()
                 ->autoSave(false)
                 ->autoSave(false)
                 ->removable(false)
                 ->removable(false)

+ 2 - 2
server/app/Admin/Controllers/ProductController.php

@@ -182,13 +182,13 @@ class="img img-thumbnail">';
                 ->options(array_column($cates,'name','id'))
                 ->options(array_column($cates,'name','id'))
                 ->required();
                 ->required();
             $form->text('name')->required();
             $form->text('name')->required();
-            $form->image('cover_img')->saveFullUrl()
+            $form->image('cover_img','产品截面图(宽高比 0.9:1)')->saveFullUrl()
                 ->uniqueName()->autoUpload()
                 ->uniqueName()->autoUpload()
                 ->autoSave(false)
                 ->autoSave(false)
                 ->removable(false)
                 ->removable(false)
                 ->width(4)
                 ->width(4)
                 ->required();
                 ->required();
-            $form->multipleImage('cases')->saveFullUrl()
+            $form->multipleImage('cases','案例(宽高比 7.5:x)')->saveFullUrl()
                 ->uniqueName()->autoUpload()
                 ->uniqueName()->autoUpload()
                 ->autoSave(false)
                 ->autoSave(false)
                 ->removable(false)
                 ->removable(false)

+ 1 - 1
server/app/Admin/Controllers/ProductHotController.php

@@ -89,7 +89,7 @@ class ProductHotController extends AdminController
             $form->multipleSelect('product_id')
             $form->multipleSelect('product_id')
                 ->options(array_column($cates,'name','id'))
                 ->options(array_column($cates,'name','id'))
                 ->required();
                 ->required();
-            $form->image('cover_img')->saveFullUrl()
+            $form->image('cover_img','爆款图片(宽高比 1.34:1)')->saveFullUrl()
                 ->uniqueName()->autoUpload()
                 ->uniqueName()->autoUpload()
                 ->autoSave(false)
                 ->autoSave(false)
                 ->removable(false)
                 ->removable(false)

+ 1 - 1
server/config/admin.php

@@ -192,7 +192,7 @@ return [
     |--------------------------------------------------------------------------
     |--------------------------------------------------------------------------
     */
     */
     'helpers' => [
     'helpers' => [
-        'enable' => true,
+        'enable' => env('ADMIN_HELPERS', false),
     ],
     ],
 
 
     /*
     /*

BIN
server/public/favicon.ico


BIN
server/public/logo.png


+ 6 - 0
server/public/static/js/analyze.js

@@ -18,6 +18,12 @@ let AnalyzeChart = (function () {
             this.options = options
             this.options = options
             chartInstance = echarts.init(selector)
             chartInstance = echarts.init(selector)
             this.buttonEvent()
             this.buttonEvent()
+            this.menuClick()
+        },
+        menuClick(){
+            $(".nav-link").unbind().bind('click',function (){
+                window.location.href = $(this).attr('href')
+            })
         },
         },
         buttonEvent() {
         buttonEvent() {
             let _this = this
             let _this = this

BIN
server/public/vendor/dcat-admin/images/logo.ico


BIN
server/public/vendor/dcat-admin/images/logo.png


+ 4 - 1
server/resources/views/admin/dashboard/product.blade.php

@@ -25,7 +25,7 @@
 <div class=" card" style=";padding:.25rem .4rem .4rem">
 <div class=" card" style=";padding:.25rem .4rem .4rem">
     <ul class="nav nav-tabs" role="tablist">
     <ul class="nav nav-tabs" role="tablist">
         <li class="nav-item">
         <li class="nav-item">
-            <a href="#product_pane" class="nav-link active">产品查看数据</a>
+            <a href="#product_pane" class="nav-link active">产品查看数据 </a>
         </li>
         </li>
         <li class="nav-item">
         <li class="nav-item">
             <a href="javascript:;" class="nav-link redirect" data-toggle="tab">展厅查看数据</a>
             <a href="javascript:;" class="nav-link redirect" data-toggle="tab">展厅查看数据</a>
@@ -58,6 +58,9 @@
                     <button class="btn btn-primary btn-sm btn-mini product-search" type="button" style="margin-left: 12px">
                     <button class="btn btn-primary btn-sm btn-mini product-search" type="button" style="margin-left: 12px">
                         <i class="feather icon-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;搜索</span>
                         <i class="feather icon-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;搜索</span>
                     </button>
                     </button>
+                    <button style="margin-left: 6px" type="reset" class="reset btn btn-white btn-sm ">
+                        <i class="feather icon-rotate-ccw"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;重置</span>
+                    </button>
                 </form>
                 </form>
                 <ul class="nav nav-tabs" role="tablist">
                 <ul class="nav nav-tabs" role="tablist">
                     @foreach ($categories as $key => $category)
                     @foreach ($categories as $key => $category)

+ 3 - 0
server/resources/views/admin/dashboard/showroom.blade.php

@@ -48,6 +48,9 @@
                     <button class="btn btn-primary btn-sm btn-mini showroom-search" type="button" style="margin-left: 12px">
                     <button class="btn btn-primary btn-sm btn-mini showroom-search" type="button" style="margin-left: 12px">
                         <i class="feather icon-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;搜索</span>
                         <i class="feather icon-search"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;搜索</span>
                     </button>
                     </button>
+                    <button style="margin-left: 6px" type="reset" class="reset btn btn-white btn-sm ">
+                        <i class="feather icon-rotate-ccw"></i><span class="d-none d-sm-inline">&nbsp;&nbsp;重置</span>
+                    </button>
                 </form>
                 </form>
                 <div class="tab-content showroom">
                 <div class="tab-content showroom">
                     <div role="tabpanel" class="tab-pane active">
                     <div role="tabpanel" class="tab-pane active">