chuweiqiang 1 year ago
parent
commit
37d6343397
2 changed files with 7 additions and 8 deletions
  1. 2 3
      .idea/workspace.xml
  2. 5 5
      application/operate/view/activity_apply/index.html

+ 2 - 3
.idea/workspace.xml

@@ -3,8 +3,7 @@
   <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/controller/ActivityApplyItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/ActivityApplyItem.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/activity_apply_item/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity_apply_item/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/view/activity_apply/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity_apply/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -571,7 +570,7 @@
       <workItem from="1710808231575" duration="7017000" />
       <workItem from="1710817453185" duration="16334000" />
       <workItem from="1710896140284" duration="18662000" />
-      <workItem from="1710981036861" duration="6726000" />
+      <workItem from="1710981036861" duration="6961000" />
     </task>
     <servers />
   </component>

+ 5 - 5
application/operate/view/activity_apply/index.html

@@ -73,11 +73,11 @@
 
             <div class="layui-form-item layui-inline">
                 <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-                <button data-action='{:url("remind")}'   data-confirm="确定要重新提醒吗?"data-csrf="{:systoken('remind')}" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量提醒</button>
-            </div>
-            <div class="layui-form-item layui-inline" style="margin-left: 5px;">
-                <div  data-title="导出" class='layui-btn layui-btn-sm layui-btn-primary' id="download">导出</div>
+<!--                <button data-action='{:url("remind")}'   data-confirm="确定要重新提醒吗?"data-csrf="{:systoken('remind')}" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量提醒</button>-->
             </div>
+<!--            <div class="layui-form-item layui-inline" style="margin-left: 5px;">-->
+<!--                <div  data-title="导出" class='layui-btn layui-btn-sm layui-btn-primary' id="download">导出</div>-->
+<!--            </div>-->
         </form>
         <script>
             form.render();
@@ -150,7 +150,7 @@
             <td class='text-left' style="width: 20%">
                 <a data-title="详情" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>订单详情</a>
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','remove','{$vo.id}');">删 除</span>
-                <span class="layui-btn layui-btn-sm layui-btn-warm" onclick="btn_confirm('重新提醒','remind','{$vo.id}');">重新提醒</span>
+<!--                <span class="layui-btn layui-btn-sm layui-btn-warm" onclick="btn_confirm('重新提醒','remind','{$vo.id}');">重新提醒</span>-->
                 {if $vo.status == 0 && $vo.pay_type == 9}
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('确认收款','confirm','{$vo.id}');">确认收款</span>
                 {/if}