no message

src/api/course.js

@@ -1,107 +1,107 @@
-import fetch from '@/common/utils/fetch.js'
-
-// 获取课程列表
-export function _optionCourse(params) {
-  return fetch('/parents/Mycourses/option_course', params)
-}
-
-// 获取课程筛选选项 parents/Mycourses/advanced_filter
-export function _filter(params) {
-  return fetch('/parents/Mycourses/advanced_filter', params)
-}
-// 课程详情 parents/Mycourses/course_details
-export function _detail(params) {
-  return fetch('/parents/Mycourses/course_details', params)
-}
-// 课程套餐详情 parents/Mycourses/course_gift
-export function _gift(params) {
-  return fetch('/parents/Mycourses/course_gift', params)
-}
-// 课程评价 parents/Mycourses/now_details_comment
-export function _comments(params) {
-  return fetch('/parents/Mycourses/now_details_comment', params)
-}
-// 添加购物车 parents/Commit/join_shop
-export function _joinShop(params, showFail = true) {
-  return fetch('/parents/Commit/join_shop', params, 'POST', showFail)
-}
-// 批量添加购物车
-export function _joinShops(params) {
-  return fetch('/parents/Commit/joinShopMulti', params)
-}
-// 购物车列表 /parents/Shopping/index
-export function _shopList(params) {
-  return fetch('/parents/Shopping/index', params)
-}
-// 删除购物车 /parents/Shopping/del_shopping
-export function _delShop(params) {
-  return fetch('/parents/Shopping/del_shopping', params)
-}
-// 生成订单 parents/Commit/order
-export function _createOrder(params) {
-  return fetch('/parents/Commit/order', params)
-}
-// 订单列表 parents/Ordercentre/index
-export function _orderCenter(params) {
-  return fetch('/parents/Ordercentre/index', params)
-}
-// 退课数据 get_dropcourse_byorder
-export function _dropList(params) {
-  return fetch('/parents/dropcourse/get_dropcourse_byorder', params)
-}
-// 订单支付
-export function _payOrder(params) {
-  return fetch('/parents/pay/payment', params)
-}
-// 取消订单 /parents/Ordercentre/del_order
-export function _cancelOrder(params) {
-  return fetch('/parents/Ordercentre/del_order', params)
-}
-// 进行退课 /parents/dropcourse/to_drop_course
-export function _dropCourse(params) {
-  return fetch('/parents/dropcourse/to_drop_course', params)
-}
-// 历史课程 /parents/Mycourses/course_history
-export function _courseHistory(params) {
-  return fetch('/parents/Mycourses/course_history', params)
-}
-// 我的课程 /parents/Mycourses/course_history
-export function _nowCourse(params) {
-  return fetch('/parents/Mycourses/now_course', params)
-}
-// 课程表 /parents/Mycourses/date_course
-export function _dateCourse(params) {
-  return fetch('/parents/Mycourses/date_course', params)
-}
-// 考勤记录 /parents/attendance/get_attendance
-export function _attendance(params) {
-  return fetch('/parents/attendance/get_attendance', params)
-}
-// 课堂详情 /parents/dailyclass/get_dailyclass_details
-export function _dailiClass(params) {
-  return fetch('/parents/dailyclass/get_dailyclass_details', params)
-}
-// 安全交接情况 /parents/sign/get_sign
-export function _getSignIn(params) {
-  return fetch('/parents/sign/get_sign', params)
-}
-// 进行安全交接 /parents/sign/to_sign
-export function _toSignIn(params) {
-  return fetch('/parents/sign/to_sign', params)
-}
-// 进行评价 /parents/Todayclass/comment
-export function _tocomment(params) {
-  return fetch('/parents/Todayclass/comment', params)
-}
-// 评价详情
-export function _commentDetail(params) {
-  return fetch('/parents/dailyclass/get_satisfaction', params)
-}
-// 获取请假类型
-export function _leaveType(params) {
-  return fetch('/teacher/leave/get_leave_type', params)
-}
-// 申请请假 parents/schedule/student_leave
-export function _askLeave(params) {
-  return fetch('/parents/schedule/student_leave', params)
-}
+import fetch from '@/common/utils/fetch.js'
+
+// 获取课程列表
+export function _optionCourse(params) {
+  return fetch('/parents/Mycourses/option_course', params)
+}
+
+// 获取课程筛选选项 parents/Mycourses/advanced_filter
+export function _filter(params) {
+  return fetch('/parents/Mycourses/advanced_filter', params)
+}
+// 课程详情 parents/Mycourses/course_details
+export function _detail(params) {
+  return fetch('/parents/Mycourses/course_details', params)
+}
+// 课程套餐详情 parents/Mycourses/course_gift
+export function _gift(params) {
+  return fetch('/parents/Mycourses/course_gift', params)
+}
+// 课程评价 parents/Mycourses/now_details_comment
+export function _comments(params) {
+  return fetch('/parents/Mycourses/now_details_comment', params, 'POST', false)
+}
+// 添加购物车 parents/Commit/join_shop
+export function _joinShop(params, showFail = true) {
+  return fetch('/parents/Commit/join_shop', params, 'POST', showFail)
+}
+// 批量添加购物车
+export function _joinShops(params) {
+  return fetch('/parents/Commit/joinShopMulti', params)
+}
+// 购物车列表 /parents/Shopping/index
+export function _shopList(params) {
+  return fetch('/parents/Shopping/index', params)
+}
+// 删除购物车 /parents/Shopping/del_shopping
+export function _delShop(params) {
+  return fetch('/parents/Shopping/del_shopping', params)
+}
+// 生成订单 parents/Commit/order
+export function _createOrder(params) {
+  return fetch('/parents/Commit/order', params)
+}
+// 订单列表 parents/Ordercentre/index
+export function _orderCenter(params) {
+  return fetch('/parents/Ordercentre/index', params)
+}
+// 退课数据 get_dropcourse_byorder
+export function _dropList(params) {
+  return fetch('/parents/dropcourse/get_dropcourse_byorder', params)
+}
+// 订单支付
+export function _payOrder(params) {
+  return fetch('/parents/pay/payment', params)
+}
+// 取消订单 /parents/Ordercentre/del_order
+export function _cancelOrder(params) {
+  return fetch('/parents/Ordercentre/del_order', params)
+}
+// 进行退课 /parents/dropcourse/to_drop_course
+export function _dropCourse(params) {
+  return fetch('/parents/dropcourse/to_drop_course', params)
+}
+// 历史课程 /parents/Mycourses/course_history
+export function _courseHistory(params) {
+  return fetch('/parents/Mycourses/course_history', params)
+}
+// 我的课程 /parents/Mycourses/course_history
+export function _nowCourse(params) {
+  return fetch('/parents/Mycourses/now_course', params)
+}
+// 课程表 /parents/Mycourses/date_course
+export function _dateCourse(params) {
+  return fetch('/parents/Mycourses/date_course', params)
+}
+// 考勤记录 /parents/attendance/get_attendance
+export function _attendance(params) {
+  return fetch('/parents/attendance/get_attendance', params)
+}
+// 课堂详情 /parents/dailyclass/get_dailyclass_details
+export function _dailiClass(params) {
+  return fetch('/parents/dailyclass/get_dailyclass_details', params)
+}
+// 安全交接情况 /parents/sign/get_sign
+export function _getSignIn(params) {
+  return fetch('/parents/sign/get_sign', params)
+}
+// 进行安全交接 /parents/sign/to_sign
+export function _toSignIn(params) {
+  return fetch('/parents/sign/to_sign', params)
+}
+// 进行评价 /parents/Todayclass/comment
+export function _tocomment(params) {
+  return fetch('/parents/Todayclass/comment', params)
+}
+// 评价详情
+export function _commentDetail(params) {
+  return fetch('/parents/dailyclass/get_satisfaction', params)
+}
+// 获取请假类型
+export function _leaveType(params) {
+  return fetch('/teacher/leave/get_leave_type', params)
+}
+// 申请请假 parents/schedule/student_leave
+export function _askLeave(params) {
+  return fetch('/parents/schedule/student_leave', params)
+}

src/common/commonMethods.js

@@ -1,57 +1,56 @@
-// 进入新的页面的方法
-import urlMap from '@/common/urlMap'
-import Vue from 'vue'
-
-const encodeParam = function (params) {
-  let url = ''
-  for (const k in params) {
-    const value = params[k] !== undefined ? params[k] : ''
-    url += '&' + k + '=' + encodeURIComponent(value)
-  }
-  return url ? url.substring(1) : ''
-}
-
-const routerToFail = function (err) {
-  console.log(err, '跳转新页面失败')
-}
-
-const commonMethods = {
-  /**
-   * 保留当前页面，跳转到应用内的某个页面，使用uni.navigateBack可以返回到原页面
-   * 页面跳转路径有层级限制，不能无限制跳转新页面
-   * @param {*} type 路径唯一类型
-   * @param {*} params 路径参数
-   * @returns {*} null
-   */
-  globalNavigateTo: function (type, params) {
-    if (urlMap.has(type)) {
-      let url = urlMap.get(type)
-      if (params) {
-        url += (url.indexOf('?') < 0 && params ? '?' : '&') + encodeParam(params)
-      }
-      uni.navigateTo({ url, fail: routerToFail })
-    }
-  },
-  // 关闭当前页面，跳转到应用内的某个页面
-  globalRedirectTo: function (type, params) {
-    if (urlMap.has(type)) {
-      let url = urlMap.get(type)
-      if (params) {
-        url += (url.indexOf('?') < 0 && params ? '?' : '&') + encodeParam(params)
-      }
-      uni.redirectTo({ url, fail: routerToFail })
-    }
-  },
-  // 关闭所有页面，打开应用内的某个页面
-  globalReLaunch: function (type, params) {
-    if (urlMap.has(type)) {
-      let url = urlMap.get(type)
-      if (params) {
-        url += (url.indexOf('?') < 0 && params ? '?' : '&') + encodeParam(params)
-      }
-      uni.reLaunch({ url, fail: routerToFail })
-    }
-  }
-}
-
-export default commonMethods
+// 进入新的页面的方法
+import urlMap from '@/common/urlMap'
+
+const encodeParam = function (params) {
+  let url = ''
+  for (const k in params) {
+    const value = params[k] !== undefined ? params[k] : ''
+    url += '&' + k + '=' + encodeURIComponent(value)
+  }
+  return url ? url.substring(1) : ''
+}
+
+const routerToFail = function (err) {
+  console.log(err, '跳转新页面失败')
+}
+
+const commonMethods = {
+  /**
+   * 保留当前页面，跳转到应用内的某个页面，使用uni.navigateBack可以返回到原页面
+   * 页面跳转路径有层级限制，不能无限制跳转新页面
+   * @param {*} type 路径唯一类型
+   * @param {*} params 路径参数
+   * @returns {*} null
+   */
+  globalNavigateTo: function (type, params) {
+    if (urlMap.has(type)) {
+      let url = urlMap.get(type)
+      if (params) {
+        url += (url.indexOf('?') < 0 && params ? '?' : '&') + encodeParam(params)
+      }
+      uni.navigateTo({ url, fail: routerToFail })
+    }
+  },
+  // 关闭当前页面，跳转到应用内的某个页面
+  globalRedirectTo: function (type, params) {
+    if (urlMap.has(type)) {
+      let url = urlMap.get(type)
+      if (params) {
+        url += (url.indexOf('?') < 0 && params ? '?' : '&') + encodeParam(params)
+      }
+      uni.redirectTo({ url, fail: routerToFail })
+    }
+  },
+  // 关闭所有页面，打开应用内的某个页面
+  globalReLaunch: function (type, params) {
+    if (urlMap.has(type)) {
+      let url = urlMap.get(type)
+      if (params) {
+        url += (url.indexOf('?') < 0 && params ? '?' : '&') + encodeParam(params)
+      }
+      uni.reLaunch({ url, fail: routerToFail })
+    }
+  }
+}
+
+export default commonMethods

src/common/utils/socket.js

@@ -1,99 +1,98 @@
-import store from '@/store/index'
-class websocketUtil {
-  constructor(url, time) {
-  /*
-  url 是请求的后端的地址
-  time 是心跳包的时间
-  */
-    this.is_open_socket = false // 避免重复连接
-    this.url = url || process.env.VUE_APP_BASE_WS
-    this.data = null
-    // 心跳检测
-    this.timeout = time || 5000 // 多少秒执行检测
-    this.heartbeatInterval = null // 检测服务器端是否还活着
-    this.reconnectTimeOut = null // 重连之后多久再次重连
-    this.onMessage = Function
-    try {
-      return this.connectSocketInit()
-    } catch (e) {
-      console.log('catch')
-      this.is_open_socket = false
-      this.reconnect()
-    }
-  }
-
-  // 进入这个页面的时候创建websocket连接【整个页面随时使用】
-  connectSocketInit () {
-    const token = store.getters.token
-    if (!token) {
-      console.log('无效链接')
-      return false
-    }
-    this.socketTask = uni.connectSocket({
-      url: `${this.url}?token=${token}`,
-      success: () => {
-        console.log('正准备建立websocket中...')
-        // 返回实例
-        return this.socketTask
-      }
-    })
-    this.socketTask.onOpen((res) => {
-      console.log('WebSocket连接正常！')
-      clearTimeout(this.reconnectTimeOut)
-      clearTimeout(this.heartbeatInterval)
-      this.is_open_socket = true
-      this.start()
-      // 注：只有连接正常打开中 ，才能正常收到消息
-      this.socketTask.onMessage((res) => {
-        try {
-          const data = JSON.parse(res.data)
-          // 业务逻辑
-          this.onMessage(data)
-        } catch (error) {
-          this.onMessage(res.data)
-        }
-      })
-    })
-
-    // 这里仅是事件监听【如果socket关闭了会执行】
-    this.socketTask.onClose((res) => {
-      if (res.code === 1000) {
-        this.is_open_socket = true
-      } else {
-        this.is_open_socket = false
-      }
-      console.log('已经被关闭了', res)
-      this.reconnect()
-    })
-  }
-
-  // 发送消息
-  send (value) {
-    // 注：只有连接正常打开中 ，才能正常成功发送消息
-    this.socketTask.send({
-      data: value
-    })
-  }
-
-  // 开启心跳检测
-  start () {
-    this.heartbeatInterval = setInterval(() => {
-      this.data = { type: 'start' }
-      this.send(JSON.stringify(this.data))
-    }, this.timeout)
-  }
-
-  // 重新连接
-  reconnect () {
-    // 停止发送心跳
-    clearInterval(this.heartbeatInterval)
-    // 如果不是人为关闭的话，进行重连
-    if (!this.is_open_socket) {
-      this.reconnectTimeOut = setTimeout(() => {
-        this.connectSocketInit()
-      }, 3000)
-    }
-  }
-}
-
-module.exports = websocketUtil
+import store from '@/store/index'
+class websocketUtil {
+  constructor(url, time) {
+  /*
+  url 是请求的后端的地址
+  time 是心跳包的时间
+  */
+    this.is_open_socket = false // 避免重复连接
+    this.url = url || process.env.VUE_APP_BASE_WS
+    this.data = null
+    // 心跳检测
+    this.timeout = time || 5000 // 多少秒执行检测
+    this.heartbeatInterval = null // 检测服务器端是否还活着
+    this.reconnectTimeOut = null // 重连之后多久再次重连
+    this.onMessage = Function
+    try {
+      return this.connectSocketInit()
+    } catch (e) {
+      console.log('catch')
+      this.is_open_socket = false
+      this.reconnect()
+    }
+  }
+
+  // 进入这个页面的时候创建websocket连接【整个页面随时使用】
+  connectSocketInit () {
+    const token = store.getters.token
+    if (!token) {
+      console.log('无效链接')
+      return false
+    }
+    this.socketTask = uni.connectSocket({
+      url: `${this.url}?token=${token}`,
+      success: () => {
+        console.log('正准备建立websocket中...')
+        // 返回实例
+        return this.socketTask
+      }
+    })
+    this.socketTask.onOpen((res) => {
+      console.log('WebSocket连接正常！')
+      clearTimeout(this.reconnectTimeOut)
+      clearTimeout(this.heartbeatInterval)
+      this.is_open_socket = true
+      this.start()
+      // 注：只有连接正常打开中 ，才能正常收到消息
+      this.socketTask.onMessage((res) => {
+        try {
+          const data = JSON.parse(res.data)
+          // 业务逻辑
+          this.onMessage(data)
+        } catch (error) {
+          this.onMessage(res.data)
+        }
+      })
+    })
+    // 这里仅是事件监听【如果socket关闭了会执行】
+    this.socketTask.onClose((res) => {
+      if (res.code === 1000) {
+        this.is_open_socket = true
+      } else {
+        this.is_open_socket = false
+      }
+      console.log('已经被关闭了', res)
+      this.reconnect()
+    })
+  }
+
+  // 发送消息
+  send (value) {
+    // 注：只有连接正常打开中 ，才能正常成功发送消息
+    this.socketTask.send({
+      data: value
+    })
+  }
+
+  // 开启心跳检测
+  start () {
+    this.heartbeatInterval = setInterval(() => {
+      this.data = { class: 'Index', type: 'heart' }
+      this.send(JSON.stringify(this.data))
+    }, this.timeout)
+  }
+
+  // 重新连接
+  reconnect () {
+    // 停止发送心跳
+    clearInterval(this.heartbeatInterval)
+    // 如果不是人为关闭的话，进行重连
+    if (!this.is_open_socket) {
+      this.reconnectTimeOut = setTimeout(() => {
+        this.connectSocketInit()
+      }, 3000)
+    }
+  }
+}
+
+module.exports = websocketUtil

src/common/webSocket.js

@@ -1,12 +1,30 @@
-import WebSocket from '@/common/utils/socket.js'
-import Vue from 'vue'
-const socket = {
-  initSocket: function() {
-    if (!Vue.prototype.socket) {
-      const ws = new WebSocket()
-      Vue.prototype.socket = ws
-    }
-  }
-}
-
-export default socket
+import WebSocket from '@/common/utils/socket.js'
+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 === 'order') {
+        uni.hideLoading()
+        store.dispatch('setConnect', true)
+        commonMethods.globalNavigateTo('order', { type: 1 })
+      }
+    }
+  }
+}
+
+export default socket

src/components/shop-cart.vue

@@ -12,6 +12,10 @@ export default {
     class_attend_id: {
       type: Number,
       default: 0
+    },
+    disableBtn: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -26,6 +30,8 @@ export default {
   },
   methods: {
     goCart() {
+      if (this.disableBtn) return false
+      this.$emit('changeDisableBtn')// 改变按钮点击
       this.globalNavigateTo('classCart')
     }
   }

src/pages/class/detail.vue

@@ -75,13 +75,13 @@
 			<view class="shop margin-top-sm shadow" v-if="detail.prop&&detail.prop.length>0">
 					<view class="shop-title">请选择课程所需要的道具</view>
 					<radio-group @change="radioChange" class="margin-top-xs">
-						<label  v-for="radio in radios" :key="radio.value" class="margin-right-sm">
+						<label  v-for="radio in radios" :key="radio.value" class="tool-choose margin-right-sm">
 								<radio :value="radio.value" class="cyan" :checked="radio.checked" style="transform:scale(0.7)"/>{{radio.name}}
 						</label>
 					</radio-group>
           <checkbox-group @change="checkboxChange" v-if="needTool==='1'" class="checkbox-group margin-top-xs">
 							<label v-for="prop in detail.prop" :key="prop.id">
-								<view>
+								<view class="tool-choose-item">
 									<checkbox :value="prop.id" class="cyan" style="transform:scale(0.7)" :checked="goods.props.includes(prop.id)"/>{{prop.name}}<text>￥{{prop.money}}</text>
 								</view>
 							</label>
@@ -156,7 +156,7 @@
 			</view>
 			<view class="static-choose text-ellipsis" v-if="goods.choose.length>0">（已选：{{goods.choose.join(',')}}）</view>
 			<view class="static-order flex align-center">
-				 <shop-cart :class_attend_id="attend_id"></shop-cart>
+				 <shop-cart :class_attend_id="attend_id" :disableBtn="disableBtn" @changeDisableBtn="changeDisableBtn"></shop-cart>
 				 <button class="cu-btn round bg-student text-white margin-left-xs" :class="{'disabled':carts.includes(attend_id)||!detail.enable}" @tap="addCart">报课</button>
 			</view>
 		</view>
@@ -275,16 +275,12 @@ export default {
         }
       })
     },
+    changeDisableBtn() {
+      this.disableBtn = true
+    },
     addCart() {
       if (this.disableBtn) return false
       this.disableBtn = true
-      if (this.carts.includes(this.attend_id)) {
-        uni.showToast({ title: '课程已存在，请勿重复添加！', icon: 'none' })
-        setTimeout(() => {
-          this.globalNavigateTo('classCart')
-        }, 1000)
-        return false
-      }
       if (!this.detail.enable) {
         uni.showToast({ title: '课程已停止！', icon: 'none' })
         this.disableBtn = false
@@ -393,8 +389,14 @@ export default {
 	padding:20rpx;
 	background:#fff;
 }
+.tool-choose{
+	padding:20rpx 20rpx 20rpx 0;
+	&-item{
+		padding:10rpx 0;
+	}
+}
 .checkbox-group{
-	height:80px;
+	height:100px;
 	overflow-y:scroll;
 	border:1px solid #f5f5f5;
 }

src/pages/class/gift.vue

@@ -1,201 +1,213 @@
-<template>
-	<view>
-		 <cu-custom :isBack="true" title="一键报课"></cu-custom>
-		 <view class="VerticalBox">
-			<scroll-view class="VerticalNav nav" scroll-y scroll-with-animation :scroll-top="verticalNavTop" :style="'height:calc(100vh - 70px - '+topHeader+'px)'">
-				<view class="cu-item" :class="index==tabCur?'text-green cur':''" v-for="(item,index) in attends" :key="index" @tap="TabSelect"
-				 :data-id="index">
-					{{weekList[index]}}
-				</view>
-			</scroll-view>
-			<scroll-view class="VerticalMain padding-sm" scroll-y scroll-with-animation :style="'height:calc(100vh - 70px - '+topHeader+'px)'"
-			 :scroll-into-view="'main-'+mainCur" @scroll="VerticalMain">
-       <radio-group @change="changeClass" style="width:100%;" v-for="(attend,i) in attends" :key="i">
-         <view class="cu-item bg-white padding margin-bottom-sm" v-for="(item,index) in attend" v-show="i==mainCur" :key="index" :id="'main-'+index">
-					<view class="cu-bar solid-bottom">
-						<view>
-							<label>
-								<view class="flex justify-between align-center">
-									<view><text>{{item.attend_name}}</text></view>
-										<view>
-											<radio :value="item.class_attend_id"
-											:disabled="!item.enable"
-											:class="{'disabled':!item.enable}"
-											:checked="checked.includes(item.class_attend_id)"  class="cyan" style="transform:scale(0.7)"/>
-										</view>
-									</view>
-							</label>
-						</view>
-					</view>
-					<view v-if="item.prop.length>0">
-							<checkbox-group  class="checkbox-group margin-top-xs" :data-id="item.class_attend_id" @change="propChange">
-									<label v-for="prop in item.prop" :key="prop.id">
-										<view>
-											<checkbox :value="prop.id"
-											:disabled="!item.enable"
-											:class="{'disabled':!item.enable}"
-											:checked="checked_props[mainCur].class_attend_id===item.class_attend_id&&checked_props[mainCur].prop.includes(prop.id+'')" class="cyan" style="transform:scale(0.7)"/>{{prop.name}}<text>￥{{prop.money}}</text>
-										</view>
-									</label>
-							</checkbox-group>
-					</view>
-				 </view>
-       </radio-group>
-			</scroll-view>
-		</view>
-		<view class="static shadow">
-			<view class="static-order flex">
-				 <shop-cart :class_attend_id="attend_id"></shop-cart>
-				 <button class="cu-btn round bg-student text-white margin-left-xs"  @tap="addCart">报课</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { _gift, _joinShops } from '@/api/course'
-import { mapGetters } from 'vuex'
-import shopCart from '@/components/shop-cart.vue'
-export default {
-  components: {
-    shopCart
-  },
-  data() {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      package_id: 0,
-      attends: [],
-      weekList: [],
-      attend_id: 0, // 添加成功课程
-      checked: [], // 选中
-      checked_props: [], // 选中工具
-      tabCur: 1,
-      mainCur: 1,
-      verticalNavTop: 0
-    }
-  },
-  computed: {
-    ...mapGetters(['kid'])
-  },
-  onLoad(options) {
-    const id = decodeURIComponent(options.package_id)
-    this.package_id = id
-    this.init()
-  },
-  methods: {
-    init() {
-      _gift({ class_package_id: this.package_id }).then(res => {
-        this.attends = res.data.attends
-        Object.keys(this.attends).forEach(item => {
-          this.$set(this.checked_props, item, { prop: [] })
-        })
-        this.weekList = res.data.week_list
-      })
-    },
-    addCart() {
-      const _self = this
-      const list = this.checked_props.filter(item => item.class_attend_id).map(item => {
-        return {
-          class_attend_id: item.class_attend_id,
-          prop: item.prop.join(','),
-          student_id: this.kid
-        }
-      })
-      if (list.length < 1) {
-        uni.showToast({ title: '请先选择课程', icon: 'none' })
-        return false
-      }
-      _joinShops({ list }).then(res => {
-        if (res.code === 1) {
-          _self.globalNavigateTo('classCart')
-        }
-      })
-    },
-    TabSelect(e) {
-      this.tabCur = e.currentTarget.dataset.id
-      this.mainCur = e.currentTarget.dataset.id
-      this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
-    },
-    changeClass(e) {
-      const value = Number(e.detail.value)
-      this.checked[this.mainCur] = value
-      this.$set(this.checked, this.mainCur, value)
-      this.$set(this.checked_props, this.mainCur, { class_attend_id: value, prop: [] })
-    },
-    propChange(e) {
-      const parentId = e.target.dataset.id
-      const values = e.detail.value
-      if (!this.checked.includes(parentId)) {
-        this.$set(this.checked, this.mainCur, parentId)
-      }
-      const item = { class_attend_id: parentId, prop: values }
-      this.$set(this.checked_props, this.mainCur, item)
-    },
-    VerticalMain(e) {
-
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-	::v-deep radio.disabled::before,::v-deep checkbox.disabled::before{
-		color:#e1e1e1 !important;
-	}
-	.static{
-			position: fixed;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			display: flex;
-			background: #fff;
-			height: 70px;
-			align-items: center;
-			padding: 0 0.8rem;
-			justify-content: flex-end;
-	}
-	.fixed {
-		position: fixed;
-		z-index: 99;
-	}
-	.VerticalNav.nav {
-		width: 200upx;
-		white-space: initial;
-	}
-
-	.VerticalNav.nav .cu-item {
-		width: 100%;
-		text-align: center;
-		background-color: #fff;
-		margin: 0;
-		border: none;
-		height: 50px;
-		position: relative;
-	}
-
-	.VerticalNav.nav .cu-item.cur {
-		background-color: #f1f1f1;
-	}
-
-	.VerticalNav.nav .cu-item.cur::after {
-		content: "";
-		width: 8upx;
-		height: 30upx;
-		border-radius: 10upx 0 0 10upx;
-		position: absolute;
-		background-color: currentColor;
-		top: 0;
-		right: 0upx;
-		bottom: 0;
-		margin: auto;
-	}
-
-	.VerticalBox {
-		display: flex;
-	}
-
-	.VerticalMain {
-		background-color: #f1f1f1;
-		flex: 1;
-	}
-</style>
+<template>
+	<view>
+		 <cu-custom :isBack="true" title="一键报课"></cu-custom>
+		 <view class="VerticalBox">
+			<scroll-view class="VerticalNav nav" scroll-y scroll-with-animation :scroll-top="verticalNavTop" :style="'height:calc(100vh - 70px - '+topHeader+'px)'">
+				<view class="cu-item" :class="index==tabCur?'text-green cur':''" v-for="(item,index) in attends" :key="index" @tap="TabSelect"
+				 :data-id="index">
+					{{weekList[index]}}
+				</view>
+			</scroll-view>
+			<scroll-view class="VerticalMain padding-sm" scroll-y scroll-with-animation :style="'height:calc(100vh - 70px - '+topHeader+'px)'"
+			 :scroll-into-view="'main-'+mainCur" @scroll="VerticalMain">
+       <radio-group @change="changeClass" style="width:100%;" v-for="(attend,i) in attends" :key="i">
+         <view class="cu-item bg-white padding margin-bottom-sm" v-for="(item,index) in attend" v-show="i==mainCur" :key="index" :id="'main-'+index">
+					<view class="cu-bar solid-bottom">
+						<view>
+							<label>
+								<view class="flex justify-between align-center">
+									<view><text>{{item.attend_name}}</text></view>
+										<view>
+											<radio :value="item.class_attend_id"
+											:disabled="!item.enable"
+											:class="{'disabled':!item.enable}"
+											:checked="checked.includes(item.class_attend_id)"  class="cyan" style="transform:scale(0.7)"/>
+										</view>
+									</view>
+							</label>
+						</view>
+					</view>
+					<view v-if="item.prop.length>0">
+							<checkbox-group  class="checkbox-group margin-top-xs" :data-id="item.class_attend_id" @change="propChange">
+									<label v-for="prop in item.prop" :key="prop.id">
+										<view>
+											<checkbox :value="prop.id"
+											:disabled="!item.enable"
+											:class="{'disabled':!item.enable}"
+											:checked="checked_props[mainCur].class_attend_id===item.class_attend_id&&checked_props[mainCur].prop.includes(prop.id+'')" class="cyan" style="transform:scale(0.7)"/>{{prop.name}}<text>￥{{prop.money}}</text>
+										</view>
+									</label>
+							</checkbox-group>
+					</view>
+				 </view>
+       </radio-group>
+			</scroll-view>
+		</view>
+		<view class="static shadow">
+			<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>
+	</view>
+</template>
+
+<script>
+import { _gift, _joinShops } from '@/api/course'
+import { mapGetters } from 'vuex'
+import shopCart from '@/components/shop-cart.vue'
+export default {
+  components: {
+    shopCart
+  },
+  data() {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      package_id: 0,
+      attends: [],
+      weekList: [],
+      attend_id: 0, // 添加成功课程
+      checked: [], // 选中
+      checked_props: [], // 选中工具
+      tabCur: 1,
+      mainCur: 1,
+      verticalNavTop: 0,
+      disableBtn: false // 避免多次重复点击
+    }
+  },
+  computed: {
+    ...mapGetters(['kid'])
+  },
+  onLoad(options) {
+    const id = decodeURIComponent(options.package_id)
+    this.package_id = id
+    this.init()
+  },
+  onShow() {
+    this.disableBtn = false
+  },
+  methods: {
+    init() {
+      _gift({ class_package_id: this.package_id }).then(res => {
+        this.attends = res.data.attends
+        Object.keys(this.attends).forEach(item => {
+          this.$set(this.checked_props, item, { prop: [] })
+        })
+        this.weekList = res.data.week_list
+      })
+    },
+    changeDisableBtn() {
+      this.disableBtn = true
+    },
+    addCart() {
+      if (this.disableBtn) return false
+      this.disableBtn = true
+      const _self = this
+      const list = this.checked_props.filter(item => item.class_attend_id).map(item => {
+        return {
+          class_attend_id: item.class_attend_id,
+          prop: item.prop.join(','),
+          student_id: this.kid
+        }
+      })
+      if (list.length < 1) {
+        uni.showToast({ title: '请先选择课程', icon: 'none' })
+        this.disableBtn = false
+        return false
+      }
+      _joinShops({ list }).then(res => {
+        if (res.code === 1) {
+          _self.globalNavigateTo('classCart')
+        } else {
+          this.disableBtn = false
+        }
+      })
+    },
+    TabSelect(e) {
+      this.tabCur = e.currentTarget.dataset.id
+      this.mainCur = e.currentTarget.dataset.id
+      this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
+    },
+    changeClass(e) {
+      const value = Number(e.detail.value)
+      this.checked[this.mainCur] = value
+      this.$set(this.checked, this.mainCur, value)
+      this.$set(this.checked_props, this.mainCur, { class_attend_id: value, prop: [] })
+    },
+    propChange(e) {
+      const parentId = e.target.dataset.id
+      const values = e.detail.value
+      if (!this.checked.includes(parentId)) {
+        this.$set(this.checked, this.mainCur, parentId)
+      }
+      const item = { class_attend_id: parentId, prop: values }
+      this.$set(this.checked_props, this.mainCur, item)
+    },
+    VerticalMain(e) {
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	::v-deep radio.disabled::before,::v-deep checkbox.disabled::before{
+		color:#e1e1e1 !important;
+	}
+	.static{
+			position: fixed;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			display: flex;
+			background: #fff;
+			height: 70px;
+			align-items: center;
+			padding: 0 0.8rem;
+			justify-content: flex-end;
+	}
+	.fixed {
+		position: fixed;
+		z-index: 99;
+	}
+	.VerticalNav.nav {
+		width: 200upx;
+		white-space: initial;
+	}
+
+	.VerticalNav.nav .cu-item {
+		width: 100%;
+		text-align: center;
+		background-color: #fff;
+		margin: 0;
+		border: none;
+		height: 50px;
+		position: relative;
+	}
+
+	.VerticalNav.nav .cu-item.cur {
+		background-color: #f1f1f1;
+	}
+
+	.VerticalNav.nav .cu-item.cur::after {
+		content: "";
+		width: 8upx;
+		height: 30upx;
+		border-radius: 10upx 0 0 10upx;
+		position: absolute;
+		background-color: currentColor;
+		top: 0;
+		right: 0upx;
+		bottom: 0;
+		margin: auto;
+	}
+
+	.VerticalBox {
+		display: flex;
+	}
+
+	.VerticalMain {
+		background-color: #f1f1f1;
+		flex: 1;
+	}
+</style>

src/pages/class/shoppingCart.vue

@@ -74,10 +74,10 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'carts', 'phone'
+      'carts', 'phone', 'ifConnectOrder'
     ])
   },
-  onLoad(option) {
+  onShow() {
     this.get_list()
     socket.initSocket()
   },
@@ -106,6 +106,10 @@ export default {
       })
     },
     pay(item) {
+      uni.showLoading({
+        mask: true,
+        title: '加载中...'
+      })
       const order = JSON.stringify([item])
       let carts = deepClone(this.carts)
       const index = carts.indexOf(item.class_attend_id)
@@ -113,21 +117,15 @@ export default {
       if (!this.phone) {
         return this.globalNavigateTo('bindPhone')
       }
-      _createOrder({ result: order }).then(res => {
-        this.socket.onMessage = message => {
-          if (typeof message !== 'object') {
-            return false
-          }
-          if (message.push_type !== 'order') {
-            return false
+      _createOrder({ result: order, notShowLoading: true }).then(res => {
+        this.$store.dispatch('setCarts', carts)
+        setTimeout(() => {
+          if (!this.ifConnectOrder) { // socket非正常状态
+            uni.hideLoading()
+            this.globalNavigateTo('order', { type: 1 })
           }
-          if (message.code === 400) {
-            uni.showToast({ title: message.msg, icon: 'none', duration: 2000 })
-            return false
-          }
-          this.$store.dispatch('setCarts', carts)
-          this.globalNavigateTo('order')
-        }
+          this.$store.dispatch('setConnect', false)
+        }, 3000)
       })
     }
   }

src/pages/order/index.vue

@@ -84,7 +84,7 @@
 										<view class="card-title">{{item.name}}</view>
 										<view class="card-item margin-top-xs">
 											<text class="card-label">时间：</text>
-											<text class="card-text">{{item.attend_day}}</text>
+											<text class="card-text">{{item.day}}</text>
 										</view>
 										<view class="card-item margin-top-xs" >
 											<text class="card-label">课时：</text>
@@ -180,9 +180,7 @@ export default {
   },
   methods: {
     refresh() {
-      this.currentIndex = 0
       this.params.page = 1
-      this.params.type = 5
       this.get_list()
     },
     onRefresh() {
@@ -241,7 +239,7 @@ export default {
       const _self = this
       uni.showModal({
         title: '提示',
-        content: '确定要删除？',
+        content: '确定退课？',
         cancelText: '取消',
         confirmText: '确定',
         success: res => {
@@ -290,7 +288,7 @@ export default {
                 paySign: res.data.paySign,
                 success: function (res) {
                   _self.isPaying = false
-                  _self.refresh()
+                  _self.changeTab(0)
                 },
                 fail: function(res) {
                   _self.isPaying = false
@@ -314,7 +312,7 @@ export default {
           if (res.confirm) {
             _cancelOrder({ order_id: id }).then(res => {
               uni.showToast({ title: res.msg, icon: 'none' })
-              _self.refresh()
+              _self.changeTab(0)
             })
           }
         }

src/store/index.js

@@ -1,16 +1,16 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import app from '@/store/app.js'
-import data from '@/store/data.js'
-import user from '@/store/user.js'
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  strict: process.env.NODE_ENV !== 'production', // 在非生产环境下，使用严格模式
-  modules: {
-    app,
-    data,
-    user
-  }
-})
+import Vue from 'vue'
+import Vuex from 'vuex'
+import app from '@/store/app.js'
+import data from '@/store/data.js'
+import user from '@/store/user.js'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+  strict: process.env.NODE_ENV !== 'production', // 在非生产环境下，使用严格模式
+  modules: {
+    app,
+    data,
+    user
+  }
+})

src/store/user.js

@@ -5,6 +5,7 @@ export default {
     session: '',
     kid: 0,
     phone: '',
+    ifConnectOrder: false, // socket连接订单正常
     carts: null// 购物车
   },
   getters: {
@@ -12,6 +13,9 @@ export default {
       const user = uni.getStorageSync('user')
       return state.user || user ? JSON.parse(user) : {}
     },
+    ifConnectOrder(state) {
+      return state.ifConnectOrder
+    },
     kid(state) {
       return state.kid || uni.getStorageSync('kid')
     },
@@ -80,6 +84,9 @@ export default {
         key: 'carts',
         data: JSON.stringify(carts)
       })
+    },
+    SET_CONNECT(state, bool) {
+      state.ifConnectOrder = bool
     }
   },
   actions: {
@@ -89,6 +96,9 @@ export default {
         resolve(true)
       })
     },
+    setConnect({ commit }, bool) {
+      commit('SET_CONNECT', bool)
+    },
     setUser({ commit }, user) {
       commit('SET_USER', user)
     },