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

src/layout/class/classInfo.vue

@@ -86,7 +86,11 @@
       <el-col :span="24" class="mess">
         <el-col :span="22" class="info">
           <p class="title">班级类型</p>
-          <p class="name">{{ classinfo.type }}</p>
+          <p class="name">
+            <template slot-scope="scope">
+              <span style="margin-left: 10px" v-if="classinfo.type">{{ scope.row.type === '0' ? '正常班级' : scope.row.type === '1' ? '特殊班级' : '' }}</span>
+            </template>
+          </p>
         </el-col>
         <el-col :span="2" class="icon">
           <van-icon name="arrow" />

src/views/user/score.vue

@@ -5,12 +5,26 @@
         <el-col :span="24" class="top">
           <NavBar v-show="true" :title="pageTitle" :isleftarrow="true"> </NavBar>
         </el-col>
-        <el-col :span="24" class="main"> </el-col>
+        <el-col :span="24" class="main" style="margin-top:5rem">
+          <el-row>
+            <el-col :span="24" class="info">
+              <el-col :span="6" class="list" v-for="(item, index) in list" :key="index" @click.native="checkScore(item)">
+                <p class="name" :style="`font-size:${changeNum(item.name)}px`">{{ item.name }}</p>
+                <p class="job">总分:{{ item.selfscore * 1 + item.taskScore * 1 || 0 }}</p>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-col>
         <el-col :span="24" class="foot">
           <footInfo></footInfo>
         </el-col>
       </el-col>
     </el-row>
+    <van-dialog v-model="dialog" :title="form.name">
+      <van-cell title="总分" :value="form.selfscore * 1 + form.taskScore * 1 || 0" size="large" />
+      <van-cell title="平时分" :value="form.selfscore || 0" size="large" />
+      <van-cell title="作业分" :value="form.taskScore || 0" size="large" />
+    </van-dialog>
   </div>
 </template>
 
@@ -28,6 +42,8 @@ export default {
   data: function() {
     return {
       list: [],
+      form: {},
+      dialog: false,
     };
   },
   created() {
@@ -62,6 +78,17 @@ export default {
         this.$set(this, `list`, classList);
       }
     },
+    changeNum(name) {
+      if (name.length >= 5) {
+        return 10;
+      } else {
+        return 15;
+      }
+    },
+    checkScore(data) {
+      this.form = data;
+      this.dialog = true;
+    },
   },
   computed: {
     ...mapState(['user', 'classid']),
@@ -75,4 +102,24 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.info {
+  margin: 15px 0 0 0;
+}
+.list {
+  text-align: center;
+  border: 1px solid #2c69fe;
+  width: 70px;
+  margin: 0 11px 10px 12px;
+  padding: 5px 0px;
+  border-radius: 10px;
+}
+.list .job {
+  font-size: 10px;
+  color: #405ffe;
+}
+</style>