fix:时间修改为换行，游戏图片上传的提示文字，upload的文件大小限制1mb

f77b8d3c · chenxin · be689ead · f77b8d3c · f77b8d3c · f77b8d3c
Commit f77b8d3c authored May 06, 2019 by chenxin
37 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.b4005fdce15d7e766caee67108453209.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.41e915fffb6fa2b1b49e.js></script><script type=text/javascript src=/marketing/static/js/main.3e9d0e378c483eb5a2c6.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.352a10e35e5cbe33910226b1d6a5182a.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.41e915fffb6fa2b1b49e.js></script><script type=text/javascript src=/marketing/static/js/main.3e91cdf5cc6b973ba643.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/main.b4005fdce15d7e766caee67108453209.css
+++ b/dist/static/css/main.b4005fdce15d7e766caee67108453209.css
--- a/dist/static/js/main.3e91cdf5cc6b973ba643.js
+++ b/dist/static/js/main.3e91cdf5cc6b973ba643.js
--- a/dist/static/js/main.3e9d0e378c483eb5a2c6.js
+++ b/dist/static/js/main.3e9d0e378c483eb5a2c6.js
--- a/src/assets/style/base/reset.scss
+++ b/src/assets/style/base/reset.scss
@@ -106,6 +106,9 @@ a:hover {
 .pr20{
  padding-right: 20px!important;
 }
+.pr30{
+  padding-right: 30px!important;
+}

 .ml30{
  margin-left: 30px!important;

--- a/src/assets/style/components/index.scss
+++ b/src/assets/style/components/index.scss
@@ -185,4 +185,9 @@
    top: 0;
    content:'';
  }
+}
+
+// 表格 \n 换行
+.el-table .cell {
+  white-space: pre-line;
 }
\ No newline at end of file
--- a/src/components/libs/imgTextTemp/index.vue
+++ b/src/components/libs/imgTextTemp/index.vue
@@ -26,7 +26,7 @@
            <a class="blue" :href="scope.row.itemList.length ? scope.row.itemList[0].mediaUrl || '' : ''" target="_blank">{{ scope.row.itemList.length ? scope.row.itemList[0].titleName || '' : '' }}</a>
          </template>
        </el-table-column>
-        <el-table-column label="作者" prop="updateTimeStr" align="left">
+        <el-table-column label="作者" prop="authorName" align="left">
          <template slot-scope="scope">
            <p>{{ scope.row.itemList.length ? scope.row.itemList[0].authorName || '--' : '' }}</p>
          </template>
@@ -112,8 +112,10 @@ export default {
          this.textImgList = res.result.result || [];
          this.total = res.result.totalCount;
          this.textImgList.map(v => {
-            v.createTimeStr = formatDateTimeByType(v.createTime, 'yyyy-MM-dd-HH-mm');
-            v.updateTimeStr = formatDateTimeByType(v.updateTime, 'yyyy-MM-dd-HH-mm');
+            const ctime = formatDateTimeByType(v.createTime, 'yyyy-MM-dd-HH-mm', true);
+            const utime = formatDateTimeByType(v.updateTime, 'yyyy-MM-dd-HH-mm', true);
+            v.createTimeStr = ctime.y + '\n' + ctime.h;
+            v.updateTimeStr = utime.y + '\n' + utime.h;
            if (this.activeId === v.imageTextWechatId) {
              this.selectedData = v;
            }
@@ -158,7 +160,8 @@ export default {
    handleCurrentChange(val) {
      this.listParams.currentPage = val;
      this.loadImgTextList();
-    }
+    },
+    formatDateTimeByType
  }
 };
 </script>

--- a/src/directives/upload.js
+++ b/src/directives/upload.js
@@ -4,7 +4,6 @@

 import axios from 'axios';
 import config from '@/config';
-const maxSize = 2 * 1024 * 1024; //5M
 axios.defaults.withCredentials = true;

 function verificationPicFile(file, l_width, l_height) {
@@ -41,11 +40,13 @@ export default {
  inserted: function(el, binding) {
    el.addEventListener('change', function() {
      binding.value.loading = true;
-      if (el.files[0].size > maxSize) {
-        binding.value.$tips({ type: 'warning', message: '上传图片不能大于2M' });
+      const size = binding.value.limit && binding.value.limit.maxSize ? binding.value.limit.maxSize : 2; // 默认最大2M限制
+      if (el.files[0].size > size * 1024 * 1024) {
+        binding.value.$tips({ type: 'warning', message: `上传图片不能大于${size}M` });
+        binding.value.loading = false;
        return;
      }
-      // 启用限制图片大小
+      // 启用限制图片宽高大小
      if (binding.value.limit && binding.value.limit.type) {
        const { width, height } = binding.value.limit;
        verificationPicFile(el, width, height)

--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -32,15 +32,15 @@ export const fillZero = num => {
 * @param {*时间} date
 * @param {*转换的格式} type
 */
-export const formatDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss') => {
+export const formatDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss', newline = false) => {
  if (!date) {
-    return '';
+    return newline ? { y: '', h: '' } : '';
  }
  if (typeof date === 'number') {
    date = new Date(date);
  }
  if (typeof date === 'string') {
-    return date;
+    return newline ? { y: date, h: '' } : date;
  } else {
    let year = type.indexOf('yyyy') >= 0 ? fillZero(date.getFullYear()) : '';
    let month = type.indexOf('MM') >= 0 ? '-' + fillZero(date.getMonth() + 1) : '';
@@ -49,6 +49,9 @@ export const formatDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss') => {
    let min = type.indexOf('mm') >= 0 ? ':' + fillZero(date.getMinutes()) : '';
    let sec = type.indexOf('ss') >= 0 ? ':' + fillZero(date.getSeconds()) : '';
    // console.log(year+month+day+hours+min+sec);
+    if (newline) {
+      return { y: year + month + day, h: hours + min + sec };
+    }
    return year + month + day + hours + min + sec;
  }
 };

--- a/src/views/calllog/calllog.vue
+++ b/src/views/calllog/calllog.vue
 <template>
  <section class="dm-wrap">
-    <el-alert type="info" :closable="false" show-icon class="mb10">
+    <el-alert type="info" :closable="false" show-icon class="mb20">
      <p slot="title" class="fz14 mb15 info-color line-height1_5">通话录音默认存储3天，如需更长的期限，请在录音设置中开启。</p>
    </el-alert>
    <div class="pb22 clearfix">
@@ -15,9 +15,10 @@
      <el-button type="primary" class="fr" @click="$router.push('/calllog/record')">录音设置</el-button>
    </div>
    <el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading">
-      <el-table-column align="left" width="160" prop="callBeginTime" label="呼叫时间">
+      <el-table-column align="left" width="120" prop="callBeginTime" label="呼叫时间">
        <template slot-scope="scope">
-          {{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss') }}
+          {{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss', true).y }} <br />
+          {{ formatDateTimeByType(scope.row.callBeginTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}
        </template>
      </el-table-column>
      <el-table-column align="left" min-width="150" prop="clerkName" label="主叫">

--- a/src/views/card/check.vue
+++ b/src/views/card/check.vue
@@ -8,7 +8,8 @@
    <el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
      <el-table-column :show-overflow-tooltip="true" width="160" align="left" prop="createTime" label="操作时间">
        <template slot-scope="scope">
-          <p>{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm') }}</p>
+          <p>{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm', true).y }}</p>
+          <p>{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" width="160" align="left" prop="orderNumber" label="订单流水号">

--- a/src/views/card/record-cache.vue
+++ b/src/views/card/record-cache.vue
@@ -19,7 +19,8 @@
    <el-table tooltipEffect="light" :data="recordList" style="width: 100%" v-loading="recordLoading" @sort-change="sortList">
      <el-table-column width="135" align="left" prop="receiveTime" label="领取时间" fixed="left">
        <template slot-scope="scope">
-          {{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm') }}
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).y }}</p>
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column width="80" align="left" prop="cardTypeExcel" label="卡券类型"> </el-table-column>
@@ -30,7 +31,8 @@
      <el-table-column min-width="100" align="left" prop="attentionStatus" label="关注状态"> </el-table-column>
      <el-table-column width="135" align="left" prop="transferDate" label="关注时间">
        <template slot-scope="scope">
-          {{ scope.row.transferDate ? formatDateTimeByType(scope.row.transferDate, 'yyyy-MM-dd-HH-mm') : '--' }}
+          <p style="color:#606266;">{{ scope.row.transferDate ? formatDateTimeByType(scope.row.transferDate, 'yyyy-MM-dd-HH-mm', true).y : '--' }}</p>
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.transferDate, 'yyyy-MM-dd-HH-mm', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" min-width="140" header-align="left" align="left" :key="Math.random()" prop="clerkId" label="会员信息">

--- a/src/views/card/record-get.vue
+++ b/src/views/card/record-get.vue
@@ -15,12 +15,14 @@
    <el-table tooltipEffect="light" :data="recordList" style="width: 100%" v-loading="recordLoading" @sort-change="sortList">
      <el-table-column width="135" align="left" prop="receiveTime" label="领取时间" fixed="left" sortable="custom">
        <template slot-scope="scope">
-          {{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm') }}
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).y }}</p>
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.receiveTime, 'yyyy-MM-dd-HH-mm', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column width="135" align="left" prop="writeOffTime" label="核销时间" fixed="left" sortable="custom">
        <template slot-scope="scope">
-          {{ scope.row.useTime ? formatDateTimeByType(scope.row.useTime, 'yyyy-MM-dd-HH-mm') : '--' }}
+          <p style="color:#606266;">{{ scope.row.useTime ? formatDateTimeByType(scope.row.useTime, 'yyyy-MM-dd-HH-mm', true).y : '--' }}</p>
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.useTime, 'yyyy-MM-dd-HH-mm', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" min-width="140" header-align="left" align="left" :key="Math.random()" prop="clerkId" label="会员信息">

--- a/src/views/card/record-send.vue
+++ b/src/views/card/record-send.vue
@@ -6,7 +6,8 @@
    <el-table tooltipEffect="light" :data="recordList" style="width: 100%" row-key="putonTime" v-loading="loading">
      <el-table-column width="160" align="left" prop="putonTime" label="投放时间" fixed="left">
        <template slot-scope="scope">
-          {{ formatDateTimeByType(scope.row.putonTime, 'yyyy-MM-dd-HH-mm') }}
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.putonTime, 'yyyy-MM-dd-HH-mm', true).y }}</p>
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.putonTime, 'yyyy-MM-dd-HH-mm', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column width="150" align="left" prop="cardName" label="卡券名称">

--- a/src/views/ecm/batch-list.vue
+++ b/src/views/ecm/batch-list.vue
@@ -59,7 +59,9 @@ export default {
          align: 'left',
          fixed: 'left',
          formatter(row) {
-            return formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm');
+            const date = formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm', true);
+            return date.y + '\n' + date.h;
+            // return formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm');
          }
        },
        {

--- a/src/views/ecm/current-list.vue
+++ b/src/views/ecm/current-list.vue
@@ -101,7 +101,8 @@ export default {
          minWidth: '120',
          align: 'left',
          formatter(row) {
-            return formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm');
+            const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm', true);
+            return date.y + '\n' + date.h;
          }
        },
        { label: '会员信息', prop: 'marketingType', minWidth: '120', align: 'left', component: 'member-info' },

--- a/src/views/evaluation/suggestion.vue
+++ b/src/views/evaluation/suggestion.vue
@@ -13,7 +13,8 @@
    <el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading" element-loading-text="拼命加载中">
      <el-table-column :show-overflow-tooltip="true" width="160" align="left" :key="Math.random()" prop="createTime" label="评价时间">
        <template slot-scope="scope">
-          <p>{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm') }}</p>
+          <p style="color:#606266">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm', true).y }}</p>
+          <p style="color:#606266">{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" min-width="200" align="left" :key="Math.random()" prop="storeName" label="门店">

--- a/src/views/game/common/share.vue
+++ b/src/views/game/common/share.vue
@@ -9,7 +9,7 @@
      </el-radio-group>
    </el-form-item>
    <el-form-item v-if="form.shareFlag === 1" label="分享图" prop="shareImg.imgUrl" class="width50" :rules="{ required: true, message: '请上传分享图片', trigger: 'blur' }">
-      <dm-upload-avatar :limit="{ type: true, width: 200, height: 200 }" :model.sync="form.shareImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：高度200px*200px" :disabled="isInfo"></dm-upload-avatar>
+      <dm-upload-avatar :limit="{ maxSize: 1 }" :model.sync="form.shareImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：200*200，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
    </el-form-item>
    <el-form-item v-if="form.shareFlag === 1" label="分享标题" prop="shareTitle" class="width50" :rules="{ required: true, message: '标题不能为空', trigger: 'blur' }">
      <dm-input v-model="form.shareTitle" class="w400" placeholder="请输入分享标题" :disabled="isInfo" :maxlength="20"></dm-input>

--- a/src/views/game/common/threshold.vue
+++ b/src/views/game/common/threshold.vue
@@ -10,21 +10,21 @@
      <el-radio v-model="form.memberType" :label="1">会员筛选</el-radio>
      <el-radio v-model="form.memberType" :label="2">会员分组</el-radio>
    </el-form-item>
-    <!-- 会员筛选 -->
-    <el-form-item label="选择会员" v-if="form.memberType === 1">
-      <vue-gic-people :projectName="projectName" :isAdd="isAdd" :triggerReset="true" :useId="thresholdData.useId" :hasSearchData="thresholdData.hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn" />
-      <div class="gic-people--button" v-show="toggleTag">
-        <el-button size="small" type="primary" @click="getData">确 定</el-button>
-        <el-button size="small" @click="cancelFilter">取 消</el-button>
-      </div>
-    </el-form-item>
-    <!-- 会员分组 -->
-    <!-- <div class="width60"> -->
-    <vue-gic-member-group v-if="form.memberType === 2" :defaltSelected="thresholdData.defaltSelected" :height="400" :projectName="projectName" :headerList="headerList" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
-    <!-- </div> -->
+    <div class="">
+      <!-- 会员筛选 -->
+      <el-form-item label="选择会员" v-if="form.memberType === 1" class="calc1">
+        <vue-gic-people :projectName="projectName" :isAdd="isAdd" :triggerReset="true" :useId="thresholdData.useId" :hasSearchData="thresholdData.hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn" />
+        <div class="gic-people--button" v-show="toggleTag">
+          <el-button size="small" type="primary" @click="getData">确 定</el-button>
+          <el-button size="small" @click="cancelFilter">取 消</el-button>
+        </div>
+      </el-form-item>
+      <!-- 会员分组 -->
+      <vue-gic-member-group class="calc2" v-if="form.memberType === 2" :defaltSelected="thresholdData.defaltSelected" :height="400" :projectName="projectName" :headerList="headerList" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
+    </div>
    <div class="width60 fl">
      <el-form-item label="提示图片" prop="tipsImg">
-        <dm-upload-avatar :model.sync="form.tipsImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸，600*600，格式为PNG\JPG\GIF,大小不超过2MB" :disabled="isInfo"></dm-upload-avatar>
+        <dm-upload-avatar :limit="{ maxSize: 1 }" :model.sync="form.tipsImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：200*200，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
      </el-form-item>
      <el-form-item label="提示文字" prop="tipTitle">
        <dm-input v-model="form.tipTitle" type="textarea" placeholder="最多输入60个字" :maxlength="60" class="w400" :rows="6"></dm-input>
@@ -136,3 +136,12 @@ export default {
  }
 };
 </script>
+
+<style scoped>
+.calc1 {
+  width: calc(60% + 330px);
+}
+.calc2 {
+  width: calc(60% + 330px + 30px);
+}
+</style>
--- a/src/views/game/dzp/form.vue
+++ b/src/views/game/dzp/form.vue
@@ -25,7 +25,7 @@
        <img class="skin-box" v-if="form.skinType === 2" src="../../../assets/img/1.2.jpg" alt="" srcset="" />
        <img class="skin-box" v-if="form.skinType === 3" src="../../../assets/img/1.3.jpg" alt="" srcset="" />
        <dm-upload-avatar v-if="form.skinType === 0" :model.sync="banner[0]" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸：750*350，格式为png、jpg，点击图片可重新上传" :limit="{ type: true, width: 750, height: 350 }"></dm-upload-avatar> -->
-        <dm-upload-avatar :model.sync="banner[form.skinType]" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸：750*350，格式为jpg、png、gif，点击图片可重新上传" :limit="{ type: true, width: 750, height: 350 }"></dm-upload-avatar>
+        <dm-upload-avatar :model.sync="banner[form.skinType]" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸：750*350，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :limit="{ type: true, width: 750, height: 350, maxSize: 1 }"></dm-upload-avatar>
      </el-form-item>
      <el-form-item label="背景颜色" prop="background" v-if="form.skinType === 0">
        <el-color-picker class="vertical-middle" :disabled="isInfo" v-model="form.background"></el-color-picker>

--- a/src/views/game/dzp/index.vue
+++ b/src/views/game/dzp/index.vue
@@ -93,7 +93,8 @@ export default {
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameStartTime ? date.y + '<br/>' + date.h : '';
          }
        },
        {
@@ -103,7 +104,8 @@ export default {
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameEndTime ? date.y + '<br/>' + date.h : '';
          }
        },
        { label: '参与人数', prop: 'userCount', width: '80', align: 'left' },

--- a/src/views/game/dzp/record.vue
+++ b/src/views/game/dzp/record.vue
@@ -12,7 +12,8 @@
    <el-table tooltipEffect="light" :data="recordList" style="width:100%" v-loading="loading">
      <el-table-column :min-width="150" align="left" label="中奖时间">
        <template slot-scope="scope">
-          {{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss') }}
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column :min-width="150" align="left" label="会员信息">

--- a/src/views/game/ggk/form.vue
+++ b/src/views/game/ggk/form.vue
@@ -21,7 +21,7 @@
        </span>
      </el-form-item>
      <el-form-item label="banner图片" class="width50" prop="gameImage">
-        <dm-upload-avatar :model.sync="banner[form.skinType]" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸：750*350，格式为jpg、png、gif，点击图片可重新上传" :limit="{ type: true, width: 750, height: 350 }"></dm-upload-avatar>
+        <dm-upload-avatar :model.sync="banner[form.skinType]" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸：750*350，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :limit="{ type: true, width: 750, height: 350, maxSize: 1 }"></dm-upload-avatar>
      </el-form-item>
      <el-form-item label="背景颜色" prop="background" class="width50" v-if="form.skinType === 0">
        <el-color-picker class="vertical-middle" :disabled="isInfo" v-model="form.background"></el-color-picker>

--- a/src/views/game/ggk/index.vue
+++ b/src/views/game/ggk/index.vue
@@ -92,7 +92,8 @@ export default {
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameStartTime ? date.y + '<br/>' + date.h : '';
          }
        },
        {
@@ -102,7 +103,8 @@ export default {
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameEndTime ? date.y + '<br/>' + date.h : '';
          }
        },
        { label: '参与人数', prop: 'userCount', width: '80', align: 'left' },

--- a/src/views/game/ggk/record.vue
+++ b/src/views/game/ggk/record.vue
@@ -12,7 +12,8 @@
    <el-table tooltipEffect="light" :data="recordList" style="width:100%" v-loading="loading">
      <el-table-column :min-width="150" align="left" label="中奖时间">
        <template slot-scope="scope">
-          {{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss') }}
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
+          <p style="color:#606266;">{{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
        </template>
      </el-table-column>
      <el-table-column :min-width="150" align="left" label="会员信息">

--- a/src/views/game/klfl/index.vue
+++ b/src/views/game/klfl/index.vue
@@ -53,11 +53,11 @@ export default {
      },
      total: 0,
      tableHeader: [
-        { label: '游戏名称', prop: 'gameName', width: '120', align: 'left', fixed: 'left' },
+        { label: '游戏名称', prop: 'gameName', width: '180', align: 'left', fixed: 'left' },
        {
          label: '游戏状态',
          prop: 'activityStatus',
-          width: '80',
+          width: '180',
          align: 'left',
          formatter: function(row) {
            if (row.activityStatus === 1) {
@@ -72,21 +72,23 @@ export default {
        {
          label: '开始时间',
          prop: 'gameStartTime',
-          minWidth: '170',
+          minWidth: '100',
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameStartTime ? date.y + '<br/>' + date.h : '';
          }
        },
        {
          label: '结束时间',
          prop: 'gameEndTime',
-          minWidth: '170',
+          minWidth: '100',
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameEndTime ? date.y + '<br/>' + date.h : '';
          }
        },
        { label: '参与人数', prop: 'cyrs', width: '80', align: 'left' },

--- a/src/views/game/klfl/record.vue
+++ b/src/views/game/klfl/record.vue
@@ -50,7 +50,8 @@ export default {
          prop: 'createTime',
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return date.y + '\n' + date.h;
          }
        },
        { label: '手机号码', prop: 'phoneNumber', align: 'left' },

--- a/src/views/game/ptyx/form.vue
+++ b/src/views/game/ptyx/form.vue
@@ -438,10 +438,10 @@ export default {
        }
      });
      if (flag) return;
-      if (this.form.dateTime[0] < Date.now() && this.isAdd) {
-        this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
-        return;
-      }
+      // if (this.form.dateTime[0] < Date.now() && this.isAdd) {
+      //   this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
+      //   return;
+      // }

      // 编辑弹窗提示
      if (await this.editAlert()) return;

--- a/src/views/game/ptyx/index.vue
+++ b/src/views/game/ptyx/index.vue
@@ -74,7 +74,8 @@ export default {
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameStartTime ? date.y + '<br/>' + date.h : '';
          }
        },
        {
@@ -84,7 +85,8 @@ export default {
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameEndTime ? date.y + '<br/>' + date.h : '';
          }
        },
        { label: '参与人数', prop: 'cyrs', width: '80', align: 'left' },

--- a/src/views/game/ptyx/record.vue
+++ b/src/views/game/ptyx/record.vue
@@ -80,7 +80,8 @@ export default {
          prop: 'createTime',
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return date.y + '\n' + date.h;
          }
        },
        { label: '手机号码', prop: 'memberPhone', align: 'left' },

--- a/src/views/game/znm/index.vue
+++ b/src/views/game/znm/index.vue
@@ -45,11 +45,11 @@ export default {
      listParams: { gameStatus: -1, searchParam: '', currentPage: 1, pageSize: 20 },
      total: 0,
      tableHeader: [
-        { label: '游戏名称', prop: 'gameName', width: '120', align: 'left', fixed: 'left', tooltip: true },
+        { label: '游戏名称', prop: 'gameName', width: '150', align: 'left', fixed: 'left', tooltip: true },
        {
          label: '游戏状态',
          prop: 'activityStatus',
-          width: '80',
+          width: '100',
          align: 'left',
          formatter: function(row) {
            if (row.activityStatus === 1) {
@@ -64,21 +64,23 @@ export default {
        {
          label: '开始时间',
          prop: 'gameStartTime',
-          minWidth: '170',
+          minWidth: '100',
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameStartTime ? date.y + '<br/>' + date.h : '';
          }
        },
        {
          label: '结束时间',
          prop: 'gameEndTime',
-          minWidth: '170',
+          minWidth: '100',
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.gameEndTime ? date.y + '<br/>' + date.h : '';
          }
        },
        { label: '参与人数', prop: 'cyrs', width: '80', align: 'left' },

--- a/src/views/game/znm/record.vue
+++ b/src/views/game/znm/record.vue
@@ -99,7 +99,8 @@ export default {
          prop: 'createTime',
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return date.y + '\n' + date.h;
          }
        },
        { label: '手机号码', prop: 'memberPhone', align: 'left' },

--- a/src/views/message/detail.vue
+++ b/src/views/message/detail.vue
@@ -113,11 +113,11 @@ export default {
        { label: '手机号码', prop: 'telephone', width: '120', align: 'left' },
        {
          label: '回执状态',
-          prop: 'sendStatus',
+          prop: 'backStatus',
          width: '80',
          align: 'left',
          formatter: function(row) {
-            return row.sendStatus === 0 ? '成功' : row.sendStatus === 1 ? '未发送' : '失败';
+            return row.backStatus === 0 ? '接收失败' : row.backStatus ? '接收成功' : '--';
          }
        },
        {
@@ -127,16 +127,17 @@ export default {
          tooltip: true,
          align: 'left',
          formatter: function(row) {
-            return formatDateTimeByType(row.backTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.backTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.backTime ? date.y + '<br/>' + date.h : '';
          }
        },
        {
          label: '发送状态',
-          prop: 'backStatus',
+          prop: 'sendStatus',
          width: '80',
          align: 'left',
          formatter: function(row) {
-            return row.backStatus === 0 ? '接收失败' : row.backStatus ? '接收成功' : '--';
+            return row.sendStatus === 0 ? '成功' : row.sendStatus === 1 ? '未发送' : '失败';
          }
        }
      ],

--- a/src/views/message/record.vue
+++ b/src/views/message/record.vue
@@ -58,7 +58,8 @@ export default {
          align: 'left',
          fixed: 'left',
          formatter(row) {
-            return formatDateTimeByType(row.sendTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.sendTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return date.y + '\n' + date.h;
          }
        },
        {

--- a/src/views/msg/list.vue
+++ b/src/views/msg/list.vue
@@ -75,7 +75,8 @@ export default {
          align: 'left',
          sortable: 'custom',
          formatter: function(row) {
-            return formatDateTimeByType(row.updateTime, 'yyyy-MM-dd-HH-mm-ss');
+            const date = formatDateTimeByType(row.updateTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return row.updateTime ? date.y + '<br/>' + date.h : '';
          }
        }
      ],

--- a/src/views/wechat/form.vue
+++ b/src/views/wechat/form.vue
@@ -70,7 +70,8 @@
        <el-table-column :show-overflow-tooltip="true" prop="remark" minWidth="180" label="备注"></el-table-column>
        <el-table-column prop="updateTime" width="140" label="更新时间">
          <template slot-scope="scope">
-            {{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd-HH-mm') }}
+            {{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd-HH-mm', true).y }} <br />
+            {{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd-HH-mm', true).h }}
          </template>
        </el-table-column>
      </el-table>

--- a/src/views/wechat/record.vue
+++ b/src/views/wechat/record.vue
@@ -70,8 +70,10 @@ export default {
          prop: 'createTimeStr',
          align: 'left',
          fixed: 'left',
+          className: 'newline',
          formatter: function(row) {
-            return formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm');
+            const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
+            return date.y + '\n' + date.h;
          }
        },
        { label: '用户名称', prop: 'clerkName', align: 'left', fixed: 'left' },