fix：智能报课、新手教程等修改

src/api/course.js

@@ -68,6 +68,10 @@ export function _dropList (params) {
 export function _payOrder (params) {
 	return fetch('/parents/pay/payment', params)
 }
+//获取支付方式
+export function _getPayType (params) {
+	return fetch('/parents/pay/paytype ', params, 'POST', false)
+}
 // 取消订单
 export function _cancelOrder (params) {
 	return fetch('/parents/Ordercentre/del_order', params)
@@ -140,3 +144,7 @@ export function _fixStudent (params) {
 export function _checkConflict (params) {
 	return fetch('/parents/Intelligent/conflictcheck', params)
 }
+//检索已报订单
+export function _checkOrders () {
+	return fetch('/parents/Intelligent/checkOrders')
+}

src/common/urlMap.js

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

src/common/webSocket.js

@@ -3,31 +3,31 @@ import store from '@/store/index'
 import commonMethods from '@/common/commonMethods.js'
 import Vue from 'vue'
 const socket = {
-  initSocket: function() {
-    Vue.prototype.socket = Vue.prototype.socket || new WebSocket()
-    this.onMessage(Vue.prototype.socket)
-  },
-  onMessage: (ws) => {
-    ws.onMessage = message => {
-      if (typeof message !== 'object') {
-        return false
-      }
-      if (message.code === 400) {
-        uni.hideLoading()
-        store.dispatch('setConnect', true)
-        uni.showToast({ title: message.msg, icon: 'none', duration: 2000 })
-        return false
-      }
-      if (message.push_type === 'reload_order') {
-        store.dispatch('setReload', true)
-      }
-      if (message.push_type === 'order') {
-        uni.hideLoading()
-        store.dispatch('setConnect', true)
-        commonMethods.globalNavigateTo('order', { type: 1 })
-      }
-    }
-  }
+	initSocket: function () {
+		Vue.prototype.socket = Vue.prototype.socket || new WebSocket()
+		this.onMessage(Vue.prototype.socket)
+	},
+	onMessage: (ws) => {
+		ws.onMessage = message => {
+			if (typeof message !== 'object') {
+				return false
+			}
+			if (message.code === 400) {
+				uni.hideLoading()
+				store.dispatch('setConnect', true)
+				uni.showModal({ title: '提示', content: message.msg, showCancel: false })
+				return false
+			}
+			if (message.push_type === 'reload_order') {
+				store.dispatch('setReload', true)
+			}
+			if (message.push_type === 'order') {
+				uni.hideLoading()
+				store.dispatch('setConnect', true)
+				commonMethods.globalNavigateTo('order', { type: 1 })
+			}
+		}
+	}
 }
 
 export default socket

src/pages.json

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

src/pages/class/detail.vue

@@ -136,7 +136,7 @@
       </view>
       <view class="bg-white padding-lr">
         <view class="text-content text-lg" v-for="(outline, index) in detail.out_line" :key="index">
-          {{ outline.course_content }}
+          <rich-text :nodes="outline.course_content"></rich-text>
         </view>
       </view>
     </scroll-view>

src/pages/class/gift.vue

@@ -85,7 +85,12 @@
                 <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" class="solid-bottom" :key="c" :class="course.status == 0 ? 'disabled-course' : ''">
+                    <view
+                      v-for="(course, c) in item.list"
+                      class="solid-bottom"
+                      :key="c"
+                      :class="course.status == 0 || payOrders.includes(course.class_attend_id) ? 'disabled-course' : ''"
+                    >
                       <view class="cu-bar">
                         <view>
                           <label @tap="classChange(course, i)">
@@ -96,7 +101,7 @@
                               <view>
                                 <checkbox
                                   :value="course.class_attend_id"
-                                  :disabled="course.status == 0"
+                                  :disabled="course.status == 0 || payOrders.includes(course.class_attend_id)"
                                   :checked="checked[i].includes(course.class_attend_id)"
                                   class="round cyan"
                                   style="transform: scale(0.7);"
@@ -114,7 +119,7 @@
                                 :checked="
                                   checked_props[i][c] ? checked_props[i][c].class_attend_id === course.class_attend_id && checked_props[i][c].prop.includes(prop.id) : false
                                 "
-                                :disabled="course.status == 0"
+                                :disabled="course.status == 0 || payOrders.includes(course.class_attend_id)"
                                 :value="prop.id"
                                 class="cyan"
                                 style="transform: scale(0.7);"
@@ -149,7 +154,7 @@
 </template>
 
 <script>
-import { _intelligentDates, _intelligentInterests, _intelligentCourses, _intelligentGetKeys, _joinShops, _checkConflict } from '@/api/course'
+import { _intelligentDates, _intelligentInterests, _intelligentCourses, _intelligentGetKeys, _joinShops, _checkConflict, _checkOrders } from '@/api/course'
 import { mapGetters } from 'vuex'
 import socket from '@/common/webSocket'
 export default {
@@ -173,6 +178,7 @@ export default {
       days: [], //周期
       daysMap: { 星期一: '1', 星期二: '2', 星期三: '3', 星期四: '4', 星期五: '5' },
       interests: [], //兴趣
+      interestMax: 5, //限定兴趣数量
       attends: [], //课程
       week: [], //记录日期
       tuoguan: [], //记录托管
@@ -190,6 +196,7 @@ export default {
       checked_props: [], // 选中工具
       checkedIds: [], //已选中选项
       conflictIds: [], //冲突选项
+      payOrders: [], //已付款订单
       attend_id: 0, // 添加成功课程
       disableBtn: false, // 避免多次重复点击
       action: 'stopmove'
@@ -208,15 +215,26 @@ export default {
     this.disableBtn = false
   },
   methods: {
-    init() {
+    async init() {
       this.getDateConfig()
       socket.initSocket()
+      await this.checkOrders() //获取支付订单
     },
     getDateConfig() {
       _intelligentDates().then(res => {
         this.days = res.data
       })
     },
+    //查询已付款订单
+    checkOrders() {
+      return new Promise((resolve, reject) => {
+        _checkOrders().then(res => {
+          this.payOrders = res.data
+          resolve(true)
+        })
+      })
+    },
+    //查询冲突判断
     checkConflict(id) {
       return new Promise((resolve, reject) => {
         if (this.checkedIds.length < 1) {
@@ -229,6 +247,7 @@ export default {
         }
         _checkConflict(params).then(res => {
           this.checkedIds = res.data.checked_list.map(item => item.class_attend_id)
+          this.checkedIds = [...new Set(this.checkedIds.concat(this.payOrders))]
           this.conflictIds = res.data.conflict_list.map(item => item.class_attend_id)
           resolve(res.data.checked_res)
         })
@@ -252,18 +271,23 @@ export default {
         return false
       }
       this.interests = this.keys.filter(item => item.includes(this.serachKey))
+      //兴趣选择数量补充
+      if (this.interests.length < this.interestMax) {
+        const others = this.keys.filter(item => !this.params.hobbyOther.includes(item) && !this.interests.includes(item))
+        const fixNum = this.interestMax - this.interests.length
+        this.interests = this.interests.concat(others.slice(0, fixNum))
+      }
     },
     check_key(key) {
       const params = { week: this.params.week.join(','), student_id: this.kid, keywords: key }
-      _intelligentGetKeys(params).then(res => {
-        if (res.data.length < 1) {
-          this.params.hobbyOther = this.params.hobbyOther.filter(k => k != key)
-          uni.showToast({
-            title: '未找到相关课程',
-            icon: 'none',
-            duration: 2000
-          })
-        }
+      return new Promise((resolve, reject) => {
+        _intelligentGetKeys(params).then(res => {
+          if (res.data.length < 1) {
+            resolve(false)
+          } else {
+            resolve(true)
+          }
+        })
       })
     },
     get_options() {
@@ -280,9 +304,9 @@ export default {
             const week = course.week
             const dayKey = this.daysMap[week]
             const item = list[0]
-            const class_attend_id = item.status == 0 || !this.params.week.includes(dayKey) ? null : item.class_attend_id
+            const class_attend_id = item.status == 0 || this.payOrders.includes(item.class_attend_id) || !this.params.week.includes(dayKey) ? null : item.class_attend_id
             this.$set(this.checked, index, [class_attend_id])
-            const prop = item.prop.length > 0 ? [item.prop[0].id] : []
+            const prop = class_attend_id && item.prop.length > 0 ? [item.prop[0].id] : []
             this.$set(this.checked_props, index, [{ class_attend_id: class_attend_id, prop: prop }])
           })
           this.checkedIds = this.getCheckedIds()
@@ -295,17 +319,25 @@ export default {
       this.checked.forEach(v => {
         arr = arr.concat(v)
       })
-      return arr.filter(e => e)
+      return [...new Set(arr.filter(e => e).concat(this.payOrders))]
     },
     delHobby(key) {
       this.params.hobbyOther = this.params.hobbyOther.filter(item => item != key)
     },
-    chooseInterest(key) {
+    async chooseInterest(key) {
       if (this.params.hobbyOther.includes(key)) {
         this.params.hobbyOther = this.params.hobbyOther.filter(item => item != key)
       } else {
         this.params.hobbyOther.push(key)
-        this.check_key(key)
+        const pass = await this.check_key(key)
+        if (!pass) {
+          this.params.hobbyOther = this.params.hobbyOther.filter(k => k != key)
+          uni.showToast({
+            title: '未找到相关课程',
+            icon: 'none',
+            duration: 2000
+          })
+        }
       }
     },
     checkboxChange(e) {
@@ -327,7 +359,7 @@ export default {
           console.log('error')
       }
     },
-    changeStep(index) {
+    async changeStep(index) {
       if (index === 1 && this.params.week.length < 1) {
         uni.showToast({ title: '请先选择周期', icon: 'none' })
         return false
@@ -338,6 +370,10 @@ export default {
       }
       if (index === 1) {
         this.getHobbyConfig()
+        const pass = await this.check_key('晚托')
+        if (pass) {
+          this.params.hobbyOther[0] = '晚托'
+        }
       }
       const step = Math.abs(index - this.cur)
       if (step > 1) return false
@@ -357,7 +393,13 @@ export default {
       if (course.status == 0) {
         return false
       }
+      //已报课程
+      if (this.payOrders.includes(course.class_attend_id)) {
+        uni.showToast({ title: '该课程已报，请重选！', icon: 'none', duration: 2000 })
+        return false
+      }
       const class_attend_id = course.class_attend_id
+
       if (this.checked[i].includes(class_attend_id)) {
         this.batchCancel([class_attend_id])
       } else {

src/pages/index/components/card.vue

@@ -14,7 +14,7 @@
       <view class="text-gray text-sm">{{ item.grade_desc }}</view>
       <view class="margin-top-sm">
         <button class="cu-btn round bg-student text-white button-hover" v-if="item.enable">报课</button>
-        <button class="cu-btn round bg-grey button-hover text-white disabled" v-else>停止</button>
+        <button class="cu-btn round bg-grey button-hover text-white disabled" v-else>停止报课</button>
       </view>
     </view>
   </view>

src/pages/mine/mine.vue

@@ -76,6 +76,12 @@
             <text class="text-black">在线客服</text>
           </view>
         </view>
+        <view class="cu-item arrow" @tap="goto('video')">
+          <text class="iconfont text-gray" style="font-size: 18px;">&#xe76d;</text>
+          <view class="content margin-left-sm">
+            <text class="text-black">新手教程</text>
+          </view>
+        </view>
       </view>
     </view>
     <mp-tabbar :outerSelected="2" />

src/pages/mine/video.vue

@@ -0,0 +1,23 @@
+<template>
+  <view class="page">
+    <cu-custom :isBack="true"></cu-custom>
+    <video :src="url" :style="[{ width: '100%', height: 'calc(100vh - ' + topHeader + 'px)' }]"></video>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      url: 'https://upload.kehoubaike.com/guide.MP4',
+      topHeader: this.globalCustomBarHeight
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+  height: 100vh;
+}
+</style>