Q-ABAB 2 年之前
父节点
当前提交
32bb82fa80
共有 2 个文件被更改,包括 89 次插入27 次删除
  1. 5 0
      src/components/markeractivityWord.vue
  2. 84 27
      src/views/home.vue

+ 5 - 0
src/components/markeractivityWord.vue

@@ -518,6 +518,7 @@
           },
           applyButton(){
             const cEmpty = /^\s*$/g;
+            const checkPhone = /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; //获取正则表达式 存放到verify变量中
             for(let i in this.wordData){
               switch(i){
                 case "associatedProjects":
@@ -542,6 +543,9 @@
                   if(cEmpty.test(this.wordData[i])){
                     this.$message.error("请选择所在学院")
                     return false;;
+                  }else if(!checkPhone.test(this.wordData[i])){
+                    this.$message.error("请输入正确的手机号");
+                    return false;
                   }
                   break;
                 case "tel":
@@ -600,6 +604,7 @@
 
               }
             }
+            this.$message.success("验证成功")
           },
           // submitWord(){
           //   const cEmpty = /^\s*$/g;

+ 84 - 27
src/views/home.vue

@@ -17,23 +17,43 @@
                   @open="handleOpen"
                   @close="handleClose"
                   :unique-opened="true">
-                  <div v-for="(item,ind) in navList" :key="ind">
-                    <el-submenu v-if="item.group.length" :index='ind.toString()'>
+                  <div class="submenu" v-for="(item,ind) in navList" :key="ind">
+                    <el-submenu v-if="item['group'].length" :index='ind.toString()' >
                       <template slot="title">
-                        <i :class="item.icon" style="margin-right: 15px;width: 15px;"></i>
-                        {{ item.label }}
+                        <div class="subTitle" @click="goto(item.goto)" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''">
+                          <i :class="item.icon" style="margin-right: 15px;width: 15px;" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''"></i>
+                          {{ item.label }}
+                        </div>
                       </template>
-                      <el-menu-item-group v-if="item.group.length">
-                        <el-menu-item  v-for="(i,num) in item.group" :key="num" :index='ind+"-"+num' @click="goto(i.goto)">
-                          <!-- <i :class="item.icon" style="margin-right: 15px;width: 15px;"></i> -->
-                          {{ i.label }}
+                      <div class="submenu" v-for="(item2,ind2) in item['group']" :key="ind2">
+                        <el-submenu v-if="item2['group']" :index="ind+'-'+ind2">
+                          <template slot="title" >
+                            <div class="subTitle" @click="goto(item2.goto)" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''">
+                              {{ item2.label }}
+                            </div>
+                          </template>
+                          <el-menu-item-group>
+                            <el-menu-item  v-for="(item3,ind3) in item2['group']" :key="ind3" :index='ind+"-"+ind2+"-"+ind3' @click="goto(item3.goto)">
+                              <div class="subTitle" :style="$route.path.indexOf(item3.goto)!=-1?'color:#40aaff':''">{{ item3.label }}</div>
+                            </el-menu-item>
+                          </el-menu-item-group>
+                        </el-submenu>
+                        <el-menu-item :index="ind2.toString()" v-else @click="goto(item2.goto)">
+                          <template slot="title">
+                            <div class="subTitle" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''">
+                              <i :class="item2.icon" style="margin-right: 15px;width: 15px;"></i>
+                              {{ item2.label }}
+                            </div>
+                          </template>
                         </el-menu-item>
-                      </el-menu-item-group>
+                      </div>
                     </el-submenu>
                     <el-menu-item :index="ind.toString()" v-else @click="goto(item.goto)">
                       <template slot="title">
-                          <i :class="item.icon" style="margin-right: 15px;width: 15px;"></i>
+                        <div class="subTitle" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''">
+                          <i :class="item.icon" style="margin-right: 15px;width: 15px;" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''"></i>
                           {{ item.label }}
+                        </div>
                       </template>
                     </el-menu-item>
                   </div>
@@ -59,9 +79,17 @@
       data() {
         return {
           navList:[
-            {id:1,label:"事前申报",icon:"iconfont icon-shuben",group:[{label:"项目立项申请",icon:"iconfont icon-shuben",goto:"/projectApplication"},{label:"活动申请",icon:"el-icon-wind-power",goto:"/makerActvity"}]},
-            // {id:2,label:"活动管理",goto:"/makerActvity",icon:"el-icon-wind-power",group:[]},
-            {id:1,label:"事后汇总",icon:"iconfont icon-zijinguanli",group:[{label:"创客活动资金申请",icon:"el-icon-wind-power",goto:"/makerfund"},{label:"非创客活动资金申请",icon:"el-icon-wind-power",goto:"/makerfund"}]},
+            {id:1,label:"项目立项申请",goto:"/projectApplication",icon:"iconfont icon-shuben",group:[
+              {label:"创客空间",goto:"/projectApplication"},
+              {label:"创客项目",goto:"/makerActvity"},
+              {label:"活动申请",icon:"el-icon-wind-power",goto:"/makerActvity",group:[
+                {label:"创客活动",icon:"iconfont icon-shuben",goto:"/makerActvity"},
+                {label:"个人创客",icon:"iconfont icon-shuben",goto:"/makerActvity"},
+              ]}]},
+            {id:2,label:"事后汇总",goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[
+              {label:"创客活动资金申请",goto:"/makerfund"},
+              {label:"个人创客资金申请",goto:"/makerfund"}
+            ]},
             // {id:3,label:"资金使用管理",goto:"/makerfund",icon:"iconfont icon-zijinguanli",group:[]},
             {id:4,label:"项目管理",goto:"/ProjectManagement",icon:"el-icon-receiving",group:[]},
             {id:5,label:"项目结项",goto:"/projectSettlement",icon:"iconfont icon-_yuanhuanchong",group:[]},
@@ -77,6 +105,7 @@
         goto(url){
           // console.log(this.$route.path);
           this.$router.push(url)
+          console.log('1111')
         },
         homeExit(){
         // console.log(this.$route.path)
@@ -161,21 +190,49 @@
         width: 100%;
       }
     }
-:deep(.el-submenu){
-  .el-submenu__title{
-      padding-left: 20% !important;
-  }
-  .el-menu{
-    .el-menu-item{
-      // background-color: blue;
-      padding-left: 20% !important;
-    }
-    // padding-left: 25% !important;
+    // .submenu{
+    //   :deep(.el-submenu){
+    //     // .el-submenu__title{
+    //     //     padding-left: 20% !important;
+    //     // }
+    //     .el-submenu{
+    //       .el-menu{
+    //       .el-menu-item{
+    //         // background-color: blue;
+    //         padding-left: 26% !important;
+    //       }
+    //       // padding-left: 25% !important;
+    //       }
+    //     }
+    //     .el-menu{
+    //       .el-menu-item{
+    //         // background-color: blue;
+    //         padding-left: 20% !important;
+    //       }
+    //       // padding-left: 25% !important;
+    //     }
+    //   }
+//       :deep(.el-menu-item){
+//         padding-left: 20% !important;
+//         // background-color: red;
+//       }
+// }
+.subTitle{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding-left: 20%;
+  // background-color: red;
+}
+:deep(.el-menu-item.is-active){
+  color: #333 !important;
+  i{
+    color: #909399;
   }
 }
 
-:deep(.el-menu-item){
-  padding-left: 20% !important;
-  // background-color: red;
-}
+
+
 </style>