wupengfei 2 年之前
父节点
当前提交
00c462039b
共有 2 个文件被更改,包括 4 次插入6 次删除
  1. 3 5
      .idea/workspace.xml
  2. 1 1
      application/operate/view/supplier_classify/third.html

+ 3 - 5
.idea/workspace.xml

@@ -3,8 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_classify/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_classify/form.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_classify/second.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_classify/second.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_classify/third.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_classify/third.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -293,7 +291,7 @@
       <workItem from="1681348081818" duration="22448000" />
       <workItem from="1681434523223" duration="19578000" />
       <workItem from="1681463431612" duration="3188000" />
-      <workItem from="1681692707179" duration="14579000" />
+      <workItem from="1681692707179" duration="14671000" />
     </task>
     <servers />
   </component>
@@ -451,10 +449,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1676615702242" />
-    <state x="1029" y="370" width="1218" height="604" key="find.popup" timestamp="1681373271790">
+    <state x="1029" y="370" width="1218" height="604" key="find.popup" timestamp="1681714469679">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1029" y="370" width="1218" height="604" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1681373271790" />
+    <state x="1029" y="370" width="1218" height="604" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1681714469679" />
     <state x="1291" y="317" key="run.anything.popup" timestamp="1679553349659">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 1 - 1
application/operate/view/supplier_classify/third.html

@@ -1,6 +1,7 @@
 {extend name='admin@main'}
 
 {block name="button"}
+<a href="javascript:history.go(-1);"  data-title="返 回" class='layui-btn layui-btn-sm layui-btn-primary'>返 回</a>
 <button data-modal='{:url("add")}?pid={$Think.get.pid|default="0"}&lev=3' data-title="添加分类" class='layui-btn layui-btn-sm layui-btn-primary'>添加分类</button>
 {/block}
 
@@ -42,7 +43,6 @@
             <td class='text-left nowrap'>{$vo.status == 1 ?'已启用' :'已禁用'}</td>
             <td class='text-left' style="width: 20%">
                 <a data-title="编辑分类" class="layui-btn layui-btn-xs" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                <a data-title="查看" class="layui-btn layui-btn-xs" data-open='{:url("second")}?pid={$vo.id}'>产品合集</a>
                 <a data-title="产品合集" class="layui-btn layui-btn-xs" data-open='{:url("/operate/supplier_goods/index")}?third_classify={$vo.id}&source=1'>产品合集</a>
                 {if $vo.status == 1}
                 <span class="layui-btn layui-btn-xs  layui-btn-warm"  onclick="btn_confirm('禁用','forbid','{$vo.id}');" >禁 用</span>