Merge remote-tracking branch 'origin/master'

h5app/src/views/sapp/tabMain.vue

@@ -4,16 +4,52 @@
       <div class="panel" style="margin-top: 125px;">
         <div class="panel-content">
           <div class="panel-title">
-            就业管理
+            我的应用
           </div>
           <div class="tool-box">
             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/attendanceSign')">
               <div class="tool-img">
-                <img src="@/assets/icon/dk.png">
+                <img src="@/assets/icon/qzxx.png">
               </div>
-              <div class="tool-title">录入信息</div>
+              <div class="tool-title">求职信息收集</div>
             </a>
+            <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/attendanceSign')">
+              <div class="tool-img">
+                <img src="@/assets/icon/qyxx.png">
+              </div>
+              <div class="tool-title">企业信息收集</div>
+            </a>
+            <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/attendanceSign')">
+              <div class="tool-img">
+                <img src="@/assets/icon/gwtj.png">
+              </div>
+              <div class="tool-title">岗位推荐</div>
+            </a>
+            <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/attendanceSign')">
+              <div class="tool-img">
+                <img src="@/assets/icon/gzrz.png">
+              </div>
+              <div class="tool-title">工作日志</div>
+            </a>
+            <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/attendanceSign')">
+              <div class="tool-img">
+                <img src="@/assets/icon/gzrw.png">
+              </div>
+              <div class="tool-title">工作任务</div>
+            </a>
+
           </div>
+          <div class="panel-title">
+            我的任务
+          </div>
+          <div class="panel-title">
+
+          </div>
+          <div class="panel-title">
+
+          </div><div class="panel-title">
+
+        </div>
         </div>
       </div>
     </div>

vue/src/views/baseSettings/site/index.vue

@@ -40,6 +40,7 @@
       <a-row class="edit-operation">
         <a-col :span="24" style="text-align: right">
           <a-button type="primary" html-type="submit" @click='onOperates(null,"新增",false)' >新增</a-button>
+          <a-button type="primary" >驿站地图</a-button>
           <a-button type="primary" >导出</a-button>
         </a-col>
       </a-row>