merge

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

@@ -1831,7 +1831,10 @@ class AlbumController extends Controller
         $url = "https://apis.map.qq.com/ws/geocoder/v1/?address=".$data['address']."&key=U5DBZ-X5VCO-6UUWV-SGPU3-PD5X2-NDFXA";
         $local = $this->curl_get($url);
         $res = json_decode($local,true);
+<<<<<<< HEAD
         //dd($res);
+=======
+>>>>>>> origin/dev
         $agent_check = AlbumAgentModel::where([['store_id',$data['store_id']],['user_id',$userAuth->id]])->first();
         if($agent_check){
             if($agent_check->status==0) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '该用户已提交申请！');

app/Models/AlbumManufacturerModel.php

@@ -48,6 +48,7 @@ class AlbumManufacturerModel extends BaseModel
         'phone',
         'address',
         'lng',
+        'is_audit',
         'lat',
         'background_pic',
         'advertising_pic',

database/migrations/2019_03_11_133732_add_column_to_manufacturer.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnToManufacturer extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('album_manufacturer', function (Blueprint $table) {
+            //
+            $table->unsignedInteger('is_audit')->default(0)->nullable()->comment('0 应用版 1 过审版');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('album_manufacturer', function (Blueprint $table) {
+            //
+        });
+    }
+}

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

@@ -172,6 +172,7 @@
                                         </div>
 
                                     </div>
+
                                     <div class="form-group">
 
                                         <label class="control-label col-sm-3">是否开启关注公众号</label>
@@ -187,6 +188,22 @@
                                             </label>
                                         </div>
 
+                                    </div>
+                                    <div class="form-group">
+
+                                        <label class="control-label col-sm-3">选择版本</label>
+
+                                        <div class="col-sm-9">
+                                            <label class="radio-inline">
+                                                <input type="radio" name="data[is_audit]" value="1"
+                                                       @if(isset($data['is_audit']) && $data['is_audit'] == '1')checked="checked" @endif/>过审版
+                                            </label>
+                                            <label class="radio-inline">
+                                                <input type="radio" name="data[is_audit]" value="0"
+                                                       @if(isset($data['is_audit']) && $data['is_audit'] == '0')checked="checked" @endif/>应用版
+                                            </label>
+                                        </div>
+
                                     </div>
                                         <div class="form-group">