1

app/Http/Controllers/Admin/Album/ManufacturerController.php

@@ -217,7 +217,7 @@ class ManufacturerController extends Controller
             $data['qrcode'] = $this->formatImgUrl($data['qrcode']);
         }
         if (!empty($data['share_image'])) {
-            $data['share'] = $this->formatImgUrl($data['share_image']);
+            $data['share_image'] = $this->formatImgUrl($data['share_image']);
         }if (!empty($data['circleOfFriends'])) {
             $data['circleOfFriends'] = $this->formatImgUrl($data['circleOfFriends']);
         }
@@ -285,7 +285,7 @@ class ManufacturerController extends Controller
            // $this->deleteUrl($saveData->advertising_pic);
         }
         if (!empty($data['share_image'])) {
-            $data['share'] = $this->formatImgUrl($data['share_image']);
+            $data['share_image'] = $this->formatImgUrl($data['share_image']);
         }
         if (!empty($data['qrcode'])) {
             $data['qrcode'] = $this->formatImgUrl($data['qrcode']);

app/Http/Controllers/Admin/Album/ProductController.php

@@ -12,12 +12,10 @@ use App\Models\AlbumCatModel;
 use App\Models\AlbumProductModel;
 use App\Models\AlbumProductPriceModel;
 use App\Models\AlbumProductStyleModel;
-use App\Repositories\Album\Criteria\PosterWhere;
 use App\Repositories\Album\Criteria\ProductWhere;
 use App\Services\OSS;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
-use App\Repositories\Album\Criteria\MultiWhere;
 use App\Repositories\Album\ProductRepository;
 
 class ProductController extends Controller
@@ -38,7 +36,7 @@ class ProductController extends Controller
     function index(Request $request)
     {
         $search['keyword'] = $request->input('keyword');
-        $query = $this->repository->pushCriteria(new PosterWhere($search, $this->getStoreId()));
+        $query = $this->repository->pushCriteria(new ProductWhere($search, $this->getStoreId()));
 
 
         if (isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {

app/Http/Controllers/Api/V1/AlbumController.php

@@ -1826,8 +1826,8 @@ class AlbumController extends Controller
         \Log::info($res_account);
         if ($user && $formId && !empty($weChatApp->wxFurniture_template_id) && $res_account['errcode']!=0) {
             $config_app = [
-                'app_id' => $weChatApp->app_id,
-                'secret' => $weChatApp->app_secret,
+                'app_id' => $weChatApp->xyx_id,
+                'secret' => $weChatApp->xyx_secret,
                 'response_type' => 'array',
             ];
             $app_x = Factory::miniProgram($config_app);

app/Models/AlbumManufacturerModel.php

@@ -34,8 +34,6 @@ class AlbumManufacturerModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-        'app_id',
-        'app_secret',
         'circleOfFriends',
         'introduce',
         'banner',

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) {
+            //
+        });
+    }
+}

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

@@ -564,7 +564,7 @@
                                                 操作 <span class="caret"></span>
                                             </button>
                                             <ul class="dropdown-menu">
-                                                <li><a href="{{ U('Album/Manufactuier/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+                                                <li><a href="{{ U('Album/Manufacturer/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
                                             </ul>
                                         </div>
 

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

@@ -338,7 +338,7 @@
                                     <td>{{ $video['url'] }}</td>
                                     <td>
                                         <div class="pull-right">
-                                            <a href="{{ U('Album/Manufactuier/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
+                                            <a href="{{ U('Album/Manufacturer/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
                                         </div>
                                     </td>
                                 </tr>

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

@@ -232,7 +232,7 @@
                                     <td>{{ $video['url'] }}</td>
                                     <td>
                                         <div class="pull-right">
-                                            <a href="{{ U('Album/Manufactuier/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
+                                            <a href="{{ U('Album/Manufacturer/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
                                         </div>
                                     </td>
                                 </tr>

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

@@ -63,7 +63,8 @@
                                 </div>
                                 <div class="form-group">
 
-                                    <label class="control-label col-sm-3">海报(440*440)</label>
+                                    <label class="control-label col-sm-3">海报 <br/>
+                                        <small class="text-navy">(440像素 * 440像素)</small></label>
                                     <div class="col-sm-9">
                                         {!!  widget('Tools.ImgUpload')->multi2('/upload/posters','posters',"data[posters]", isset($data['posters'])? $data['posters'] : '',array("sizex"=>440,"sizey"=>440)) !!}
                                     </div>

resources/views/admin/album/product/edit.blade.php

@@ -185,7 +185,7 @@
                                                     <source src="{{$data['upload_video'] ?? ''}}" type="video/mp4">
                                                 </video>
                                             </div>
-                                            <input id="file-0b" class="file" type="file" name="data[upload_video]" value="">
+                                            <input id="file-0b" class="file" type="file" name="upload_video" value="">
                                         </div>
                                     </div>
 

routes/api.php

@@ -247,176 +247,6 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         ]);
     });
 
-    $api->post('attachment/upload', [
-        'as' => 'attachment.upload',
-        'uses' => 'AttachmentController@upload',
-    ]);
-    $api->post('attachment/delete', [
-        'as' => 'attachment.delete',
-        'uses' => 'AttachmentController@delete',
-    ]);
-    $api->get('shop2', [
-        'as' => 'shop2',
-        'uses' => 'AuthController@shop2',
-    ]);
-
-    $api->post('auth/login', [
-        'as' => 'auth.login',
-        'uses' => 'AuthController@login',
-    ]);
-
-    $api->get('home/index', [
-        'as' => 'home.index',
-        'uses' => 'HomeController@index',
-    ]);
-    $api->get('home/search', [
-        'as' => 'home.search',
-        'uses' => 'HomeController@search',
-    ]);
-    $api->get('cate/index', [
-        'as' => 'cate.index',
-        'uses' => 'CateController@index',
-    ]);
-    $api->get('goods/show', [
-        'as' => 'goods.show',
-        'uses' => 'GoodsController@show',
-    ]);
-    $api->post('goods/comment', [
-        'as' => 'goods.comment',
-        'uses' => 'GoodsController@comment',
-    ]);
-    $api->get('goods/addtocar', [
-        'as' => 'goods.addtocar',
-        'uses' => 'GoodsController@addToCar',
-    ]);
-    $api->get('goods/chose_attr', [
-        'as' => 'goods.chose_attr',
-        'uses' => 'GoodsController@choseAttr',
-    ]);
-    $api->get('goods/collection', [
-        'as' => 'goods.collection',
-        'uses' => 'GoodsController@collection',
-    ]);
-    $api->get('car/index', [
-        'as' => 'car.index',
-        'uses' => 'CarController@index',
-    ]);
-    $api->get('car/delete', [
-        'as' => 'car.delete',
-        'uses' => 'CarController@delete',
-    ]);
-    $api->post('car/update', [
-        'as' => 'car.update',
-        'uses' => 'CarController@update',
-    ]);
-    $api->get('find/index', [
-        'as' => 'find.index',
-        'uses' => 'FindController@index',
-    ]);
-    $api->get('my/index', [
-        'as' => 'my.index',
-        'uses' => 'MyController@index',
-    ]);
-    $api->get('my/favorite', [
-        'as' => 'my.favorite',
-        'uses' => 'MyController@favorite',
-    ]);
-    $api->get('my/address/index', [
-        'as' => 'address.index',
-        'uses' => 'AddressController@index',
-    ]);
-    $api->get('my/address/area', [
-        'as' => 'address.area',
-        'uses' => 'AddressController@area',
-    ]);
-    $api->get('my/address/show', [
-        'as' => 'address.show',
-        'uses' => 'AddressController@show',
-    ]);
-    $api->post('my/address/update', [
-        'as' => 'address.update',
-        'uses' => 'AddressController@update',
-    ]);
-    /*  $api->post('my/address/store', [
-          'as' => 'address.store',
-          'uses' => 'AddressController@store',
-      ]);*/
-    $api->get('my/address/delete', [
-        'as' => 'address.delete',
-        'uses' => 'AddressController@delete',
-    ]);
-    $api->get('my/address/edit', [
-        'as' => 'address.edit',
-        'uses' => 'AddressController@edit',
-    ]);
-
-    $api->get('order/sure', [
-        'as' => 'order.sure',
-        'uses' => 'OrderController@sure',
-    ]);
-    $api->get('order/create', [
-        'as' => 'order.create',
-        'uses' => 'OrderController@create',
-    ]);
-    $api->get('order/show', [
-        'as' => 'order.show',
-        'uses' => 'OrderController@show',
-    ]);
-    $api->post('order/pay', [
-        'as' => 'order.pay',
-        'uses' => 'OrderController@pay',
-    ]);
-    $api->post('order/refund', [
-        'as' => 'order.refund',
-        'uses' => 'OrderController@refund',
-    ]);
-    $api->get('company/info', [
-        'as' => 'company.info',
-        'uses' => 'CompanyController@companyInfo',
-    ]);
-    $api->get('company/version', [
-        'as' => 'company.version',
-        'uses' => 'CompanyController@version',
-    ]);
-    $api->get('card/index', [
-        'as' => 'card.index',
-        'uses' => 'CardController@cardIndex',
-    ]);
-    $api->get('card/info', [
-        'as' => 'card.info',
-        'uses' => 'CardController@cardUserInfo',
-    ]);
-    $api->get('card/progress', [
-        'as' => 'card.progress',
-        'uses' => 'CardController@cardUserProgress',
-    ]);
-    $api->get('card/honor', [
-        'as' => 'card.honor',
-        'uses' => 'CardController@cardUserHonor',
-    ]);
-    $api->get('card/setting', [
-        'as' => 'card.setting',
-        'uses' => 'CardController@cardSetting',
-    ]);
-    $api->get('card/project', [
-        'as' => 'card.project',
-        'uses' => 'CardController@cardUserProject',
-    ]);
-
-    $api->get('card/projectDetail', [
-        'as' => 'card.projectDetail',
-        'uses' => 'CardController@projectDetail',
-    ]);
-
-    $api->get('card/trend', [
-        'as' => 'card.trend',
-        'uses' => 'CardController@CardUserTrend',
-    ]);
-    $api->get('card/trendDetail', [
-        'as' => 'card.trendDetail',
-        'uses' => 'CardController@trendDetail',
-    ]);
-
 
     /*$api->get('album/get-banner', [
         'as' => 'album.GetBanner',