From 5e412f687670947a41eecdb8bf083ba541d00c5e Mon Sep 17 00:00:00 2001
From: elliott <382696293@qq.com>
Date: Fri, 29 Dec 2023 10:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=B4=E5=83=8F=E7=AD=89?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/CtLeaveMessageMapper.xml |  1 +
 flossom-ui/src/views/system/firing/index.vue  | 27 ++++++++++++++++---
 .../src/views/system/leaveMessage/index.vue   |  9 ++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml
index 4006782..9b4003b 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/CtLeaveMessageMapper.xml
@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
             <if test="messageInfo != null  and messageInfo != ''"> and message_info = #{messageInfo}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectCtLeaveMessageById" parameterType="Long" resultMap="CtLeaveMessageResult">
diff --git a/flossom-ui/src/views/system/firing/index.vue b/flossom-ui/src/views/system/firing/index.vue
index e7b37e6..6922890 100644
--- a/flossom-ui/src/views/system/firing/index.vue
+++ b/flossom-ui/src/views/system/firing/index.vue
@@ -30,8 +30,10 @@
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
             <div class="el-upload__tip" slot="tip">请上传视频，用于启动页显示，比例建议为16: 9</div>
           </el-upload>
+          <div slot="footer" class="dialog-footer" style="margin-left: 70%;margin-top: 10%">
+            <el-button type="primary" @click="handleDelete()">删 除</el-button>
+          </div>
         </div>
-
       </el-tab-pane>
       <el-tab-pane label="介绍页" name="middlePage">
         <div style="height: 600px;" v-for="(item,index) of imagesInfo">
@@ -64,10 +66,10 @@
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="标题" prop="title">
-                    <el-input v-model="item.title" placeholder="请输入标题" />
+                    <el-input v-model="item.title" placeholder="请输入标题" maxlength="10" />
                   </el-form-item>
                   <el-form-item label="介绍文字" prop="content">
-                    <el-input v-model="item.content" placeholder="请输入介绍文字" />
+                    <el-input v-model="item.content" placeholder="请输入介绍文字" maxlength="30" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -175,7 +177,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-
+        title: [
+          { required: true, message: '请输入标题', trigger: 'blur' },
+        ],
+        content: [
+          { required: true, message: '请输入内容', trigger: 'blur' },
+        ]
       }
     };
   },
@@ -331,6 +338,10 @@ export default {
       this.form = item;
       this.form.fileSuffix = 'images';
       this.form.type = 1;
+      if (!this.form.title || !this.form.content) {
+        this.$modal.msgError("标题或者内容不能为空");
+        return;
+      }
       if (this.form.id != null) {
         updateInfo(this.form).then(response => {
           this.$modal.msgSuccess("修改成功");
@@ -347,6 +358,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      if(!row && this.videoForm) {
+        row = this.videoForm;
+      }
       if (!row.id) {
         this.$modal.msgError('目前数据状态不允许删除');
         return;
@@ -357,6 +371,11 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
+        if(this.videoForm && this.videoForm.id){
+          this.videoForm = {};
+          this.$refs["video"].load();
+          this.$refs["video"].play();
+        }
       }).catch(() => {});
     },
     /** 导出按钮操作 */
diff --git a/flossom-ui/src/views/system/leaveMessage/index.vue b/flossom-ui/src/views/system/leaveMessage/index.vue
index e2b284a..fa1abd2 100644
--- a/flossom-ui/src/views/system/leaveMessage/index.vue
+++ b/flossom-ui/src/views/system/leaveMessage/index.vue
@@ -84,7 +84,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="来源" align="center" prop="sourceName" />
-      <el-table-column label="用户头像" align="center" prop="userImg" />
+      <el-table-column label="用户头像" align="center" prop="userImg" >
+        <template slot-scope="scope">
+          <el-image :src="scope.row.userImg" style="width: 60px;height: 80px">
+            <div slot="placeholder" class="image-slot"><span class="dot"></span>
+            </div>
+          </el-image>
+        </template>
+      </el-table-column>
       <el-table-column label="用户昵称" align="center" prop="userName" />
       <el-table-column label="用户编号" align="center" prop="userNumber" />
       <el-table-column label="用户手机号码" align="center" prop="userPhone" />