diff --git a/ZR.Vue/src/views/business/gendemo/index.vue b/ZR.Vue/src/views/business/gendemo/index.vue
index 81e7e13..f543ac0 100644
--- a/ZR.Vue/src/views/business/gendemo/index.vue
+++ b/ZR.Vue/src/views/business/gendemo/index.vue
@@ -3,16 +3,19 @@
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
       <el-form-item label="自增id" :label-width="labelWidth">
-        <el-input v-model.number="queryParams.id"/>
+        <el-input v-model.number="queryParams.id" />
       </el-form-item>
       <el-form-item label="名称" :label-width="labelWidth">
-        <el-input v-model="queryParams.name"/>
+        <el-input v-model="queryParams.name" />
       </el-form-item>
-      <el-form-item label="显示状态" :label-width="labelWidth">
-        <el-input v-model.number="queryParams.showStatus"/>
+      <el-form-item label="显示状态" :label-width="labelWidth" prop="showStatus">
+        <el-select v-model="queryParams.showStatus">
+          <el-option v-for="item in showStatusOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="时间">
-        <el-date-picker v-model="timeRange" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="timeRange" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期"
+          end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
 
       <el-row class="mb8" style="text-align:center">
@@ -20,44 +23,46 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-row>
     </el-form>
-    
+
     <!-- 工具区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" v-hasPermi="['business:gendemo:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" :disabled="single" v-hasPermi="['business:gendemo:update']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
+        <el-button type="success" :disabled="single" v-hasPermi="['business:gendemo:update']" plain icon="el-icon-edit" size="mini"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['business:gendemo:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['business:gendemo:delete']" plain icon="el-icon-delete" size="mini"
+          @click="handleDelete">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 数据区域 -->
-    <el-table :data="dataList" ref="table" border  @selection-change="handleSelectionChange">
+    <el-table :data="dataList" ref="table" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" />
       <el-table-column prop="id" label="自增id" align="center" />
-      <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true"/>
+      <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="icon" label="图片">
-         <template slot-scope="scope">
-            <el-image class="table-td-thumb" :src="scope.row.icon" :preview-src-list="[scope.row.icon]"></el-image>
-         </template>
-       </el-table-column>
-      <el-table-column prop="showStatus" label="显示状态" align="center"  :formatter="showStatusFormat"/>
+        <template slot-scope="scope">
+          <el-image class="table-td-thumb" :src="scope.row.icon" :preview-src-list="[scope.row.icon]"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column prop="showStatus" label="显示状态" align="center" :formatter="showStatusFormat" />
       <el-table-column prop="addTime" label="添加时间" align="center" />
-      <el-table-column prop="sex" label="用户性别" align="center"  :formatter="sexFormat"/>
+      <el-table-column prop="sex" label="用户性别" align="center" :formatter="sexFormat" />
       <el-table-column prop="sort" label="排序" align="center" />
       <el-table-column prop="beginTime" label="开始时间" align="center" />
       <el-table-column prop="endTime" label="结束时间" align="center" />
-      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true"/>
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" />
 
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button v-hasPermi="['business:gendemo:update']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
           <el-popconfirm title="确定删除吗？" @confirm="handleDelete(scope.row)" style="margin-left:10px">
-            <el-button slot="reference"  v-hasPermi="['business:gendemo:delete']" type="text" icon="el-icon-delete">删除</el-button>
+            <el-button slot="reference" v-hasPermi="['business:gendemo:delete']" type="text" icon="el-icon-delete">删除</el-button>
           </el-popconfirm>
         </template>
       </el-table-column>
@@ -65,57 +70,61 @@
     <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
         <el-row>
-    <el-col :span="12">
-      <el-form-item label="名称" :label-width="labelWidth" prop="name">
-        <el-input v-model="form.name" placeholder="请输入名称" />
-      </el-form-item>
-    </el-col>
-    <el-col :span="24">
-      <el-form-item label="图片" :label-width="labelWidth" prop="icon">
-        <el-upload class="avatar-uploader" name="file" action="/api/upload/saveFile/" :show-file-list="false" :on-success="handleUploadIconSuccess" :before-upload="beforeFileUpload">
-          <img v-if="form.icon" :src="form.icon" class="icon">
-          <i v-else class="el-icon-plus uploader-icon"></i>
-        </el-upload>
-        <el-input v-model="form.icon" placeholder="请上传文件或手动输入文件地址"></el-input>
-      </el-form-item>
-    </el-col>
-    <el-col :span="12">
-      <el-form-item label="显示状态" :label-width="labelWidth" prop="showStatus">
-        <el-select v-model="form.showStatus">
-          <el-option v-for="item in showStatusOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
-        </el-select>
-      </el-form-item>
-    </el-col>
-    <el-col :span="12">
-      <el-form-item label="用户性别" :label-width="labelWidth" prop="sex">
-        <el-radio-group v-model="form.sex">
-          <el-radio v-for="item in sexOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-col>
-    <el-col :span="12">
-      <el-form-item label="排序" :label-width="labelWidth" prop="sort">
-        <el-input-number v-model.number="form.sort" placeholder="请输入排序" />
-      </el-form-item>
-    </el-col>
-      <el-col :span="12">
-        <el-form-item label="开始时间" :label-width="labelWidth" prop="beginTime">
-           <el-date-picker v-model="form.beginTime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  type="datetime"  placeholder="选择日期时间"> </el-date-picker>
-         </el-form-item>
-     </el-col>
-      <el-col :span="12">
-        <el-form-item label="结束时间" :label-width="labelWidth" prop="endTime">
-           <el-date-picker v-model="form.endTime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  type="datetime"  placeholder="选择日期时间"> </el-date-picker>
-         </el-form-item>
-     </el-col>
-    <el-col :span="24">
-      <el-form-item label="备注" :label-width="labelWidth" prop="remark">
-        <editor v-model="form.remark" :min-height="200" />
-      </el-form-item>
-    </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" :label-width="labelWidth" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="图片" :label-width="labelWidth" prop="icon">
+              <el-upload class="avatar-uploader" name="file" :action="uploadUrl" :show-file-list="false" :on-success="handleUploadIconSuccess"
+                :before-upload="beforeFileUpload">
+                <el-image v-if="form.icon" :src="form.icon" class="icon" />
+                <i v-else class="el-icon-plus uploader-icon"></i>
+              </el-upload>
+              <el-input v-model="form.icon" placeholder="请上传文件或手动输入文件地址"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示状态" :label-width="labelWidth" prop="showStatus">
+              <el-select v-model="form.showStatus">
+                <el-option v-for="item in showStatusOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户性别" :label-width="labelWidth" prop="sex">
+              <el-radio-group v-model="form.sex">
+                <el-radio v-for="item in sexOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="排序" :label-width="labelWidth" prop="sort">
+              <el-input-number v-model.number="form.sort" placeholder="请输入排序" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开始时间" :label-width="labelWidth" prop="beginTime">
+              <el-date-picker v-model="form.beginTime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
+                placeholder="选择日期时间"> </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结束时间" :label-width="labelWidth" prop="endTime">
+              <el-date-picker v-model="form.endTime" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
+                placeholder="选择日期时间"> </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" :label-width="labelWidth" prop="remark">
+              <editor v-model="form.remark" :min-height="200" />
+            </el-form-item>
+          </el-col>
 
         </el-row>
       </el-form>
@@ -128,16 +137,15 @@
   </div>
 </template>
 <script>
-import { 
+import {
   listGendemo,
   addGendemo,
   delGendemo,
   updateGendemo,
-  getGendemo 
-} from '@/api/gendemo.js';
-
-import Editor from '@/components/Editor';
+  getGendemo,
+} from "@/api/gendemo.js";
 
+import Editor from "@/components/Editor";
 
 export default {
   name: "Gendemo",
@@ -145,7 +153,7 @@ export default {
   data() {
     return {
       labelWidth: "100px",
-      formLabelWidth:"100px",
+      formLabelWidth: "100px",
       // 选中id数组
       ids: [],
       // 非单个禁用
@@ -166,10 +174,12 @@ export default {
       form: {},
       // 时间范围数组
       timeRange: [],
-            // 显示状态选项列表
+      // 显示状态选项列表
       showStatusOptions: [],
       // 用户性别选项列表
       sexOptions: [],
+      //文件上传前判断方法
+      uploadUrl: process.env.VUE_APP_BASE_API + "/upload/SaveFile/",
 
       // 数据列表
       dataList: [],
@@ -179,9 +189,10 @@ export default {
       btnSubmitVisible: true,
       // 表单校验
       rules: {
-        id: [{ type: 'number', message: 'id必须为数字值', trigger: "blur"}],
-        showStatus: [{ required: true, message: '请输入显示状态', trigger: "blur"}],
-
+        id: [{ type: "number", message: "id必须为数字值", trigger: "blur" }],
+        showStatus: [
+          { required: true, message: "请输入显示状态", trigger: "blur" },
+        ],
       },
     };
   },
@@ -191,22 +202,23 @@ export default {
 
     this.getDicts("sys_show_hide").then((response) => {
       this.showStatusOptions = response.data;
-    })
+    });
     this.getDicts("sys_user_sex").then((response) => {
       this.sexOptions = response.data;
-    })
-
+    });
   },
   methods: {
     // 查询数据
     getList() {
       console.log(JSON.stringify(this.queryParams));
-       listGendemo(this.addDateRange(this.queryParams, this.timeRange)).then(res => {
-         if (res.code == 200) {
-           this.dataList = res.data.result;
-           this.total = res.data.totalNum;
-         }
-       })
+      listGendemo(this.addDateRange(this.queryParams, this.timeRange)).then(
+        (res) => {
+          if (res.code == 200) {
+            this.dataList = res.data.result;
+            this.total = res.data.totalNum;
+          }
+        }
+      );
     },
     // 取消按钮
     cancel() {
@@ -226,7 +238,7 @@ export default {
         endTime: undefined,
         remark: undefined,
 
-		//TODO 根据实际内容调整
+        //TODO 根据实际内容调整
       };
       this.resetForm("form");
     },
@@ -244,7 +256,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
-      this.single = selection.length !=1
+      this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
     /** 搜索按钮操作 */
@@ -270,15 +282,14 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getGendemo(id).then((res) => {
-        if(res.code == 200){
-           this.form = res.data;
-           this.open = true;
-           this.title = "修改数据";
+        if (res.code == 200) {
+          this.form = res.data;
+          this.open = true;
+          this.title = "修改数据";
         }
       });
     },
-    beforeFileUpload(file) { },
-        //文件上传成功方法
+    //文件上传成功方法
     handleUploadIconSuccess(res, file) {
       this.form.icon = URL.createObjectURL(file.raw);
       // this.$refs.upload.clearFiles();
@@ -291,32 +302,44 @@ export default {
     sexFormat(row, column) {
       return this.selectDictLabel(this.sexOptions, row.sex);
     },
+    //文件上传前判断方法
+    beforeFileUpload(file) {
+      const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      if (!isJPG) {
+        this.msgError("上传图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.msgError("上传图片大小不能超过 2MB!");
+      }
+      return isJPG && isLt2M;
+    },
 
     /** 提交按钮 */
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           console.log(JSON.stringify(this.form));
-          
+
           if (this.form.id != undefined || this.title === "修改数据") {
             updateGendemo(this.form).then((res) => {
-                if (!res.data) {
-                    this.msgError("修改失败");
-                    return;
-                }
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
+              if (!res.data) {
+                this.msgError("修改失败");
+                return;
+              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
             addGendemo(this.form).then((res) => {
-                if (!res.data) {
-                    this.msgError("新增失败");
-                    return;
-                }
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
+              if (!res.data) {
+                this.msgError("新增失败");
+                return;
+              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }