diff --git a/app/admin/view/goods/goods/add.html b/app/admin/view/goods/goods/add.html
index aa6bf51..47e5c9f 100644
--- a/app/admin/view/goods/goods/add.html
+++ b/app/admin/view/goods/goods/add.html
@@ -728,6 +728,7 @@
         $('input[name="goods_id"]').val(goods_info['base']['id']);
         $('input[name="name"]').val(goods_info['base']['name']);
         $('input[name="code"]').val(goods_info['base']['code']);
+        $('input[name="brand_name"]').val(goods_info['base']['brand_name']);
         setSelectFirst(goods_info['base']['first_cate_id']);
         setSelectSecond(goods_info['base']['second_cate_id']);
         setSelectThird(goods_info['base']['third_cate_id']);
diff --git a/app/admin/view/goods/goods/goods_base.html b/app/admin/view/goods/goods/goods_base.html
index 55b453d..cad9583 100644
--- a/app/admin/view/goods/goods/goods_base.html
+++ b/app/admin/view/goods/goods/goods_base.html
@@ -77,14 +77,21 @@
                 </div>
             </div>
             <!--商品品牌-->
+<!--            <div class="layui-form-item">-->
+<!--                <label class="layui-form-label">商品品牌：</label>-->
+<!--                <div class="layui-input-inline">-->
+<!--                    <select disabled name="brand_id" lay-verType="tips" switch-tab="0" verify-msg="请选择商品品牌">-->
+<!--                        <option value="">请选择品牌</option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="layui-form-item">
                 <label class="layui-form-label">商品品牌：</label>
-                <div class="layui-input-inline">
-                    <select disabled name="brand_id" lay-verType="tips" switch-tab="0" verify-msg="请选择商品品牌">
-                        <option value="">请选择品牌</option>
-                    </select>
+                <div class="layui-input-block">
+                    <input type="text" maxlength="60" name="brand_name"  autocomplete="off" class="layui-input">
                 </div>
             </div>
+
             <!--供货商-->
             <div class="layui-form-item">
                 <label class="layui-form-label">供货商：</label>
diff --git a/app/shop/logic/goods/GoodsLogic.php b/app/shop/logic/goods/GoodsLogic.php
index 57c11da..8e79aa4 100644
--- a/app/shop/logic/goods/GoodsLogic.php
+++ b/app/shop/logic/goods/GoodsLogic.php
@@ -350,6 +350,7 @@ class GoodsLogic extends Logic
                 'second_cate_id'            => $post['second_cate_id'],
                 'third_cate_id'             => $post['third_cate_id'],
                 'brand_id'                  => $post['brand_id'],
+                'brand_name'                  => $post['brand_name'],
                 'unit_id'                   => $post['unit_id'],
                 'supplier_id'               => $post['supplier_id'],
                 'status'                    => $post['status'],
@@ -661,6 +662,7 @@ class GoodsLogic extends Logic
             'third_cate_id'             => $post['third_cate_id'],
             'unit_id'                   => $post['unit_id'],
             'brand_id'                  => $post['brand_id'],
+            'brand_name'                  => $post['brand_name'],
             'supplier_id'               => $post['supplier_id'],
             'status'                    => $post['status'],
             'image'                     => $post['image'],
diff --git a/app/shop/view/goods/goods/add.html b/app/shop/view/goods/goods/add.html
index 8b64dc4..8df7675 100644
--- a/app/shop/view/goods/goods/add.html
+++ b/app/shop/view/goods/goods/add.html
@@ -727,6 +727,7 @@
         $('input[name="goods_id"]').val(goods_info['base']['id']);
         $('input[name="name"]').val(goods_info['base']['name']);
         $('input[name="code"]').val(goods_info['base']['code']);
+        $('input[name="brand_name"]').val(goods_info['base']['brand_name']);
         setSelectFirst(goods_info['base']['first_cate_id']);
         setSelectSecond(goods_info['base']['second_cate_id']);
         setSelectThird(goods_info['base']['third_cate_id']);
diff --git a/app/shop/view/goods/goods/goods_base.html b/app/shop/view/goods/goods/goods_base.html
index 69e5599..752f984 100644
--- a/app/shop/view/goods/goods/goods_base.html
+++ b/app/shop/view/goods/goods/goods_base.html
@@ -76,14 +76,23 @@
                 </div>
             </div>
             <!--商品品牌-->
+<!--            <div class="layui-form-item">-->
+<!--                <label class="layui-form-label">商品品牌：</label>-->
+<!--                <div class="layui-input-inline">-->
+<!--                    <select name="brand_id" lay-verType="tips" switch-tab="0" verify-msg="请选择商品品牌">-->
+<!--                        <option value="">请选择品牌</option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+            <!--商品卖点-->
             <div class="layui-form-item">
                 <label class="layui-form-label">商品品牌：</label>
-                <div class="layui-input-inline">
-                    <select name="brand_id" lay-verType="tips" switch-tab="0" verify-msg="请选择商品品牌">
-                        <option value="">请选择品牌</option>
-                    </select>
+                <div class="layui-input-block">
+                    <input type="text" maxlength="60" name="brand_name"  autocomplete="off" class="layui-input">
+                    <input type="hidden" maxlength="60" name="brand_id"   autocomplete="off" class="layui-input">
                 </div>
             </div>
+
             <!--供货商-->
             <div class="layui-form-item">
                 <label class="layui-form-label">供货商：</label>
@@ -143,7 +152,7 @@
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label"></label>
-                <span style="color: #a3a3a3;font-size: 9px">商品视频，在商品详情页面播放。(限制4m内)</span>
+                <span style="color: #a3a3a3;font-size: 9px">商品视频，在商品详情页面播放。(限制30m内)</span>
             </div>
         </div>
     </div>