Merge branch 'master' of http://git.cc-lotus.info/new_train/train-dirtea

src/layout/user/clickBtn.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-col :span="24" class="native" v-if="this.user.type === '1'">
-          <van-cell is-link @click="$router.push({ path: '/user/teaLeave' })">请假管理</van-cell>
+          <van-cell is-link @click="$router.push({ path: '/user/teaLeave' })">请假&退出管理</van-cell>
         </el-col>
         <el-col :span="24" class="native" v-if="this.user.type === '4'">
           <van-cell is-link @click="$router.push({ path: '/user/leave' })">请假</van-cell>
@@ -14,19 +14,12 @@
         <el-col :span="24" class="native" v-if="this.user.type === '4'">
           <van-cell is-link @click="$router.push({ path: '/user/homework' })">作业管理</van-cell>
         </el-col>
-
-        <el-col :span="24" class="native">
+        <el-col :span="24" class="native" v-if="this.user.type === '1'">
           <van-cell is-link @click="$router.push({ path: '/user/pingfenclass' })">评分</van-cell>
         </el-col>
         <el-col :span="24" class="native" v-if="this.user.type === '4'">
           <van-cell is-link @click="$router.push({ path: '/user/quit' })">退出</van-cell>
         </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '1'">
-          <van-cell is-link @click="$router.push({ path: '/user/teaquit' })">退出</van-cell>
-        </el-col>
-        <el-col :span="24" class="native" v-if="this.user.type === '1'">
-          <van-cell is-link @click="$router.push({ path: '/user/teacher' })">查看任课教师</van-cell>
-        </el-col>
         <!-- <el-col :span="24" class="native" v-if="this.user.type === '3'">
           <van-cell is-link @click="$router.push({ path: '/user/terstudent' })">查看任课教师</van-cell>
         </el-col> -->

src/views/question/dir/dir-quest.vue

@@ -9,7 +9,7 @@
     <template v-else>
       <el-row>
         <el-col :span="3" style="margin:5px 10px">
-          <el-button type="text" size="mini" icon="el-icon-arrow-left" @click="view = 'list'">返回</el-button>
+          <el-button type="text" size="mini" icon="el-icon-arrow-left" @click="view = 'list'">返回班级列表</el-button>
         </el-col>
       </el-row>
       <van-panel title="进度" :status="`${student.answertotal || 0}/${student.alltotal || 0}`">