fix:修改筛选部分

src/pages/index/index.vue

@@ -63,29 +63,53 @@
         :style="[{top:topHeader+'px',height:'calc(100vh - ' + topHeader + 'px)'}]">
 					<view class="filter-title">机构筛选</view>
 				  <view class="btn-check-group padding-lr">
-						<checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="agency">
+						<!-- <checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="agency">
 							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm text-ellipsis" :class="{'bg-cyan':params.agency.includes(item.id+'')}"
 								v-for="item in filters.agency" :key="item.id">
 								<checkbox :value="item.id"/>
 								{{item.name}}
 							</label>
-						</checkbox-group>
+						</checkbox-group> -->
+						<radio-group  class="flex" style="flex-wrap: wrap;" id="agency">
+								<label class="btn-check-label margin-top-sm padding-lr-xs text-sm text-ellipsis" :class="{'bg-cyan':params.agency.includes(item.id)}"
+									v-for="item in filters.agency" :key="item.id" @tap="radioChange('agency',item.id)">
+									<radio :value="item.id"/>
+									{{item.name}}
+								</label>
+						</radio-group>
+        	</view>
+					<view class="filter-title">分类筛选</view>
+					<view class="btn-check-group padding-lr">
+						<radio-group  class="flex" style="flex-wrap: wrap;" id="category">
+								<label class="btn-check-label margin-top-sm padding-lr-xs text-sm text-ellipsis" :class="{'bg-cyan':params.category.includes(item.id)}"
+									v-for="item in filters.category" :key="item.id" @tap="radioChange('category',item.id)">
+									<radio :value="item.id"/>
+									{{item.name}}
+								</label>
+						</radio-group>
         	</view>
 					<view class="filter-title">周期筛选</view>
 					<view class="btn-check-group padding-lr">
-						<checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="day">
+						<!-- <checkbox-group @change="checkboxChange" class="flex" style="flex-wrap: wrap;" id="day">
 							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.day.includes(index+'')}"
 								v-for="(item,index) in filters.week" :key="index">
 								<checkbox :value="index"/>
 								{{item}}
 							</label>
-						</checkbox-group>
+						</checkbox-group> -->
+						<radio-group  class="flex" style="flex-wrap: wrap;" id="day">
+								<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.day.includes(index+'')}"
+									v-for="(item,index) in filters.week" :key="index" @tap="radioChange('day',index)">
+									<radio :value="index"/>
+									{{item}}
+								</label>
+						</radio-group>
         	</view>
 					<view class="filter-title">价格区间（元）</view>
 					<view class="btn-check-group padding-lr">
 						<radio-group  class="flex" style="flex-wrap: wrap;" id="price">
 							<label class="btn-check-label margin-top-sm padding-lr-xs text-sm" :class="{'bg-cyan':params.price===item.name}"
-								 v-for="item in filters.price_list" :key="item.id" @tap="radioChange(item.name)">
+								 v-for="item in filters.price_list" :key="item.id" @tap="radioChange('price',item.name)">
 								<radio :value="item.name"/>
 								{{item.name}}
 							</label>
@@ -105,6 +129,7 @@ import course from './components/course.vue'
 import card from './components/card.vue'
 import { _optionCourse, _filter } from '@/api/course'
 import { filterParams } from '@/common/utils/tool'
+import { deepClone } from '@/common/utils'
 import { mapGetters } from 'vuex'
 export default {
   components: {
@@ -160,6 +185,7 @@ export default {
         course_name: '',
         agency: [],
         day: [],
+        category: [],
         price: '',
         sort: '',
         list_type: 0// 0 课程,1 餐饮,2活动
@@ -169,6 +195,7 @@ export default {
         course_name: '',
         agency: [],
         day: [],
+        category: [],
         price: '',
         sort: '',
         list_type: 0// 0 课程,1 餐饮,2活动
@@ -232,11 +259,22 @@ export default {
     hideModal (e) {
       this.modalName = null
     },
-    radioChange(v) {
-      if (this.params.price === v) { // 选中取消
-        this.params.price = null
-      } else { // 空则赋值
-        this.params.price = v
+    radioChange(type, v) {
+      switch (type) {
+        case 'agency':
+          this.params.agency = this.params.agency[0] === v ? [] : [v]
+          break
+        case 'day':
+          this.params.day = this.params.day[0] === v ? [] : [v]
+          break
+        case 'category':
+          this.params.category = this.params.category[0] === v ? [] : [v]
+          break
+        case 'price':
+          this.params.price = this.params.price === v ? null : v
+          break
+        default:
+          console.log('error')
       }
     },
     checkboxChange(e) {
@@ -301,13 +339,22 @@ export default {
       this.get_list()
     },
     get_list(init = false) {
-      let params = Object.assign({}, this.params)
+      let params = deepClone(this.params)
       params = filterParams(params)
       if (params.day.length > 0) {
         params.day = JSON.stringify(params.day)
+      } else {
+        delete params.day
       }
       if (params.agency.length > 0) {
         params.agency = JSON.stringify(params.agency)
+      } else {
+        delete params.agency
+      }
+      if (params.category.length > 0) {
+        params.category = JSON.stringify(params.category)
+      } else {
+        delete params.category
       }
       _optionCourse(params).then(res => {
         if (params.page_num > 1) {

src/pages/studentcenter/absent.vue

@@ -1,84 +1,86 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="true" title="请假"></cu-custom>
-		<form>
-			<view class="cu-form-group">
-				<view class="title">请假类型</view>
-				<picker @change="changeType" :value="index" :range="types" range-key="name">
-					<view class="picker">
-						{{index>-1? types[index].name:'请选择请假类型'}}
-					</view>
-				</picker>
-			</view>
-			<view class="cu-form-group align-start">
-				<view class="title">请假理由</view>
-				<textarea maxlength="-1"  placeholder="请输入请假理由" v-model="params.reason"></textarea>
-			</view>
-		</form>
-		<view class="solids-bottom bg-white text-center padding text-student margin-top" @tap="apply">
-        提交申请
-    </view>
-	</view>
-</template>
-
-<script>
-import { _leaveType, _askLeave } from '@/api/course'
-import validate from '@/common/utils/ys-validate'
-export default {
-  data() {
-    return {
-      key: 1212,
-      index: -1,
-      types: [],
-      params: {
-        plan_id: '',
-        reason: '',
-        type_id: ''
-      },
-      rules: [
-        { name: 'reason', required: true, type: 'required', errmsg: '请输入请假理由' },
-        { name: 'type_id', required: true, type: 'required', errmsg: '请选择请假类型' }
-      ]
-    }
-  },
-  onLoad(options) {
-    const id = decodeURIComponent(options.id)
-    if (!id) uni.navigateBack()
-    this.params.plan_id = id
-    this.getTypes()
-  },
-  methods: {
-    getTypes() {
-      _leaveType().then(res => {
-        this.types = res.data.leave_type_data
-      })
-    },
-    changeType(e) {
-      this.index = e.detail.value
-      this.params.type_id = this.types[this.index].id
-    },
-    apply() {
-      const validRes = validate.validate(this.params, this.rules)
-      if (!validRes.isOk) {
-        uni.showToast({
-          icon: 'none',
-          title: validRes.errmsg
-        })
-        return false
-      }
-      _askLeave(this.params).then(res => {
-        uni.showToast({ title: '提交成功', icon: 'success' })
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 800)
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page{
-	height:100vh;
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="true" title="请假"></cu-custom>
+		<form>
+			<view class="cu-form-group">
+				<view class="title">请假类型</view>
+				<picker @change="changeType" :value="index" :range="types" range-key="name">
+					<view class="picker">
+						{{index>-1? types[index].name:'请选择请假类型'}}
+					</view>
+				</picker>
+			</view>
+			<view class="cu-form-group align-start">
+				<view class="title">请假理由</view>
+				<textarea maxlength="-1"  placeholder="请输入请假理由" v-model="params.reason"></textarea>
+			</view>
+		</form>
+		<view class="solids-bottom bg-white text-center padding text-student margin-top" @tap="apply">
+        提交申请
+    </view>
+	</view>
+</template>
+
+<script>
+import { _leaveType, _askLeave } from '@/api/course'
+import validate from '@/common/utils/ys-validate'
+export default {
+  data() {
+    return {
+      key: 1212,
+      index: -1,
+      types: [],
+      params: {
+        plan_id: '',
+        reason: '',
+        type_id: ''
+      },
+      rules: [
+        { name: 'reason', required: true, type: 'required', errmsg: '请输入请假理由' },
+        { name: 'type_id', required: true, type: 'required', errmsg: '请选择请假类型' }
+      ]
+    }
+  },
+  onLoad(options) {
+    const id = decodeURIComponent(options.id)
+    if (!id) uni.navigateBack()
+    this.params.plan_id = id
+    this.getTypes()
+  },
+  methods: {
+    getTypes() {
+      _leaveType().then(res => {
+        this.types = res.data.leave_type_data
+      })
+    },
+    changeType(e) {
+      this.index = e.detail.value
+      this.params.type_id = this.types[this.index].id
+    },
+    apply() {
+      const validRes = validate.validate(this.params, this.rules)
+      if (!validRes.isOk) {
+        uni.showToast({
+          icon: 'none',
+          title: validRes.errmsg
+        })
+        return false
+      }
+      _askLeave(this.params).then(res => {
+        if (res.code === 1) {
+          uni.showToast({ title: '提交成功', icon: 'success' })
+        }
+        setTimeout(() => {
+          uni.navigateBack()
+        }, 2000)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+</style>