Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-ui/src/views/system/firing/index.vue

@@ -58,7 +58,7 @@
             >
               <i class="el-icon-upload"></i>
               <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-              <div class="el-upload__tip" slot="tip">请上传启动页介绍图片，建议尺寸为330px*460p</div>
+              <div class="el-upload__tip" slot="tip">请上传启动页介绍图片，建议尺寸为330px*460px</div>
             </el-upload>
           </div>
           <div  style="float: left;margin-left: 5%;margin-top: 10%;">
@@ -103,7 +103,7 @@
           >
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">请上传登录页背景图片，建议尺寸为375px*471p</div>
+            <div class="el-upload__tip" slot="tip">请上传登录页背景图片，建议尺寸为375px*471px</div>
           </el-upload>
         </div>
 

flossom-ui/src/views/system/globalIntegral/index.vue

@@ -103,7 +103,7 @@
 <!--    </div>-->
     <!-- 添加或修改积分奖励对话框 -->
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-form-item label="完善资料-初始积分" prop="integral">
+        <el-form-item label="完善资料-奖励积分" prop="integral">
           <el-input v-model="form.integral" placeholder="请输入初始奖励积分" style="width: 75%;"/>
         </el-form-item>
       </el-form>
@@ -148,10 +148,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        integral: [
-          { required: true, message: '请输入奖励积分', trigger: 'blur' },
-          { min: 1, max: 5, message: '长度在 1 到 5 个字符', trigger: 'blur' }
-        ],
+
       }
     };
   },
@@ -227,6 +224,14 @@ export default {
             this.$modal.msgError("仅能输入数字");
             return;
           }
+          if(!this.form.integral) {
+            this.$modal.msgError("积分不能为空");
+            return;
+          }
+          if(this.form.integral.length >5) {
+            this.$modal.msgError("积分长度不能超过5个字符");
+            return;
+          }
           if (this.form.id != null) {
             updateGlobal(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

flossom-ui/src/views/system/leaveMessage/index.vue

@@ -96,6 +96,11 @@
       <el-table-column label="用户编号" align="center" prop="userNumber" />
       <el-table-column label="用户手机号码" align="center" prop="userPhone" />
       <el-table-column label="用户留言" align="center" prop="messageInfo" />
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -149,6 +154,9 @@
         <el-form-item label="用户留言" prop="messageInfo">
           <el-input v-model="form.messageInfo" type="textarea" disabled />
         </el-form-item>
+        <el-form-item label="提交时间" prop="createTime">
+          <el-input v-model="form.createTime" disabled  />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>