no message

src/common/urlMap.js

@@ -27,5 +27,5 @@ urlMap.set('order', '/pages/order/index')
 urlMap.set('agreement', '/pages/agreement/index')
 urlMap.set('courseFiles', '/pages/mine/courseFiles')
 urlMap.set('fileDetail', '/pages/mine/fileDetail')
-
+urlMap.set('teachAims', '/pages/studentcenter/teachAims')
 export default urlMap

src/pages.json

@@ -103,6 +103,10 @@
     {
       "path": "pages/mine/fileDetail",
       "style": {}
+    },
+    {
+      "path": "pages/studentcenter/teachAims",
+      "style": {}
     }
   ],
   "globalStyle": {

src/pages/class/gift.vue

@@ -2,12 +2,6 @@
   <view class="page" style="background-color: #fff;">
     <cu-custom :isBack="true" title="智能报课"></cu-custom>
     <view class="steps solid-bottom flex justify-between">
-      <!-- <view class="text-center"><text class="text-red">点击切换下一步</text></view>
-      <view class="cu-steps">
-        <view class="cu-item" :class="index > cur ? '' : 'text-student'" v-for="(item, index) in numList" :key="index" @tap="changeStep(index)">
-          <text class="num" :data-index="index + 1"></text> {{ item.name }}
-        </view>
-      </view> -->
       <view v-for="(item, index) in stepList" :key="index" class="step flex-sub text-center" :class="{ cur: cur === index }" @tap="changeStep(index)">{{ item.name }}</view>
     </view>
     <view class="main" :style="[{ height: 'calc(100vh - 40px - ' + topHeader + 'px)' }]">
@@ -87,21 +81,26 @@
                 scroll-with-animation
                 :style="'height:calc(100vh - 70px - 40px - ' + topHeader + 'px)'"
                 :scroll-into-view="'main-' + mainCur"
-                @scroll="VerticalMain"
               >
                 <checkbox-group style="width: 100%;" v-model="checked">
                   <view class="cu-item bg-white padding margin-bottom-sm" v-for="(item, i) in attends" :key="i">
                     <view>{{ item.week }}</view>
-                    <view v-for="(course, c) in item.list" :key="c">
+                    <view v-for="(course, c) in item.list" :key="c" :class="course.status == 0 ? 'disabled-course' : ''">
                       <view class="cu-bar solid-bottom">
                         <view>
-                          <label @tap="classChange(course.class_attend_id, i)">
+                          <label @tap="classChange(course, i)">
                             <view class="flex justify-between align-center">
                               <view
                                 ><text>{{ course.attend_name }}</text></view
                               >
                               <view>
-                                <checkbox :value="course.class_attend_id" :checked="checked.includes(course.class_attend_id)" class="round cyan" style="transform: scale(0.7);" />
+                                <checkbox
+                                  :disabled="course.status == 0"
+                                  :value="course.class_attend_id"
+                                  :checked="checked.includes(course.class_attend_id)"
+                                  class="round cyan"
+                                  style="transform: scale(0.7);"
+                                />
                               </view>
                             </view>
                           </label>
@@ -112,6 +111,7 @@
                           <label v-for="prop in course.prop" :key="prop.id">
                             <view>
                               <checkbox
+                                :disabled="course.status == 0"
                                 :value="prop.id"
                                 class="cyan"
                                 style="transform: scale(0.7);"
@@ -257,8 +257,10 @@ export default {
         this.checked = [] //初始化选项
         if (this.attends.length > 0) {
           this.attends.map((course, index) => {
-            const item = course.list[0]
-            const class_attend_id = item.class_attend_id
+            //过滤不能报课的
+            const list = course.list
+            const item = list[0]
+            const class_attend_id = item.status > 0 ? item.class_attend_id : null
             this.$set(this.checked, index, class_attend_id)
             const prop = item.prop.length > 0 ? [item.prop[0].id] : []
             this.$set(this.checked_props, index, { class_attend_id: class_attend_id, prop: prop })
@@ -318,7 +320,11 @@ export default {
     changeDisableBtn() {
       this.disableBtn = true
     },
-    classChange(class_attend_id, i) {
+    classChange(course, i) {
+      if (course.status == 0) {
+        return false
+      }
+      const class_attend_id = course.class_attend_id
       if (this.checked.includes(class_attend_id)) {
         this.$set(this.checked, i, null)
         this.$set(this.checked_props, i, { class_attend_id: null, prop: [] })
@@ -430,6 +436,12 @@ export default {
   position: fixed;
   bottom: 60px;
 }
+.disabled-course {
+  color: #c3c3c3;
+  checkbox::before {
+    color: #e8e0e0 !important;
+  }
+}
 .btn-check-group {
   checkbox {
     display: none;

src/pages/index/components/card.vue

@@ -37,7 +37,6 @@ export default {
   },
   methods: {
     goDetail(item) {
-      console.log(111)
       if (!item.enable) {
         uni.showToast({ title: '课程已停止！', icon: 'none' })
         return false

src/pages/index/index.vue

@@ -67,13 +67,6 @@
       <view class="cu-dialog basis-lg" @tap.stop="" :style="[{ top: topHeader + 'px', height: 'calc(100vh - ' + topHeader + 'px)' }]">
         <view class="filter-title">机构筛选</view>
         <view class="btn-check-group padding-lr">
-          <!-- <checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="agency">
-							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm text-ellipsis" :class="{'bg-cyan':params.agency.includes(item.id+'')}"
-								v-for="item in filters.agency" :key="item.id">
-								<checkbox :value="item.id"/>
-								{{item.name}}
-							</label>
-						</checkbox-group> -->
           <radio-group class="flex" style="flex-wrap: wrap;" id="agency">
             <label
               class="btn-check-label margin-top-sm padding-lr-xs text-sm text-ellipsis"
@@ -104,13 +97,6 @@
         </view>
         <view class="filter-title">周期筛选</view>
         <view class="btn-check-group padding-lr">
-          <!-- <checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="day">
-							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.day.includes(index+'')}"
-								v-for="(item,index) in filters.week" :key="index">
-								<checkbox :value="index"/>
-								{{item}}
-							</label>
-						</checkbox-group> -->
           <radio-group class="flex" style="flex-wrap: wrap;" id="day">
             <label
               class="btn-check-label margin-top-sm padding-lr-xs text-sm"

src/pages/studentcenter/operation.vue

@@ -1,12 +1,11 @@
 <template>
   <view class="page">
     <cu-custom :isBack="true" title="课堂操作"></cu-custom>
-    <scroll-view scroll-y="true" :style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
+    <scroll-view scroll-y="true" :style="[{ height: 'calc(100vh - ' + topHeader + 'px)' }]">
       <view class="content">
         <view class="course-img">
-          <swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay"
-            :interval="swiper.interval" :duration="swiper.duration">
-            <swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
+          <swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
+            <swiper-item v-for="(item, index) in detail.course_data.image" :key="index">
               <view class="swiper-item">
                 <image :src="item" mode="widthFix"></image>
               </view>
@@ -14,30 +13,30 @@
           </swiper>
         </view>
         <view class="detail bg-white padding">
-          <view class="detail-title">{{detail.course_data.attend_name}}</view>
+          <view class="detail-title">{{ detail.course_data.attend_name }}</view>
           <view class="detail-item">
             <text class="cuIcon-title text-student"></text>
             <text class="text-gray">周期</text>
-            <text class="text-black margin-left-xs">{{detail.course_data.start_at}}</text>
+            <text class="text-black margin-left-xs">{{ detail.course_data.start_at }}</text>
           </view>
           <view class="detail-item flex">
-            <text class="text-gray" style="width:40px;"></text>
-            <text class="text-black margin-left-xs">{{detail.course_data.end_at}}</text>
+            <text class="text-gray" style="width: 40px;"></text>
+            <text class="text-black margin-left-xs">{{ detail.course_data.end_at }}</text>
           </view>
           <view class="detail-item margin-top-xs">
             <text class="cuIcon-title text-student"></text>
             <text class="text-gray">年级</text>
-            <text class="text-black margin-left-xs">{{detail.course_data.grade}}</text>
+            <text class="text-black margin-left-xs">{{ detail.course_data.grade }}</text>
           </view>
         </view>
         <view class="teacher flex bg-white padding margin-tb-sm">
           <image mode="scaleToFill" :src="teacher_avatar" class="avatar lg"></image>
           <view class="flex-sub margin-left">
-            <view class="teacher-title">{{detail.teacher.username||''}}老师授课</view>
-            <view class="teacher-item">所属机构：{{detail.teacher.agency_name||''}}</view>
+            <view class="teacher-title">{{ detail.teacher.username || '' }}老师授课</view>
+            <view class="teacher-item">所属机构：{{ detail.teacher.agency_name || '' }}</view>
             <view class="teacher-exp flex">
-              <view class="exp-item">{{detail.teacher.honor||''}}</view>
-              <view class="exp-item">{{detail.teacher.introduce||''}}</view>
+              <view class="exp-item">{{ detail.teacher.honor || '' }}</view>
+              <view class="exp-item">{{ detail.teacher.introduce || '' }}</view>
             </view>
           </view>
         </view>
@@ -46,23 +45,40 @@
           <view class="cu-item">
             <view class="cu-content time-item flex justify-between">
               <view class="time-left text-black flex-sub">评价</view>
-              <view class="time-right text-student" v-if="detail.teacher&&detail.teacher.username"
-                @tap="check('studentEvaluate')">
+              <view class="time-right text-student" v-if="detail.teacher && detail.teacher.username" @tap="check('studentEvaluate')">
                 查看
               </view>
             </view>
           </view>
           <view class="cu-item">
             <view class="cu-content time-item flex justify-between">
-              <view class="time-left text-black flex-sub">上课时间
-                <view>{{detail.course_data.start_at}}</view>
+              <view class="time-left text-black flex-sub"
+                >上课时间
+                <view>{{ detail.course_data.start_at }}</view>
               </view>
             </view>
           </view>
           <view class="cu-item">
             <view class="cu-content time-item flex justify-between">
-              <view class="time-left text-black flex-sub">课堂签到
-                <view>{{detail.call_status.title}}</view>
+              <view class="time-left text-black flex-sub"
+                >课堂签到
+                <view>{{ detail.call_status.title }}</view>
+              </view>
+            </view>
+          </view>
+          <view class="cu-item">
+            <view class="cu-content time-item flex justify-between">
+              <view class="time-left text-black flex-sub">教学目标</view>
+              <view class="time-right text-student" @tap="globalNavigateTo('teachAims', { type: 'aims' })" v-show="detail.teach_aims.data">
+                查看
+              </view>
+            </view>
+          </view>
+          <view class="cu-item">
+            <view class="cu-content time-item flex justify-between">
+              <view class="time-left text-black flex-sub">教学任务</view>
+              <view class="time-right text-student" @tap="globalNavigateTo('teachAims', { type: 'task' })" v-show="detail.teach_task.data">
+                查看
               </view>
             </view>
           </view>
@@ -84,8 +100,9 @@
           </view>
           <view class="cu-item">
             <view class="cu-content time-item flex justify-between">
-              <view class="time-left text-black flex-sub">下课时间
-                <view>{{detail.course_data.end_at}}</view>
+              <view class="time-left text-black flex-sub"
+                >下课时间
+                <view>{{ detail.course_data.end_at }}</view>
               </view>
             </view>
           </view>
@@ -106,7 +123,7 @@
 <script>
 import { _dailiClass } from '@/api/course'
 export default {
-  data () {
+  data() {
     return {
       topHeader: this.globalCustomBarHeight,
       plan_id: 0,
@@ -120,17 +137,17 @@ export default {
       teacher_avatar: '/static/imgs/class/logo0.png'
     }
   },
-  onLoad (options) {
+  onLoad(options) {
     const id = decodeURIComponent(options.id)
     if (!id) uni.navigateBack()
     this.plan_id = id
     this.init()
   },
   methods: {
-    check (page) {
+    check(page) {
       this.globalNavigateTo(page, { plan_id: this.plan_id })
     },
-    init () {
+    init() {
       _dailiClass({ plan_id: this.plan_id }).then(res => {
         this.detail = res.data
         uni.setStorage({

src/pages/studentcenter/teachAims.vue

@@ -0,0 +1,40 @@
+<template>
+  <view class="page">
+    <cu-custom :isBack="true" :title="title"></cu-custom>
+    <scroll-view scroll-y="true" :style="[{ height: 'calc(100vh - ' + topHeader + 'px)' }]">
+      <view class="content padding">
+        {{ content.data }}
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import { checkTypes } from '@/common/utils/index'
+export default {
+  data() {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      title: '',
+      content: {}
+    }
+  },
+  onLoad(options) {
+    this.title = options.type === 'task' ? '教学任务' : '教学目标'
+    this.init(options.type)
+  },
+  methods: {
+    checkTypes,
+    init(type) {
+      const detail = JSON.parse(uni.getStorageSync('daily_class'))
+      this.content = type === 'task' ? detail.teach_task : detail.teach_aims
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+  height: 100vh;
+}
+</style>