From 6fa7a0103fdb76a3d496dd0d1bfdabfc7dd02d5a Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Tue, 20 Jun 2023 18:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shop/refundOrder/index.vue      |  4 ++--
 yudao-ui-app/pages/member_record/index.vue    | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/yudao-ui-admin/src/views/shop/refundOrder/index.vue b/yudao-ui-admin/src/views/shop/refundOrder/index.vue
index 9db190686..8f18107e0 100644
--- a/yudao-ui-admin/src/views/shop/refundOrder/index.vue
+++ b/yudao-ui-admin/src/views/shop/refundOrder/index.vue
@@ -60,7 +60,7 @@
       <el-table-column label="会员名称" align="center" prop="realName" />
       <el-table-column label="充值号码" align="center" prop="userPhone" />
       <el-table-column label="退款类型" align="center" prop="refundName" />
-      <el-table-column label="退款理由" align="center" prop="memberReason" />
+      <el-table-column label="退款理由" align="center" prop="memberReason" width="180" show-overflow-tooltip/>
       <el-table-column label="申请退款时间" align="center" prop="payTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.applyTime) }}</span>
@@ -71,7 +71,7 @@
           <span>{{ parseTime(scope.row.applySucceedTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="adminReason" />
+      <el-table-column label="备注" align="center" prop="adminReason" width="180" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding" fixed="right" width="80">
         <template v-slot="scope">
           <el-button size="mini" type="text"  @click="handleAdd(scope.row)" v-hasPermi="['shop:recharge-order:remark']">添加备注</el-button>
diff --git a/yudao-ui-app/pages/member_record/index.vue b/yudao-ui-app/pages/member_record/index.vue
index 31ef1fc5d..f0cc37bcf 100644
--- a/yudao-ui-app/pages/member_record/index.vue
+++ b/yudao-ui-app/pages/member_record/index.vue
@@ -22,11 +22,11 @@
       confirm-text="确认退款" cancel-text="取消退款">
       <view class="slot-content">
         <u--form :model="form" ref="uForm" :rules="rules" label-width="120">
-          <u-form-item label="退款类型" prop="name" @click="show = true;">
-            <u--input v-model="form.name" disabled disabledColor="#ffffff" placeholder='请选择退款类型'></u--input>
+          <u-form-item label="退款类型" prop="refundName" @click="show = true;">
+            <u--input v-model="form.refundName" disabled disabledColor="#ffffff" placeholder='请选择退款类型'></u--input>
             <u-icon slot="right" name="arrow-right"></u-icon>
           </u-form-item>
-          <u-form-item label="退款理由" prop="refundName"><u--textarea v-model="form.refundName" maxlength="100"
+          <u-form-item label="退款理由" prop="memberReason"><u--textarea v-model="form.memberReason" maxlength="100"
               placeholder='请输入退款理由' count autoHeight /></u-form-item>
         </u--form>
       </view>
@@ -53,7 +53,7 @@
     data() {
       return {
         rules: {
-          name: [{
+          refundName: [{
             required: true,
             message: '请选择退款类型',
             // 可以单个或者同时写两个触发验证方式
@@ -65,7 +65,7 @@
             // 可以单个或者同时写两个触发验证方式
             trigger: ['change', 'blur'],
           }],
-          refundName: [{
+          memberReason: [{
             required: true,
             message: '请输入退款理由',
             trigger: ['change', 'blur'],
@@ -76,9 +76,9 @@
         keyword: '',
         memberData: [],
         form: {
-          name: '',
+          refundName: '',
           refundType: '',
-          refundName: ''
+          memberReason:''
         },
         list: ['未退款', '退款申请中', '已退款', '退款中'],
         actionSheetList: [{
@@ -134,9 +134,8 @@
     },
     methods: {
       handleSelect(e) {
-        this.form.refundType = e.refundType
-        this.form.name = e.name
-        this.$refs.uForm.validateField('form.refundType')
+        this.form.refundType = e.value
+        this.form.refundName = e.name
       },
       handleBack(item) {
         uni.navigateTo({