cnlive_project / cnlive-community-web-vue · Commits

Commit 6c7a47fe13c6d0a107f07a9f8adebe35921577c9

Authored by 杨泽宇
1 parent 5f2a159b

debug

Inline Side-by-side
Showing 2 changed files with 13 additions and 12 deletions
src/utils/tool.ts
  View file @6c7a47f
... ... @@ -45,11 +45,11 @@ export function toDecimal2(x) {
45 45 * @param {string} cFormat 转换格式
46 46 * @returns {string | null}
47 47 */
48   -export function parseTime(time, cFormat) {
  48 +export function parseTime(time, cFormat, sep = '-') {
49 49 if (arguments.length === 0 || !time) {
50 50 return null
51 51 }
52   - const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
  52 + const format = cFormat || `{y}${sep}{m}${sep}{d} {h}:{i}:{s}`
53 53 let date
54 54 if (typeof time === 'object') {
55 55 date = time
... ...
src/views/fee/paper.vue
  View file @6c7a47f
... ... @@ -110,9 +110,9 @@ const props = withDefaults(defineProps<Props>(), {
110 110 <el-col :span="20">
111 111 <div class="paper-table-content">
112 112 {{
113   - parseTime(new Date(paperData.beginTime).getTime()).slice(0, 7)
  113 + parseTime(new Date(paperData.beginTime).getTime(), "", "/").slice(0, 7)
114 114 }}
115   - ~ {{ parseTime(new Date(paperData.endTime).getTime()).slice(0, 7) }}
  115 + - {{ parseTime(new Date(paperData.endTime).getTime(), "", "/").slice(0, 7) }}
116 116 </div>
117 117 </el-col>
118 118 </el-col>
... ... @@ -124,7 +124,7 @@ const props = withDefaults(defineProps&lt;Props&gt;(), {
124 124 </el-col>
125 125 <el-col :span="20">
126 126 <div class="paper-table-content">
127   - {{ parseTime(new Date(paperData.payTime).getTime()) }}
  127 + {{ parseTime(new Date(paperData.payTime).getTime(), "", "/") }}
128 128 </div>
129 129 </el-col>
130 130 </el-col>
... ... @@ -134,26 +134,27 @@ const props = withDefaults(defineProps&lt;Props&gt;(), {
134 134  
135 135 <style lang="scss" scoped>
136 136 .paper-table {
137   - border: 1px solid #ebeef5;
  137 + border-top: 2px solid #000;
  138 + border-left: 2px solid #000;
  139 + border-right: 2px solid #000;
138 140 &-line {
139   - border-bottom: 1px solid #ebeef5;
  141 + border-bottom: 2px solid #000;
140 142 display: flex;
141 143 }
142 144 &-content-right {
143   - border-left: 1px solid #ebeef5;
  145 + border-left: 2px solid #000;
144 146 flex-grow: 1;
145 147 }
146 148 }
147 149 .paper-table-label {
148   - background-color: #f5f7fa;
149   - line-height: 30px;
  150 + line-height: 25px;
150 151 padding: 10px;
151 152 width: 100px;
152   - border-right: 1px solid #ebeef5;
  153 + border-right: 2px solid #000;
153 154 text-align: center;
154 155 }
155 156 .paper-table-content {
156   - line-height: 30px;
  157 + line-height: 25px;
157 158 padding: 10px;
158 159 }
159 160 </style>
... ...