Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/FShareMain.vue

@@ -167,10 +167,10 @@
         </div>
         <ul class="pintuanSetUU">
           <li class="menu_item" :class="{'Fchecked':isChecked=='/shareCategory'}"  @click="isChecked='/shareCategory',CommonJump('shareCategory')">
-              <i class="el-icon-menu"></i><span>分类</span>
+              <i class="el-icon-menu"></i><span>发圈素材分类</span>
           </li>
           <li class="menu_item" :class="{'Fchecked':isChecked=='/shareFriend'}" @click="isChecked='/shareFriend',CommonJump('shareFriend')">
-              <i class="el-icon-menu"></i><span>一键发圈</span>
+              <i class="el-icon-menu"></i><span>发圈素材管理</span>
           </li>
         </ul>
       </div>