提交一下啊

src/common/vueFilters.js

@@ -117,4 +117,12 @@ Vue.filter('formatDate', value => {
     let hour = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()
     let minute = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes()
     return hour + ':' + minute
-})
+})
+
+Vue.filter('formatTimer', (value) => {
+    if (value) {
+      return value.split(' ')[0]
+    } else {
+      return value
+    }
+  })

src/views/app/AppLogin.vue

@@ -1,351 +1,434 @@
 <template>
-    <div class="login">
-        <div class="logo">
-            <img src="../../assets/images/logo.png" alt="">
-        </div>
-        <div class="container" v-show="isTrue">
-            <div class="input-group">
-                <input type="number" @keyup="onKeyUp()" placeholder="请输入手机号" class="input" v-model="phoneNumber" maxlength="11" minlength="11" pattern="[0-9]" />
-            </div>
-            <div class="input-group">
-                <input type="password" @keyup="onKeyUp()" placeholder="请输入密码" class="input" v-model="password" />
-            </div>
+  <div class="login">
+    <div class="logo">
+      <img src="../../assets/images/logo.png" alt="" />
+    </div>
+    <div class="container" v-show="isTrue">
+      <div class="input-group">
+        <input
+          type="number"
+          @keyup="onKeyUp()"
+          placeholder="请输入手机号"
+          class="input"
+          v-model="phoneNumber"
+          maxlength="11"
+          minlength="11"
+          pattern="[0-9]"
+        />
+      </div>
+      <div class="input-group">
+        <input
+          type="password"
+          @keyup="onKeyUp()"
+          placeholder="请输入密码"
+          class="input"
+          v-model="password"
+        />
+      </div>
 
-            <van-button round size="large" @click="onLogin" :disabled="pwdDisable">登录</van-button>
-            <span class="login-change" @click="isTrue = false">验证码登录</span>
-            <span class="login-change" @click="onRegister" style="float: left;">立即注册</span>
-        </div>
+      <van-button round size="large" @click="onLogin" :disabled="pwdDisable"
+        >登录</van-button
+      >
+      <span class="login-change" @click="isTrue = false">验证码登录</span>
+      <span class="login-change" @click="onRegister" style="float: left"
+        >立即注册</span
+      >
+    </div>
 
-        <div class="container" v-show="!isTrue">
-            <div class="input-group">
-                <input type="number" @keyup="onKeyUp()" placeholder="请输入手机号" class="input" v-model="phoneNumber" maxlength="11" minlength="11" pattern="[0-9]">
-            </div>
-            <div class="input-group">
-                <input type="text" @keyup="onKeyUp()" placeholder="请输入验证码" class="input" minlength="6" maxlength="6" v-model="code" >
-                <span class="code-text" v-show="countDownStatus" @click="onSendCode">{{ codeText }}</span>
-                <span class="code-text" v-show="!countDownStatus">
-                    <van-count-down 
-                        ref="countdown"
-                        :auto-start="false"
-                        :time="countDownTime" 
-                        @finish="onFinished"
-                        format="ss秒" />
-                </span>
-            </div>
+    <div class="container" v-show="!isTrue">
+      <div class="input-group">
+        <input
+          type="number"
+          @keyup="onKeyUp()"
+          placeholder="请输入手机号"
+          class="input"
+          v-model="phoneNumber"
+          maxlength="11"
+          minlength="11"
+          pattern="[0-9]"
+        />
+      </div>
+      <div class="input-group">
+        <input
+          type="text"
+          @keyup="onKeyUp()"
+          placeholder="请输入验证码"
+          class="input"
+          minlength="6"
+          maxlength="6"
+          v-model="code"
+        />
+        <span class="code-text" v-show="countDownStatus" @click="onSendCode">{{
+          codeText
+        }}</span>
+        <span class="code-text" v-show="!countDownStatus">
+          <van-count-down
+            ref="countdown"
+            :auto-start="false"
+            :time="countDownTime"
+            @finish="onFinished"
+            format="ss秒"
+          />
+        </span>
+      </div>
 
-            <van-button round size="large" @click="onCodeLogin" :disabled="codeDisable">登录</van-button>
-            <span class="login-change" @click="isTrue = true">密码登录</span>
-            <span class="login-change" @click="onRegister" style="float: left;">立即注册</span>
+      <van-button
+        round
+        size="large"
+        @click="onCodeLogin"
+        :disabled="codeDisable"
+        >登录</van-button
+      >
+      <span class="login-change" @click="isTrue = true">密码登录</span>
+      <span class="login-change" @click="onRegister" style="float: left"
+        >立即注册</span
+      >
 
-            <!-- 图形验证码 -->
-            <m-img-code v-if="showImgCode" v-model="showImgCode" :phone="phoneNumber" @onCodeSend="onCodeSend" />
-        </div>
+      <!-- 图形验证码 -->
+      <m-img-code
+        v-if="showImgCode"
+        v-model="showImgCode"
+        :phone="phoneNumber"
+        @onCodeSend="onCodeSend"
+      />
     </div>
+  </div>
 </template>
 <script>
 /* eslint-disable */
-import { usernameLogin, sendSms, verifySmsCode, smsLogin, queryUserByPhone } from '@/api/app'
-import MImgCode from '@/components/MImgCode'
+import {
+  usernameLogin,
+  sendSms,
+  verifySmsCode,
+  smsLogin,
+  queryUserByPhone,
+} from "@/api/app";
+import MImgCode from "@/components/MImgCode";
 export default {
-    name: 'login',
-    components: {
-        MImgCode
-    },
-    data() {
-        return {
-            groupId: this.$route.query.groupId,
-            pwdDisable: true, // 密码登录按钮状态
-            codeDisable: true, // 验证码登录按钮状态
-            isTrue: true,
-            countDownStatus: true, // 到计时状态
-            phoneNumber: null,
-            password: null,
-            code: null,
-            codeText: '获取验证码',
-            countDownTime: 1000 * 120, // 倒计时时间
-            isClick: false,
-            showImgCode: false
+  name: "login",
+  components: {
+    MImgCode,
+  },
+  data() {
+    return {
+      groupId: this.$route.query.groupId,
+      pwdDisable: true, // 密码登录按钮状态
+      codeDisable: true, // 验证码登录按钮状态
+      isTrue: true,
+      countDownStatus: true, // 到计时状态
+      phoneNumber: null,
+      password: null,
+      code: null,
+      codeText: "获取验证码",
+      countDownTime: 1000 * 120, // 倒计时时间
+      isClick: false,
+      showImgCode: false,
+    };
+  },
+  mounted() {
+    // 登录时删除无用的token
+    localStorage.removeItem("userInfo");
+    localStorage.removeItem("Authorization");
+    // 登录时间判断用户是Token是否有效
+  },
+  methods: {
+    onKeyUp() {
+      if (this.isTrue) {
+        if (!this.phoneNumber || !this.password) {
+          this.pwdDisable = true;
+        } else {
+          this.pwdDisable = false;
         }
+      } else {
+        if (!this.phoneNumber || !this.code) {
+          this.codeDisable = true;
+        } else {
+          this.codeDisable = false;
+        }
+      }
     },
-    mounted() {
-        // 登录时删除无用的token
-        localStorage.removeItem('userInfo')
-        localStorage.removeItem('Authorization')
-        // 登录时间判断用户是Token是否有效
-
-    },
-    methods: {
-        onKeyUp() {
-            if(this.isTrue) {
-                if(!this.phoneNumber || !this.password) {
-                    this.pwdDisable = true
-                } else {
-                    this.pwdDisable = false
-                }
-            } else {
-                if(!this.phoneNumber || !this.code) {
-                    this.codeDisable = true
-                } else {
-                    this.codeDisable = false
-                }
-            }
-        },
-        onRegister() {
-            this.$router.push({
-                path: '/appRegister',
-                query: {
-                    groupId: this.groupId
-                }
-            })
-        },
-        onSendCode() { // 发送验证码
-            if(!this.checkPhone(this.phoneNumber)) {
-                return
-            }
-            queryUserByPhone({ mobile: this.phoneNumber }).then(res => {
-                let result = res.data
-                if(result.code == 200) {
-                    if(result.data == 1) {
-                        // sendSms({
-                        //     mobile: this.phoneNumber
-                        // }).then(res => {
-                        //     let result = res.data
-                        //     if(result.code == 200) {
-                        //         this.countDownStatus = false
-                        //         this.$refs.countdown.start() // 倒计时开始
-                        //     } else {
-                        //         this.$toast(result.msg)
-                        //     }
-                        // })
-                        this.showImgCode = true
-                    } else {
-                        this.$dialog.confirm({
-                            message: '此手机号尚未注册<br/>是否注册？',
-                            confirmButtonText: '注册'
-                        }).then(() => {
-                            this.$router.push({
-                                path: '/appRegister',
-                                query: {
-                                    groupId: this.groupId
-                                }
-                            })
-                        }).catch(() => { });
-                    }
-                } else {
-                    this.$toast(result.msg)
-                }
-            })
+    onRegister() {
+      this.$router.push({
+        path: "/appRegister",
+        query: {
+          groupId: this.groupId,
         },
-        onCodeSend() {
-            this.countDownStatus = false
-            this.$refs.countdown.start() // 倒计时开始
-        },
-        onCodeLogin() { // 短信登录
-            if(this.isClick) {
-                return
-            }
-            this.isClick = true
-            let params = {
-                clientId: 'student',
-                clientSecret: 'student',
-                phone: this.phoneNumber,
-                smsCode: this.code,
-                channel: 'H5'
-            }
-            smsLogin(params).then(sms => {
-                let s = sms.data
-                this.isClick = false
-                // 保存用户信息
-                if(s.code == 200) {
-                    let auth = s.data.authentication
-                    localStorage.setItem('userInfo', auth.token_type + ' ' + auth.access_token)
-                    if(s.data.password) {
-                        this.$router.push({
-                            path: '/classDetail',
-                            query: {
-                                groupId: this.groupId
-                            }
-                        })
-                    } else {
-                        this.$router.push({
-                            path: '/appSetInfo',
-                            query: {
-                                groupId: this.groupId
-                            }
-                        })
-                    }
-                } else if(s.code == 99) {
-                    this.$dialog.confirm({
-                        message: '此手机号尚未注册<br/>是否注册？',
-                        confirmButtonText: '注册'
-                    }).then(() => {
-                        this.$router.push({
-                            path: '/appRegister',
-                            query: {
-                                groupId: this.groupId
-                            }
-                        })
-                    }).catch(() => { });
-                } else {
-                    this.$toast(s.msg)
-                }
-            })
-            // queryUserByPhone({ mobile: this.phoneNumber }).then(res => {
+      });
+    },
+    onSendCode() {
+      // 发送验证码
+      if (!this.checkPhone(this.phoneNumber)) {
+        return;
+      }
+      queryUserByPhone({ mobile: this.phoneNumber }).then((res) => {
+        let result = res.data;
+        if (result.code == 200) {
+          if (result.data == 1) {
+            // sendSms({
+            //     mobile: this.phoneNumber
+            // }).then(res => {
             //     let result = res.data
             //     if(result.code == 200) {
-            //         this.isRegister = result.data
-            //     }
-            //     if(this.isRegister == 1) {
-            //         this.onLoginStr()
+            //         this.countDownStatus = false
+            //         this.$refs.countdown.start() // 倒计时开始
             //     } else {
-            //         this.$dialog.confirm({
-            //             message: '此手机号尚未注册<br/>是否注册？',
-            //             confirmButtonText: '注册'
-            //         }).then(() => {
-            //             this.$router.push({
-            //                 path: '/appRegister',
-            //                 query: {
-            //                     groupId: this.groupId
-            //                 }
-            //             })
-            //         }).catch(() => { });
+            //         this.$toast(result.msg)
             //     }
             // })
-        },
-        onLogin() { // 账号登录
-            if(this.isClick) {
-                return
-            }
-            this.isClick = true
+            this.showImgCode = true;
+          } else {
+            this.$dialog
+              .confirm({
+                message: "此手机号尚未注册<br/>是否注册？",
+                confirmButtonText: "注册",
+              })
+              .then(() => {
+                this.$router.push({
+                  path: "/appRegister",
+                  query: {
+                    groupId: this.groupId,
+                  },
+                });
+              })
+              .catch(() => {});
+          }
+        } else {
+          this.$toast(result.msg);
+        }
+      });
+    },
+    onCodeSend() {
+      this.countDownStatus = false;
+      this.$refs.countdown.start(); // 倒计时开始
+    },
+    onCodeLogin() {
+      // 短信登录
+      if (this.isClick) {
+        return;
+      }
+      this.isClick = true;
+      let params = {
+        clientId: "student",
+        clientSecret: "student",
+        phone: this.phoneNumber,
+        smsCode: this.code,
+        channel: "H5",
+      };
+      smsLogin(params).then((sms) => {
+        let s = sms.data;
+        this.isClick = false;
+        // 保存用户信息
+        if (s.code == 200) {
+          let auth = s.data.authentication;
+          localStorage.setItem(
+            "userInfo",
+            auth.token_type + " " + auth.access_token
+          );
+          if (s.data.password) {
+            this.$router.push({
+              path: "/classDetail",
+              query: {
+                groupId: this.groupId,
+              },
+            });
+          } else {
+            this.$router.push({
+              path: "/appSetInfo",
+              query: {
+                groupId: this.groupId,
+              },
+            });
+          }
+        } else if (s.code == 99) {
+          this.$dialog
+            .confirm({
+              message: "此手机号尚未注册<br/>是否注册？",
+              confirmButtonText: "注册",
+            })
+            .then(() => {
+              this.$router.push({
+                path: "/appRegister",
+                query: {
+                  groupId: this.groupId,
+                },
+              });
+            })
+            .catch(() => {});
+        } else {
+          this.$toast(s.msg);
+        }
+      });
+      // queryUserByPhone({ mobile: this.phoneNumber }).then(res => {
+      //     let result = res.data
+      //     if(result.code == 200) {
+      //         this.isRegister = result.data
+      //     }
+      //     if(this.isRegister == 1) {
+      //         this.onLoginStr()
+      //     } else {
+      //         this.$dialog.confirm({
+      //             message: '此手机号尚未注册<br/>是否注册？',
+      //             confirmButtonText: '注册'
+      //         }).then(() => {
+      //             this.$router.push({
+      //                 path: '/appRegister',
+      //                 query: {
+      //                     groupId: this.groupId
+      //                 }
+      //             })
+      //         }).catch(() => { });
+      //     }
+      // })
+    },
+    onLogin() {
+      // 账号登录
+      if (this.isClick) {
+        return;
+      }
+      this.isClick = true;
+
+      usernameLogin({
+        clientId: "student",
+        clientSecret: "student",
+        username: this.phoneNumber,
+        password: this.password,
+      }).then((sms) => {
+        let s = sms.data;
+        this.isClick = false;
+        // 保存用户信息
+        if (s.code == 200) {
+          let auth = s.data.authentication;
+          localStorage.setItem(
+            "userInfo",
+            auth.token_type + " " + auth.access_token
+          );
 
-            usernameLogin({
-                clientId: 'student',
-                clientSecret: 'student',
-                username: this.phoneNumber,
-                password: this.password
-            }).then(sms => {
-                let s = sms.data
-                this.isClick = false
-                // 保存用户信息
-                if(s.code == 200) {
-                    let auth = s.data.authentication
-                    localStorage.setItem('userInfo', auth.token_type + ' ' + auth.access_token)
-                    
-                    this.$router.push({
-                        path: '/classDetail',
-                        query: {
-                            groupId: this.groupId
-                        }
-                    })
-                } else if(s.code == 99) {
-                    this.$dialog.confirm({
-                        message: '此手机号尚未注册<br/>是否注册？',
-                        confirmButtonText: '注册'
-                    }).then(() => {
-                        this.$router.push({
-                            path: '/appRegister',
-                            query: {
-                                groupId: this.groupId
-                            }
-                        })
-                    }).catch(() => { });
-                } else {
-                    this.$toast(s.msg)
-                }
+          this.$router.push({
+            path: "/classDetail",
+            query: {
+              groupId: this.groupId,
+            },
+          });
+        } else if (s.code == 99) {
+          this.$dialog
+            .confirm({
+              message: "此手机号尚未注册<br/>是否注册？",
+              confirmButtonText: "注册",
             })
-        },
-        onFinished() { // 倒计时结束
-            this.countDownStatus = true
-            this.$refs.countdown.reset()
-        },
-        checkPhone(phoneNumber) {
-            let result = true
-            if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(phoneNumber))){ 
-                this.$toast('手机号输入有误')
-                result = false
-            }
-            return result
+            .then(() => {
+              this.$router.push({
+                path: "/appRegister",
+                query: {
+                  groupId: this.groupId,
+                },
+              });
+            })
+            .catch(() => {});
+        } else {
+          this.$toast(s.msg);
         }
-    }
-}
+      });
+    },
+    onFinished() {
+      // 倒计时结束
+      this.countDownStatus = true;
+      this.$refs.countdown.reset();
+    },
+    checkPhone(phoneNumber) {
+      let result = true;
+      if (!/^1(3|4|5|6|7|8|9)\d{9}$/.test(phoneNumber)) {
+        this.$toast("手机号输入有误");
+        result = false;
+      }
+      return result;
+    },
+  },
+};
 </script>
 <style lang='less' scoped>
 @import url("../../assets/commonLess/variable.less");
 
 .login {
-    min-height: 100vh;
-    background: linear-gradient(to bottom, #15938B, #6dbeba);
+  min-height: 100vh;
+//   background: -webkit-gradient(
+//     linear,
+//     left bottom,
+//     left top,
+//     from(#01c1b5),
+//     to(#1bcbbf)
+//   );
+  background: linear-gradient(1turn, #01c1b5, #1bcbbf);
 }
 .container {
-    padding: 0 .48rem;
+  padding: 0 0.48rem;
 }
 .logo {
-    padding-top: 1rem;
-    padding-bottom: .9rem;
-    width: 1.6rem;
-    margin: 0 auto;
-    img {
-        width: inherit;
-    }
+  padding-top: 1rem;
+  padding-bottom: 0.9rem;
+  width: 1.6rem;
+  margin: 0 auto;
+  img {
+    width: inherit;
+  }
 }
 .input-group {
-    position: relative;
-    height: .44rem;
-    border-radius: .5rem;
-    border: .02rem solid @whiteColor;
-    margin-bottom: .2rem;
-    padding-left: .3rem;
-    padding-right: .3rem;
-    display: flex;
-    align-items: center;
-    .input {
-        flex: 1;
-        font-size: .14rem;
-        color: @whiteColor;
-        
-        background: transparent;
-        border: none;
-        &::placeholder {
-            color: @whiteColor;
-        }
-    }
-    .code-text {
-        position: absolute;
-        right: 0;
-        flex: 1;
-        display: block;
-        width: .94rem;
-        text-align: center;
-        border-left: .02rem solid @whiteColor;
-        font-size: .14rem;
-        color: @whiteColor;
-        line-height: .3rem;
-        height: .3rem;
+  position: relative;
+  height: 0.44rem;
+  border-radius: 0.5rem;
+  border: 0.02rem solid @whiteColor;
+  margin-bottom: 0.2rem;
+  padding-left: 0.3rem;
+  padding-right: 0.3rem;
+  display: flex;
+  align-items: center;
+  .input {
+    flex: 1;
+    font-size: 0.14rem;
+    color: @whiteColor;
+
+    background: transparent;
+    border: none;
+    &::placeholder {
+      color: @whiteColor;
     }
+  }
+  .code-text {
+    position: absolute;
+    right: 0;
+    flex: 1;
+    display: block;
+    width: 0.94rem;
+    text-align: center;
+    border-left: 0.02rem solid @whiteColor;
+    font-size: 0.14rem;
+    color: @whiteColor;
+    line-height: 0.3rem;
+    height: 0.3rem;
+  }
 }
 /deep/.van-count-down {
-    font-size: .14rem;
-    color: @whiteColor;
-    line-height: .3rem;
-    height: .3rem;
+  font-size: 0.14rem;
+  color: @whiteColor;
+  line-height: 0.3rem;
+  height: 0.3rem;
 }
 /deep/.van-button--large {
-    height: .44rem;
-    line-height: .42rem;
-    color: @mColor;
-    border: 0;
+  height: 0.44rem;
+  line-height: 0.42rem;
+  color: @mColor;
+  border: 0;
 }
 /deep/.van-button:active::before {
-    opacity: 0.05;
+  opacity: 0.05;
 }
 /deep/.van-button--disabled {
-    opacity: 1;
-    color: rgba(0, 0, 0, 0.25);
+  opacity: 1;
+  color: rgba(0, 0, 0, 0.25);
 }
 .login-change {
-    padding-top: .08rem;
-    font-size: .14rem;
-    color: @whiteColor;
-    float: right;
+  padding-top: 0.08rem;
+  font-size: 0.14rem;
+  color: @whiteColor;
+  float: right;
 }
 </style>

src/views/app/AppRegister.vue

@@ -216,7 +216,7 @@ export default {
 
 .login {
     min-height: 100vh;
-    background: linear-gradient(to bottom, #15938B, #6dbeba);
+     background: linear-gradient(1turn, #01c1b5, #1bcbbf);
 }
 .container {
     padding: 0 .48rem;

src/views/app/ClassDetail.vue

@@ -267,7 +267,7 @@ export default {
 }
 .pay_btn {
     margin: .25rem .3rem .2rem;
-    background: #14928A;
+    background: @mColor;
     line-height: .45rem;
     color: #fff;
     font-size: .18rem;

src/views/audition/ArrangeWork.vue

@@ -7,11 +7,12 @@
         <van-field type="text" placeholder="请输入（1-25字）" />
       </div> -->
       <div class="formGroup">
+           <div class="dot"></div>
         <div class="formTitle">作业内容</div>
         <van-field rows="8" v-model="content" type="textarea" placeholder="请输入（1-600字）" />
       </div>
     </div>
-    <van-cell class="endTime" title="截止时间" @click="onEndTime" readonly placeholder="请选择截止时间" >
+    <van-cell class="endTime" title="作业提交截止时间" @click="onEndTime" readonly placeholder="请选择截止时间" >
       <template #default>
         {{ dateSection.showStartDate }} <span class="arrowDown"></span>
       </template>
@@ -37,6 +38,7 @@
 <script>
 import MHeader from "@/components/MHeader"
 import { browser, _throttle, getYMD }  from '@/common/common'
+import dayjs from "dayjs";
 import { addHomeWork } from '@/api/audition'
 export default {
   name: "teacherList",
@@ -52,7 +54,7 @@ export default {
         minDate: new Date(),
         maxDate: new Date(2025, 10, 1),
         currentDate: tempDate,
-        showStartDate: getYMD(tempDate, true)
+        showStartDate: dayjs(tempDate).format("YYYY年MM月DD日")
       },
       content: null, // 课程编号
       expiryDate: null, // 作业截止日期
@@ -82,7 +84,7 @@ export default {
       return val
     },
     confirmStartTime() {
-      this.dateSection.showStartDate = getYMD(this.dateSection.currentDate, true)
+      this.dateSection.showStartDate = dayjs(this.dateSection.currentDate).format("YYYY年MM月DD日")
       this.dateSection.status = false
     },
     onEndTime() {
@@ -105,7 +107,9 @@ export default {
         courseId: query.courseId,
         expiryDate: this.dateSection.showStartDate
       }
-      addHomeWork(params).then(res => {
+      let visitTime = this.dateSection.showStartDate.replace(/[^\d]/g,'/');
+      let someDate = new Date(visitTime)
+      addHomeWork({...params,expiryDate:dayjs(someDate).format("YYYY-MM-DD")}).then(res => {
         let result = res.data
         this.$toast.clear()
         if(result.code == 200) {
@@ -148,10 +152,10 @@ export default {
 .container {
   background: #ffffff;
   .formTitle {
-    padding: .12rem .16rem 0;
-    font-size: .14rem;
-    color: #14928A;
-    font-weight: 600;
+    padding: .12rem .21rem 0;
+    font-size: .16rem;
+    color: #333333;
+    font-weight: 500;
   }
 }
 
@@ -160,12 +164,13 @@ export default {
   .van-cell__title {
     font-size: .16rem;
     color: #1A1A1A;
+ 
   }
 
   /deep/.van-cell__value {
-    width: 30%;
-    flex: 1 auto;
-    text-align: left;
+    // width: 30%;
+    justify-content: flex-end;
+    text-align: right;
     font-size: .16rem;
     color: #1A1A1A;
     display: flex;
@@ -183,4 +188,18 @@ export default {
     font-size: 0.18rem;
   }
 }
+
+.dot {
+  width: 4px;
+  height: 0.17rem;
+  background: #01c1b5;
+  border-radius: 3px;
+  position: absolute;
+  z-index: 200;
+  top: .15rem;
+  left: 0.12rem;
+}
+.formGroup {
+  position: relative;
+}
 </style>

src/views/audition/CourseEvaluation.vue

@@ -1,23 +1,18 @@
 <template>
-  <div style="overflow: hidden;">
+  <div style="overflow: hidden">
     <m-header v-if="headerStatus" />
     <van-cell-group>
       <van-cell title="课程班名称" :value="classGroupName" />
-    </van-cell-group>
-    <van-cell-group>
-      <van-cell title="课程类型" >
+           <van-cell title="课程类型">
         <template #default>
           {{ classType | coursesType }}
         </template>
       </van-cell>
-    </van-cell-group>
-    <van-cell-group>
       <van-cell title="上课时间" :value="classTimer" />
+        <van-cell title="乐器" :value="subjectNames" />
     </van-cell-group>
     <van-cell-group>
-      <van-cell title="乐器" :value="subjectNames" />
-    </van-cell-group>
-    <van-cell-group>
+       <div class="dot"></div>
       <van-field
         required
         rows="4"
@@ -25,33 +20,62 @@
         v-model="teachingMaterial"
         maxlength="255"
         autosize
-        label=" 教材内容"
+        label="教材内容"
         type="textarea"
         placeholder="请输入（1-255字）"
       />
     </van-cell-group>
     <van-cell-group>
-      <van-field required label="曲目" input-align="right" placeholder="请输入曲目名" v-model="song" />
+       <div class="dot"></div>
+      <van-field
+        required
+        rows="1"
+        label="曲目"
+        type="textarea"
+        placeholder="请输入曲目名"
+        class="textarea"
+        v-model="song"
+      />
     </van-cell-group>
+    <!-- <van-cell-group >
+ 
+    </van-cell-group> -->
+    <!--   label="评价备注" -->
     <van-cell-group>
-      <van-cell>
+       <div class="dot"></div>
+      <p class="evTitle">评价</p>
+
+      <van-cell class="start">
         <template slot="title">
           <div class="title-item">
             <span class="text">发音</span>
-            <van-rate v-model="pronunciation" :size="25" void-color="#eee" void-icon="star" />
+            <van-rate
+              v-model="pronunciation"
+              :size="25"
+              void-color="#eee"
+              void-icon="star"
+            />
           </div>
           <div class="title-item">
             <span class="text">节奏</span>
-            <van-rate :size="25" void-color="#eee" v-model="tempo" void-icon="star" />
+            <van-rate
+              :size="25"
+              void-color="#eee"
+              v-model="tempo"
+              void-icon="star"
+            />
           </div>
           <div class="title-item">
             <span class="text">乐理</span>
-            <van-rate :size="25" v-model="musicTheory" void-color="#eee" void-icon="star" />
+            <van-rate
+              :size="25"
+              v-model="musicTheory"
+              void-color="#eee"
+              void-icon="star"
+            />
           </div>
         </template>
       </van-cell>
-    </van-cell-group>
-    <van-cell-group>
       <van-field
         rows="4"
         required
@@ -59,26 +83,13 @@
         maxlength="255"
         v-model="memo"
         autosize
-        label="评价备注"
         type="textarea"
         placeholder="请输入（1-255字）"
       />
     </van-cell-group>
-    <!-- <van-cell-group v-if="!isReset || (isReset && homeWork)">
-      <van-field
-        rows="4"
-        class="textarea"
-        :disabled="isReset"
-        maxlength="255"
-        v-model="homeWork"
-        autosize
-        label="布置作业"
-        type="textarea"
-        placeholder="请输入（1-255字）"
-      />
-    </van-cell-group> -->
     <van-cell-group v-if="classType != 'VIP'">
-      <van-cell title="是否完成双向沟通" value-class="twoConnect">
+         <div class="dot"></div>
+      <van-cell title="是否完成双向沟通" value-class="twoConnect" class="talk">
         <template slot="default">
           <van-radio-group required v-model="hasLiaison" direction="horizontal">
             <van-radio name="1">是</van-radio>
@@ -87,29 +98,36 @@
         </template>
       </van-cell>
     </van-cell-group>
-<!--
-    <van-cell-group v-if="isReset">
-      <van-cell title="是否完成作业" value-class="twoConnect">
-        <template slot="default">
-          <van-radio-group required v-model="handHomework" direction="horizontal">
-            <van-radio name="1">是</van-radio>
-            <van-radio name="0">否</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
-    </van-cell-group> -->
+
     <div class="button-group" v-if="!reviewId">
-      <van-button type="primary"  round size="large" @click="submitReview">提交评价</van-button>
+      <van-button type="primary" round size="large" @click="submitReview"
+        >提交评价</van-button
+      >
     </div>
     <div class="button-group btn-operation" v-if="reviewId">
-      <van-button type="primary" :disabled="homeWork?true: false" v-if="enableAssignHomework" round @click="onWork(isAssignHomework)">{{ homeWork ? '已布置作业' : '布置作业' }}</van-button>
-      <van-button type="primary" round class="btn-plain" @click="submitReview">修改评价</van-button>
+      <van-button
+        type="primary"
+        :disabled="homeWork ? true : false"
+        v-if="enableAssignHomework"
+        round
+        @click="onWork(isAssignHomework)"
+        >{{ homeWork ? "已布置作业" : "布置作业" }}</van-button
+      >
+      <van-button type="primary" round class="btn-plain" @click="submitReview"
+        >修改评价</van-button
+      >
     </div>
 
     <van-popup v-model="showWork">
       <van-icon class="closeable" @click="onClose" name="cross" />
       <div class="popup_container">
-        <p class="content">评价成功<br/>{{ isAssignHomework ? '您课程所在周已经布置作业，是否继续布置?' : '是否布置作业？' }}</p>
+        <p class="content">
+          评价成功<br />{{
+            isAssignHomework
+              ? "您课程所在周已经布置作业，是否继续布置?"
+              : "是否布置作业？"
+          }}
+        </p>
         <div class="btn_group">
           <span @click="onClose">取消</span>
           <span @click="onWork(0)">布置作业</span>
@@ -125,7 +143,7 @@ import {
   courseReviewAdd,
   getReviewInfo,
   updateReviewInfo,
-  checkeIsAssignHomework
+  checkeIsAssignHomework,
 } from "@/api/teacher";
 import { browser } from "@/common/common";
 import MHeader from "@/components/MHeader";
@@ -178,23 +196,23 @@ export default {
       localStorage.setItem("Authorization", decodeURI(params.Authorization));
       localStorage.setItem("userInfo", decodeURI(params.Authorization));
     }
-    if(browser().android || browser().iPhone) {
-      this.headerStatus = false
+    if (browser().android || browser().iPhone) {
+      this.headerStatus = false;
     }
     // 获取头部信息
     if (this.reviewId) {
       // 获取老评价
       this.$toast.loading({
-        message: '加载中...',
+        message: "加载中...",
         duration: 10000,
         forbidClick: true,
-        loadingType: 'spinner',
-      })
-      getReviewInfo({ id: this.reviewId }).then(res => {
-        this.$toast.clear()
+        loadingType: "spinner",
+      });
+      getReviewInfo({ id: this.reviewId }).then((res) => {
+        this.$toast.clear();
         if (res.data.code == 200) {
-          let result = res.data.data
-          let teacherClassHeadInfo = result.teacherClassHeadInfo
+          let result = res.data.data;
+          let teacherClassHeadInfo = result.teacherClassHeadInfo;
           this.classTimer =
             teacherClassHeadInfo.classDate +
             teacherClassHeadInfo.startClassTime +
@@ -202,10 +220,10 @@ export default {
             teacherClassHeadInfo.endClassTime;
           this.subjectNames = teacherClassHeadInfo.subjectNames;
           this.classGroupName = teacherClassHeadInfo.classGroupName;
-          this.classType = teacherClassHeadInfo.courseScheduleType
+          this.classType = teacherClassHeadInfo.courseScheduleType;
 
           // 评价内容
-          let courseScheduleReview = result.courseScheduleReview
+          let courseScheduleReview = result.courseScheduleReview;
           this.teachingMaterial = courseScheduleReview.teachingMaterial;
           this.song = courseScheduleReview.song;
           this.pronunciation = courseScheduleReview.pronunciation;
@@ -218,9 +236,9 @@ export default {
         }
       });
     } else {
-      getCourseInfoHead({ courseId: this.courseId }).then(res => {
+      getCourseInfoHead({ courseId: this.courseId }).then((res) => {
         if (res.data.code == 200) {
-          let result = res.data.data
+          let result = res.data.data;
           this.classTimer =
             result.classDate +
             result.startClassTime +
@@ -228,19 +246,19 @@ export default {
             result.endClassTime;
           this.subjectNames = result.subjectNames;
           this.classGroupName = result.classGroupName;
-          this.classType = result.courseScheduleType
+          this.classType = result.courseScheduleType;
         }
       });
     }
-    checkeIsAssignHomework({ courseScheduleId: this.courseId }).then(res => {
-      let result = res.data
-      if(result.code == 200) {
-        this.isAssignHomework = result.data.isAssignHomework
-        this.enableAssignHomework = result.data.enableAssignHomework
+    checkeIsAssignHomework({ courseScheduleId: this.courseId }).then((res) => {
+      let result = res.data;
+      if (result.code == 200) {
+        this.isAssignHomework = result.data.isAssignHomework;
+        this.enableAssignHomework = result.data.enableAssignHomework;
       } else {
-        this.$toast(result.msg)
+        this.$toast(result.msg);
       }
-    })
+    });
   },
   methods: {
     submitReview() {
@@ -257,7 +275,7 @@ export default {
         return;
       }
       // VIP课程是没有双向沟通的
-      if (!this.hasLiaison && this.classType != 'VIP') {
+      if (!this.hasLiaison && this.classType != "VIP") {
         this.$toast("请勾选双向沟通");
         return;
       }
@@ -271,13 +289,13 @@ export default {
         // homeWork: this.homeWork,
         hasLiaison: this.hasLiaison,
         handHomework: this.handHomework,
-        courseScheduleId: this.courseId
+        courseScheduleId: this.courseId,
       };
       if (this.reviewId) {
         obj.id = this.reviewId;
-        updateReviewInfo(obj).then(res => {
-          this.$toast("修改成功")
-          setTimeout(res => {
+        updateReviewInfo(obj).then((res) => {
+          this.$toast("修改成功");
+          setTimeout((res) => {
             if (this.isInside) {
               this.$router.replace({ path: "/manageEvaluation" });
             } else {
@@ -286,13 +304,13 @@ export default {
           }, 1000);
         });
       } else {
-        courseReviewAdd(obj).then(res => {
+        courseReviewAdd(obj).then((res) => {
           if (res.data.code == 200) {
-            if(this.enableAssignHomework) {
-              this.showWork = true
+            if (this.enableAssignHomework) {
+              this.showWork = true;
             } else {
               this.$toast("提交成功");
-              setTimeout(res => {
+              setTimeout((res) => {
                 if (this.isInside) {
                   this.$router.push({ path: "/manageEvaluation" });
                 } else {
@@ -305,33 +323,35 @@ export default {
       }
     },
     onWork(isAssignHomework) {
-      if(isAssignHomework == 1) {
-        this.$dialog.confirm({
-          message: '您课程所在周已经布置作业，是否继续布置?',
-          confirmButtonText: '布置作业'
-        })
-        .then(() => {
-          // on confirm
-          this.$router.replace({
-            path: '/arrangeWork',
-            query: {
-              courseId: this.courseId
-            }
+      if (isAssignHomework == 1) {
+        this.$dialog
+          .confirm({
+            message: "您课程所在周已经布置作业，是否继续布置?",
+            confirmButtonText: "布置作业",
+          })
+          .then(() => {
+            // on confirm
+            this.$router.replace({
+              path: "/arrangeWork",
+              query: {
+                courseId: this.courseId,
+              },
+            });
           })
-        })
-        .catch(() => {
-          // on cancel
-        })
+          .catch(() => {
+            // on cancel
+          });
       } else {
         this.$router.replace({
-          path: '/arrangeWork',
+          path: "/arrangeWork",
           query: {
-            courseId: this.courseId
-          }
-        })
+            courseId: this.courseId,
+          },
+        });
       }
     },
-    onClose() { // 关闭弹窗
+    onClose() {
+      // 关闭弹窗
       if (this.isInside) {
         this.$router.replace({ path: "/manageEvaluation" });
       } else {
@@ -346,11 +366,11 @@ export default {
           JSON.stringify({ api: "back" })
         );
       }
-    }
+    },
   },
   destroyed() {
-    this.$toast.clear()
-  }
+    this.$toast.clear();
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -358,11 +378,11 @@ export default {
 
 /deep/.van-cell-group {
   margin-top: 0.15rem;
-  /deep/.van-cell {
-    padding: 0.14rem 0.16rem;
-    font-size: 16px;
-    line-height: .24rem;
-  }
+}
+/deep/.van-cell {
+  padding: 16px 16px;
+  font-size: 16px;
+  line-height: 0.24rem;
 }
 
 .title-item {
@@ -393,6 +413,7 @@ export default {
 }
 .textarea {
   flex-direction: column;
+  padding:16px .21rem;
   /deep/.van-cell__value {
     margin-top: 0.1rem;
     width: 100%;
@@ -404,7 +425,7 @@ export default {
 /deep/.van-radio-group {
   display: flex;
   justify-content: flex-end;
-  height: .24rem;
+  height: 0.24rem;
   /deep/.van-radio {
     margin-left: 0.18rem;
   }
@@ -414,21 +435,21 @@ export default {
 }
 /deep/.van-radio__icon--checked {
   .van-icon {
-    border-color: #14928a;
-    background: #14928a;
+    border-color: @mColor;
+    background: @mColor;
   }
 }
 .button-group {
-  margin: 0.3rem 0.26rem 0.2rem;
+  margin: 0.3rem .16rem 0.2rem;
   .van-button--primary {
     background: @mColor;
     border: 1px solid @mColor;
     font-size: 0.18rem;
-    height: .5rem;
-    line-height: .48rem;
+    height: 0.5rem;
+    line-height: 0.48rem;
   }
   &.btn-operation {
-    margin: 0.3rem 0.16rem 0.2rem;
+    margin: 0.3rem .16rem 0.2rem;
     display: flex;
     justify-content: space-around;
     button {
@@ -436,14 +457,15 @@ export default {
     }
   }
   .btn-plain {
-    color: #14928A;
-    background: #F3F4F8;
+    color:  @mColor;
+    background: #f3f4f8;
+    width: 3.2rem;
   }
 }
 
 .van-popup {
   width: 90%;
-  border-radius: .05rem;
+  border-radius: 0.05rem;
 }
 /deep/.van-popup__close-icon {
   color: #888;
@@ -453,29 +475,58 @@ export default {
   font-size: 24px;
   color: #888;
   position: absolute;
-  right: .1rem;
-  top: .1rem;
+  right: 0.1rem;
+  top: 0.1rem;
 }
 .popup_container {
   .content {
     text-align: center;
-    font-size: .15rem;
+    font-size: 0.15rem;
     color: #000;
-    padding-top: .5rem;
-    padding-bottom: .35rem;
+    padding-top: 0.5rem;
+    padding-bottom: 0.35rem;
   }
   .btn_group {
-    font-size: .14rem;
+    font-size: 0.14rem;
     color: #009688;
-    padding: .03rem .25rem .2rem;
+    padding: 0.03rem 0.25rem 0.2rem;
     display: flex;
     justify-content: space-between;
     span {
-      width: .8rem;
+      width: 0.8rem;
       text-align: center;
     }
   }
 }
-
-
+.start.van-cell {
+   padding:16px .21rem 0;
+  &:not(:last-child) {
+    &:after {
+      border-bottom: 1px solid transparent
+    }
+  }
+}
+.talk {
+  padding:16px .21rem;
+} 
+.evTitle {
+  padding: 16px .21rem 0;
+  color: #333;
+  font-weight: 500;
+}
+.dot {
+  width: 4px;
+  height: 0.17rem;
+  background: #01c1b5;
+  border-radius: 3px;
+  position: absolute;
+  z-index: 200;
+  top: 19px;
+  left: 0.12rem;
+}
+.van-cell--required{
+  &:before {
+    color:transparent;
+  }
+}
 </style>

src/views/audition/ManageEvaluation.vue

@@ -5,59 +5,98 @@
       <div class="searchDate">
         <div class="date startDate" @click="dateSection.status = true">
           开始
-          <span>{{dateSection.showStartDate}}</span>
-        </div>-
+          <span>{{ dateSection.showStartDate }}</span>
+        </div>
+        -
         <div class="date endDate" @click="dateEndSection.status = true">
           结束
-          <span>{{dateEndSection.showEndDate}}</span>
+          <span>{{ dateEndSection.showEndDate }}</span>
         </div>
       </div>
       <!-- <div class="searchMore">
                 筛选<i class="arrowDown"></i>
       </div>-->
-      <van-dropdown-menu active-color="#14928A">
+      <van-dropdown-menu active-color="#01C1B5">
         <van-dropdown-item title="筛选" ref="item" v-model="search.status">
           <div class="dropList">
             <div class="dropItem">
               <p class="dropTitle">课程类型</p>
-              <div class="radioGroup">
-                <span :class="search.type=='PRACTICE'?'actived':''" @click="search.type='PRACTICE'">网管课</span>
-                <span :class="search.type=='VIP'?'actived':''" @click="search.type='VIP'">VIP课</span>
-                <span :class="search.type==0?'actived':''" @click="search.type=0" style="margin-top: .08rem">全部</span>
+              <div class="radioGroup" id='courseType'>
+                <span
+                  :class="search.type == 'PRACTICE' ? 'actived' : ''"
+                  @click="search.type = 'PRACTICE'"
+                  >网管课</span
+                >
+                <span
+                  :class="search.type == 'VIP' ? 'actived' : ''"
+                  @click="search.type = 'VIP'"
+                  >VIP课</span
+                >
+                <span
+                  :class="search.type == 0 ? 'actived' : ''"
+                  @click="search.type = 0"
+                  >全部</span
+                >
               </div>
             </div>
             <div class="dropItem">
               <p class="dropTitle">评价进度</p>
               <div class="radioGroup">
-                <span :class="search.hasReview==0?'actived':''" @click="search.hasReview=0">待完成</span>
-                <span :class="search.hasReview==1?'actived':''" @click="search.hasReview=1">已完成</span>
+                <span
+                  :class="search.hasReview == 0 ? 'actived' : ''"
+                  @click="search.hasReview = 0"
+                  >待完成</span
+                >
+                <span
+                  :class="search.hasReview == 1 ? 'actived' : ''"
+                  @click="search.hasReview = 1"
+                  >已完成</span
+                >
               </div>
             </div>
             <div class="dropItem">
               <p class="dropTitle">提交作业</p>
               <div class="radioGroup">
                 <span
-                  :class="search.hasHandHomework==1?'actived':''"
-                  @click="search.hasHandHomework=1"
-                >是</span>
+                  :class="search.hasHandHomework == 1 ? 'actived' : ''"
+                  @click="search.hasHandHomework = 1"
+                  >是</span
+                >
                 <span
-                  :class="search.hasHandHomework==0?'actived':''"
-                  @click="search.hasHandHomework=0"
-                >否</span>
+                  :class="search.hasHandHomework == 0 ? 'actived' : ''"
+                  @click="search.hasHandHomework = 0"
+                  >否</span
+                >
               </div>
             </div>
             <div class="dropItem">
               <p class="dropTitle">完成双向沟通</p>
               <div class="radioGroup">
-                <span :class="search.hasLiaison==1?'actived':''" @click="search.hasLiaison=1">是</span>
-                <span :class="search.hasLiaison==0?'actived':''" @click="search.hasLiaison=0">否</span>
+                <span
+                  :class="search.hasLiaison == 1 ? 'actived' : ''"
+                  @click="search.hasLiaison = 1"
+                  >是</span
+                >
+                <span
+                  :class="search.hasLiaison == 0 ? 'actived' : ''"
+                  @click="search.hasLiaison = 0"
+                  >否</span
+                >
               </div>
             </div>
             <div class="dropItem">
               <p class="dropTitle">学生是否到课</p>
               <div class="radioGroup">
-                <span :class="search.hasArrived==1?'actived':''" @click="search.hasArrived=1">是</span>
-                <span :class="search.hasArrived==0?'actived':''" @click="search.hasArrived=0">否</span>
+                <span
+                  :class="search.hasArrived == 1 ? 'actived' : ''"
+                  @click="search.hasArrived = 1"
+                  >是</span
+                >
+                <span
+                  :class="search.hasArrived == 0 ? 'actived' : ''"
+                  @click="search.hasArrived = 0"
+                  >否</span
+                >
               </div>
             </div>
           </div>
@@ -69,31 +108,53 @@
       </van-dropdown-menu>
     </div>
     <div v-if="dataShow" key="data">
-      <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getList">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getList"
+      >
         <van-cell
-          v-for="(item,index) in courseList"
+          v-for="(item, index) in courseList"
           :key="index"
           class="cellGroup"
           :title="item.classDate | filterClass"
-          title-class="sectionTitle"
           value-class="sectionValue"
         >
+          <template slot="title">
+            <div class="titleWrap" style="word-break: break-all">
+              <img class="titleIcon" :src="getIcon(item.groupType)" alt="" />
+              <div class="">
+                <p class="content van-ellipsis courseName">
+                  {{ item.courseName }}
+                </p>
+                <p class="content van-ellipsis courseTime">
+                  {{ item.classDate | formatTimer }}
+                </p>
+              </div>
+            </div>
+
+            <!--  -->
+          </template>
+
           <template solt="default">
-            <p class="content van-ellipsis">{{ item.courseName }}</p>
             <van-button
               type="primary"
               round
               size="small"
-              v-if="item.reviewId==0"
+              v-if="item.reviewId == 0"
               @click="submitReview(item)"
-            >提交评价</van-button>
+              >提交评价</van-button
+            >
             <van-button
               type="primary"
-              round class="van-update"
+              round
+              class="van-update"
               size="small"
-              v-if="item.reviewId>0"
+              v-if="item.reviewId > 0"
               @click="submitReview(item)"
-            >修改评价</van-button>
+              >修改评价</van-button
+            >
           </template>
         </van-cell>
       </van-list>
@@ -130,10 +191,10 @@
   </div>
 </template>
 <script>
-import MHeader from '@/components/MHeader'
-import MEmpty from "@/components/MEmpty"
-import { browser }  from '@/common/common'
-import { getOnlineCourse } from "@/api/audition"
+import MHeader from "@/components/MHeader";
+import MEmpty from "@/components/MEmpty";
+import { browser } from "@/common/common";
+import { getOnlineCourse } from "@/api/audition";
 // SINGLE,MIX,HIGH,VIP,DEMO,COMPREHENSIVE,PRACTICE,ENLIGHTENMENT,TRAINING_SINGLE,TRAINING_MIX,CLASSROOM,COMM,HIGH_ONLINE,MUSIC_NETWORK
 export default {
   name: "teacherList",
@@ -146,14 +207,14 @@ export default {
         minDate: new Date(2020, 0, 1),
         maxDate: new Date(2025, 10, 1),
         currentDate: null,
-        showStartDate: null
+        showStartDate: null,
       },
       dateEndSection: {
         status: false,
         minDate: new Date(2020, 0, 1),
         maxDate: new Date(2025, 10, 1),
         currentDate: null,
-        showEndDate: null
+        showEndDate: null,
       },
       search: {
         status: false,
@@ -167,7 +228,14 @@ export default {
       loading: false,
       finished: false,
       dataShow: true, // 是否显示
-      page: 1
+      page: 1,
+      iconList: {
+        pIcon: require("@/assets/images/Pdot.png"),
+        mIcon: require("@/assets/images/Mdot.png"),
+        wIcon: require("@/assets/images/Wdot.png"),
+        vIcon: require("@/assets/images/Vdot.png"),
+        tIcon: require("@/assets/images/Tdot.png"),
+      },
     };
   },
   created() {
@@ -183,8 +251,8 @@ export default {
       localStorage.setItem("Authorization", decodeURI(params.Authorization));
       localStorage.setItem("userInfo", decodeURI(params.Authorization));
     }
-    if(browser().android || browser().iPhone) {
-      this.headerStatus = false
+    if (browser().android || browser().iPhone) {
+      this.headerStatus = false;
     }
     this.dateSection.currentDate = new Date();
     this.dateSection.showStartDate = this.timeFormat(
@@ -200,8 +268,12 @@ export default {
       this.dateSection.showStartDate = this.timeFormat(
         new Date(this.search.startTime.replace(/-/g, "/"))
       );
-      this.dateSection.currentDate = new Date(this.search.startTime.replace(/-/g, "/"))
-      this.dateEndSection.currentDate = new Date(this.search.endTime.replace(/-/g, "/"))
+      this.dateSection.currentDate = new Date(
+        this.search.startTime.replace(/-/g, "/")
+      );
+      this.dateEndSection.currentDate = new Date(
+        this.search.endTime.replace(/-/g, "/")
+      );
       this.dateEndSection.showEndDate = this.timeFormat(
         new Date(this.search.endTime.replace(/-/g, "/"))
       );
@@ -222,8 +294,8 @@ export default {
       this.dateSection.showStartDate = this.timeFormat(
         this.dateSection.currentDate
       );
-      this.dataShow = true
-      this.page = 1
+      this.dataShow = true;
+      this.page = 1;
       this.onRefresh();
       this.dateSection.status = false;
     },
@@ -231,8 +303,8 @@ export default {
       this.dateEndSection.showEndDate = this.timeFormat(
         this.dateEndSection.currentDate
       );
-      this.dataShow = true
-      this.page = 1
+      this.dataShow = true;
+      this.page = 1;
       this.onRefresh();
       this.dateEndSection.status = false;
     },
@@ -254,14 +326,14 @@ export default {
         hasHandHomework: null,
         hasLiaison: null,
         hasArrived: null,
-        type: null
+        type: null,
       };
     },
     submitInfo() {
       // 提交请求
       this.onRefresh();
-      this.dataShow = true
-      this.page = 1
+      this.dataShow = true;
+      this.page = 1;
       this.search.status = false;
       this.$refs.item.toggle();
     },
@@ -272,9 +344,9 @@ export default {
       (this.search.endTime =
         this.dateEndSection.showEndDate.replace(/\//g, "-") + " 23:59:59"),
         (this.search.page = this.page);
-      this.search.type = this.search.type ? this.search.type : null
+      this.search.type = this.search.type ? this.search.type : null;
       this.search.rows = 20;
-      getOnlineCourse(this.search).then(res => {
+      getOnlineCourse(this.search).then((res) => {
         let result = res.data;
         this.loading = false;
         if (result.code == 200) {
@@ -307,15 +379,25 @@ export default {
     submitReview(item) {
       this.$router.push({
         path: "/courseEvaluation",
-        query: { id: item.id, reviewId: item.reviewId, isInside: true }
+        query: { id: item.id, reviewId: item.reviewId, isInside: true },
       });
-    }
+    },
+    getIcon(type) {
+      let obj = {
+        MUSIC: this.iconList.mIcon,
+        VIP: this.iconList.vIcon,
+        DEMO: this.iconList.tIcon,
+        PRACTICE: this.iconList.pIcon,
+        COMM: this.iconList.wIcon,
+      };
+      return obj[type];
+    },
   },
   filters: {
     filterClass(val) {
       return val.substring(0, 10);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -324,7 +406,7 @@ export default {
   min-height: 100vh;
   overflow-y: auto;
   overflow-x: hidden;
-  background-color: #F3F4F8;
+  background-color: #f3f4f8;
 }
 /deep/.van-dropdown-item__content {
   height: 100%;
@@ -335,7 +417,7 @@ export default {
   justify-content: space-between;
   background: #fff;
   margin-bottom: 0.12rem;
-  padding: .1rem 0.16rem;
+  padding: 0.1rem 0.16rem;
   align-items: center;
 
   .searchDate {
@@ -387,16 +469,16 @@ export default {
       padding: 0.12rem 0;
     }
     .btn-reset {
-      background-color: #e1f6f4;
-      color: #14928a;
+      background-color: #EEEFF3;
+      color: @mColor;
     }
     .btn-sure {
-      background-color: #14928a;
+      background-color: @mColor;
       color: #fff;
     }
   }
   .dropList {
-    margin-bottom: .55rem;
+    margin-bottom: 0.55rem;
   }
   .dropItem {
     padding: 0.1rem 0.16rem;
@@ -404,32 +486,40 @@ export default {
       font-size: 0.17rem;
       color: #1a1a1a;
     }
+    #courseType {
+      span {
+        width: 1.02rem;
+      }
+    }
     .radioGroup {
       display: flex;
       justify-content: space-between;
-      padding-top: .08rem;
+      padding-top: 0.08rem;
       flex-wrap: wrap;
       span {
         color: #000000;
-        background-color: #f4f4f4;
+        background-color: #ffffff;
         width: 48%;
-        padding: .08rem 0;
+        padding: 0.08rem 0;
         text-align: center;
         border-radius: 2px;
+         border: 1px solid #E2E0E0;
         &.actived {
-          color: #14928a;
-          background: url("../../assets/images/audition/icon_check.png")
-            no-repeat bottom right #e4f6f5;
-          background-size: 0.2rem;
+          color: @mColor;
+          // background: url("../../assets/images/audition/icon_check.png")
+          //   no-repeat bottom right #e4f6f5;
+          // background-size: 0.2rem;
+          border: 1px solid @mColor;
+          background: #ffffff;
         }
       }
     }
   }
 }
 .cellGroup {
-  padding: 0.16rem;
-  font-size: .14rem;
-  line-height: .24rem;
+  // padding: 0.16rem;
+  font-size: 0.14rem;
+  line-height: 0.24rem;
 }
 .sectionTitle {
   font-size: 0.16rem;
@@ -440,31 +530,26 @@ export default {
 .sectionValue {
   display: flex;
   width: 70%;
-  flex: 1 auto;
-  justify-content: space-between;
+  justify-content: flex-end;
   align-items: center;
   height: auto !important;
-  .content {
-    font-size: 0.17rem;
-    color: #1a1a1a;
-  }
+
   .van-button {
     font-size: 0.14rem;
-    background-color: #14928a;
-    border-color: #14928a;
+    background-color: @mColor;
+    border-color: @mColor;
     padding: 0 0.12rem;
     min-width: 0.88rem;
-    height: .3rem;
+    height: 0.3rem;
     &.van-update {
       background-color: #fff;
-      color: #14928a;
+      color: @mColor;
     }
   }
 }
 /deep/.van-cell__title {
   font-size: 0.14rem;
   color: @mFontColor;
-  flex: 1 auto;
 }
 .logo {
   width: 0.35rem;
@@ -504,4 +589,37 @@ export default {
 /deep/.van-dropdown-menu__bar {
   box-shadow: none;
 }
+.titleWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  .content {
+    width: 2rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: 0.17rem;
+    color: #1a1a1a;
+  }
+  .courseName {
+    font-size: 0.16rem;
+    color: #1a1a1a;
+  }
+  .courseTime {
+    font-size: 0.13rem;
+    color: #666;
+  }
+}
+.titleIcon {
+  width: 0.42rem;
+  height: 0.42rem;
+  margin-right: 0.1rem;
+}
+/deep/.van-picker__cancel,
+/deep/.van-picker__confirm {
+  color: @mColor;
+}
+
+/deep/.van-popup--bottom {
+  border-radius: 0.1rem 0.1rem 0px 0px;
+}
 </style>

src/views/teacher/tobeReport.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="m-container">
     <div class="cellWrap">
-      <div class="mcell" v-for="(item,index) in reportList" :key="index" >
+      <div class="mcell" v-for="(item, index) in reportList" :key="index">
         <div class="left">
-          <span class="timer">{{ item.month}}</span>
-          <span class="title">{{ item.groupName}}</span>
+          <img :src="item.studentAvatar?item.studentAvatar:nomorlIcon" class="titleIcon" alt="" />
+          <div class="textWrap">
+            <span class="title">{{ item.groupName?item.groupName:'暂无课程名' }}</span>
+            <span class="timer">{{ item.month }}</span>
+          </div>
         </div>
         <div class="cellBtn" @click="submitReport(item)">提交报告</div>
       </div>
@@ -12,85 +15,94 @@
   </div>
 </template>
 <script>
-import {getNeedPost} from '@/api/teacher'
+import { getNeedPost } from "@/api/teacher";
 export default {
   data() {
     return {
-        reportList:[]
+      reportList: [],
+      nomorlIcon:require("@/assets/images/icon_student.png")
     };
   },
-  created(){
-       let params = this.$route.query;
+  created() {
+    let params = this.$route.query;
     if (params.Authorization) {
       localStorage.setItem("Authorization", decodeURI(params.Authorization));
       localStorage.setItem("userInfo", decodeURI(params.Authorization));
     }
   },
-  mounted(){
-      getNeedPost().then(res=>{
-          if(res.data.code == 200){
-              if(res.data.data.length > 0){
-                  this.reportList = res.data.data
-              }else {
-                   this.$toast('当前没有待填写报告')
-              }
-          }
-      })
-  },
-  methods:{
-      submitReport(item){
-          this.$router.push({path:'/studyReportNew',query:{id:item.id,classGroupId:item.classGroupId}})
+  mounted() {
+    getNeedPost().then((res) => {
+      if (res.data.code == 200) {
+        if (res.data.data.length > 0) {
+          this.reportList = res.data.data;
+        } else {
+          this.$toast("当前没有待填写报告");
+        }
       }
-  }
+    });
+  },
+  methods: {
+    submitReport(item) {
+      this.$router.push({
+        path: "/studyReportNew",
+        query: { id: item.id, classGroupId: item.classGroupId },
+      });
+    },
+  },
 };
 </script>
 <style lang="less" scoped>
+@import url("../../assets/commonLess/variable.less");
 .m-container {
   min-height: 100vh;
   background-color: #f3f4f8;
+  .titleIcon {
+    width: .42rem;
+    height: .42rem;
+    border-radius: 50%;
+    margin-right: .09rem;
+  }
   .cellWrap {
     background-color: #fff;
     .mcell {
       display: flex;
       flex-direction: row;
       justify-content: space-between;
-      height: 0.54rem;
-      line-height: 0.54rem;
       background-color: #fff;
       margin-left: 0.16rem;
+      height: 0.82rem;
       border-bottom: 1px solid #f0f0f0;
       align-items: center;
       .left {
         display: flex;
         flex-direction: row;
         justify-content: flex-start;
-          .timer {
-        font-size: 0.14rem;
-        color: #808080;
-        margin-right: 0.3rem;
-      }
-      .title {
-        font-size: 0.14rem;
-        color: #1a1a1a;
-        display: block;
-        width: 1.45rem;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        
+        .timer {
+          font-size: 0.14rem;
+          color: #666666;
+          margin-right: 0.3rem;
+        }
+        .title {
+          font-size: 0.16rem;
+          color: #1a1a1a;
+          display: block;
+          width: 1.45rem;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
       }
-      }
-    
+
       .cellBtn {
         text-align: center;
-        width: .8rem;
-        height: 0.24rem;
-        line-height: .24rem;
+        width: 0.8rem;
+        height: 0.28rem;
+        line-height: 0.28rem;
         color: #fff;
-        background: rgba(20, 146, 138, 1);
-        border-radius: 17px;
-        font-size: .14rem;
-        margin-right: .16rem;
+        background-color: @mColor;
+        border-radius: 0.22rem;
+        font-size: 0.14rem;
+        margin-right: 0.12rem;
       }
     }
   }