Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/assets/pc/html/setGoods.html

@@ -23,6 +23,8 @@
             <div class="layui-row">
                 <div class="top">
                     <i class="layui-icon layui-icon-app"></i>商品列表
+
+                    <a class="mini-button" onclick="javascript:history.back()">返回上一页</a>
                 </div>
                 <div class="left_main">
                     <input id="key" class="mini-textbox" placeholder="请输入商品名称" onenter="onKeyEnter"/>

service/agent/assets/pc/html/setMemberGoods.html

@@ -23,6 +23,8 @@
             <div class="layui-row">
                 <div class="top">
                     <i class="layui-icon layui-icon-app"></i>商品列表
+
+                    <a class="mini-button" onclick="javascript:history.back()">返回上一页</a>
                 </div>
                 <div class="left_main">
                     <input id="key" class="mini-textbox" placeholder="请输入商品名称" onenter="onKeyEnter"/>