diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index a32c216..de5b9d6 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -1,26 +1,32 @@
 <template>
   <div class="page-container">
+    
     <div class="page-outer">
-      <el-form>
-        <el-form-item label="账号">
-          <el-input v-model="form.name" placeholder="账号" />
-        </el-form-item>
-        <el-form-item label="密码">
-          <el-input type="password" v-model="form.password" placeholder="密码" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" style="width: 100%" @click="submit"
-            >登 录</el-button
-          >
-        </el-form-item>
-      </el-form>
+      <div class="login-box" v-if="status == 1">
+        <el-form>
+          <el-form-item label="账号"><el-input v-model="form.name" placeholder="账号" /></el-form-item>
+          <el-form-item label="密码"><el-input type="password" v-model="form.password" placeholder="密码" /></el-form-item>
+          <el-form-item><el-button type="primary" style="width: 100%" @click="submit">登 录</el-button></el-form-item>
+          <el-form-item><el-link @click="status = 2">注册账号</el-link></el-form-item>
+        </el-form>
+      </div>
+      <div class="login-box"  v-if="status == 2">
+        <el-form>
+          <el-form-item label="账号"><el-input v-model="regForm.name" placeholder="请输入账号" /></el-form-item>
+          <el-form-item label="密码"><el-input type="password" v-model="regForm.password" placeholder="请输入密码" /></el-form-item>
+          <el-form-item label="手机号码"><el-input v-model="regForm.tel" placeholder="请输入手机号码" /></el-form-item>
+          <el-form-item label="真实姓名"><el-input v-model="regForm.realName" placeholder="请输入真实姓名" /></el-form-item>
+          <el-form-item><el-button type="primary" style="width: 100%" @click="registerSubmit">注 册</el-button></el-form-item>
+          <el-form-item><el-link @click="status = 1">前往登录</el-link></el-form-item>
+        </el-form>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import { useStore } from "vuex";
-import { defineComponent, reactive, getCurrentInstance } from "vue";
+import { defineComponent, reactive, ref, getCurrentInstance } from "vue";
 export default defineComponent({
   name: 'v-login',
   setup() {
@@ -30,8 +36,16 @@ export default defineComponent({
       name: "",
       password: "",
     });
+    const regForm = reactive({
+      name: "",
+      password: "",
+      tel: "",
+      realName: ''
+    });
+    const status = ref(1); //1登录 2注册
     return {
-      form,
+      form,regForm,
+      status,
       proxy,
       store
     };
@@ -46,18 +60,36 @@ export default defineComponent({
           this.$router.push('/');
       });
     },
+    registerSubmit() {
+      this.proxy.$post("/admin/register", this.regForm).then((res) => {
+          const data = res.data;
+          this.$message.success("注册成功");
+          this.regForm.name = '';
+          this.regForm.password = '';
+          this.regForm.tel = '';
+          this.regForm.realName = '';
+          this.status = 1;
+      });
+    }
   },
 });
 </script>
 
 <style lang="less" scoped>
 .page-container {
+  background: rgb(242, 242, 242);
   position: relative;
   width: 100%;
   height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   .page-outer {
     width: 400px;
-    transform: translate(170%, 280%);
+    .login-box {
+      background: #FFF;
+      padding: 24px;
+    }
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/MatManage/_setManage/index.vue b/src/views/MatManage/_setManage/index.vue
index 3934313..7c2bef3 100644
--- a/src/views/MatManage/_setManage/index.vue
+++ b/src/views/MatManage/_setManage/index.vue
@@ -28,16 +28,18 @@
            <el-table :data="tableData.data" size="default" border
                :header-cell-style="{background: '#EEE'}">
                <el-table-column prop="name" label="分组名" width="360"></el-table-column>
-               <!-- <el-table-column prop="sort" label="排序" width="160">
+               <el-table-column prop="sortWeight" label="排序" >
                    <template #default="scope">
-                        <span>{{scope.row.sort}}</span>
+                       <el-input v-model="sortValue" @blur="editCancel" @change="handlerChangeSort(value)" style="width: 120px" v-if="isEditing && scope.row.id == editId"></el-input>
+                       <span v-else>{{scope.row.sortWeight}}</span>
+                       <el-icon @click="handlerSortEdit(scope.row)"><Edit /></el-icon>
                    </template>
-               </el-table-column> -->
+               </el-table-column>
                <el-table-column prop="creatAt" label="创建时间"></el-table-column>
                <el-table-column prop="updateAt" label="更新时间"></el-table-column>
                <el-table-column prop="action" label="操作" fixed="right" width="240">
                    <template #default="scope">
-                        <el-link type="primary" @click="handlerEdit(scope.row.id)">重命名</el-link>
+                        <el-link type="primary" @click="handlerEdit(scope.row.id)">编辑</el-link>
                         <el-link type="danger" @click="singleDel(scope.row.id)" style="margin-left: 8px">删除</el-link>
                    </template>
                </el-table-column>
@@ -51,8 +53,17 @@
                 :total="pagination.total"
             />
        </div>
-       <el-dialog v-model="editVisible" width="30%" title="重命名">
-           <el-input v-model="setForm.name" placeholder="请输入分组名"></el-input>
+       <el-dialog v-model="editVisible" width="30%" title="编辑分组">
+           <el-form>
+               <el-form-item style="width:80%" label="分组名">
+                   <el-input v-model="setForm.name" placeholder="请输入分组名"></el-input>
+               </el-form-item>
+               <el-form-item style="width:80%" label="封面">
+                   <uploadFile @change="handlerCoverUpload" :config="{ limit: 1, accept: '.jpg, .jpeg, .png, .gif'}">
+                        <el-button>点击上传</el-button>
+                    </uploadFile>
+               </el-form-item>
+           </el-form>
            <template #footer>
                <el-button @click="editVisible = false;setForm.name = ''">取消</el-button>
                <el-button @click="editConfirm" type="primary">确定</el-button>
@@ -88,12 +99,15 @@ export default defineComponent({
         const visible = ref(false);
         const editVisible = ref(false);
         const activeId = ref(false);
+        const editId = ref(undefined)
+        const isEditing = ref(false);
+        const sortValue = ref(undefined);
         return {
             form,setForm,proxy,
             tableData,
             pagination,
             statusFormatter,
-            visible,editVisible,activeId
+            visible,editVisible,activeId,isEditing,sortValue,editId
         }
     },
     mounted() {
@@ -126,6 +140,8 @@ export default defineComponent({
             this.proxy.$post("/referenceGroup/upd", obj).then(res => {
                 this.getData();
                 this.editVisible = false;
+                this.setForm.name = '';
+                this.setForm.coverUrl = '';
                 this.$message.success(res.data)
             }).catch(() => {});
         },
@@ -134,6 +150,8 @@ export default defineComponent({
             this.proxy.$post("/referenceGroup/add", this.setForm).then(res => {
                 this.getData();
                 this.visible = false;
+                this.setForm.name = '';
+                this.setForm.coverUrl = '';
                 this.$message.success(res.data)
             }).catch(() => {});
         },
@@ -150,9 +168,30 @@ export default defineComponent({
                 }).catch(() => {});
             }).catch(() => {})
         },
+        //改变排序
+        handlerChangeSort(value) {
+            let obj = {id: this.editId,sortWeight: this.sortValue*1}
+            this.proxy.$post("/reference/updSort", obj).then(res => {
+                this.getData();
+                this.isEditing = false;
+                this.editId = undefined;
+                this.sortValue = undefined;
+                this.$message.success(res.data)
+            }).catch(() => {});
+        },
+        handlerSortEdit(value) {
+            this.editId = value.id;
+            this.isEditing = true;
+        },
+        editCancel() {
+            this.isEditing = false;
+        },
         //上传图片
         handlerUpload(data) {
             this.setForm.coverUrl = data.fileUrl
+        },
+        handlerCoverUpload(data) {
+            this.setForm.coverUrl = data.fileUrl
         }
     }
 })
diff --git a/src/views/StarwayInfo/index.vue b/src/views/StarwayInfo/index.vue
index 7ebb873..d070c1f 100644
--- a/src/views/StarwayInfo/index.vue
+++ b/src/views/StarwayInfo/index.vue
@@ -17,6 +17,11 @@
            <el-table :data="tableData.data" size="default" border :header-cell-style="{background: '#EEE'}">
                <el-table-column prop="title" label="标题" width="360"></el-table-column>
                <el-table-column prop="type" label="动态类型" :formatter="statusFormatter" width="100"></el-table-column>
+               <el-table-column prop="type" label="是否显示在首页" width="180">
+                   <template #default="scope">
+                       <el-switch @change="changeIsShow(scope.row)" :model-value="scope.row.showAtIndex" :active-value="1" :inactive-value="0" active-text="是" inactive-text="否"></el-switch>
+                   </template>
+               </el-table-column>
                <el-table-column prop="cover" label="封面" >
                    <template #default="scope">
                        <img style="width: 200px;height: 100px" :src="$ImgUrl(scope.row.cover)" />
@@ -105,6 +110,14 @@ export default defineComponent({
                     this.$message.success(res.data)
                 }).catch(() => {});
             }).catch(() => {})
+        },
+        //改变是否显示在首页
+        changeIsShow(val) {
+            let obj = {id: val.id, showAtIndex: val.showAtIndex == 1?0:1};
+            this.proxy.$post("/topicActivity/showAtIndex", obj).then(res => {
+                this.getData();
+                this.$message.success(res.data)
+            }).catch(() => {});
         }
     }
 })