Merge branch 'master' of http://git.cc-lotus.info/Information/cxyy-web2

src/components/custom/custom-layout.vue

@@ -223,10 +223,14 @@ const toCenter = () => {
 }
 // 消息
 const toChat = () => {
-  if (user.value && user.value.id) {
-    router.push({ path: `/center/notice` })
-  } else {
-    router.push({ path: '/login', query: { status: '1' } })
+  const role = user.value.role.find((i) => i === 'Admin')
+  if (role) window.open(`/cxyyAdmin/message/index`)
+  else {
+    if (user.value && user.value.id) {
+      router.push({ path: `/center/notice` })
+    } else {
+      router.push({ path: '/login', query: { status: '1' } })
+    }
   }
 }
 const handleMouseOver = (index) => {
@@ -433,6 +437,7 @@ const toOut = () => {
           }
         }
         .footer_right {
+          text-align: center;
           padding: 10px 0 0 0;
           border-top: 1px solid rgba(229, 241, 255, 0.7);
         }

src/views/center/sign.vue

@@ -22,7 +22,8 @@
             </el-table-column>
             <el-table-column align="center" label="操作" width="180">
               <template #default="{ row }">
-                <el-link :underline="false" v-if="row.status != '1'" type="primary" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改报名信息</el-link>
+                <el-link :underline="false" type="primary" size="mini" @click="toView(row)" style="margin-right: 10px">查看活动</el-link>
+                <el-link :underline="false" v-if="row.status != '1'" type="warning" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改报名信息</el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -104,6 +105,8 @@ const store = SignStore()
 const dictDataStore = DictDataStore()
 // 加载中
 const loading = ref(false)
+// 路由
+const router = useRouter()
 // 列表
 const list = ref([])
 let skip = 0
@@ -188,6 +191,10 @@ const toEdit = (data) => {
   form.value = data
   dialog.value = { type: '1', show: true, title: '修改报名信息' }
 }
+// 查看赛事
+const toView = (item) => {
+  router.push({ path: '/match/detail', query: { id: item.match } })
+}
 // 报名
 const submitForm = async (formEl) => {
   if (!formEl) return

src/views/five/index.vue

@@ -95,9 +95,6 @@ import { MatchStore } from '@/store/api/platform/match'
 import { DictDataStore } from '@/store/api/system/dictData'
 const store = MatchStore()
 const dictDataStore = DictDataStore()
-import { UserStore } from '@/store/user'
-const userStore = UserStore()
-const user = computed(() => userStore.user)
 // 加载中
 const loading = ref(false)
 // 路由
@@ -166,10 +163,6 @@ const handleClick = async (tab) => {
   await search({ skip, limit })
   loading.value = false
 }
-// 搜索
-const toSearchInfo = async () => {
-  await search({ skip, limit })
-}
 // 查看
 const toView = (item) => {
   router.push({ path: '/match/detail', query: { id: item.id || item._id } })

src/views/help/index.vue

@@ -92,9 +92,9 @@ const search = async () => {
     select.value = route.query.type
     selectedKeys.value = [route.query.type]
   }
-  // // 基础设置
-  // const result = await designStore.query({})
-  // if ($checkRes(result)) configInfo.value = result.data[0] || {}
+  // 基础设置
+  const result = await designStore.query({})
+  if ($checkRes(result)) configInfo.value = result.data[0] || {}
 }
 const onOpenChange = (item) => {
   select.value = item.key