dyjh há 6 anos atrás
pai
commit
5ffe4b860b

+ 12 - 10
app/Http/Controllers/Admin/Album/PosterController.php

xqd xqd xqd xqd xqd xqd
@@ -58,8 +58,8 @@ class PosterController extends Controller
     private function _createSave()
     {
         $data = (array) request('data');
-        if (isset($data['video_url'])) {
-            $data['video_url'] = $this->uploadVideo($data['video_url'], '');
+        if (request()->file('video_url')) {
+            $data['video_url'] = $this->uploadVideo(request()->file('video_url'), '');
         }
         if (!empty($data['posters']['url'])) {
             foreach ($data['posters']['url'] as $key => $val) {
@@ -95,8 +95,8 @@ class PosterController extends Controller
         if (!empty($data)) {
             $data = $data[0];
             $data['posters'] = json_decode($data['posters'], true);
-            $data['banner'] = json_decode($data['banner'], true);
-            $data['words'] = json_decode($data['words'], true);
+            $data['video_url'] = json_decode($data['video_url'], true);
+            $data['video_url'] = $data['video_url']['url'];
         }
         return view('admin.album.poster.edit', compact('data'));
     }
@@ -107,8 +107,9 @@ class PosterController extends Controller
     private function updateSave()
     {
         $data = (array) request('data');
-        if (isset($data['video_url'])) {
-            $data['video_url'] = $this->uploadVideo($data['video_url'], request('id'));
+
+        if (request()->file('video_url')) {
+            $data['video_url'] = $this->uploadVideo(request()->file('video_url'), request('id'));
         }
         if (!empty($data['posters']['url'])) {
             foreach ($data['posters']['url'] as $key => $val) {
@@ -133,7 +134,7 @@ class PosterController extends Controller
         }
     }
 
-    public function uploadVideo($video,$id)
+    public function uploadVideo($video, $id)
     {
         // dd($video);
 // 判断图片有效性
@@ -143,8 +144,10 @@ class PosterController extends Controller
         if ($id) {
             $check = AlbumPosterModel::where([['id',$id]])->first();
             if ($check) {
-                $res = json_decode($check->upload_video, true);
-                OSS::publicDeleteObject(config('alioss.BucketName'), $res['oss_key']);
+                $res = json_decode($check->video_url, true);
+                if ($res != '') {
+                    OSS::publicDeleteObject(config('alioss.BucketName'), $res['oss_key']);
+                }
             }
         }
 
@@ -155,7 +158,6 @@ class PosterController extends Controller
         $ex = $video->getClientOriginalExtension();
         $key = time() . rand(10000, 99999999) . '.' . $ex;
 //阿里 OSS 文件上传
-
         $result = OSS::publicUpload(config('alioss.BucketName'), $key, $videoPath);
         if ($result) {
             $data['oss_key'] =  $key;

+ 2 - 1
app/Http/Controllers/Api/V1/AlbumPosterController.php

xqd
@@ -91,9 +91,10 @@ class AlbumPosterController extends Controller
             $name = $agent_check->realname;
         }
         $info['username'] = $name;
+        $info['avatar'] = $userAuth->avatar;
         $info['share'] = $WeChatApp->share_image;
         $info['title'] = $WeChatApp->share_title;
-        $info['qrcode_'] = $this->createPoster($userAuth, $store_id);
+        $info['qrcode'] = $this->createPoster($userAuth, $store_id);
         return $this->api(compact('info'));
     }
 

+ 0 - 3
app/Models/AlbumPosterModel.php

xqd
@@ -34,9 +34,6 @@ class AlbumPosterModel extends BaseModel
                            'store_id',
                            'posters',
                            'words',
-                           'banners',
-                           'introduce',
-                           'qrcode',
                            'video_url',
                            'share_type',
                            'name'

+ 33 - 0
database/migrations/2019_05_30_153526_drop_banner_column_in_album_poster.php

xqd
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropBannerColumnInAlbumPoster extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('album_poster', function (Blueprint $table) {
+            //
+            $table->dropColumn(['banner','introduce','qrcode']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('album_poster', function (Blueprint $table) {
+            //
+        });
+    }
+}

+ 2 - 2
resources/views/admin/album/poster/edit.blade.php

xqd xqd
@@ -34,7 +34,7 @@
 
 		            <div class="row">
                         <div class="col-lg-10">
-                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+                            <form name="form_product" id="form-validation" enctype="multipart/form-data" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
                                 <input type="hidden" name="id" value="{{ $data['id'] or ''}}"/>
                                 <div class="form-group">
 
@@ -63,7 +63,7 @@
                                                 <source src="{{$data['video_url'] ?? ''}}" type="video/mp4">
                                             </video>
                                         </div>
-                                        <input id="file-0b" class="file" type="file" name="data[video_url]" value="">
+                                        <input id="file-0b" class="file" type="file" name="video_url" value="">
                                     </div>
                                 </div>