no message

src/common/webSocket.js

@@ -18,6 +18,9 @@ const socket = {
         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)

src/pages/class/shoppingCart.vue

@@ -10,52 +10,78 @@
 			</view>
 		</view>
 			<scroll-view  scroll-y="true"
-			:style="[{height:'calc(100vh - 64px - '+ topHeader+'px)'}]"
+			:style="[{height:'calc(100vh - 64px - 70px - '+ topHeader+'px)'}]"
 			class="scroll-main">
 				<view class="list">
-					<view class="cu-card margin-bottom shadow" v-for="(item,index) in list" :key="index">
-						<view class="cu-item">
-							<view class="card-header flex justify-between solid-bottom">
-								 <view>{{item.student_name}}</view>
-								 <view>
-									  <text class="cuIcon-delete text-red" @tap="del(item,index)"></text>
-								 </view>
-							</view>
-							<view class="card flex">
-								<view class="card-left">
-									<img mode="scaleToFill" :src="item.image" alt="" class="card-image">
-								</view>
-								<view class="card-right flex-sub margin-left-sm">
-									<view class="card-title">{{item.class_attend_name}}</view>
-									<view class="text-price text-student text-xl margin-top-xs">{{item.price}}</view>
-									<view class="card-item">
-										 <text class="card-label">机构：</text>
-										 <text class="card-text">{{item.agency_name||'-'}}</text>
+					<checkbox-group @change="checkChange">
+						<view class="cu-card margin-bottom shadow" v-for="(item,index) in list" :key="index">
+							<!-- <label class="cu-item"> -->
+								<label class="cu-item">
+									<view class="card-header flex justify-between solid-bottom">
+										<view>
+											<checkbox style="transform:scale(0.7)"  :value="item.shopping_id" :checked="checkedIds.includes(item.shopping_id)"></checkbox>
+											<!-- <checkbox
+											style="transform:scale(0.7)"
+											:value="item.shopping_id" :checked="checked.includes(item.shopping_id)"></checkbox> -->
+											{{item.student_name}}
+										</view>
+										<view @tap.stop=''>
+												<text class="cuIcon-delete text-red" @tap="del(item,index)"></text>
+										</view>
 									</view>
-									<view class="card-item margin-top-xs" v-if="item.cate_type===0">
-										 <text class="card-label">老师：</text>
-										 <text class="card-text">{{item.teacher_name||'-'}}</text>
+									<view class="card flex">
+										<view class="card-left">
+											<img mode="scaleToFill" :src="item.image" alt="" class="card-image">
+										</view>
+										<view class="card-right flex-sub margin-left-sm">
+											<view class="card-title">{{item.class_attend_name}}</view>
+											<view class="text-price text-student text-xl margin-top-xs">{{item.price}}</view>
+											<view class="card-item">
+												<text class="card-label">机构：</text>
+												<text class="card-text">{{item.agency_name||'-'}}</text>
+											</view>
+											<view class="card-item margin-top-xs" v-if="item.cate_type===0">
+												<text class="card-label">老师：</text>
+												<text class="card-text">{{item.teacher_name||'-'}}</text>
+											</view>
+											<view class="card-item margin-top-xs">
+												<text class="card-label">总共：</text>
+												<text class="card-text">{{item.class_total||'-'}}</text>
+											</view>
+											<view class="card-item margin-top-xs">
+												<text class="card-label">时间：</text>
+												<text class="card-text">{{item.week_limit||'-'}}</text>
+											</view>
+										</view>
 									</view>
-									<view class="card-item margin-top-xs">
-										 <text class="card-label">总共：</text>
-										 <text class="card-text">{{item.class_total||'-'}}</text>
+									<view class="card-footer margin-top-xs" v-if="item.prop">
+										<view v-for="(tag,index) in item.prop" :key="index" class="cu-tag line-red">{{tag}}</view>
 									</view>
-									<view class="card-item margin-top-xs">
-										 <text class="card-label">时间：</text>
-										 <text class="card-text">{{item.week_limit||'-'}}</text>
+									<view class="card-bottom margin-top-xs">
+										<!-- <button @tap="pay(item)" class="cu-btn round bg-student text-white">立即下单</button> -->
 									</view>
-								</view>
-							</view>
-							<view class="card-footer margin-top-xs" v-if="item.prop">
-								<view v-for="(tag,index) in item.prop" :key="index" class="cu-tag line-red">{{tag}}</view>
-							</view>
-							<view class="card-bottom margin-top-xs">
-								<button @tap="pay(item)" class="cu-btn round bg-student text-white">立即下单</button>
-							</view>
+								</label>
+							<!-- </label> -->
 						</view>
-					</view>
+					</checkbox-group>
 				</view>
 			</scroll-view>
+			<view class="static flex shadow">
+				<view class="static-price">
+				  <checkbox-group @change="chooseAll">
+						<label>
+							<checkbox  :checked="checkAll" style="transform:scale(0.7);"/>全选
+						</label>
+				  </checkbox-group>
+				</view>
+				<view class="static-choose  text-ellipsis" v-if="checkedIds.length>0">
+					  <text>已选：</text><text class="margin-right-xs">{{checkedIds.length}}</text>
+						<text>总价：</text><text class="text-price text-red">{{sum}}</text>
+				</view>
+				<view class="static-order flex align-center">
+					<button class="cu-btn round bg-student text-white margin-left-xs" @tap="pay">立即下单</button>
+				</view>
+		  </view>
 	</view>
 </template>
 
@@ -63,13 +89,19 @@
 import { _shopList, _delShop, _createOrder } from '@/api/course'
 import { mapGetters } from 'vuex'
 import { deepClone } from '@/common/utils'
+import NP from 'number-precision'
 import socket from '@/common/webSocket'
 export default {
   data() {
     return {
       title: '购物车',
       topHeader: this.globalCustomBarHeight,
-      list: []
+      list: [],
+      checkedIds: [], // 已选择
+      shoppingList: [], // 购物车列表
+      sum: 0,
+      all: [], // 全部
+      checkAll: false
     }
   },
   computed: {
@@ -82,9 +114,25 @@ export default {
     socket.initSocket()
   },
   methods: {
+    checkChange(e) {
+      this.checkedIds = e.detail.value.map(x => Number(x))
+      this.shoppingList = this.list.filter(item => this.checkedIds.includes(item.shopping_id))
+      this.sum_money()
+    },
+    chooseAll() {
+      this.checkAll = !this.checkAll
+      this.checkedIds = this.checkAll ? this.all : []
+      this.shoppingList = this.checkAll ? deepClone(this.list) : []
+      this.sum_money()
+    },
+    sum_money() {
+      const arr = this.shoppingList.map(item => item.price)
+      this.sum = arr.reduce((x, y) => NP.plus(x, y), 0)
+    },
     get_list() {
       _shopList().then(res => {
         this.list = res.data
+        this.all = this.list.map(item => item.shopping_id)// 统计全部
         const carts = this.list.map(item => item.class_attend_id)
         this.$store.dispatch('setCarts', carts)// 刷新购物车
       })
@@ -105,18 +153,22 @@ export default {
         }
       })
     },
-    pay(item) {
+    pay() {
+      if (!this.phone) {
+        return this.globalNavigateTo('bindPhone')
+      }
+      if (this.checkedIds.length < 1) {
+        uni.showToast({ title: '请先选择课程', icon: 'none', duration: 1000 })
+        return false
+      }
       uni.showLoading({
         mask: true,
         title: '加载中...'
       })
-      const order = JSON.stringify([item])
+      const order = JSON.stringify(this.shoppingList)
       let carts = deepClone(this.carts)
-      const index = carts.indexOf(item.class_attend_id)
-      carts = carts.splice(index, 1)
-      if (!this.phone) {
-        return this.globalNavigateTo('bindPhone')
-      }
+      const shoppingCarts = this.shoppingList.map(item => item.class_attend_id)
+      carts = carts.filter(item => !shoppingCarts.includes(item))
       _createOrder({ result: order, notShowLoading: true }).then(res => {
         this.$store.dispatch('setCarts', carts)
         setTimeout(() => {
@@ -168,4 +220,24 @@ export default {
 .card-bottom{
 	text-align:right;
 }
+.static{
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    background: #fff;
+    height: 70px;
+    align-items: center;
+    padding: 0 0.8rem;
+    justify-content: space-between;
+		&-price{
+			font-size:14px;
+		}
+		&-choose{
+      color: #666;
+    	width: calc(100vw - 240px);
+		}
+}
+
 </style>

src/pages/order/index.vue

@@ -17,53 +17,57 @@
 		@refresherrefresh="onRefresh" @scrolltolower="loadMore">
 			<view class="list" v-if="params.type<7">
 				<view class="cu-card margin-top margin-bottom shadow" v-for="(item,index) in list" :key="index">
-					<view class="cu-item" v-for="(course,i) in item.list" :key="i">
-							<view class="card-header flex justify-between solid-bottom">
-								 <view>{{index}}</view>
-								 <view class="text-student course-status">
-									  {{item.status|status}}
-								 </view>
+					<view class="cu-item">
+						<view class="card-header flex justify-between solid-bottom">
+							<view>{{index}}</view>
+							<view class="text-student course-status">
+									{{item.status|status}}
 							</view>
-							<view class="card flex">
-								<view class="card-left">
-									<img mode="scaleToFill" :src="course.image" alt="" class="card-image">
-								</view>
-								<view class="card-right flex-sub margin-left-sm">
-									<view class="card-title">{{course.name}}</view>
-									<view class="card-item margin-top-xs">
-										 <text class="card-label">时间：</text>
-										 <text class="card-text">{{course.attend_day}}</text>
-									</view>
-									<view class="card-item margin-top-xs" >
-										 <text class="card-label">课时：</text>
-										 <text class="card-text">{{course.class_total}}</text>
-									</view>
-									<view class="card-item margin-top-xs">
-										 <text class="card-label">学生：</text>
-										 <text class="card-text">{{course.student_name}}</text>
+						</view>
+						<view class="card-center" v-for="(course,i) in item.list" :key="i">
+								<view class="card flex">
+									<view class="card-left">
+										<img mode="scaleToFill" :src="course.image" alt="" class="card-image">
 									</view>
-									<view class="card-item margin-top-xs">
-										 <text class="card-label">老师：</text>
-										 <text class="card-text">{{course.teacher||'--'}}</text>
+									<view class="card-right flex-sub margin-left-sm">
+										<view class="card-title">{{course.name}}</view>
+										<view class="card-item margin-top-xs">
+											<text class="card-label">时间：</text>
+											<text class="card-text">{{course.attend_day}}</text>
+										</view>
+										<view class="card-item margin-top-xs" >
+											<text class="card-label">课时：</text>
+											<text class="card-text">{{course.class_total}}</text>
+										</view>
+										<view class="card-item margin-top-xs">
+											<text class="card-label">学生：</text>
+											<text class="card-text">{{course.student_name}}</text>
+										</view>
+										<view class="card-item margin-top-xs">
+											<text class="card-label">老师：</text>
+											<text class="card-text">{{course.teacher||'--'}}</text>
+										</view>
 									</view>
 								</view>
-							</view>
-							<view class="flex card-footer solid-bottom padding-bottom-xs">
-										<view v-for="(prop,k) in course.prop" :key="k" class="margin-right-xs">
-											<text class="card-label">{{prop.name}}：</text><text class="text-price">{{prop.money}}</text>
-										</view>
-							</view>
-							<view class="card-bottom margin-top-xs flex justify-between">
-								<view>
-									<text class="text-price text-red">{{item.sum_money}}</text>
+								<view class="flex card-footer solid-bottom padding-bottom-xs">
+											<view v-for="(prop,k) in course.prop" :key="k" class="margin-right-xs">
+												<text class="card-label">{{prop.name}}：</text><text class="text-price">{{prop.money}}</text>
+											</view>
 								</view>
-								<view>
+								<view class="card-bottom flex justify-end">
 										<button @tap="dropCourse(course.order_info_id)" class="cu-btn round bg-student text-white" v-if="dropStatus.includes(item.status)&&course.is_return===0">退课</button>
 										<button @tap="droping" class="cu-btn round sm line-cyan" v-if="dropStatus.includes(item.status)&&course.is_return===1">退课中</button>
-										<button @tap="pay(item.order_id)" class="cu-btn round bg-student text-white margin-right-sm" v-if="item.status===0">立即付款</button>
-										<button @tap="cancel(item.order_id)" class="cu-btn round bg-gray" v-if="item.status===0&&!isPaying">取消</button>
 								</view>
-							</view>
+						</view>
+						<view class="card-bottom margin-top-xs flex justify-between">
+									<view>
+										<text class="text-price text-red">{{item.sum_money}}</text>
+									</view>
+									<view>
+											<button @tap="pay(item.order_id)" class="cu-btn round bg-student text-white margin-right-sm" v-if="item.status===0">立即付款</button>
+											<button @tap="cancel(item.order_id)" class="cu-btn round bg-gray" v-if="item.status===0&&!isPaying">取消</button>
+									</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -116,6 +120,7 @@
 <script>
 import { _orderCenter, _dropList, _payOrder, _dropCourse, _cancelOrder } from '@/api/course'
 import swiperTab from '@/components/swiper-tab.vue'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     swiperTab
@@ -132,7 +137,7 @@ export default {
       menuList: ['全部订单', '待付款', '已付款', '退课售后'],
       currentIndex: 0,
       list: [],
-      dropStatus: [1, 4],
+      dropStatus: [1],
       orderTypes: {
         0: 5,
         1: 0,
@@ -178,6 +183,19 @@ export default {
       this.get_list()
     }
   },
+  watch: {
+    ifReloadOrder(n, o) {
+      if (n) {
+        this.changeTab(0)
+        this.$store.dispatch('setReload', false)
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'ifReloadOrder'
+    ])
+  },
   methods: {
     refresh() {
       this.params.page = 1

src/pages/studentcenter/evaluate.vue

@@ -13,7 +13,7 @@
 			</view>
 		</view>
 		<view class="comment bg-white margin-top padding-lr padding-tb-lg">
-			<view>请评价</view>
+			<view>{{satisfaction.satisfaction?'已评价':'请评价'}}</view>
 			<view class="flex text-center margin-top" style="padding-left:80rpx;">
 					<view class="flex-sub">
 						<img src="/static/imgs/class/satisfaction.png" mode="widthFix" style="width:70px;">
@@ -42,7 +42,7 @@
 					<button class="cu-btn" :class="params.statisfaction===1?'bg-cyan':'line-cyan'"  @tap="evaluate('statisfaction',1)">一般</button>
 				</view>
 			</view>
-			<view class="margin-top-lg">
+			<view class="margin-top-lg" v-if="!satisfaction.satisfaction">
 				<button class="cu-btn bg-cyan lg" style="width:100%;" @tap="comment">提交评价</button>
 			</view>
 		</view>

src/store/user.js

@@ -6,6 +6,7 @@ export default {
     kid: 0,
     phone: '',
     ifConnectOrder: false, // socket连接订单正常
+    ifReloadOrder: false, // 刷新订单列表
     carts: null// 购物车
   },
   getters: {
@@ -16,6 +17,9 @@ export default {
     ifConnectOrder(state) {
       return state.ifConnectOrder
     },
+    ifReloadOrder(state) {
+      return state.ifReloadOrder
+    },
     kid(state) {
       return state.kid || uni.getStorageSync('kid')
     },
@@ -87,6 +91,9 @@ export default {
     },
     SET_CONNECT(state, bool) {
       state.ifConnectOrder = bool
+    },
+    SET_RELOAD(state, bool) {
+      state.ifReloadOrder = bool
     }
   },
   actions: {
@@ -99,6 +106,9 @@ export default {
     setConnect({ commit }, bool) {
       commit('SET_CONNECT', bool)
     },
+    setReload({ commit }, bool) {
+      commit('SET_RELOAD', bool)
+    },
     setUser({ commit }, user) {
       commit('SET_USER', user)
     },