Skip to content

Commit 6dfda97

Browse files
committed
7.2.1
1 parent bdda9cf commit 6dfda97

File tree

2 files changed

+6
-32
lines changed

2 files changed

+6
-32
lines changed

src/SSCMS.Web/Pages/shared/_PartialContents.cshtml

-14
Original file line numberDiff line numberDiff line change
@@ -242,20 +242,6 @@
242242
{{scope.row.templateName || '<默认>'}}
243243
</template>
244244

245-
<!-- Date -->
246-
<template v-else-if="column.inputType === 'Date'">
247-
<span>
248-
{{ utils.getFriendlyDate(scope.row.getEntityValue(column.attributeName)) }}
249-
</span>
250-
</template>
251-
252-
<!-- DateTime -->
253-
<template v-else-if="column.inputType === 'DateTime'">
254-
<span>
255-
{{ utils.getFriendlyDateTime(scope.row.getEntityValue(column.attributeName)) }}
256-
</span>
257-
</template>
258-
259245
<!-- Others -->
260246
<template v-else>
261247
<span v-html="scope.row.getEntityValue(column.attributeName)"></span>

src/SSCMS.Web/Pages/ss-admin/clouds/dashboard.cshtml

+6-18
Original file line numberDiff line numberDiff line change
@@ -228,21 +228,15 @@
228228
</el-form-item>
229229
<el-form-item label="购买时长" prop="periods" :rules="{ required: true, message: '请选择购买时长' }">
230230
<el-radio-group v-model="buyForm.periods" v-on:change="btnChangeClick">
231-
<el-radio-button :label="'M1'">1月</el-radio-button>
232231
<el-radio-button :label="'Y1'">1年</el-radio-button>
233232
<el-radio-button :label="'Y2'">2年</el-radio-button>
234233
</el-radio-group>
235234
</el-form-item>
236235
<el-form-item label="费用合计">
237236
<div style="font-size: 16px;">
238-
<template v-if="buyForm.periods !== 'M1'">
239-
原价:<span style="text-decoration: line-through; margin-right: 10px;">¥{{ getOriginalAmount() }}</span>
240-
现价:<span style="color: #fa5300;">¥{{ buyForm.amount.toFixed(2) }}</span>
241-
(节省:{{ buyForm.save }}%)
242-
</template>
243-
<template v-else>
244-
合计:<span style="color: #fa5300;">¥{{ buyForm.amount.toFixed(2) }}</span>
245-
</template>
237+
原价:<span style="text-decoration: line-through; margin-right: 10px;">¥{{ getOriginalAmount() }}</span>
238+
现价:<span style="color: #fa5300;">¥{{ buyForm.amount.toFixed(2) }}</span>
239+
(节省:{{ buyForm.save }}%)
246240
</div>
247241
</el-form-item>
248242
<el-divider></el-divider>
@@ -262,21 +256,15 @@
262256
</el-form-item>
263257
<el-form-item label="续费时长" prop="periods" :rules="{ required: true, message: '请选择续费时长' }">
264258
<el-radio-group v-model="buyForm.periods" v-on:change="btnChangeClick">
265-
<el-radio-button :label="'M1'">1月</el-radio-button>
266259
<el-radio-button :label="'Y1'">1年</el-radio-button>
267260
<el-radio-button :label="'Y2'">2年</el-radio-button>
268261
</el-radio-group>
269262
</el-form-item>
270263
<el-form-item label="费用合计">
271264
<div style="font-size: 16px;">
272-
<template v-if="buyForm.periods !== 'M1'">
273-
原价:<span style="text-decoration: line-through; margin-right: 10px;">¥{{ getOriginalAmount() }}</span>
274-
现价:<span style="color: #fa5300;">¥{{ buyForm.amount.toFixed(2) }}</span>
275-
(节省:{{ buyForm.save }}%)
276-
</template>
277-
<template v-else>
278-
合计:<span style="color: #fa5300;">¥{{ buyForm.amount.toFixed(2) }}</span>
279-
</template>
265+
原价:<span style="text-decoration: line-through; margin-right: 10px;">¥{{ getOriginalAmount() }}</span>
266+
现价:<span style="color: #fa5300;">¥{{ buyForm.amount.toFixed(2) }}</span>
267+
(节省:{{ buyForm.save }}%)
280268
</div>
281269
</el-form-item>
282270
<el-divider></el-divider>

0 commit comments

Comments
 (0)