Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/router/index.js

@@ -68,6 +68,7 @@ const routes = [{
                 component: () =>import ('@/views/activityManage/makerActvityDetails.vue'),
                 meta: { isAuth: true }
             },
+           
             { //项目立项申请
                 name: 'projectApplication',
                 path: '/projectApplication',
@@ -81,6 +82,13 @@ const routes = [{
                 component: () =>import ('@/views/projectApply/projectApplicationDetails.vue'),
                 meta: { isAuth: true }
 
+            },
+            {
+                name: 'projectApplicationDetailMain',
+                path: '/projectApplicationDetailMain',
+                component: () =>import ('@/views/projectApply/projectApplicationDetailMain.vue'),
+                meta: { isAuth: true }
+
             },
             {
                 name: 'projectApplication2',
@@ -129,7 +137,12 @@ const routes = [{
                 path: '/makerfundDetails',
                 component: () =>import ('@/views/fundManage/makerfundDetails.vue'),
                 meta: { isAuth: true }
-
+            },
+            { //创客活动详情
+                name: 'markerfundMain',
+                path: '/markerfundMain',
+                component: () =>import ('@/views/fundManage/markerfundMain'),
+                meta: { isAuth: true }
             },
             { //消息通知
                 name: 'messageNotification',

src/views/fundManage/markerfundMain.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+
+    </div>
+</template>
+
+<script>
+        export default {
+            
+        }
+</script>
+
+<style>
+
+</style>

src/views/projectApply/projectApplicationDetailMain.vue

@@ -0,0 +1,41 @@
+<template>
+  <div>
+        <!-- 项目立项申请查看详细项目基本内容 -->
+        <!-- <div class="projectApplication1" v-loading="loading"> -->
+        <div class="projectApplication1">
+
+            <div class="vfpHeader">
+                <div class="titleOne">项目立项申请</div>
+                <span class="smallTitle">项目进展详情</span>
+                <el-button @click="back()" type="primary" size="mini">返回</el-button>
+            </div>
+            <hr>
+            <!-- 跳转导航开始 -->
+            <div class="AppBar">
+                <div class="AppBarActive">项目基本内容</div>
+                <div @click="remark">项目详情</div>
+            </div>
+            <!-- 跳转导航结束 -->
+        </div>
+        <projectApplicationDetails></projectApplicationDetails>
+        <projectApplication2></projectApplication2>
+  </div>
+</template>
+
+<script>
+import projectApplicationDetails from './projectApplicationDetails.vue'
+import projectApplication2 from './projectApplication2.vue'
+
+    export default {
+        components:{projectApplicationDetails,projectApplication2},
+        data() {
+            return {
+                
+            }
+        },
+    }
+</script>
+
+<style>
+
+</style>