diff --git a/src/views/admin/member-renwal-config/index.vue b/src/views/admin/member-renwal-config/index.vue
index ac13e96..7810ad6 100644
--- a/src/views/admin/member-renwal-config/index.vue
+++ b/src/views/admin/member-renwal-config/index.vue
@@ -1,23 +1,18 @@
-
 <template>
     <BasicLayout>
         <template #wrapper>
             <el-card class="box-card">
                 <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-                    <el-form-item label="套餐名称" prop="packageName"><el-input v-model="queryParams.packageName" placeholder="请输入套餐名称" clearable
-                                              size="small" @keyup.enter.native="handleQuery"/>
-                            </el-form-item>
-                        <el-form-item label="套餐状态（字典 rewal_status）" prop="status"><el-select v-model="queryParams.status"
-                                               placeholder="会员套餐管理套餐状态（字典 rewal_status）" clearable size="small">
-                                        <el-option
-                                                v-for="dict in statusOptions"
-                                                :key="dict.value"
-                                                :label="dict.label"
-                                                :value="dict.value"
-                                        />
-                                    </el-select>
-                            </el-form-item>
-                        
+                    <el-form-item label="套餐名称" prop="packageName"><el-input v-model="queryParams.packageName"
+                            placeholder="请输入套餐名称" clearable size="small" @keyup.enter.native="handleQuery" />
+                    </el-form-item>
+                    <el-form-item label="套餐状态" prop="status"><el-select v-model="queryParams.status"
+                            placeholder="会员套餐管理套餐状态" clearable size="small">
+                            <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label"
+                                :value="dict.value" />
+                        </el-select>
+                    </el-form-item>
+
                     <el-form-item>
                         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -26,128 +21,110 @@
 
                 <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                        <el-button
-                                v-permisaction="['admin:memberRenwalConfig:add']"
-                                type="primary"
-                                icon="el-icon-plus"
-                                size="mini"
-                                @click="handleAdd"
-                        >新增
+                        <el-button v-permisaction="['admin:memberRenwalConfig:add']" type="primary" icon="el-icon-plus"
+                            size="mini" @click="handleAdd">新增
                         </el-button>
                     </el-col>
                     <el-col :span="1.5">
-                        <el-button
-                                v-permisaction="['admin:memberRenwalConfig:edit']"
-                                type="success"
-                                icon="el-icon-edit"
-                                size="mini"
-                                :disabled="single"
-                                @click="handleUpdate"
-                        >修改
+                        <el-button v-permisaction="['admin:memberRenwalConfig:edit']" type="success" icon="el-icon-edit"
+                            size="mini" :disabled="single" @click="handleUpdate">修改
                         </el-button>
                     </el-col>
                     <el-col :span="1.5">
-                        <el-button
-                                v-permisaction="['admin:memberRenwalConfig:remove']"
-                                type="danger"
-                                icon="el-icon-delete"
-                                size="mini"
-                                :disabled="multiple"
-                                @click="handleDelete"
-                        >删除
+                        <el-button v-permisaction="['admin:memberRenwalConfig:remove']" type="danger"
+                            icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
                         </el-button>
                     </el-col>
                 </el-row>
 
                 <el-table v-loading="loading" :data="memberRenwalConfigList" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" align="center"/><el-table-column label="套餐名称" align="center" prop="packageName"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="续期时间(天)" align="center" prop="durationDay"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="原始单价" align="center" prop="originalPrice"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="折扣价格" align="center" prop="discountPrice"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="是否默认套餐 0-无 1-是 2-否" align="center" prop="isDefault"
-                                                 :show-overflow-tooltip="true"/><el-table-column label="套餐状态（字典 rewal_status）" align="center" prop="status"
-                                                 :formatter="statusFormat" width="100">
-                                    <template slot-scope="scope">
-                                        {{ statusFormat(scope.row) }}
-                                    </template>
-                                </el-table-column>
+                    <el-table-column type="selection" width="55" align="center" />
+                    <el-table-column label="套餐名称" align="center" prop="packageName" :show-overflow-tooltip="true" />
+                    <el-table-column label="续期时间(天)" align="center" prop="durationDay" :show-overflow-tooltip="true" />
+                    <el-table-column label="原始单价（U）" align="center" prop="originalPrice"
+                        :show-overflow-tooltip="true" />
+                    <el-table-column label="折扣价格（U）" align="center" prop="discountPrice" :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            {{ scope.row.discountPrice > 0 ? scope.row.discountPrice : '' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="排序" align="center" prop="sort"></el-table-column>
+                    <el-table-column label="是否可见" align="center" prop="isDefault">
+                        <template slot-scope="scope">
+                            {{ defaultFormat(scope.row.isVisible) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="是否默认套餐" align="center" :defaultFormat="statusFormat" prop="isDefault">\
+                        <template slot-scope="scope">
+                            {{ defaultFormat(scope.row.isDefault) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="套餐状态" align="center" prop="status" :formatter="statusFormat" width="100">
+                        <template slot-scope="scope">
+                            {{ statusFormat(scope.row) }}
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
-                         <el-popconfirm
-                           class="delete-popconfirm"
-                           title="确认要修改吗?"
-                           confirm-button-text="修改"
-                           @confirm="handleUpdate(scope.row)"
-                         >
-                           <el-button
-                             slot="reference"
-                             v-permisaction="['admin:memberRenwalConfig:edit']"
-                             size="mini"
-                             type="text"
-                             icon="el-icon-edit"
-                           >修改
-                           </el-button>
-                         </el-popconfirm>
-                         <el-popconfirm
-                            class="delete-popconfirm"
-                            title="确认要删除吗?"
-                            confirm-button-text="删除"
-                            @confirm="handleDelete(scope.row)"
-                         >
-                            <el-button
-                              slot="reference"
-                              v-permisaction="['admin:memberRenwalConfig:remove']"
-                              size="mini"
-                              type="text"
-                              icon="el-icon-delete"
-                            >删除
-                            </el-button>
-                         </el-popconfirm>
+                            <el-popconfirm class="delete-popconfirm" title="确认要修改吗?" confirm-button-text="修改"
+                                @confirm="handleUpdate(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:memberRenwalConfig:edit']"
+                                    size="mini" type="text" icon="el-icon-edit">修改
+                                </el-button>
+                            </el-popconfirm>
+                            <el-popconfirm class="delete-popconfirm" title="确认要删除吗?" confirm-button-text="删除"
+                                @confirm="handleDelete(scope.row)">
+                                <el-button slot="reference" v-permisaction="['admin:memberRenwalConfig:remove']"
+                                    size="mini" type="text" icon="el-icon-delete">删除
+                                </el-button>
+                            </el-popconfirm>
                         </template>
                     </el-table-column>
                 </el-table>
 
-                <pagination
-                        v-show="total>0"
-                        :total="total"
-                        :page.sync="queryParams.pageIndex"
-                        :limit.sync="queryParams.pageSize"
-                        @pagination="getList"
-                />
+                <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageIndex"
+                    :limit.sync="queryParams.pageSize" @pagination="getList" />
 
                 <!-- 添加或修改对话框 -->
                 <el-dialog :title="title" :visible.sync="open" width="500px">
-                    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                        
-                                    <el-form-item label="套餐名称" prop="packageName">
-                                        <el-input v-model="form.packageName" placeholder="套餐名称"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="续期时间(天)" prop="durationDay">
-                                        <el-input v-model="form.durationDay" placeholder="续期时间(天)"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="原始单价" prop="originalPrice">
-                                        <el-input v-model="form.originalPrice" placeholder="原始单价"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="折扣价格" prop="discountPrice">
-                                        <el-input v-model="form.discountPrice" placeholder="折扣价格"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="是否默认套餐 0-无 1-是 2-否" prop="isDefault">
-                                        <el-input v-model="form.isDefault" placeholder="是否默认套餐 0-无 1-是 2-否"
-                                                      />
-                                    </el-form-item>
-                                    <el-form-item label="套餐状态（字典 rewal_status）" prop="status">
-                                        <el-radio-group v-model="form.status">
-                                                <el-radio
-                                                        v-for="dict in statusOptions"
-                                                        :key="dict.value"
-                                                        :label="dict.value"
-                                                >{{ dict.label }}</el-radio>
-                                            </el-radio-group>
-                                    </el-form-item>
+                    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+
+                        <el-form-item label="套餐名称" prop="packageName">
+                            <el-input v-model="form.packageName" placeholder="套餐名称" />
+                        </el-form-item>
+                        <el-form-item label="续期时间(天)" prop="durationDay">
+                            <el-input v-model="form.durationDay" type="number" :min="1" placeholder="续期时间(天)" />
+                        </el-form-item>
+                        <el-form-item label="原始单价" prop="originalPrice">
+                            <el-input v-model="form.originalPrice" placeholder="原始单价" />
+                        </el-form-item>
+                        <el-form-item label="折扣价格" prop="discountPrice">
+                            <el-input v-model="form.discountPrice" placeholder="折扣价格" />
+                        </el-form-item>
+                        <el-form-item label="排序(顺序)" prop="sort">
+                            <el-input v-model="form.sort" type="number" :min="1" placeholder="排序(顺序)" />
+                        </el-form-item>
+                        <el-form-item label="是否可见 " prop="isVisible">
+                            <el-radio-group v-model="form.isVisible">
+                                <el-radio v-for="dict in defaultOptions" :key="'default' + dict.value"
+                                    :label="dict.value">{{ dict.label
+                                    }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="是否默认套餐 " prop="isDefault">
+                            <el-radio-group v-model="form.isDefault">
+                                <el-radio v-for="dict in defaultOptions" :key="'default' + dict.value"
+                                    :label="dict.value">{{ dict.label
+                                    }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="套餐状态" prop="status">
+                            <el-radio-group v-model="form.status">
+                                <el-radio v-for="dict in statusOptions" :key="dict.value" :label="dict.value">{{
+                                    dict.label
+                                }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
                     </el-form>
                     <div slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -160,184 +137,211 @@
 </template>
 
 <script>
-    import {addMemberRenwalConfig, delMemberRenwalConfig, getMemberRenwalConfig, listMemberRenwalConfig, updateMemberRenwalConfig} from '@/api/admin/member-renwal-config'
-    
-    export default {
-        name: 'MemberRenwalConfig',
-        components: {
-        },
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 总条数
-                total: 0,
-                // 弹出层标题
-                title: '',
-                // 是否显示弹出层
-                open: false,
-                isEdit: false,
-                // 类型数据字典
-                typeOptions: [],
-                memberRenwalConfigList: [],
-                statusOptions: [],
-                // 关系表类型
-                
-                // 查询参数
-                queryParams: {
-                    pageIndex: 1,
-                    pageSize: 10,
-                    packageName:undefined,
-                    status:undefined,
-                    
-                },
-                // 表单参数
-                form: {
-                },
-                // 表单校验
-                rules: {packageName:  [ {required: true, message: '套餐名称不能为空', trigger: 'blur'} ],
-                status:  [ {required: true, message: '套餐状态（字典 rewal_status）不能为空', trigger: 'blur'} ],
-                }
+import { addMemberRenwalConfig, delMemberRenwalConfig, getMemberRenwalConfig, listMemberRenwalConfig, updateMemberRenwalConfig } from '@/api/admin/member-renwal-config'
+
+export default {
+    name: 'MemberRenwalConfig',
+    components: {
+    },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 总条数
+            total: 0,
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            isEdit: false,
+            // 类型数据字典
+            typeOptions: [],
+            defaultOptions: [{
+                label: '是',
+                value: 1
+            }, {
+                label: '否',
+                value: 2
+            }],
+            memberRenwalConfigList: [],
+            statusOptions: [],
+            // 关系表类型
+
+            // 查询参数
+            queryParams: {
+                pageIndex: 1,
+                pageSize: 10,
+                packageName: undefined,
+                status: undefined,
+                sortOrder: "asc",
+            },
+            // 表单参数
+            form: {
+            },
+            // 表单校验
+            rules: {
+                packageName: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }],
+                status: [{ required: true, message: '套餐状态不能为空', trigger: 'blur' }],
+                durationDay: [{ required: true, message: '套餐时长不能为空', trigger: 'blur' }],
+                originalPrice: [{ required: true, message: '原价不能为空', trigger: 'blur' }],
+            }
         }
+    },
+    created() {
+        this.getList()
+        this.getDicts('member_renwal_config_status').then(response => {
+            this.statusOptions = response.data
+        })
+    },
+    methods: {
+        /** 查询参数列表 */
+        getList() {
+            this.loading = true
+            listMemberRenwalConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+                this.memberRenwalConfigList = response.data.list
+                this.total = response.data.count
+                this.loading = false
+            }
+            )
         },
-        created() {
-            this.getList()
-            this.getDicts('member_renwal_config_status').then(response => {
-                this.statusOptions = response.data
-            })
-            },
-        methods: {
-            /** 查询参数列表 */
-            getList() {
-                this.loading = true
-                listMemberRenwalConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-                        this.memberRenwalConfigList = response.data.list
-                        this.total = response.data.count
-                        this.loading = false
-                    }
-                )
-            },
-            // 取消按钮
-            cancel() {
-                this.open = false
-                this.reset()
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+
                 id: undefined,
                 packageName: undefined,
                 durationDay: undefined,
                 originalPrice: undefined,
                 discountPrice: undefined,
-                isDefault: undefined,
-                status: undefined,
+                isDefault: 1,
+                isVisible: 1,
+                sort: 0,
+                status: 'enable',
             }
-                this.resetForm('form')
-            },
-            getImgList: function() {
-              this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
-            },
-            fileClose: function() {
-              this.fileOpen = false
-            },
-            statusFormat(row) {
-                return this.selectDictLabel(this.statusOptions, row.status)
-            },
-            // 关系
-            // 文件
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageIndex = 1
-                this.getList()
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRange = []
-                this.resetForm('queryForm')
-                this.handleQuery()
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset()
-                this.open = true
-                this.title = '添加会员套餐管理'
-                this.isEdit = false
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.id)
-                this.single = selection.length !== 1
-                this.multiple = !selection.length
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset()
-                const id =
-                row.id || this.ids
-                getMemberRenwalConfig(id).then(response => {
-                    this.form = response.data
-                    this.open = true
-                    this.title = '修改会员套餐管理'
-                    this.isEdit = true
-                })
-            },
-            /** 提交按钮 */
-            submitForm: function () {
-                this.$refs['form'].validate(valid => {
-                    if (valid) {
-                        if (this.form.id !== undefined) {
-                            updateMemberRenwalConfig(this.form).then(response => {
-                                if (response.code === 200) {
-                                    this.msgSuccess(response.msg)
-                                    this.open = false
-                                    this.getList()
-                                } else {
-                                    this.msgError(response.msg)
-                                }
-                            })
-                        } else {
-                            addMemberRenwalConfig(this.form).then(response => {
-                                if (response.code === 200) {
-                                    this.msgSuccess(response.msg)
-                                    this.open = false
-                                    this.getList()
-                                } else {
-                                    this.msgError(response.msg)
-                                }
-                            })
-                        }
-                    }
-                })
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                var Ids = (row.id && [row.id]) || this.ids
+            this.resetForm('form')
+        },
+        getImgList: function () {
+            this.form[this.fileIndex] = this.$refs['fileChoose'].resultList[0].fullUrl
+        },
+        fileClose: function () {
+            this.fileOpen = false
+        },
+        statusFormat(row) {
+            return this.selectDictLabel(this.statusOptions, row.status)
+        },
+        defaultFormat(val) {
+            var label = ""
 
-                this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(function () {
-                      return delMemberRenwalConfig( { 'ids': Ids })
-                }).then((response) => {
-                   if (response.code === 200) {
-                     this.msgSuccess(response.msg)
-                     this.open = false
-                     this.getList()
-                   } else {
-                     this.msgError(response.msg)
-                   }
-                }).catch(function () {
-                })
-            }
+            this.defaultOptions.forEach(element => {
+                if (element.value === val) {
+                    label = element.label
+                }
+            });
+
+            return label
+        },
+        // 关系
+        // 文件
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageIndex = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加会员套餐'
+            this.isEdit = false
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const id =
+                row.id || this.ids
+            getMemberRenwalConfig(id).then(response => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改会员套餐'
+                this.isEdit = true
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate(valid => {
+                if (valid) {
+                    this.form.originalPrice = Number(this.form.originalPrice)
+                    this.form.durationDay = Number(this.form.durationDay)
+                    this.form.sort = Number(this.form.sort)
+
+                    if (this.form.id !== undefined) {
+                        updateMemberRenwalConfig(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
+                    } else {
+                        addMemberRenwalConfig(this.form).then(response => {
+                            if (response.code === 200) {
+                                this.msgSuccess(response.msg)
+                                this.open = false
+                                this.getList()
+                            } else {
+                                this.msgError(response.msg)
+                            }
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            var Ids = (row.id && [row.id]) || this.ids
+
+            this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(function () {
+                return delMemberRenwalConfig({ 'ids': Ids })
+            }).then((response) => {
+                if (response.code === 200) {
+                    this.msgSuccess(response.msg)
+                    this.open = false
+                    this.getList()
+                } else {
+                    this.msgError(response.msg)
+                }
+            }).catch(function () {
+            })
         }
     }
+}
 </script>