Merge branch 'insist' into http_test

src/components/newLayout/Head.vue

@@ -16,6 +16,11 @@
     <div v-show="navTagType === 1" class="nav-tag-type" @click="setNavTagType(2)">
       <i class="el-icon-notebook-2" />
     </div> -->
+    <el-tooltip class="item" effect="dark" content="用户指导手册" placement="right">
+      <el-link class="user-tip" href="https://base3.xiaojukeji.com/docs/zhihui/" target="_blank">
+        <svg-icon style="width: 24px; height: 24px;" icon-class="question" />
+      </el-link>
+    </el-tooltip>
     <div v-if="userInfo" class="user-info">
       <a-popover placement="rightBottom" overlay-class-name="head-popover">
         <template #content>
@@ -181,6 +186,10 @@ export default {
   color: #ffffff;
   cursor: pointer;
 }
+.user-tip {
+  margin-top: auto;
+  margin-bottom: 30px;
+}
 .user-info {
   height: 30px;
   width: 30px;
@@ -190,7 +199,7 @@ export default {
   background-color: #fff;
   border-radius: 50%;
   overflow: hidden;
-  margin-top: auto;
+  // margin-top: auto;
   margin-bottom: 30px;
   img {
     height: 30px;

src/icons/svg/question.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="问题" d="M12,0A12,12,0,1,0,24,12,12,12,0,0,0,12,0Zm.826,17.324a.8.8,0,0,1-1.6,0V16.97a.8.8,0,0,1,1.6,0Zm0-3.606,0,.8a.8.8,0,0,1-1.6,0v-.8A1.6,1.6,0,0,1,12.5,12.15,2.4,2.4,0,1,0,9.625,9.8a.8.8,0,1,1-1.6,0,4,4,0,1,1,4.8,3.92Z" fill="#fff"/>
+</svg>