diff --git a/README.md b/README.md index 26f1c99..e87b99b 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,20 @@ See [Configuration Reference](https://cli.vuejs.org/config/). padding-bottom: 0; padding-bottom: calc( 0 + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ padding-bottom: calc( 0 + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ -``` \ No newline at end of file +``` + +正式服： + +APPID: + wxd71043ec955dfecf +AppSecret: + dacec45d75df1cd109090e88855cefc8 + + +测试服： + +APPID: + wx7873af4ffca558fd + +AppSecret: + 9110b93981e88b0127a4f6a8c940dc90 \ No newline at end of file diff --git a/src/js/api.js b/src/js/api.js index 02d9831..433331d 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,7 +1,7 @@ -export const ORIGIN = `https://test.ouxuanzhineng.cn`; // 测试 +// export const ORIGIN = `https://test.ouxuanzhineng.cn`; // 测试 // export const ORIGIN = `http://testmanager.ouxuanzhineng.cn`; // 测试 // export const ORIGIN = `http://kahing.local:9090`; // 本地测试 -// export const ORIGIN = `https://coach.ouxuanzhineng.cn`; // 正式 +export const ORIGIN = `https://coach.ouxuanzhineng.cn`; // 正式 export const API = { coachLogin: `${ORIGIN}/stadium/coach/login`, // 小程序-账号登录 diff --git a/src/manifest.json b/src/manifest.json index de738c3..7ad7abc 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -54,7 +54,7 @@ }, "mp-weixin": { /* 微信小程序特有相关 */ - "appid": "wx7873af4ffca558fd", + "appid": "wxd71043ec955dfecf", "setting": { "urlCheck": false }, diff --git a/src/pages.json b/src/pages.json index 56582f4..bbc3e31 100644 --- a/src/pages.json +++ b/src/pages.json @@ -116,7 +116,7 @@ { "path": "pages/approve/record/record", "style": { - "navigationBarTitleText": "我的审批" + "navigationBarTitleText": "审批记录" } }, { diff --git a/src/pages/approve/list/list.vue b/src/pages/approve/list/list.vue index 94cf730..8431ad9 100644 --- a/src/pages/approve/list/list.vue +++ b/src/pages/approve/list/list.vue @@ -49,9 +49,9 @@ 原因: - {{e.for_leave_reason || '-'}} + {{e.for_leave_reason || '-'}} - + {{e._isUnfold?'收起':'展开'}} diff --git a/src/pages/approve/record/record.vue b/src/pages/approve/record/record.vue index d791f2d..14e0b82 100644 --- a/src/pages/approve/record/record.vue +++ b/src/pages/approve/record/record.vue @@ -47,12 +47,12 @@ 原因: - {{e.for_leave_reason || '-'}} + {{e.for_leave_reason || '-'}} - + - 展开 - + {{e._isUnfold?'收起':'展开'}} + @@ -79,6 +79,11 @@ export default { this.getApproveList(); }, methods:　{ + unFoldBtn(i){ + let _list = [...this.approveList]; + _list[i]._isUnfold = !_list[i]._isUnfold; + this.approveList = [..._list]; + }, tabChange: util.debounce(function(i){ this.approveList = []; this.tabIdx = i; @@ -238,6 +243,10 @@ export default { line-height: 40upx; font-size: 28upx; color: #9a9a9d; + word-break: break-all; + &.text-hide{ + @include textHide(2); + } } } } diff --git a/src/pages/course/experience/experience.vue b/src/pages/course/experience/experience.vue index c5a648a..13a4aab 100644 --- a/src/pages/course/experience/experience.vue +++ b/src/pages/course/experience/experience.vue @@ -121,7 +121,8 @@ export default { if(_ids.length<=0)return; let _query = { occupyType: 'exp_booking', - exp_booking_ids: _ids + exp_booking_ids: _ids, + course_id: this.course_id, } util.routeTo(`/pages/site/manage/manage?query=${util.jsonStr(_query)}`, 'nT'); }, diff --git a/src/pages/course/offer/offer.vue b/src/pages/course/offer/offer.vue index 5169145..cff8344 100644 --- a/src/pages/course/offer/offer.vue +++ b/src/pages/course/offer/offer.vue @@ -39,6 +39,7 @@ 课程名称:{{optionsQuery.course_name || '-'}} 上课用户:{{optionsQuery.user_name || '-'}} + 上课教练:{{coachInfo.name || '-'}} 课程次数:{{courseNumber || '-'}} 课程报价:{{coursePrice || '-'}} diff --git a/src/pages/shift/application/application.vue b/src/pages/shift/application/application.vue index a052c07..7f58b07 100644 --- a/src/pages/shift/application/application.vue +++ b/src/pages/shift/application/application.vue @@ -227,16 +227,16 @@ export default { // 教练列表 getCoachList(){ util.showLoad(); + let { storeInfo } = this; servers.get({ url: API.getCoachList, - data: { }, + data: { stadium_id: storeInfo.id }, failMsg: '加载失败！' }) .then(res=>{ util.hideLoad(); let _list = res.list || []; this.coachList = _list; - console.warn(_list) }) }, // 班级列表 @@ -267,6 +267,7 @@ export default { stadium_id: storeInfo.id, is_experience_class, kind, + have_class_way: 2, }, failMsg: '加载失败！' }) diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue index 1a01864..af17cc8 100644 --- a/src/pages/site/manage/manage.vue +++ b/src/pages/site/manage/manage.vue @@ -118,6 +118,7 @@ export default { occupyTypeInfo: { occupyType: 'normal', // normal:教练占场， exp_booking： 代表体验课占场 exp_booking_ids: [], // 体验课预约id数组 + course_id: '', // 课程id }, } }, @@ -130,19 +131,20 @@ export default { tipTimer = null; }, async onLoad(options){ + let _optionsQuery = {}; if(options.query){ - let _optionsQuery = util.jsonPar(options.query); + _optionsQuery = util.jsonPar(options.query); if(!!_optionsQuery.occupyType)this.occupyTypeInfo = _optionsQuery; } try { util.showLoad(); - let _storeInfo = await this.getStoreList(); + let _storeInfo = await this.getStoreList(_optionsQuery.course_id); let _storeList = _storeInfo.stadium_data || []; if(!_storeList.length)return util.showNone('没有店铺信息！'); this.storeList = _storeList ; let _curStore = _storeList[0] || {}; this.curStoreInfo = _curStore; - let _typeInfo = await this.getClassify({ stadium_id: _curStore.id }); + let _typeInfo = await this.getClassify({ stadium_id: _curStore.id, course_id: _optionsQuery.course_id }); let _typeList = _typeInfo || []; this.typeList = _typeList; if(!_typeList.length)return util.showNone('没有球类信息！'); @@ -324,18 +326,18 @@ export default { }) }, // 球类列表 - getClassify({stadium_id}){ + getClassify({stadium_id, course_id = ''}){ return servers.get({ url: API.venueTypes, - data: {stadium_id}, + data: { stadium_id, course_id }, failMsg: '加载分类失败！' }) }, // 店铺列表 - getStoreList(){ + getStoreList( course_id = '' ){ return servers.get({ url: API.getHomeData, - data: {}, + data: { course_id }, failMsg: '加载店铺失败！' }) }, diff --git a/src/pages/time/select/select.vue b/src/pages/time/select/select.vue index d272e7e..7d1cdb9 100644 --- a/src/pages/time/select/select.vue +++ b/src/pages/time/select/select.vue @@ -46,7 +46,7 @@ ]" @click="timeSelect({i, j, k})" > - {{k.remark || ''}} + {{ k.status == 2&&!!k.course_id ? k.course.name : k.remark }} @@ -218,10 +218,16 @@ export default { this.changeStatusIDX = e.detail.value; }, timeSelect({i, j, k}){ - if(k.status ==1 || k.status ==2)return util.showModal({ - title: '备注', - content: k.remark - }); + if(k.status ==1 || k.status ==2){ + if(k.course_id)return util.showModal({ + title: '课程', + content: k.course.name + }); + return util.showModal({ + title: '备注', + content: k.remark + }); + } let _list = [...this.timeList]; _list[i].items[j]._selectStatus = !_list[i].items[j]._selectStatus; this.timeList = [..._list];