1

.idea/workspace.xml

@@ -3,7 +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/ActivityApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/ActivityApply.php" 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" />
       <change beforePath="$PROJECT_DIR$/application/order/view/store_order/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/view/store_order/index_search.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -307,7 +307,7 @@
       <workItem from="1682643377193" duration="23223000" />
       <workItem from="1683165052103" duration="22621000" />
       <workItem from="1683248100682" duration="23381000" />
-      <workItem from="1683334424783" duration="14636000" />
+      <workItem from="1683334424783" duration="14680000" />
     </task>
     <servers />
   </component>

application/operate/view/activity_apply/index.html

@@ -24,9 +24,9 @@
                 <div class="layui-input-inline">
                     <select class="layui-select" name="order_status">
                         <option  value="-1">全部</option>
-                        {foreach $order_status as $k=>$v}
+                        {foreach $status_list as $k=>$v}
                             {if $v}
-                                {if $Think.get.order_status eq $k}
+                                {if $order_status eq $k}
                                     <option selected value="{$k}">{$v}</option>
                                 {else}
                                     <option  value="{$k}">{$v}</option>

application/order/view/store_order/index_search.html

@@ -25,9 +25,9 @@
             <div class="layui-input-inline">
                 <select class="layui-select" name="order_status">
                     <option  value="-1">全部</option>
-                    {foreach $status_list as $k=>$v}
+                    {foreach $order_status as $k=>$v}
                     {if $v}
-                    {if $order_status eq $k}
+                    {if $Think.get.order_status eq $k}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option  value="{$k}">{$v}</option>