From 501b1a7bde23434cb0f13a94d22d294d3574efdc Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 31 Mar 2025 14:27:41 +0800
Subject: [PATCH] text

---
 .../admin/controller/orders/Dispatch2.php     |  1 +
 .../admin/view/orders/dispatch2/edit.html     | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index 1ff69b6..4962270 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -239,6 +239,7 @@ class Dispatch2 extends Backend
                 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                 $row->validateFailException()->validate($validate);
             }
+
             $params['status'] = OrderDispatch::STATUS_FINISH;
             $params['finish_time'] = date('Y-m-d H:i:s');
             $result = $row->allowField(true)->save($params);
diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html
index 232dc7e..c567552 100644
--- a/application/admin/view/orders/dispatch2/edit.html
+++ b/application/admin/view/orders/dispatch2/edit.html
@@ -88,15 +88,30 @@
     {if $row['is_receipt']==0 }
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('线下尾款')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('线上收款')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input readonly  class="form-control" name="row[total]" type="text"  value="无需收款">
+            <input  readonly type="text"  class="form-control" value="{$order.online_amount|htmlentities}">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('尾款收款')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input readonly  class="form-control" type="text"  value="无需收尾款">
         </div>
     </div>
 
     {/if}
 
     {if $row['is_receipt']==1 }
+
+        <div class="form-group">
+            <label class="control-label col-xs-12 col-sm-2">{:__('线上尾款')}:</label>
+            <div class="col-xs-12 col-sm-8">
+                <input name="row[online_total]"   type="number" min="0" placeholder="请输入线上尾款金额"  class="form-control" value="{$order.online_total|htmlentities}">
+            </div>
+        </div>
+
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('线下尾款')}:</label>
             <div class="col-xs-12 col-sm-8">
@@ -111,7 +126,7 @@
                     <input id="c-image" class="form-control" size="35" name="row[image]" type="text" value="">
                     <div class="input-group-addon no-border no-padding">
                         <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                        <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                        <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                     </div>
                     <span class="msg-box n-right"></span>
                 </div>