Explorar o código

improve: gittee问题处理

From-wh %!s(int64=2) %!d(string=hai) anos
pai
achega
4ee0cfb2a3

+ 1 - 0
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;

+ 1 - 1
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
           >

+ 11 - 3
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: {