From 4ee0cfb2a3671b7940f7dee2ddf64db2e645c574 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Tue, 27 Jun 2023 10:00:56 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20gittee=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/app/upload/index.vue      |  1 +
 .../finance/financialRecords/recharge/index.vue    |  2 +-
 .../src/pages/order/orderList/handle/orderSend.vue | 14 +++++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/template/admin/src/pages/app/upload/index.vue b/template/admin/src/pages/app/upload/index.vue
index e5811c962..0a76b923b 100644
--- a/template/admin/src/pages/app/upload/index.vue
+++ b/template/admin/src/pages/app/upload/index.vue
@@ -191,6 +191,7 @@ export default {
   height: 113px;
   line-height: 113px;
   overflow: inherit;
+  margin: 5px;
 }
 /deep/ .el-upload-list--picture-card .el-upload-list__item img {
   width: 111px;
diff --git a/template/admin/src/pages/finance/financialRecords/recharge/index.vue b/template/admin/src/pages/finance/financialRecords/recharge/index.vue
index ee874f174..93708ebdf 100644
--- a/template/admin/src/pages/finance/financialRecords/recharge/index.vue
+++ b/template/admin/src/pages/finance/financialRecords/recharge/index.vue
@@ -77,7 +77,7 @@
         <template slot-scope="{ row, index }" slot="right">
           <a
             href="javascript:void(0);"
-            v-if="row.refund_price <= 0 && row.paid && row.recharge_type != 'system'"
+            v-if="row.refund_price <= 0 && row.paid && row.recharge_type != 'system' && row.recharge_type != 'balance'"
             @click="refund(row)"
             >退款</a
           >
diff --git a/template/admin/src/pages/order/orderList/handle/orderSend.vue b/template/admin/src/pages/order/orderList/handle/orderSend.vue
index 0ac1c597c..d0c8a15ca 100644
--- a/template/admin/src/pages/order/orderList/handle/orderSend.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderSend.vue
@@ -8,7 +8,14 @@
     width="1000"
     @on-visible-change="changeModal"
   >
-    <Form v-if="modals" ref="formItem" :model="formItem" :label-width="100" @submit.native.prevent>
+    <Form
+      v-if="modals"
+      ref="formItem"
+      :rules="ruleValidate"
+      :model="formItem"
+      :label-width="100"
+      @submit.native.prevent
+    >
       <FormItem label="选择类型：">
         <RadioGroup v-model="formItem.type" @on-change="changeRadio">
           <Radio label="1" v-if="virtual_type !== 3">发货</Radio>
@@ -98,8 +105,8 @@
           </FormItem>
         </template>
       </div>
-      <div v-show="formItem.type === '2'">
-        <FormItem label="送货人：">
+      <div v-if="formItem.type === '2'">
+        <FormItem label="送货人：" :prop="formItem.type == '2' ? 'sh_delivery' : ''">
           <Select
             v-model="formItem.sh_delivery"
             placeholder="请选择送货人"
@@ -293,6 +300,7 @@ export default {
       selectData: [],
       serviceTypeList: [],
       sendPrice: 0,
+      ruleValidate: { sh_delivery: [{ required: true, message: '请输入送货人', trigger: 'change' }] },
     };
   },
   watch: {