From 6dfda976f4d1108c7f6db46b54920cec89851cb1 Mon Sep 17 00:00:00 2001
From: timlai <timlai99@outlook.com>
Date: Mon, 15 May 2023 08:15:23 +0800
Subject: [PATCH] 7.2.1

---
 .../Pages/shared/_PartialContents.cshtml      | 14 -----------
 .../Pages/ss-admin/clouds/dashboard.cshtml    | 24 +++++--------------
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/SSCMS.Web/Pages/shared/_PartialContents.cshtml b/src/SSCMS.Web/Pages/shared/_PartialContents.cshtml
index 1869f7963..12a699167 100644
--- a/src/SSCMS.Web/Pages/shared/_PartialContents.cshtml
+++ b/src/SSCMS.Web/Pages/shared/_PartialContents.cshtml
@@ -242,20 +242,6 @@
         {{scope.row.templateName || '<默认>'}}
       </template>
 
-      <!-- Date -->
-      <template v-else-if="column.inputType === 'Date'">
-        <span>
-          {{ utils.getFriendlyDate(scope.row.getEntityValue(column.attributeName)) }}
-        </span>
-      </template>
-
-      <!-- DateTime -->
-      <template v-else-if="column.inputType === 'DateTime'">
-        <span>
-          {{ utils.getFriendlyDateTime(scope.row.getEntityValue(column.attributeName)) }}
-        </span>
-      </template>
-
       <!-- Others -->
       <template v-else>
         <span v-html="scope.row.getEntityValue(column.attributeName)"></span>
diff --git a/src/SSCMS.Web/Pages/ss-admin/clouds/dashboard.cshtml b/src/SSCMS.Web/Pages/ss-admin/clouds/dashboard.cshtml
index 74ba552bc..58ca92c7d 100644
--- a/src/SSCMS.Web/Pages/ss-admin/clouds/dashboard.cshtml
+++ b/src/SSCMS.Web/Pages/ss-admin/clouds/dashboard.cshtml
@@ -228,21 +228,15 @@
                     </el-form-item>
                     <el-form-item label="购买时长" prop="periods" :rules="{ required: true, message: '请选择购买时长' }">
                       <el-radio-group v-model="buyForm.periods" v-on:change="btnChangeClick">
-                        <el-radio-button :label="'M1'">1月</el-radio-button>
                         <el-radio-button :label="'Y1'">1年</el-radio-button>
                         <el-radio-button :label="'Y2'">2年</el-radio-button>
                       </el-radio-group>
                     </el-form-item>
                     <el-form-item label="费用合计">
                       <div style="font-size: 16px;">
-                        <template v-if="buyForm.periods !== 'M1'">
-                          原价：<span style="text-decoration: line-through; margin-right: 10px;">￥{{ getOriginalAmount() }}</span>
-                          现价：<span style="color: #fa5300;">￥{{ buyForm.amount.toFixed(2) }}</span>
-                          （节省：{{ buyForm.save }}%）
-                        </template>
-                        <template v-else>
-                          合计：<span style="color: #fa5300;">￥{{ buyForm.amount.toFixed(2) }}</span>
-                        </template>
+                        原价：<span style="text-decoration: line-through; margin-right: 10px;">￥{{ getOriginalAmount() }}</span>
+                        现价：<span style="color: #fa5300;">￥{{ buyForm.amount.toFixed(2) }}</span>
+                        （节省：{{ buyForm.save }}%）
                       </div>
                     </el-form-item>
                     <el-divider></el-divider>
@@ -262,21 +256,15 @@
                     </el-form-item>
                     <el-form-item label="续费时长" prop="periods" :rules="{ required: true, message: '请选择续费时长' }">
                       <el-radio-group v-model="buyForm.periods" v-on:change="btnChangeClick">
-                        <el-radio-button :label="'M1'">1月</el-radio-button>
                         <el-radio-button :label="'Y1'">1年</el-radio-button>
                         <el-radio-button :label="'Y2'">2年</el-radio-button>
                       </el-radio-group>
                     </el-form-item>
                     <el-form-item label="费用合计">
                       <div style="font-size: 16px;">
-                        <template v-if="buyForm.periods !== 'M1'">
-                          原价：<span style="text-decoration: line-through; margin-right: 10px;">￥{{ getOriginalAmount() }}</span>
-                          现价：<span style="color: #fa5300;">￥{{ buyForm.amount.toFixed(2) }}</span>
-                          （节省：{{ buyForm.save }}%）
-                        </template>
-                        <template v-else>
-                          合计：<span style="color: #fa5300;">￥{{ buyForm.amount.toFixed(2) }}</span>
-                        </template>
+                        原价：<span style="text-decoration: line-through; margin-right: 10px;">￥{{ getOriginalAmount() }}</span>
+                        现价：<span style="color: #fa5300;">￥{{ buyForm.amount.toFixed(2) }}</span>
+                        （节省：{{ buyForm.save }}%）
                       </div>
                     </el-form-item>
                     <el-divider></el-divider>