diff --git a/app/admin/controller/MallNews.php b/app/admin/controller/MallNews.php
index 051c94e1..434349a5 100644
--- a/app/admin/controller/MallNews.php
+++ b/app/admin/controller/MallNews.php
@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\logic\goods\GoodsLogic;
 use app\admin\logic\live\LiveGoodsLogic;
 use app\admin\logic\live\LiveRoomLogic;
 use app\admin\logic\MallNewsLogic;
@@ -91,4 +92,15 @@ class MallNews extends AdminBase
             return JsonServer::error('删除失败');
         }
     }
+    
+    // 选择商品
+    public function goods()
+    {
+        if ($this->request->isAjax()) {
+            $get = $this->request->get();
+            return JsonServer::success('', GoodsLogic::lists($get));
+        }
+
+        return view();
+    }
 }
\ No newline at end of file
diff --git a/app/admin/logic/MallNewsLogic.php b/app/admin/logic/MallNewsLogic.php
index efd1860f..c5d39658 100644
--- a/app/admin/logic/MallNewsLogic.php
+++ b/app/admin/logic/MallNewsLogic.php
@@ -58,6 +58,7 @@ class MallNewsLogic extends Logic
             }
         }
 
+        $result['shop'] = Db::name('goods')->where('id', $result['shop_id'])->find();
         return $result;
     }
 
@@ -172,6 +173,12 @@ class MallNewsLogic extends Logic
         return false;
     }
 
+    // 选择商品
+    public static function selectGoods()
+    {
+
+    }
+
     private static function checkForm(&$form)
     {
         if (empty($form)) {
diff --git a/app/admin/view/mall_news/add.html b/app/admin/view/mall_news/add.html
index b96eee24..7bea982f 100644
--- a/app/admin/view/mall_news/add.html
+++ b/app/admin/view/mall_news/add.html
@@ -71,9 +71,11 @@
         </div>
 
         <div class="layui-form-item">
-            <label for="shop_name" class="layui-form-label">商品名称：</label>
-            <div class="layui-input-inline">
-                <input type="text" name="shop_name" id="shop_name" autocomplete="off" class="layui-input">
+            <label class="layui-form-label">商品：</label>
+            <div class="layui-input-inline" style="display: flex">
+                <div id="shop_name"></div>
+                <input type="hidden" id="shop_id" name="shop_id">
+                <a class="layui-btn layui-btn-normal select-goods">选择商品</a>
             </div>
         </div>
 
@@ -203,6 +205,22 @@
             })
         });
 
+        // 选择商品
+        $(document).on('click','.select-goods',function () {
+            layer.open({
+                type: 2
+                ,title: '选择商品'
+                ,content: '{:url("mallNews/goods")}'
+                ,area: ['90%', '90%']
+                ,btn: ['确认', '取消']
+                ,yes: function(index, layero){
+                    var data = window["layui-layer-iframe" + index].callbackdata();
+                    $('#shop_name').html(data[0].name)
+                    $('#shop_id').val(data[0].id)
+                }
+            })
+        })
+
         form.verify({
             title: function (value, item) {
                 if (!value) {
diff --git a/app/admin/view/mall_news/audit.html b/app/admin/view/mall_news/audit.html
index 8938737c..5a0da55a 100644
--- a/app/admin/view/mall_news/audit.html
+++ b/app/admin/view/mall_news/audit.html
@@ -71,10 +71,18 @@
             </div>
         </div>
 
+<!--        <div class="layui-form-item">-->
+<!--            <label for="shop_name" class="layui-form-label">商品名称：</label>-->
+<!--            <div class="layui-input-inline">-->
+<!--                <input type="text" name="shop_name" id="shop_name" autocomplete="off" class="layui-input" value="{$detail.shop_name}">-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="layui-form-item">
-            <label for="shop_name" class="layui-form-label">商品名称：</label>
-            <div class="layui-input-inline">
-                <input type="text" name="shop_name" id="shop_name" autocomplete="off" class="layui-input" value="{$detail.shop_name}">
+            <label class="layui-form-label">商品：</label>
+            <div class="layui-input-inline" style="display: flex">
+                <div id="shop_name">{$detail.shop['name']}</div>
+                <input type="hidden" id="shop_id" name="shop_id">
+                <a class="layui-btn layui-btn-normal select-goods">选择商品</a>
             </div>
         </div>
 
@@ -230,6 +238,22 @@
             })
         });
 
+        // 选择商品
+        $(document).on('click','.select-goods',function () {
+            layer.open({
+                type: 2
+                ,title: '选择商品'
+                ,content: '{:url("mallNews/goods")}'
+                ,area: ['90%', '90%']
+                ,btn: ['确认', '取消']
+                ,yes: function(index, layero){
+                    var data = window["layui-layer-iframe" + index].callbackdata();
+                    $('#shop_name').html(data[0].name)
+                    $('#shop_id').val(data[0].id)
+                }
+            })
+        })
+
         form.verify({
             title: function (value, item) {
                 if (!value) {
diff --git a/app/admin/view/mall_news/goods.html b/app/admin/view/mall_news/goods.html
new file mode 100644
index 00000000..375eb66f
--- /dev/null
+++ b/app/admin/view/mall_news/goods.html
@@ -0,0 +1,105 @@
+{layout name="layout1" /}
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-tab layui-tab-card" lay-filter="tab-all">
+            <div class="layui-tab-item layui-show">
+                <div class="layui-card">
+                    <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+                        <div class="layui-form-item type">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">商品名称:</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="goods_name" id="keyword" placeholder="请输入关键词" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <button class="layui-btn layuiadmin-btn-goods {$view_theme_color}" lay-submit lay-filter="goods-search">查询</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-card-body">
+                        <table id="goods-lists" lay-filter="goods-lists"></table>
+                        <script type="text/html" id="goods-info">
+                            <img src="{{d.image}}" style="height:60px;width: 60px" class="image-show"> {{d.name}}
+                        </script>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+    <div class="layui-form-item layui-hide">
+        <input type="button" lay-submit lay-filter="select-submit" class="select-submit" id="select-submit" value="确认">
+    </div>
+</div>
+<style>
+    .layui-table-cell {
+        height: auto;
+    }
+</style>
+<script>
+    var table;
+    layui.config({
+        version:"{$front_version}",
+        base: '/static/lib/' //静态资源所在路径
+    }).use(['table','form'], function(){
+        var $ = layui.$
+            ,form = layui.form
+            ,element = layui.element;
+
+        //监听搜索
+        form.on('submit(goods-search)', function(data){
+            var field = data.field;
+            //执行重载
+            table.reload('goods-lists', {
+                where: field
+            });
+        });
+        //清空查询
+        form.on('submit(goods-clear-search)', function(){
+            $('#keyword').val('');  //清空输入框
+            $('#status_search').val('');  //清空输入框
+            form.render('select');
+            //刷新列表
+            table.reload('goods-lists', {
+                where: []
+            });
+        });
+
+    });
+    layui.define(['table', 'form'], function (exports) {
+        var $ = layui.$
+            , form = layui.form;
+        table = layui.table;
+
+        table.render({
+            id: 'goods-lists'
+            , elem: '#goods-lists'
+            , url: '{:url("mallNews/goods")}'  //模拟接口
+            , cols: [[
+                {type: 'radio'}
+                , {field: 'name', title: '商品名称', toolbar: '#goods-info'}
+            ]]
+            , page: true
+            , text: {none: '暂无数据！'}
+            , parseData: function (res) { //将原始数据解析成 table 组件所规定的数据
+                return {
+                    "code": res.code,
+                    "msg": res.msg,
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.lists, //解析数据列表
+                };
+            },
+            response: {
+                statusCode: 1
+            }
+        });
+    })
+    var callbackdata = function () {
+        var data = table.checkStatus('goods-lists').data
+            ,index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
+        return data;
+    }
+
+</script>
\ No newline at end of file