fix:更新多订单，退课，页面优化等修改

src/components/u-charts/component.vue

@@ -0,0 +1,166 @@
+<template>
+  <canvas v-if="canvasId" :id="canvasId" :canvasId="canvasId"
+    :style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"
+    @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" @error="error">
+  </canvas>
+</template>
+
+<script>
+import uCharts from './u-charts.js';
+var canvases = {};
+
+export default {
+  props: {
+    chartType: {
+      required: true,
+      type: String,
+      default: 'column'
+    },
+    opts: {
+      required: true,
+      type: Object,
+      default () {
+        return null;
+      },
+    },
+    canvasId: {
+      type: String,
+      default: 'u-canvas',
+    },
+    cWidth: {
+      default: 375,
+    },
+    cHeight: {
+      default: 250,
+    },
+    pixelRatio: {
+      type: Number,
+      default: 1,
+    },
+  },
+  mounted () {
+    this.init();
+  },
+  methods: {
+    init () {
+      switch (this.chartType) {
+        case 'column':
+          this.initColumnChart();
+          break;
+        case 'line':
+          this.initLineChart();
+          break;
+        default:
+          break;
+      }
+    },
+    initColumnChart () {
+      canvases[this.canvasId] = new uCharts({
+        $this: this,
+        canvasId: this.canvasId,
+        type: 'column',
+        legend: true,
+        fontSize: 11,
+        background: '#FFFFFF',
+        pixelRatio: this.pixelRatio,
+        animation: true,
+        categories: this.opts.categories,
+        series: this.opts.series,
+        enableScroll: true,
+        xAxis: {
+          disableGrid: true,
+          itemCount: 4,
+          scrollShow: true
+        },
+        yAxis: {
+          //disabled:true
+        },
+        dataLabel: true,
+        width: this.cWidth * this.pixelRatio,
+        height: this.cHeight * this.pixelRatio,
+        extra: {
+          column: {
+            type: 'group',
+          }
+        }
+      });
+    },
+    initLineChart () {
+      canvases[this.canvasId] = new uCharts({
+        $this: this,
+        canvasId: this.canvasId,
+        type: 'line',
+        fontSize: 11,
+        legend: true,
+        dataLabel: false,
+        dataPointShape: true,
+        background: '#FFFFFF',
+        pixelRatio: this.pixelRatio,
+        categories: this.opts.categories,
+        series: this.opts.series,
+        animation: true,
+        enableScroll: true,
+        xAxis: {
+          type: 'grid',
+          gridColor: '#CCCCCC',
+          gridType: 'dash',
+          dashLength: 8,
+          itemCount: 4,
+          scrollShow: true
+        },
+        yAxis: {
+          gridType: 'dash',
+          gridColor: '#CCCCCC',
+          dashLength: 8,
+          splitNumber: 5,
+          min: 10,
+          max: 180,
+          format: (val) => {
+            return val.toFixed(0) + '元'
+          }
+        },
+        width: this.cWidth * this.pixelRatio,
+        height: this.cHeight * this.pixelRatio,
+        extra: {
+          line: {
+            type: 'straight'
+          }
+        }
+      });
+    },
+    // 这里仅作为示例传入两个参数，cid为canvas-id,newdata为更新的数据，需要更多参数请自行修改
+    changeData (cid, newdata) {
+      canvases[cid].updateData({
+        series: newdata.series,
+        categories: newdata.categories
+      });
+    },
+    touchStart (e) {
+      canvases[this.canvasId].showToolTip(e, {
+        format: function (item, category) {
+          return category + ' ' + item.name + ':' + item.data
+        }
+      });
+      // canvases[this.canvasId].scrollStart(e);
+    },
+    touchMove (e) {
+      // canvases[this.canvasId].scroll(e);
+    },
+    touchEnd (e) {
+      // canvases[this.canvasId].scrollEnd(e);
+    },
+    error (e) {
+      console.log(e)
+    }
+  },
+};
+</script>
+
+<style scoped>
+.charts {
+  width: 100%;
+  height: 100%;
+  flex: 1;
+  background-color: #ffffff;
+}
+</style>

src/pages/class/gift2.vue

@@ -0,0 +1,126 @@
+<template>
+	<view class="page">
+		<cu-custom :isBack="true" title="智能报课"></cu-custom>
+		<view class="steps">
+			<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>
+		<view class="main bg-white" 	:style="[{height:'calc(100vh - 82px - '+ topHeader+'px)'}]">
+			<swiper @change="swipeChange" :current="cur" class="swipe">
+				<swiper-item>
+					<view class="btn-check-group padding">
+						<checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="day">
+							<label class="btn-check-label padding-lr margin" :class="{'bg-cyan':params.day.includes(item.id+'')}"
+								v-for="item in days" :key="item.id">
+								<checkbox :value="item.id"/>
+								{{item.name}}
+							</label>
+						</checkbox-group>
+					</view>
+				</swiper-item>
+				<swiper-item>2</swiper-item>
+				<swiper-item>3</swiper-item>
+			</swiper>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import shopCart from '@/components/shop-cart.vue'
+export default {
+  components: {
+    shopCart
+  },
+  data() {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      numList: [{
+        name: '选周期'
+      }, {
+        name: '选兴趣'
+      }, {
+        name: '确认选课'
+      }],
+      cur: 0,
+      days: [
+        { id: 1, name: '周一' },
+        { id: 2, name: '周二' },
+        { id: 3, name: '周三' },
+        { id: 4, name: '周四' },
+        { id: 5, name: '周五' },
+        { id: 6, name: '周六' },
+        { id: 7, name: '周日' },
+        { id: 8, name: '托管' }
+      ],
+      params: {
+        day: []
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['kid'])
+  },
+  onLoad(options) {
+    const id = decodeURIComponent(options.package_id)
+    this.package_id = id
+    this.init()
+  },
+  onShow() {
+    this.disableBtn = false
+  },
+  methods: {
+    init() {
+
+    },
+    checkboxChange(e) {
+      const type = e.target.id
+      const values = e.detail.value
+      this.params.day = values
+    },
+    changeStep(index) {
+      const step = Math.abs(index - this.cur)
+      if (step > 1) return false
+      this.cur = index
+    },
+    swipeChange(e) {
+      this.cur = e.detail.current
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+.steps{
+	margin:10px 0;
+}
+.main{
+ .swipe{
+		height:100%;
+  }
+}
+.btn-check-group {
+  checkbox {
+    display: none;
+  }
+	radio{
+		display:none;
+	}
+  label {
+    display: inline-block;
+		margin-right:10rpx;
+    position: relative;
+		padding:0 30rpx;
+    line-height: 30px;
+    border-radius: 100rpx;
+    flex-wrap: nowrap;
+    border: 1px solid #eee;
+  }
+}
+</style>

src/pages/class/shoppingCart.vue

@@ -15,14 +15,10 @@
 				<view class="list">
 					<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> -->
+											<checkbox style="transform:scale(0.8)" class="round" :value="item.shopping_id" :checked="checkedIds.includes(item.shopping_id)"></checkbox>
 											{{item.student_name}}
 										</view>
 										<view @tap.stop=''>
@@ -33,7 +29,7 @@
 										<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-right flex-sub margin-left-sm text-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">
@@ -61,7 +57,6 @@
 										<!-- <button @tap="pay(item)" class="cu-btn round bg-student text-white">立即下单</button> -->
 									</view>
 								</label>
-							<!-- </label> -->
 						</view>
 					</checkbox-group>
 				</view>
@@ -70,11 +65,11 @@
 				<view class="static-price">
 				  <checkbox-group @change="chooseAll">
 						<label>
-							<checkbox  :checked="checkAll" style="transform:scale(0.7);"/>全选
+							<checkbox class="round" :checked="checkAll" style="transform:scale(0.8);"/>全选
 						</label>
 				  </checkbox-group>
 				</view>
-				<view class="static-choose  text-ellipsis" v-if="checkedIds.length>0">
+				<view class="static-choose text-center" 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>
@@ -111,6 +106,8 @@ export default {
   },
   onShow() {
     this.get_list()
+  },
+  onLoad(options) {
     socket.initSocket()
   },
   methods: {
@@ -236,7 +233,7 @@ export default {
 		}
 		&-choose{
       color: #666;
-    	width: calc(100vw - 240px);
+    	width: calc(100vw - 200px);
 		}
 }
 

src/pages/login/index.vue

@@ -7,8 +7,9 @@
 			<view class="title">课后百科</view>
 			<view class="action margin-top-xl">
 						<view class="des margin-top">您尚未登录需要获取您的授权后进入</view>
-			      <button class="cu-btn block round bg-grey lg margin-top" @tap="back">暂不登录</button>
+			      <!-- <button class="cu-btn block round bg-grey lg margin-top" @tap="back">暂不登录</button> -->
 			      <button class="cu-btn block round bg-cyan lg margin-top" @tap="login">立即登录</button>
+						<view class="margin-top text-cyan lh-30" @tap="back">暂不登录</view>
 			</view>
 			<view class="agreement margin-top-lg">
 				<checkbox-group @change="agreement=!agreement" style="display:inline-block;">

src/pages/mine/message.vue

@@ -1,50 +1,69 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="true" title="消息中心"></cu-custom>
-		<view class="cu-list box-shadow menu">
-		  <view class="cu-item arrow margin-top-xs" v-for="message in list" :key="message.id">
-					<text class="cuIcon-notice lg text-gray" style="font-size:18px;"></text>
-        	<view class="content margin-left-sm">
-						<view>系统通知</view>
-          	<text class="text-black">{{message.title}}</text>
-        	</view>
-			</view>
-			<view class="cu-item arrow margin-top-xs" @tap="report">
-					<text class="cuIcon-notice lg text-gray" style="font-size:18px;"></text>
-        	<view class="content margin-left-sm">
-          	<text class="text-black">学生综合素质报告</text>
-        	</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { _getNotice } from '@/api/auth'
-export default {
-  data() {
-    return {
-      list: []
-    }
-  },
-  onLoad() {
-    this.get_list()
-  },
-  methods: {
-    report() {
-      uni.showToast({ title: '学期末才能领取对应的学生综合素质报告，敬请期待!', icon: 'none', duration: 2000 })
-    },
-    get_list() {
-      _getNotice().then(res => {
-        this.list = res.data.notice_data
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page{
-	height:100vh;
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="true" title="消息中心"></cu-custom>
+		<view class="cu-list box-shadow menu">
+		  <view class="cu-item arrow margin-top-xs" v-for="message in list" :key="message.id">
+					<text class="cuIcon-notice lg text-gray" style="font-size:18px;"></text>
+        	<view class="content margin-left-sm">
+						<view>系统通知</view>
+          	<text class="text-black">{{message.title}}</text>
+        	</view>
+			</view>
+			<view class="cu-item arrow margin-top-xs" @tap="report">
+					<text class="cuIcon-notice lg text-gray" style="font-size:18px;"></text>
+        	<view class="content margin-left-sm">
+          	<text class="text-black">学生综合素质报告</text>
+        	</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { _getNotice } from '@/api/auth'
+export default {
+  data() {
+    return {
+      list: []
+    }
+  },
+  onLoad() {
+    this.get_list()
+  },
+  methods: {
+    report() {
+      uni.showToast({ title: '学期末才能领取对应的学生综合素质报告，敬请期待!', icon: 'none', duration: 2000 })
+    },
+    get_list() {
+      _getNotice().then(res => {
+        this.list = res.data.notice_data
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+.g-container {
+    position: relative;
+    margin: auto;
+    height: 200px;
+    padding-top: 100px;
+    filter: contrast(20);
+    background-color: #fff;
+    overflow: hidden;
+    &::before {
+        content: "";
+        position: absolute;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        backdrop-filter: blur(10px);
+        z-index: 1;
+    }
+}
+</style>

src/pages/myStudents/myStudents.vue

@@ -3,7 +3,7 @@
 		<cu-custom :isBack="false" :isHome="true">
 			 <view slot="content">我的学生</view>
 		</cu-custom>
-		<scroll-view>
+		<view>
 			<view class="cu-card case no-card">
 				<view class="cu-item shadow">
 					<view class="image">
@@ -12,7 +12,7 @@
 					</view>
 				</view>
 			</view>
-			  <view class="cu-card">
+				<view class="cu-card">
 					 <view class="cu-item shadow">
 						  <view class="students-title flex justify-between align-center">
 								 <view class="text-lg">学生列表</view>
@@ -27,7 +27,8 @@
 								  <text class="text-red text-xs">右侧点击绑定手机号，直接获取绑定学生列表</text>
 									<text class="cuIcon-mobile text-cyan add-icon margin-left-xl" @tap="globalNavigateTo('bindPhone')"></text>
 							</view>
-							<view class="cu-list menu-avatar">
+							<scroll-view scroll-y :style="[{height:'calc(100vh - 230px - '+ topHeader+'px)'}]">
+								<view class="cu-list menu-avatar">
 									<view class="cu-item" :class="moveModel=='move-box-'+ index?'move-cur':''"
 									v-for="(item,index) in result.student_data" :key="index"
 									@touchstart="ListTouchStart" @touchmove="ListTouchMove"
@@ -45,10 +46,11 @@
 											<view class="bg-red" @tap.stop="unbind(item.id)">删除</view>
 										</view>
 									</view>
-							</view>
+								</view>
+							</scroll-view>
 					 </view>
 				</view>
-		</scroll-view>
+		</view>
 		<!-- 选择学生列表 -->
 		<view class="cu-modal" :class="modalName=='showStudents'?'show':''" @tap="hideModal">
 			<view class="cu-dialog bg-student" @tap.stop=''>
@@ -100,6 +102,7 @@ export default {
   data() {
     return {
       showAdd: false,
+      topHeader: this.globalCustomBarHeight,
       modalName: null,
       selectKid: 0,
       student: {

src/pages/order/index.vue

@@ -16,7 +16,7 @@
 		 :refresher-triggered="triggered"
 		@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-card margin-top margin-bottom shadow" v-for="(item,index) in orders" :key="index">
 					<view class="cu-item">
 						<view class="card-header flex justify-between solid-bottom">
 							<view>{{index}}</view>
@@ -29,8 +29,10 @@
 									<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-right flex-sub margin-left-sm text-sm">
+										<view class="card-title">
+											<text>{{course.name}}</text>
+										</view>
 										<view class="card-item margin-top-xs">
 											<text class="card-label">时间：</text>
 											<text class="card-text">{{course.attend_day}}</text>
@@ -47,6 +49,9 @@
 											<text class="card-label">老师：</text>
 											<text class="card-text">{{course.teacher||'--'}}</text>
 										</view>
+										<view class="card-item margin-top-xs" v-if="dropStatus.includes(item.status)&&course.is_return===1">
+											<view class="text-student text-right">{{course.return_status}}</view>
+										</view>
 									</view>
 								</view>
 								<view class="flex card-footer solid-bottom padding-bottom-xs">
@@ -54,9 +59,9 @@
 												<text class="card-label">{{prop.name}}：</text><text class="text-price">{{prop.money}}</text>
 											</view>
 								</view>
-								<view class="card-bottom flex justify-end">
+								<view class="card-bottom flex justify-end margin-top-xs">
 										<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="droping" class="cu-btn round sm line-cyan" v-if="dropStatus.includes(item.status)&&course.is_return===1">退课中</button> -->
 								</view>
 						</view>
 						<view class="card-bottom margin-top-xs flex justify-between">
@@ -75,7 +80,7 @@
 				<view class="cu-card margin-top 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.code}}</view>
+								 <view>{{item.refund_code}}</view>
 								 <view class="text-student course-status">
 									  {{item.status|dropStatus}}
 								 </view>
@@ -84,7 +89,7 @@
 									<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-right flex-sub margin-left-sm text-sm">
 										<view class="card-title">{{item.name}}</view>
 										<view class="card-item margin-top-xs">
 											<text class="card-label">时间：</text>
@@ -102,6 +107,10 @@
 											<text class="card-label">老师：</text>
 											<text class="card-text">{{item.teacher||'--'}}</text>
 										</view>
+										<view class="card-item margin-top-xs">
+											<text class="card-label">订单：</text>
+											<text class="card-text">{{item.code}}</text>
+										</view>
 									</view>
 							</view>
 							<view class="flex card-footer padding-bottom-xs">
@@ -120,6 +129,7 @@
 <script>
 import { _orderCenter, _dropList, _payOrder, _dropCourse, _cancelOrder } from '@/api/course'
 import swiperTab from '@/components/swiper-tab.vue'
+import { deepClone } from '@/common/utils'
 import { mapGetters } from 'vuex'
 export default {
   components: {
@@ -136,7 +146,8 @@ export default {
       payurl: '',
       menuList: ['全部订单', '待付款', '已付款', '退课售后'],
       currentIndex: 0,
-      list: [],
+      list: [], // 退课订单
+      orders: {}, // 订单
       dropStatus: [1],
       orderTypes: {
         0: 5,
@@ -227,10 +238,10 @@ export default {
       _orderCenter(this.params).then(res => {
         if (this.params.page > 1) {
           if (Object.keys(res.data).length < this.page_size) this.noMore = true
-          this.list = Object.assign({}, this.list, res.data)
+          this.orders = Object.assign({}, this.orders, res.data)
         } else {
           this.noMore = false
-          this.list = res.data
+          this.orders = res.data
         }
       })
     },
@@ -337,6 +348,7 @@ export default {
       })
     },
     changeTab(index) {
+      this.orders = {}
       this.params.page = 1
       this.currentIndex = index
       this.params.type = this.orderTypes[index]

src/pages/studentcenter/index.vue

@@ -92,7 +92,7 @@
 											<button class="cu-btn round line-cyan button-hover" @tap="classOperation(mark.class_plan_id)">
 												{{mark.status==-1?'查看':'去上课'}}
 											</button>
-											<button class="cu-btn round line-red button-hover margin-left" @tap="askLeave(mark.class_plan_id)">去请假</button>
+											<button class="cu-btn round line-red button-hover margin-left" @tap="askLeave(mark.class_plan_id)" v-if="mark.status!==-1">去请假</button>
 										</view>
 									</view>
 								</view>
@@ -123,7 +123,7 @@
 									</view>
 									<view class="card-right margin-left-sm">
 										<view class="card-title">{{item.attend_name}}</view>
-										<view class="card-item margin-top-xs" >
+										<view class="card-item margin-top-xs">
 											<text class="card-label">机构：</text>
 										 	<text class="card-text">{{item.agency_name||'-'}}</text>
 									  </view>
@@ -146,7 +146,7 @@
 import NP from 'number-precision'
 import calendar from '@/components/calendar.vue'
 import { _nowCourse, _courseHistory, _attendance, _dateCourse } from '@/api/course'
-import { getDate } from '@/common/utils'
+import { getDate, deepClone } from '@/common/utils'
 import swiperTab from '@/components/swiper-tab.vue'
 export default {
   components: {
@@ -248,6 +248,7 @@ export default {
     },
     chooseDay(day) {
       this.classList = this.courses.filter(item => item.date.replace(/-/g, '') === day)// 匹配当天数据
+      this.classList = this.classList.length > 0 ? this.classList : deepClone(this.courses)
     },
     get_course() {
       _nowCourse({ page_num: this.page_num }).then(res => {