Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 7fbfa41a by 朱继来
Options

Merge branch 'development' of http://119.23.72.7/zhujilai/Order into development

parents c160baa4 0c8cc031
Inline Side-by-side
Showing with 16 additions and 12 deletions
.idea/workspace.xml
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment=""> <list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" afterPath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" afterPath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
</list> </list>
<ignored path="Order.iws" /> <ignored path="Order.iws" />
...@@ -63,10 +62,11 @@ ...@@ -63,10 +62,11 @@
<file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="true"> <file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="725">
<caret line="85" column="26" selection-start-line="83" selection-start-column="20" selection-end-line="85" selection-end-column="26" /> <caret line="92" column="22" selection-start-line="83" selection-start-column="16" selection-end-line="92" selection-end-column="22" />
<folding> <folding>
<marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." /> <element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -404,12 +404,12 @@ ...@@ -404,12 +404,12 @@
<workItem from="1539065020769" duration="33480000" /> <workItem from="1539065020769" duration="33480000" />
<workItem from="1539167536899" duration="1228000" /> <workItem from="1539167536899" duration="1228000" />
<workItem from="1539327663189" duration="3659000" /> <workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="56000" /> <workItem from="1539332944482" duration="692000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="39709000" /> <option name="totallyTimeSpent" value="40345000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" /> <frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
...@@ -516,7 +516,8 @@ ...@@ -516,7 +516,8 @@
<state relative-caret-position="550"> <state relative-caret-position="550">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" /> <caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding> <folding>
<marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." /> <element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -572,7 +573,8 @@ ...@@ -572,7 +573,8 @@
<state relative-caret-position="1975"> <state relative-caret-position="1975">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" /> <caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding> <folding>
<marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." /> <element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -841,10 +843,11 @@ ...@@ -841,10 +843,11 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="725">
<caret line="85" column="26" selection-start-line="83" selection-start-column="20" selection-end-line="85" selection-end-column="26" /> <caret line="92" column="22" selection-start-line="83" selection-start-column="16" selection-end-line="92" selection-end-column="22" />
<folding> <folding>
<marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." /> <element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
resources/views/PaymentDays/AuthPaymentDays.blade.php
...@@ -79,7 +79,8 @@ ...@@ -79,7 +79,8 @@
<input type="radio" lay-verify="required" name="status" value="2" title="审核通过" @if($info['status']==1 || $info['status']==2) checked @endif @if($info['status']!=1) disabled @endif> <input type="radio" lay-verify="required" name="status" value="2" title="审核通过" @if($info['status']==1 || $info['status']==2) checked @endif @if($info['status']!=1) disabled @endif>
<input type="radio" lay-verify="required" name="status" value="3" title="审核不通过" @if($info['status']==3) checked @endif @if($info['status']!=1) disabled @endif> <input type="radio" lay-verify="required" name="status" value="3" title="审核不通过" @if($info['status']==3) checked @endif @if($info['status']!=1) disabled @endif>
</div> </div>
</div>
<div class="layui-form-item" style="margin-top: 20px">
@if($info['status']==1) @if($info['status']==1)
<div class="layui-input-block" style="text-align: center"> <div class="layui-input-block" style="text-align: center">
<button class="layui-btn" lay-submit lay-filter="load">立即提交</button> <button class="layui-btn" lay-submit lay-filter="load">立即提交</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment