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/synth/controller/BillApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -443,7 +443,7 @@
       <workItem from="1694739473903" duration="20371000" />
       <workItem from="1694997975324" duration="5574000" />
       <workItem from="1695085328694" duration="21844000" />
-      <workItem from="1695603648860" duration="4505000" />
+      <workItem from="1695603648860" duration="4618000" />
     </task>
     <servers />
   </component>

application/synth/view/bill_apply/form.html

@@ -30,7 +30,7 @@
                         {eq name='data.order_info.pay_state' value='0'}<span class="layui-badge layui-bg-orange margin-left-5">已支付</span>{/eq}
                         {eq name='data.order_info.pay_state' value='1'}<span class="layui-badge layui-bg-black margin-left-5">已支付</span>{/eq}
                     </div><hr />
-                    <div class="layui-col-md6">实际支付金额：{$data.order_type == 1 ? $data.order_info.price_total : $data.order_info.money}</div>
+                    <div class="layui-col-md6">实际支付金额：{$data.order_type == 1  || $data.order_type == 2 ? $data.order_info.price_total : $data.order_info.money}</div>
                     <div class="layui-col-md6">退款金额：{$data.order_info.refund_money|default='0'}</div>
                     <hr />
                     <div class="layui-col-md6">支付方式：