From ae6dcc295af46e9e713ed1901bf7da6da9174bec Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 30 Aug 2024 09:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82=E4=B8=A4?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/components/extend.vue | 31 ++++++++++++++--------------
 src/views/user_manage/user_list.vue  |  6 +++++-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/shop/components/extend.vue b/src/views/shop/components/extend.vue
index 6e353bf..d42a9f5 100644
--- a/src/views/shop/components/extend.vue
+++ b/src/views/shop/components/extend.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-button type="primary" @click="resetting">添加</el-button>
+        <!-- <el-button type="primary" @click="resetting">添加</el-button> -->
         <el-table :data="tableData">
             <el-table-column label="类型" prop="type">
                 <template v-slot="row">
@@ -8,21 +8,20 @@
                 </template>
             </el-table-column>
             <el-table-column label="描述" prop="name"> </el-table-column>
-            <el-table-column label="key" prop="autokey"> </el-table-column>
-            <el-table-column label="value" prop="value">
+            <el-table-column label="内容" prop="value">
                 <template v-slot="row">
-                    <img v-if="row.row.type == 'img'" :src="row.row.value" style="width: 40px;height: 40px;">
+                    <template v-if="row.row.id">
+                        <img v-if="row.row.type == 'img'" :src="row.row.value" style="width: 40px;height: 40px;">
+                    </template>
                     <span v-else>{{ row.row.value }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="更新时间" prop="updateTime"> </el-table-column>
-            <el-table-column label="创建时间" prop="createTime"> </el-table-column>
             <el-table-column label="操作" width="250">
                 <template v-slot="scope">
                     <el-button type="text" size="mini" round icon="el-icon-edit"
-                        @click="edit(scope.row.id)">编辑</el-button>
+                        @click="edit(scope.row)">编辑</el-button>
                     <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
-                        <el-button type="text" size="mini" round icon="el-icon-delete" slot="reference">
+                        <el-button type="text" :disabled="!scope.row.id" size="mini" round icon="el-icon-delete" slot="reference">
                             删除
                         </el-button>
                     </el-popconfirm>
@@ -35,18 +34,20 @@
                     <el-radio v-model="form.type" label="text">文本</el-radio>
                     <el-radio v-model="form.type" label="img">图片</el-radio>
                 </el-form-item>
-                
+
                 <el-form-item label="描述">
                     <el-input v-model="form.name" placeholder="请输入内容"></el-input>
-                </el-form-item>   <el-form-item label="自定义key">
+                </el-form-item> 
+                 <!-- <el-form-item label="自定义key">
                     <el-input v-model="form.autokey" placeholder="请输入内容"></el-input>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="上传图片" v-if="form.type == 'img'">
                     <el-upload :headers="headers" class="avatar-uploader" :action="qiNiuUploadApi"
                         :show-file-list="false" :on-success="handleSuccess">
                         <img v-if="imageUrl" :src="imageUrl" class="avatar">
                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
+                    <span>{{form.detail}}</span>
                 </el-form-item>
                 <el-form-item label="文本" v-else>
                     <el-input v-model="form.value" placeholder="请输入内容"></el-input>
@@ -98,13 +99,11 @@ export default {
         handleBeforeRemove(file, fileList) {
 
         },
-        async edit(id) {
+        async edit(item) {
             this.title = '编辑'
-            let res = await querytbShopExtend(id)
-            this.form.id = id
             this.showLocation = true
-            this.form = res
-            this.imageUrl = res.value
+            this.form = item
+            this.imageUrl = item.value
         },
         // 删除
         async delHandle(proId) {
diff --git a/src/views/user_manage/user_list.vue b/src/views/user_manage/user_list.vue
index 879814f..1a62b36 100644
--- a/src/views/user_manage/user_list.vue
+++ b/src/views/user_manage/user_list.vue
@@ -174,7 +174,7 @@
             <el-radio label="inMoney" v-show="userinfo.operationType == 'in'">充值</el-radio>
             <el-radio label="consumeIn" v-show="userinfo.operationType == 'in'">消费退款</el-radio>
             <el-radio label="consumeOut" v-show="userinfo.operationType != 'in'">消费</el-radio>
-            <el-radio label=" inMoneyOut " v-show="userinfo.operationType != 'in'">充值退款</el-radio>
+            <el-radio label="inMoneyOut" v-show="userinfo.operationType != 'in'">充值退款</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -277,6 +277,10 @@ export default {
       this.getTableData();
     },
     async sumbit() {
+      if (!this.userinfo.amount) {
+        this.$message.error("请填写金额")
+        return
+      }
       let res = await midfiyAccount(this.userinfo)
       this.dialogVisible = false
       this.$message.success('修改成功')