1

app/Http/Controllers/Admin/Base/PhotosController.php

@@ -45,7 +45,6 @@ class PhotosController extends Controller
             } else {
                 $photos = BaseAttachmentModel::where([['name', 'like', $name],['store_id', $this->getStoreId()]])->paginate(24);
             }
-
             $status = 'search';
         } else {
             if ($a_class) {
@@ -53,7 +52,6 @@ class PhotosController extends Controller
                     $photos = BaseAttachmentModel::where([['class', $a_class->class]])->paginate(24);
                 } else {
                     $photos = BaseAttachmentModel::where([['class', $a_class->class],['store_id', $this->getStoreId()]])->paginate(24);
-
                 }
             }
         }

database/migrations/2019_05_31_095826_add_column_to_album_mancufacturer.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnToAlbumMancufacturer extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('album_manufacturer', function (Blueprint $table) {
+            //
+            $table->string('circleOfFriends', 255)->nullable()->default(null)->comment('朋友圈画报');
+            $table->string('introduce', 30)->nullable()->default(null)->comment('个人二维码介绍语');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('album_mancufacturer', function (Blueprint $table) {
+            //
+        });
+    }
+}

resources/views/admin/album/manufacturer/platform-edit.blade.php

@@ -59,17 +59,32 @@
 
                                         </div>
 
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">个人二维码画报(440像素 * 440像素)</label>
+                                        <div class="col-sm-9">
+                                            {!!  widget('Tools.ImgUpload')->single2('/upload/posters','posters',"posters",  isset($data['posters'])? $data['posters'] : '',array("sizex"=>440,"sizey"=>440)) !!}
+                                        </div>
+                                    </div>
                                     <div class="form-group">
 
-                                        <label class="control-label col-sm-3">厂家二维码(430像素 * 430像素)</label>
+                                        <label class="control-label col-sm-3">个人二维码介绍语</label>
+
                                         <div class="col-sm-9">
-                                            {!!  widget('Tools.ImgUpload')->single2('/upload/qrcode','qrcode',"qrcode",  isset($data['qrcode'])? $data['qrcode'] : '',array("sizex"=>430,"sizey"=>430)) !!}
+                                            <input id="data_introduce" name="data[introduce]" class="form-control"
+                                                   value="{{ $data['introduce'] or ''}}" required="" aria-required="true"
+                                                   placeholder="">
                                         </div>
 
                                     </div>
 
+                                    <div class="form-group">
 
+                                        <label class="control-label col-sm-3">厂家二维码(430像素 * 430像素)</label>
+                                        <div class="col-sm-9">
+                                            {!!  widget('Tools.ImgUpload')->single2('/upload/qrcode','qrcode',"qrcode",  isset($data['qrcode'])? $data['qrcode'] : '',array("sizex"=>430,"sizey"=>430)) !!}
+                                        </div>
 
+                                    </div>
 
 
 

resources/views/admin/album/poster/index.blade.php

@@ -38,7 +38,7 @@
 								
             <th class="sorting" data-sort="id"> ID </th>
             <th class="sorting" data-sort="name"> 名称 </th>
-            <th class="sorting" data-sort="share_type"> 视频 </th>
+            <th class="sorting" data-sort="share_type"> 文案类型 </th>
         						<th width="22%">相关操作</th>
         					</tr>
 						</thead>
@@ -69,7 +69,6 @@
 							</tr>
 							@endforeach
 							@endif
-
 						</tbody>
 					</table>
 					<div class="row">