no message

package.json

@@ -31,6 +31,7 @@
     "@dcloudio/uni-cli-i18n": "^2.0.1-34720220422002",
     "@dcloudio/uni-ui": "^1.4.14",
     "number-precision": "^1.4.0",
+    "regenerator-runtime": "^0.13.11",
     "vue": "^2.6.10",
     "vue-class-component": "^6.3.2",
     "vue-count-to": "^1.0.13",

src/api/course.js

@@ -9,8 +9,8 @@ export function _intelligentDates () {
 	return fetch('/parents/Intelligent/getLigentDate')
 }
 //智能报课获取兴趣
-export function _intelligentInterests () {
-	return fetch('/parents/Intelligent/getLigentCategory')
+export function _intelligentInterests (params) {
+	return fetch('/parents/Intelligent/getLigentCategory', params)
 }
 //智能报课关键词检索
 export function _intelligentGetKeys (params) {
@@ -136,3 +136,7 @@ export function _getClasses (params) {
 export function _fixStudent (params) {
 	return fetch('/parents/student/update', params)
 }
+//检索冲突
+export function _checkConflict (params) {
+	return fetch('/parents/Intelligent/conflictcheck', params)
+}

src/components/calendar.vue

@@ -7,7 +7,7 @@
       <view v-for="(item, index) in dateArr" :key="index" @tap="calendarTap(item, index)">
         <view
           class="date-head1"
-          :class="[todayIndex === index ? 'operationInProgress' : showBusiness ? item.styleClass : '', { showOverdue: item.showOverdue, 'date-class': item.dateClass }]"
+          :class="[todayIndex === index ? 'operationInProgress' : '', showBusiness ? item.styleClass : '', { showOverdue: item.showOverdue, 'date-class': item.dateClass }]"
         >
           <view>{{ item.dateNum }}</view>
         </view>
@@ -100,6 +100,8 @@ export default {
           const renderingTime = '' + year + (month + 1 > 9 ? month + 1 : '0' + (month + 1)) + (num > 9 ? num : '0' + num)
           if (Number(currentTime) > Number(renderingTime)) {
             showOverdue = 1 // 过期
+          } else if (Number(currentTime) == Number(renderingTime)) {
+            this.todayIndex = i
           } else {
             showOverdue = 0 // 有效
           }
@@ -152,7 +154,6 @@ export default {
 }
 .header-cal {
   font-size: 0;
-  /* padding: 0 24rpx;  */
 }
 .header-cal > view {
   display: inline-block;
@@ -160,7 +161,6 @@ export default {
   color: #5fd0e4;
   font-size: 30rpx;
   text-align: center;
-  /* border-bottom: 1px solid #D0D0D0;  */
   padding: 39rpx 0;
 }
 .weekMark {
@@ -213,36 +213,26 @@ export default {
 .nowDay .date-weight {
   color: #22a7f6;
 }
-/* 过期样式*/
-.showOverdue {
-  color: #5fd0e4;
-}
 /* 正在操作样式*/
 .operationInProgress {
-  // background: #20ba96;
-  // color: #fff;
   color: #20ba96;
 }
 /* 正常样式*/
 .normal {
-  // background: #4db8e4;
-  // color: #fff;
   &:after {
     content: '';
     position: absolute;
     bottom: 0;
     right: 0;
-    width: 0;
-    height: 0;
-    border-color: #39b54a transparent;
-    border-width: 0 0 12px 12px;
-    border-style: solid;
+    width: 6px;
+    height: 10px;
+    border-bottom: 2px solid #39b54a;
+    border-right: 2px solid #39b54a;
+    transform: rotate(45deg);
   }
 }
 /* 异常样式*/
 .abnormal {
-  // background: #ff7361;
-  // color: #fff;
   &:after {
     content: '';
     position: absolute;
@@ -256,8 +246,6 @@ export default {
   }
 }
 .leave {
-  // background: #3390f5;
-  // color: #fff;
   &:after {
     content: '';
     position: absolute;
@@ -271,8 +259,6 @@ export default {
   }
 }
 .late {
-  // background: #fbbd08;
-  // color: #fff;
   &:after {
     content: '';
     position: absolute;

src/pages/class/detail.vue

@@ -72,7 +72,7 @@
         </view>
       </view>
       <!-- 道具选择 -->
-      <view class="shop margin-top-sm shadow" v-if="detail.prop && detail.prop.length > 0">
+      <view class="shop margin-top-sm shadow" v-if="detail.prop && detail.prop.length > 0 && !detail.prop[0].required">
         <view class="shop-title">请选择课程所需要的道具</view>
         <radio-group @change="radioChange" class="margin-top-xs">
           <label v-for="radio in radios" :key="radio.value" class="tool-choose margin-right-sm">

src/pages/class/gift.vue

@@ -34,7 +34,7 @@
               </view>
               <view class="margin-top-sm">
                 <view v-for="(h, i) in params.hobbyOther" :key="i" class="hobby"
-                  >{{ h }}
+                  >{{ i + 1 }}.{{ h }}
                   <text class="cuIcon-close del-hobby text-red" @tap="delHobby(h)"></text>
                 </view>
               </view>
@@ -95,9 +95,9 @@
                               >
                               <view>
                                 <checkbox
-                                  :disabled="course.status == 0"
                                   :value="course.class_attend_id"
-                                  :checked="checked.includes(course.class_attend_id)"
+                                  :disabled="course.status == 0"
+                                  :checked="checked[i].includes(course.class_attend_id)"
                                   class="round cyan"
                                   style="transform: scale(0.7);"
                                 />
@@ -111,11 +111,13 @@
                           <label v-for="prop in course.prop" :key="prop.id">
                             <view>
                               <checkbox
+                                :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"
                                 :value="prop.id"
                                 class="cyan"
                                 style="transform: scale(0.7);"
-                                :checked="checked_props[i].class_attend_id === course.class_attend_id && checked_props[i].prop.includes(prop.id)"
                               />{{ prop.name }}<text>￥{{ prop.money }}</text>
                             </view>
                           </label>
@@ -135,7 +137,6 @@
                   </button>
                 </view>
                 <view class="static-order flex">
-                  <shop-cart :class_attend_id="attend_id" @changeDisableBtn="changeDisableBtn"></shop-cart>
                   <button class="cu-btn round bg-student text-white margin-left-xs" @tap="addCart">报课</button>
                 </view>
               </view>
@@ -148,13 +149,10 @@
 </template>
 
 <script>
-import { _intelligentDates, _intelligentInterests, _intelligentCourses, _intelligentGetKeys, _joinShops } from '@/api/course'
-import shopCart from '@/components/shop-cart.vue'
+import { _intelligentDates, _intelligentInterests, _intelligentCourses, _intelligentGetKeys, _joinShops, _checkConflict } from '@/api/course'
 import { mapGetters } from 'vuex'
+import socket from '@/common/webSocket'
 export default {
-  components: {
-    shopCart
-  },
   data() {
     return {
       topHeader: this.globalCustomBarHeight,
@@ -189,13 +187,15 @@ export default {
       colors: ['#0CAAF4', '#082FCC', '#FDC534', '#09E294'],
       checked: [], // 选中
       checked_props: [], // 选中工具
+      checkedIds: [], //已选中选项
+      conflictIds: [], //冲突选项
       attend_id: 0, // 添加成功课程
       disableBtn: false, // 避免多次重复点击
       action: 'stopmove'
     }
   },
   computed: {
-    ...mapGetters(['kid'])
+    ...mapGetters(['kid', 'ifConnectOrder'])
   },
   onLoad(options) {
     const id = decodeURIComponent(options.package_id)
@@ -209,19 +209,36 @@ export default {
   methods: {
     init() {
       this.getDateConfig()
-      this.getHobbyConfig()
+      socket.initSocket()
     },
     getDateConfig() {
       _intelligentDates().then(res => {
         this.days = res.data
       })
     },
+    checkConflict(id) {
+      return new Promise((resolve, reject) => {
+        if (this.checkedIds.length < 1) {
+          resolve(false)
+          return
+        }
+        const params = {
+          checked: id,
+          ids: this.checkedIds.join(',')
+        }
+        _checkConflict(params).then(res => {
+          this.checkedIds = res.data.checked_list.map(item => item.class_attend_id)
+          this.conflictIds = res.data.conflict_list.map(item => item.class_attend_id)
+          resolve(res.data.checked_res)
+        })
+      })
+    },
     getHobbyConfig() {
-      _intelligentInterests().then(res => {
-        // this.interests = res.data
+      const params = { week: this.params.week.join(',') }
+      _intelligentInterests(params).then(res => {
         const choose = res.data[res.data.length - 1]
         this.params.hobby = [choose.id]
-        this.keys = [...new Set(choose.names)].filter(e => e)
+        this.keys = [...new Set(Object.values(choose.names))].filter(e => e)
         if (this.interests.length < 1) this.interests = this.keys.slice(0, 5)
       })
     },
@@ -239,6 +256,7 @@ export default {
       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',
@@ -257,17 +275,25 @@ export default {
         this.checked = [] //初始化选项
         if (this.attends.length > 0) {
           this.attends.map((course, index) => {
-            //过滤不能报课的
             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)
+            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 })
+            this.$set(this.checked_props, index, [{ class_attend_id: class_attend_id, prop: prop }])
           })
+          this.checkedIds = this.getCheckedIds()
         }
       })
     },
+    getCheckedIds() {
+      //获取默认选择集合
+      let arr = []
+      this.checked.forEach(v => {
+        arr = arr.concat(v)
+      })
+      return arr.filter(e => e)
+    },
     delHobby(key) {
       this.params.hobbyOther = this.params.hobbyOther.filter(item => item != key)
     },
@@ -307,6 +333,9 @@ export default {
         uni.showToast({ title: '请先选择兴趣', icon: 'none' })
         return false
       }
+      if (index === 1) {
+        this.getHobbyConfig()
+      }
       const step = Math.abs(index - this.cur)
       if (step > 1) return false
       this.cur = index
@@ -320,27 +349,61 @@ export default {
     changeDisableBtn() {
       this.disableBtn = true
     },
-    classChange(course, i) {
+    async 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: [] })
+      if (this.checked[i].includes(class_attend_id)) {
+        this.batchCancel([class_attend_id])
       } else {
-        this.$set(this.checked, i, class_attend_id)
-        this.$set(this.checked_props, i, { class_attend_id: class_attend_id, prop: [] })
+        //判断课程冲突
+        const pass = await this.checkConflict(course.class_attend_id)
+        if (pass) {
+          //冲突取消之前选择
+          uni.showToast({ title: '存在课程时间冲突，已取消冲突课程！', icon: 'none', duration: 2000 })
+          this.batchCancel(this.conflictIds)
+        }
+        this.batchChoose(class_attend_id, [])
       }
     },
-    propChange(e, i) {
+    async propChange(e, i) {
       const parentId = e.target.dataset.id
       const values = e.detail.value.map(item => Number(item))
-      if (values.length > 0 && !this.checked.includes(parentId)) {
-        this.$set(this.checked, i, parentId)
+      if (values.length > 0 && !this.checked[i].includes(parentId)) {
+        //判断课程冲突
+        const pass = await this.checkConflict(parentId)
+        if (pass) {
+          //冲突取消之前选择
+          uni.showToast({ title: '存在课程时间冲突，已取消冲突课程！', icon: 'none', duration: 2000 })
+          this.batchCancel(this.conflictIds)
+        }
       }
-      const item = { class_attend_id: parentId, prop: values }
-      this.$set(this.checked_props, i, item)
+      this.batchChoose(parentId, values)
+    },
+    batchCancel(ids) {
+      if (ids.length < 1) return false
+      this.checked.forEach((e, i) => {
+        const f = e.findIndex(c => ids.includes(c))
+        if (f >= 0) {
+          this.$set(this.checked[i], f, null)
+          this.$set(this.checked_props[i], f, { class_attend_id: null, prop: [] })
+        }
+      })
+    },
+    batchChoose(id, props) {
+      this.attends.map((course, i) => {
+        const list = course.list
+        const c = list.findIndex(e => e.class_attend_id == id)
+        if (c >= 0) {
+          const choose = list[c]
+          this.$set(this.checked[i], c, choose.class_attend_id)
+          //道具选择
+          const items = props.length > 0 ? props : choose.prop.length > 0 ? [choose.prop[0].id] : []
+          this.$set(this.checked_props[i], c, { class_attend_id: choose.class_attend_id, prop: items })
+        }
+      })
     },
     TabSelect(e) {
       this.tabCur = e.currentTarget.dataset.id
@@ -348,10 +411,22 @@ export default {
       this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
     },
     addCart() {
-      if (this.disableBtn) return false
+      uni.showLoading({
+        mask: true,
+        title: '加载中...'
+      })
+      //合并选中项
+      let arr = []
+      this.checked_props.forEach(v => {
+        arr = arr.concat(v)
+      })
+      if (this.disableBtn) {
+        uni.hideLoading()
+        return false
+      }
       this.disableBtn = true
       const _self = this
-      const list = this.checked_props
+      const list = arr
         .filter(item => item.class_attend_id)
         .map(item => {
           return {
@@ -361,13 +436,22 @@ export default {
           }
         })
       if (list.length < 1) {
+        uni.hideLoading()
         uni.showToast({ title: '请先选择课程', icon: 'none' })
         this.disableBtn = false
         return false
       }
       _joinShops({ list }).then(res => {
         if (res.code === 1) {
-          _self.globalNavigateTo('classCart')
+          setTimeout(() => {
+            if (!this.ifConnectOrder) {
+              // socket非正常状态
+              uni.hideLoading()
+              this.globalNavigateTo('order', { type: 1 })
+            }
+            this.disableBtn = false
+            this.$store.dispatch('setConnect', false)
+          }, 3000)
         } else {
           this.disableBtn = false
         }
@@ -405,12 +489,7 @@ export default {
 .hobby {
   position: relative;
   display: inline-block;
-  margin-left: 20rpx;
-  padding: 10rpx 40rpx;
-  border-radius: 100rpx;
-  border: 1px solid #eee;
-  color: #fff;
-  background-color: #09e294;
+  margin-left: 30rpx;
   .del-hobby {
     position: absolute;
     top: -6rpx;