sys 3 gadi atpakaļ
vecāks
revīzija
d9cf0f9609

+ 1 - 1
app/Http/Controllers/Admin/IndexController.php

@@ -165,7 +165,7 @@ class IndexController extends BaseController
                 $fileName = time() . str_random(4) . mt_rand(1000, 9999) . ".{$ext}";
                 $pathA = 'image/' . date('y-m', time()) . '/' . $fileName;
                 // oss 上传图片
-                $oss = Storage::disk('oss');
+                $oss = Storage::disk('local');
 //                dd(file_get_contents($request->{'file_image'}->getRealPath()));
                 $update = $oss->put($pathA, file_get_contents($request->{'file_image'}->getRealPath()));
 //                $path = $request->file("file_image")->storeAs(!$request->uploadName?'oneImage':$request->uploadName.'/'.date('y-m',time()),$fileName,'public_storage');

+ 8 - 82
app/Http/Controllers/Banner/BannersController.php

@@ -79,31 +79,13 @@ class BannersController extends AdminBaseController
      */
     protected function _indexPost($datum)
     {
-        foreach ($datum as $value) {
-            $this->getValue($value);
+        foreach ($datum as $value){
+            $value->{'image'}=env('APP_URL').$value->{'image'};
         }
         return $datum;
     }
 
-    private function getValue(&$value)
-    {
-        $to_name='无';
-        if($value->{'type'}==0){
-            $value->{'type'}='无';
-        }elseif ($value->{'type'}==1){
-            $value->{'type'}='链接商品';
-            $to_name=Goods::where('id', $value->{'to_id'})->value('good_name');
-        }elseif ($value->{'type'}==2){
-            $value->{'type'}='链接分类';
-            $to_name=GoodsClass::where('id', $value->{'to_id'})->value('class_name');
-        }elseif ($value->{'type'}==3){
-            $to_name='秒杀';
-            $value->{'type'}='链接秒杀';
-        }else{
-            $value->{'type'}='外部链接';
-        }
-        $value->{'to_name'}=$to_name;
-    }
+
 
 
     /**
@@ -112,9 +94,9 @@ class BannersController extends AdminBaseController
      */
     function _storeGet()
     {
-        $type_list = $this->getTypeList('0');
 
-        return ['type_list' => json_encode($type_list, JSON_UNESCAPED_SLASHES)];
+
+        return [];
     }
 
 
@@ -126,69 +108,13 @@ class BannersController extends AdminBaseController
     function _editGet($id)
     {
         $model = $this->repository->find($id);
-        $type_list = $this->getTypeList($model->{'type'});
-        $this->getBannerInfo($model);
-        return ['model' => $model, 'type_list' => json_encode($type_list, JSON_UNESCAPED_SLASHES)];
-    }
 
-    private function getBannerInfo(&$model)
-    {
-        $goods_name = '';
-        $class_id = 0;
-        if ($model->{'type'} == 1) {
-            $goods_name = Goods::where('id', $model->{'to_id'})->value('good_name');
-        } elseif ($model->{'type'} == 2) {
-            $class_id = GoodsClass::where('id', $model->{'to_id'})->value('p_id');
-        }
-        $model->{'to_name'} = $goods_name;
-        $model->{'class_id'} = $class_id;
+        return ['model' => $model];
     }
 
 
-    /**
-     * 轮播链接类型
-     * @param $type
-     * @return array
-     */
-    private function getTypeList($type)
-    {
-        $option = [
-            'checked' => $type . '',
-            'attr' => [
-                [
-                    'value' => '0',
-                    'label' => "无链接",
-                    'disabled' => false,
-                    'notice' => '*'
-                ],
-                [
-                    'value' => '1',
-                    'label' => "链接商品",
-                    'disabled' => false,
-                    'notice' => '*'
-                ],
-                [
-                    'value' => '2',
-                    'label' => "链接分类",
-                    'disabled' => false,
-                    'notice' => '*'
-                ],
-                [
-                    'value' => '3',
-                    'label' => "链接秒杀",
-                    'disabled' => false,
-                    'notice' => '*'
-                ],
-                [
-                    'value' => '4',
-                    'label' => "外部链接",
-                    'disabled' => false,
-                    'notice' => '*'
-                ],
-            ]
-        ];
-        return $option;
-    }
+
+
 
 
 }

+ 0 - 49
app/Http/Controllers/Banner/Front/BannerNotTokenController.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Banner\Front;
-
-use App\Http\Controllers\FrontController;
-use App\Models\Banners;
-use Carbon\Carbon;
-
-/**
- * Class BannerNotTokenController
- * @package App\Http\Controllers\Banner\Front
- *
- * Banner列表
- */
-class BannerNotTokenController extends FrontController
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * @return \Illuminate\Http\JsonResponse
-     *
-     * banner列表
-     */
-    public function index()
-    {
-        $lists = Banners::select(['id', 'image', 'image_en', 'link', 'created_at', 'updated_at'])
-            ->where('show', '>=', 1)
-            ->orderBy('sort', 'ASC')
-            ->get();
-
-        $data = array();
-        foreach ( $lists as $key => $list ) {
-            $data[$key]['id']    = $list->id;
-            if ( request()->input('lang', 'zh') == 'zh' ) {
-                $data[$key]['image'] = $list->image."?image/auto-orient,1/quality,q_90";
-            }else{
-                $data[$key]['image'] = $list->image_en."?image/auto-orient,1/quality,q_90";
-            }
-            $data[$key]['link']  = $list->link;
-            $data[$key]['created_at']  = Carbon::parse($list->created_at)->format('Y.m.d H:i:s');
-            $data[$key]['updated_at']  = Carbon::parse($list->updated_at)->format('Y.m.d H:i:s');
-        }
-
-        return $this->apiResponseSuccess($data, 'banner.success');
-    }
-}

+ 0 - 36
app/Http/Controllers/Banner/Front/BannersController.php

@@ -1,36 +0,0 @@
-<?php
-
-
-namespace App\Http\Controllers\Banner\Front;
-
-
-use App\Http\Controllers\FrontController;
-use App\Models\Banner;
-use Carbon\Carbon;
-
-class BannersController extends FrontController
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function index()
-    {
-        $banners = Banner::where('show', '>=',1)
-            ->orderBy('sort', 'ASC')
-            ->get();
-
-        $data = [];
-        foreach ( $banners as $key => $banner ){
-            $data[$key]['image'] = $banner->image;
-            $data[$key]['created_at'] = Carbon::parse($banner->created_at, config('app.timezone'))->toDateTimeString();
-        }
-
-        return response()->json([
-            'msg'   => '',
-            'data'  => $data,
-            'code'  => 1,
-        ]);
-    }
-}

+ 2 - 31
resources/views/admins/banners/create.blade.php

@@ -6,14 +6,7 @@
         <!-- image -->
         <ui-input-text label="轮播标题" name="title" placeholder="请输入轮播标题" maxlength="255" tips="请输入轮播标题" autofocus="true"></ui-input-text>
         <ui-file label="轮播图" size="1.5" name="image" :data="{uploadName:'banners'}" tips="图片建议(686*128)"></ui-file>
-        <ui-select label="链接类型:"  @set-keys="setType" id="type_list" name="type" placeholder=""
-                   :options="type_list" :free="true"></ui-select>
-        <!-- link -->
-        <ui-input-text v-if="type_num*1==4" label="外部链接" name="link" placeholder="请输入外部链接" maxlength="255" tips="请输入外部链接" autofocus="true"></ui-input-text>
 
-        <ui-input-select label="绑定商品" button_title="选择商品"  tips="请选择需要跳转的商品" v-else-if="type_num*1==1"  send_url="{{route('admin.good.select')}}" name="to_id" title="" value="" :options="select_arr" ></ui-input-select>
-        <ui-linkage v-else-if="type_num*1==2" label="商品分类"  :options="class_list" tips="请选择需要跳转的商品分类"></ui-linkage>
-        <!-- show -->
         <ui-radio label="是否开启" :params="params" tips="轮播显示"></ui-radio>
         <!-- sort -->
         <ui-input-number label="排序" checked="checked" value="50" name="sort" min="1" max="100" tips="排序-控制前台轮播显示顺序"></ui-input-number>
@@ -29,22 +22,7 @@
             el: '#banners-app',
             data :function () {
                 return {
-                    'type_num':0,
-                    'type_list':{!! $type_list !!},
-                    'select_arr':{
-                        'button_title':'选择商品',
-                        'name':'to_id',
-                        'title':'',
-                        'value':'',
-                    },
-                    class_list: {
-                        'tier_num': 2,
-                        'one_id': '',
-                        'two_id': '',
-                        'send_url': '{{route('admin.goodsClass.class')}}',
-                        'one_name': '',
-                        'two_name':'to_id'
-                    },
+
                     params: {
                         // 注意:group和attr连个属性都不能省略 就算为空
                         group: {},
@@ -69,14 +47,7 @@
                 };
             },
             methods: {
-                setType: function (level) {
-                    console.log('数据变化:' + level);
-                    this.type_num = level*1;
-                },
-                setGoods:function (row){
-                    this.select_arr.title=row.good_name;
-                    this.select_arr.value=row.id;
-                }
+
             },
         });
         jQuery.validator.setDefaults({

+ 2 - 31
resources/views/admins/banners/edit.blade.php

@@ -6,13 +6,6 @@
         <!-- 图片 -->
         <ui-input-text label="轮播标题" name="title" value="{{$model->title}}" placeholder="请输入轮播标题" maxlength="255" tips="请输入轮播标题" autofocus="true"></ui-input-text>
         <ui-file label="轮播图" size="0.5" name="image" :data="{uploadName:'banners'}" imageurl="{{$model->image}}" tips="图片大小建议(686*128)"></ui-file>
-        <ui-select label="链接类型:"  @set-keys="setType" id="type_list" name="type" placeholder=""
-                   :options="type_list" :free="true"></ui-select>
-        <!-- link -->
-        <ui-input-text v-if="type_num*1==4" label="外部链接" name="link" placeholder="请输入外部链接" maxlength="255" tips="请输入外部链接" autofocus="true"></ui-input-text>
-
-        <ui-input-select label="绑定商品" button_title="选择商品"  tips="请选择需要跳转的商品" v-else-if="type_num*1==1"  send_url="{{route('admin.good.select')}}" name="to_id" title="{{$model->to_name}}" value="{{$model->to_id}}" :options="select_arr" ></ui-input-select>
-        <ui-linkage v-else-if="type_num*1==2" label="商品分类"  :options="class_list" tips="请选择需要跳转的商品分类"></ui-linkage>
         <!-- 是否显示 -->
         <ui-radio label="是否开启" :params="params" tips="轮播显示"></ui-radio>
         <!-- 排序 -->
@@ -29,22 +22,7 @@
             el: '#banners-app',
             data :function () {
                 return {
-                    'type_num':{{$model->type}},
-                    'type_list':{!! $type_list !!},
-                    'select_arr':{
-                        'button_title':'选择商品',
-                        'name':'to_id',
-                        'title':'{{$model->to_name}}',
-                        'value':'{{$model->to_id}}',
-                    },
-                    class_list: {
-                        'tier_num': 2,
-                        'one_id': '{{$model->class_id}}',
-                        'two_id': '{{$model->to_id}}',
-                        'send_url': '{{route('admin.goodsClass.class')}}',
-                        'one_name': '',
-                        'two_name':'to_id'
-                    },
+
                     params: {
                         // 注意:group和attr连个属性都不能省略 就算为空
                         group: {},
@@ -69,14 +47,7 @@
                 };
             },
             methods: {
-                setType: function (level) {
-                    console.log('数据变化:' + level);
-                    this.type_num = level*1;
-                },
-                setGoods:function (row){
-                    this.select_arr.title=row.good_name;
-                    this.select_arr.value=row.id;
-                }
+
             },
         });
         jQuery.validator.setDefaults({

+ 1 - 11
resources/views/admins/banners/index.blade.php

@@ -16,17 +16,7 @@
                 <label for="name" class="label-css"> 轮播标题:</label>
                 <input class="form-control" type="text" name="title">
             </div>
-            <div class="form-group">
-                <label for="level_id" class="label-css"> 轮播类型:</label>
-                <select class="form-control" name="type" style="margin-top: -8px;">
-                    <option value="">全部类型</option>
-                    <option value="0">无链接</option>
-                    <option value="1">链接商品</option>
-                    <option value="2">链接分类</option>
-                    <option value="3">链接秒杀</option>
-                    <option value="4">外部链接</option>
-                </select>
-            </div>
+
             <div class="form-group">
                 <label for="level_id" class="label-css"> 显示状态:</label>
                 <select class="form-control" name="show" style="margin-top: -8px;">