1

app/Models/AgentBannerModel.php

@@ -27,7 +27,7 @@ class AgentBannerModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-        'agent_id',
+        'store_id',
         'url',
         'name',
         'oss_key',

app/Models/AlbumBannerModel.php

@@ -34,11 +34,9 @@ class AlbumBannerModel extends BaseModel
                            'store_id',
                            'pic_url',
                            'title',
-                           'page_url',
                            'sort',
                            'addtime',
                            'is_delete',
-                           'type'
                           ];
 
 }

app/Models/AlbumCatModel.php

@@ -39,7 +39,6 @@ class AlbumCatModel extends BaseModel
                            'name',
                            'sort',
                            'parent_id',
-                           'level',
                            'pic_url',
                             'store_id'
                           ];

app/Models/AlbumManufacturerModel.php

@@ -34,11 +34,14 @@ class AlbumManufacturerModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-        'app_id',
-        'app_secret',
+        'circleOfFriends',
+        'introduce',
         'banner',
+        'qrcode',
         'logo',
         'service_app_secret',
+        'wxFurniture_template_id',
+        'wxaccount_template_id',
         'service_app_id',
         'goods_app_id',
         'xyx_id',
@@ -63,7 +66,9 @@ class AlbumManufacturerModel extends BaseModel
         'redirectapp',
         'print_type',
         'getPhone',
-        'getFocus'
+        'getFocus',
+        'share_title',
+        'share_image'
     ];
 
 }

app/Models/AlbumPosterModel.php

@@ -34,10 +34,10 @@ class AlbumPosterModel extends BaseModel
                            'store_id',
                            'posters',
                            'words',
-                           'introduce',
-                           'qrcode',
-                           'title',
-                           'share'
+                           'video_url',
+                           'share_type',
+                           'downloadNum',
+                           'name'
                           ];
 
 }

app/Models/AlbumProductModel.php

@@ -48,6 +48,7 @@ class AlbumProductModel extends BaseModel
                            'cover_pic',
                            'thumb',
                            'install_img',
+                           'upload_video',
                            'hot_cake',
                            'news',
                            'detail',

app/Models/AlbumProductPriceModel.php

@@ -32,6 +32,8 @@ class AlbumProductPriceModel extends BaseModel
      */
     protected $fillable = [
                            'agent_id',
+                           'name',
+                           'cat_id',
                            'store_id',
                            'product_id',
                            'mobile',

app/Models/AlbumUserModel.php

@@ -49,6 +49,7 @@ class AlbumUserModel extends Authenticatable
         'avatar',
         'store_id',
         'is_dealer',
+        'is_boss',
         'phone',
         'role'
     ];
@@ -64,6 +65,9 @@ class AlbumUserModel extends Authenticatable
             case 3:
                 return '经理';
                 break;
+            case 4:
+                return 'Boss';
+                break;
             default:
                 return '普通用户';
                 break;

app/Models/AlbumWatchRecord.php

@@ -34,6 +34,7 @@ class AlbumWatchRecord extends BaseModel
     protected $fillable = [
         'agent_id',
         'open_id',
+        'is_new',
         'action',
         'detail',
         'store_id'

app/Models/ClassModel.php

@@ -19,10 +19,4 @@ class ClassModel extends BaseModel
 
     //分页
     protected $perPage = PAGE_NUMS;
-
-
-    protected $fillable = [
-        'store_id',
-        'class'
-    ];
 }

app/Models/CustomerCatRecordModel.php

@@ -31,6 +31,6 @@ class CustomerCatRecordModel extends BaseModel
         'store_id',
         'open_id',
         'cat_id',
-        'style_id',
+        'parent_id',
     ];
 }

database/migrations/2019_06_05_105903_change_column_album_manufacturer.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeColumnAlbumManufacturer extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('album_manufacturer', function (Blueprint $table) {
+            //
+            $table->string('avatar', 255)->default('')->nullable()->change();
+            $table->string('service_app_id', 255)->default('')->nullable()->change();
+            $table->string('service_app_secret', 255)->default('')->nullable()->change();
+            $table->string('redirectapp', 255)->default('')->nullable()->change();
+            $table->string('G_app_id', 255)->default('')->nullable()->change();
+            $table->string('G_app_secret', 255)->default('')->nullable()->change();
+            $table->dropColumn(['app_id','app_secret']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('album_manufacturer', function (Blueprint $table) {
+            //
+        });
+    }
+}