feat：课程接口修改

夏洋涛
1 parent 6a7e9871
Showing 3 changed files with 80 additions and 52 deletions Show diff stats
src/main.js
src/views/Service/CourseBaseList/SelectionCourse.vue
src/views/Service/component/ServiceListSecond.vue
@@ -22,6 +22,7 @@ Vue.prototype.baseUrl = &#39;https://proxy.shunzhi.net&#39;;
 // Vue.prototype.yanxueUrl = 'https://www.zlyanxue.cn';
 // Vue.prototype.yanxueUrl = 'https://zlyx.shunzhi.net';
 Vue.prototype.yanxueUrl = 'https://ocp.sxsedu.net/sxyx/api';
+Vue.prototype.yanxueUrlNew = 'https://ocp.sxsedu.net/szsh/yx';
 Vue.prototype.kqUrl = 'https://proxy.shunzhi.net/achieve'
 Vue.prototype.TestUnionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU' //夏
@@ -2,17 +2,14 @@
 <template>
   <div id="SelectionCourse">
     <van-search v-model="searchValue" placeholder="请输入课程关键词" @search="reloadData" />
-    <van-tabs v-model="active" @click="tabChange">
+    <!-- <van-tabs v-model="active" @click="tabChange">
       <van-tab :title="item.text" v-for="(item, index) in typeOption" :key="index"></van-tab>
+    </van-tabs> -->
+    <van-tabs v-model="provinceActive" :ellipsis="false" ref="tabs" color="#4092FF" @change="provinceTabChange">
+      <van-tab :title="item.label" v-for="(item, index) in provinceTabList" :key="index"> </van-tab>
     </van-tabs>
-    <van-list
-      v-if="CourseData.length > 0"
-      v-model="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-      :immediate-check="false"
-      @load="getCourseData"
-    >
+    <van-list v-if="CourseData.length > 0" v-model="loading" :finished="finished" finished-text="没有更多了"
+      :immediate-check="false" @load="getCourseData">
       <ServiceListSecond :list="CourseData" :courseTypeLableId="typeOption[active].id"></ServiceListSecond>
     </van-list>
     <van-empty v-if="finished && CourseData.length == 0" :image="require('@/assets/empty.png')" description="暂无活动" />
@@ -23,7 +20,7 @@
 <script>
 import ServiceListSecond from '@/views/Service/component/ServiceListSecond.vue'
 export default {
-  data() {
+  data () {
     return {
       pageLoading: true,
       pageSize: 10,
@@ -35,9 +32,19 @@ export default {
       CourseData: [],
       typeOption: [],
       active: 0,
+      provinceTabList: [
+        { label: '推荐', text: '', value: 0, id: '' },
+        { label: '越城', text: '越城区', value: 2, id: '' },
+        { label: '柯桥', text: '柯桥区', value: 1, id: '' },
+        { label: '上虞', text: '上虞区', value: 4, id: '' },
+        { label: '诸暨', text: '诸暨市', value: 3, id: '' },
+        { label: '嵊州', text: '嵊州市', value: 5, id: '' },
+        { label: '新昌', text: '新昌县', value: 5, id: '' },
+      ],
+      provinceActive: 0,
     }
   },
-  mounted() {
+  mounted () {
     let userInfo = localStorage.getItem('userInfo')
     if (userInfo) {
       userInfo = JSON.parse(userInfo)
@@ -49,18 +56,18 @@ export default {
   },
   methods: {
     // 下拉刷新
-    onRefresh() {
+    onRefresh () {
       this.pageNum = 1
       this.reloadData()
     },
-    reloadData() {
+    reloadData () {
       console.log('reloadData')
       this.pageNum = 1
       this.CourseData = []
       this.getCourseData()
     },
     // 精选活动
-    getCourseData() {
+    getCourseData () {
       if (this.pageNum == 1) {
         this.$toast.loading({
           message: '加载中...',
@@ -77,35 +84,41 @@ export default {
       let startPrice = '-1',
         endPrice = '-1'
       this.yxAxios
-        .post(`${this.yanxueUrl}/api/SchoolManage/SchoolCourseListV2`, {
-          labelIdList: labelIdList,
-          ageType: 0, //适应对象
-          days: 0, //线路天数
-          isSelfSupport: null, //是否支持定制
-          // "provinceName":provinceName,//省份
-          // "cityName":cityName,//城市
-          areaName: areaName, //区
-          startPrice: startPrice,
-          endPrice: endPrice,
-          courseName: this.searchValue,
-          stype:1,
-          pageIndex: this.pageNum,
+        .post(`${this.yanxueUrlNew}/course/getCourseByArea`, {
+          page: this.pageNum,
           pageSize: this.pageSize,
+          provinceName: '浙江省',
+          cityName: '绍兴市',
+          areaName: this.provinceTabList[this.provinceActive].text,
         })
+        // .post(`${this.yanxueUrl}/api/SchoolManage/SchoolCourseListV2`, {
+        //   labelIdList: labelIdList,
+        //   ageType: 0, //适应对象
+        //   days: 0, //线路天数
+        //   isSelfSupport: null, //是否支持定制
+        //   // "provinceName":provinceName,//省份
+        //   // "cityName":cityName,//城市
+        //   areaName: areaName, //区
+        //   startPrice: startPrice,
+        //   endPrice: endPrice,
+        //   courseName: this.searchValue,
+        //   stype:1,
+        //   pageIndex: this.pageNum,
+        //   pageSize: this.pageSize,
+        // })
         .then((res) => {
           this.$toast.clear()
-          if (res.data.status == 1) {
-            let data = res.data.data
+          if (res.data.code == 200) {
             this.loading = false
-            let CourseData = data.data
+            let CourseData = res.data.rows || []
             console.log('活动数据:', CourseData)
-            if (this.pageSize * this.pageNum >= data.count) {
+            if (this.pageSize * this.pageNum >= res.data.total) {
               this.finished = true
             } else {
               this.pageNum++
             }
             for (let i in CourseData) {
-              CourseData[i].course_labels = CourseData[i].course_labels?.split(',')
+              CourseData[i].courseLabels = CourseData[i].courseLabels?.split(',')
               if (CourseData[i].startDate) {
                 CourseData[i].week = this.formatWeek(this.Moment(CourseData[i].startDate).format('d'))
                 CourseData[i].startDate = this.Moment(CourseData[i].startDate).format('YYYY.M.D')
@@ -115,12 +128,12 @@ export default {
             this.CourseData = this.CourseData.concat(CourseData)
           } else {
             this.finished = true
-            this.$toast(res.data.message || res.data.result)
+            this.$toast(res.data.msg)
           }
         })
     },
     // 获取研学类型
-    getType() {
+    getType () {
       // this.yxAxios.post(`http://121.40.30.78:9000/StudyLabelDetail/List`, {
       this.yxAxios
         .post(`${this.yanxueUrl}/StudyLabelDetail/List`, {
@@ -152,28 +165,33 @@ export default {
     },
     // 返回顶部
-    backTop() {
+    backTop () {
       document.getElementById('SelectionCourse').scrollIntoView()
     },
     // 格式化星期
-    formatWeek(week) {
+    formatWeek (week) {
       return week == 1
         ? '周一'
         : week == 2
-        ? '周二'
-        : week == 3
-        ? '周三'
-        : week == 4
-        ? '周四'
-        : week == 5
-        ? '周五'
-        : week == 6
-        ? '周六'
-        : week == 0
-        ? '周日'
-        : ''
+          ? '周二'
+          : week == 3
+            ? '周三'
+            : week == 4
+              ? '周四'
+              : week == 5
+                ? '周五'
+                : week == 6
+                  ? '周六'
+                  : week == 0
+                    ? '周日'
+                    : ''
+    },
+    // 改变地区
+    provinceTabChange () {
+      this.CourseData = []
+      this.getCourseData()
     },
-    tabChange() {
+    tabChange () {
       this.pageNum = 1
       this.CourseData = []
       this.getCourseData()
@@ -190,24 +208,29 @@ export default {
   min-height: 100%;
   background: #fff;
   padding-bottom: 40px;
+
   .drop_down_box {
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .filter {
       flex-shrink: 0;
       font-size: 28px;
       padding: 0 30px;
     }
   }
+
   .characteristic_label {
     white-space: nowrap;
     overflow-x: auto;
     padding: 0 30px;
     padding-top: 20px;
+
     &::-webkit-scrollbar {
       display: none;
     }
+
     span {
       display: inline-block;
       padding: 10px;
@@ -216,6 +239,7 @@ export default {
       border-radius: 8px;
       border: 1px solid #f5f6fa;
       margin-right: 12px;
+
       &.active {
         background: #ebf4ff;
         color: #1373ea;
@@ -223,11 +247,13 @@ export default {
       }
     }
   }
+
   .page_loading {
     font-size: 24px;
     text-align: center;
     padding-top: 40px;
   }
+
   .backtop {
     position: fixed;
     bottom: 100px;
@@ -237,6 +263,7 @@ export default {
     border-radius: 10px;
     padding: 10px;
   }
+
   // .van-tab {
   //   font-size: 32px;
   // }
@@ -6,8 +6,8 @@
         <!-- <div class="uni_item_mini" :key="index" @click="handleUniDetail(item)" v-if="index<=3"> -->
         <div class="uni_item_mini" :key="index" @click="handleUniDetail(item)">
           <div class="img_box" :style="{ backgroundImage: 'url(' + item.coverUrl + ')' }">
-            <div class="bottom" v-if="item.cityAddress || item.areaAddress">
-              <span class="count">{{ item.read_count }} 人查看</span>
+            <div class="bottom">
+              <span class="count" v-if="item.readCount">{{ item.readCount }} 人查看</span>
             </div>
           </div>
           <div class="content">
@@ -16,7 +16,7 @@
               <van-icon name="location" /> {{ item.cityAddress }}{{ item.cityAddress && item.areaAddress ? '·' : '' }}{{ item.areaAddress }}
             </p>
             <!-- <div class="tag_box">
-              <template v-for="(tag, index2) in item.course_labels">
+              <template v-for="(tag, index2) in item.courseLabels">
                 <span class="tag" v-if="tag" :key="index2">{{ tag }}</span>
               </template>
             </div> -->
	@@ -22,6 +22,7 @@ Vue.prototype.baseUrl = 'https://proxy.shunzhi.net';		@@ -22,6 +22,7 @@ Vue.prototype.baseUrl = 'https://proxy.shunzhi.net';
22	// Vue.prototype.yanxueUrl = 'https://www.zlyanxue.cn';	22	// Vue.prototype.yanxueUrl = 'https://www.zlyanxue.cn';
23	// Vue.prototype.yanxueUrl = 'https://zlyx.shunzhi.net';	23	// Vue.prototype.yanxueUrl = 'https://zlyx.shunzhi.net';
24	Vue.prototype.yanxueUrl = 'https://ocp.sxsedu.net/sxyx/api';	24	Vue.prototype.yanxueUrl = 'https://ocp.sxsedu.net/sxyx/api';
		25	+Vue.prototype.yanxueUrlNew = 'https://ocp.sxsedu.net/szsh/yx';
25	Vue.prototype.kqUrl = 'https://proxy.shunzhi.net/achieve'	26	Vue.prototype.kqUrl = 'https://proxy.shunzhi.net/achieve'
26		27
27	Vue.prototype.TestUnionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU' //夏	28	Vue.prototype.TestUnionId = 'oJPmPuLaAx2x2DaRGfCFeYuLWzLU' //夏