From 1956fd9219f087664423ca25dda9aa8da39d70d6 Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Sat, 18 Sep 2021 16:19:00 +0800
Subject: [PATCH 01/11] add style course

---
 src/pages.json                                     |  14 ++
 src/pages/index/index.vue                          |   6 +
 src/static/images/icon/index/tab_10.png            | Bin 402 -> 0 bytes
 src/static/images/icon/index/tab_8.png             | Bin 477 -> 2497 bytes
 src/static/images/icon/index/tab_9.png             | Bin 696 -> 0 bytes
 .../course/components/store_name/store_name.vue    |  81 ++++++++
 src/subpackage/course/js/course_api.js             |   8 +
 src/subpackage/course/js/course_server.js          |  10 +
 src/subpackage/course/pages/index/index.vue        | 204 +++++++++++++++++++++
 .../course/static/images/icon/arrow_b2.png         | Bin 0 -> 251 bytes
 .../course/static/images/icon/arrow_white.png      | Bin 0 -> 563 bytes
 .../course/static/images/tab/tab_0_0.png           | Bin 0 -> 2149 bytes
 .../course/static/images/tab/tab_0_1.png           | Bin 0 -> 2527 bytes
 .../course/static/images/tab/tab_0_2.png           | Bin 0 -> 2459 bytes
 .../course/static/images/tab/tab_0_3.png           | Bin 0 -> 2245 bytes
 15 files changed, 323 insertions(+)
 delete mode 100644 src/static/images/icon/index/tab_10.png
 delete mode 100644 src/static/images/icon/index/tab_9.png
 create mode 100644 src/subpackage/course/components/store_name/store_name.vue
 create mode 100644 src/subpackage/course/js/course_api.js
 create mode 100644 src/subpackage/course/js/course_server.js
 create mode 100644 src/subpackage/course/pages/index/index.vue
 create mode 100644 src/subpackage/course/static/images/icon/arrow_b2.png
 create mode 100644 src/subpackage/course/static/images/icon/arrow_white.png
 create mode 100644 src/subpackage/course/static/images/tab/tab_0_0.png
 create mode 100644 src/subpackage/course/static/images/tab/tab_0_1.png
 create mode 100644 src/subpackage/course/static/images/tab/tab_0_2.png
 create mode 100644 src/subpackage/course/static/images/tab/tab_0_3.png

diff --git a/src/pages.json b/src/pages.json
index 116db35..709fc16 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -385,6 +385,20 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "subpackage/course",
+			"pages": [
+			  {
+					"path": "pages/index/index",
+					"style" : {
+						"navigationBarTitleText": "课程管理" ,
+						"navigationBarBackgroundColor": "#009874",
+						"navigationBarTextStyle": "white"
+					}
+				}
+				
+			]
 		}
 	],
 	"globalStyle": {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5589bbf..9d03d23 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -125,6 +125,12 @@
 			name: '商品零售',
 			path: '/subpackage/retail/pages/index/index',
 			serverKey: 1011  // 后端对应权限编号
+		},
+		{
+			id: 8,
+			name: '课程管理',
+			path: '/subpackage/course/pages/index/index',
+			serverKey: 1011  // 后端对应权限编号
 		}
 	];
 	
diff --git a/src/static/images/icon/index/tab_10.png b/src/static/images/icon/index/tab_10.png
deleted file mode 100644
index 247c05817f10c7d3400855f1495531b92de8fa7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^CLqkg3?x4-dwml~xd!-zxB_X086^y}iWz1C$r2D7
zh=A-F#SAkl7^WkM%qnG=QwWuvS;{c87{r}g3KU`Q2yz3OBUTdR7tHX;YmL*wo{~ha
zZzs1+4;K3H?3$&DM5t256rhS{o-U3d9>?!qd(G9Vz{Bt$EiF!K_q)IHU*~8#DafeL
zQMj{SvTmv0rFBmQ8d@19DjKOyRZKbZ|H699?F~n^bw-t}?RXv9$(F@m>XF0|+1PVO
z`PR~h3!N>cIa^C#X(-R!b-wsiir~_94{TN9T)2b2+^Si=?DvI;Q^i43d_O*P+4*Qq
zT*Y6Hn-X@XqKY1`$bNM0!>c8k#uaOAbGgsz==E~xEMk>X7uMX<nzZO)ADdd&RmKj{
z<VCGqs=NGrLL${(J*hbMMCPe?y-v=Q`3ed*I(&ls7uHnh$LyVUVe<0ozfTwcn{~OM
ZhM{x5v+=B)+83a}^>p=fS?83{1OP6iq{9FJ

diff --git a/src/static/images/icon/index/tab_8.png b/src/static/images/icon/index/tab_8.png
index f90fae4cf475c3624b140bb9f15983c36b024171..4b19fe3d3927094bc048984e8f9c798a8521bcbc 100644
GIT binary patch
literal 2497
zcmV;y2|o6TP)<h;3K|Lk000e1NJLTq001-q001-y1^@s6#dsU*000SyNkl<ZXhZFp
zYm8l06~}*jpPA`ADijskQb>6iGzc*u6pTVkfRuu1L74#wf;>7CM2U|XY9WN9Ar$B|
zXccj$wG|<xv?#U_DgkUO5^IqVLnUA+6-lL~D6ig`wsX&3W}S2PopY~u=H9t;>j%R5
zbY||^d$0d`{@2=u57=WqV0ictP)!z<RB;BWY5f=$9XJbxq2>6$8QRx4JP-x8rrq-5
zr-d+dW014zPwNZF3#`X?tchYN^nd+fOZ?s$4i><zZV%%BWdT<$_Q)TOACOuCEVqVH
zL0CO+`FE!y<_yGq31iMoz{wvl@@tGd&9zHjD~P3_zaJ_<H(txt1}G6g*IL3bUl6Qs
z!NC~jfLw%d2FTRdMii1y`flF9@HCi55Z2Rm=evbH!muF*c5A4oj5+422Q-ovS1de~
z{X?f?%v=of5Dv|N*q?%FOa&fFe`_jyW7v(b7Lj!{HE!nWMY}WL%3FUF*Q^Z4yHwT^
ztHUPV&dtJ@ixHUx92;9Jc{JEnaCITowm#m9*}pZ$6liwcHjLSb$ip1cwvmod6_PyO
zaut$Ec|bm3HL%q(YWlvg6_Yy^D|3i!JIFB^OL)zzfPT**Fk7+iNsxyUsmvufdk)A6
zDVR92QU&NbUGLrURRXsLXVxQa&(akR6l5uvK~vntfP9wn8A=yU+j|lw-%e!C1ym4q
zmyrcAY{$sMIJ=$}w}mTubFm;X9)w?Zw=rmEVBH)<EzHps6r)z!N+3@l4QtrZ{CpvC
zsNzeq<S-y_2?a4_@I;K8jiCeKq>Njr>y)~RV9Yi|He&3<OlsNiKdzz~P#?`?rLOzV
z;8}>f7-ME3qOR*@D(AXd)1F6Ijo8Q8+44dR&dZ)zoalV%(h0P@z68fLKyw+*4F@yk
zEsU%KvzEwh=DOZDs|x0klFPl_hY{G*LFOT5F3876NG?8W?!$5)gL`k_h9B?qXD8ZF
z)2W*+yYUA&xg`y3)liaUhEwmGSgj>ILKHkY?sPj^`VXQD5H7;SHSDmA3@TSfHg^YI
zOBQ+z>eWfmt8ec$n-D&m2I+9BH9ST>T0!8RrR#@p6f9B4g2+e(y6;<4iR`H~1Xm-R
zpGhW~h#E0GN3+cIu{sRso^T=!xlO>yX`1yZRu?`>6s<&pEnL5N=l>PZJv~z}(F}s%
zD&T@lCR8g0VE#%|>nyGc-%+I$yWH~bJBZAJH1O3|OI*(Eid`<^5hk>)k2fi;6Jx3H
zBe~qla1#4+a|pc4$>fa7`54kf6JX>SCe4^hM@L*@iqrPWu$g@BM>wtoCR9iYyRmK^
zV%O0S{Hf{+KN{o6N1wyExj3syVKl~}YV?4fX8z)t7$e1iiqiIbCt~e+5VRw%QrcG2
zZ^N<)$C|Pgezdf$jKk87V`deMV?W01K;(#&iP)IvmIaiQ%A{W@EvyoCAog5v)m3;c
ztVY)3CT=NIcwbnRao9aG5Hm-chbju|5ZJ94*#JQw<fkHRNHd+f+$eyuph}ytxWaP+
zmh*7-N{}ild`x|w!kJZZs9CubXU|Tl&*+Q;vmNX1!|^*>*vhLD2je38)1EU3(BzdQ
zg^GX*QJ%hJ$!XtBQ(>r;<Jw;1mG@48;7S}yiL}D|r&e;R>(zCifapFxanN7*du}>3
z4$yV`8!Y|igt&l?8<3B!Wj)v9=miF_Y$0;X*!hul9J6Oa%*~8k4qS-v(J{6U{{eo3
zm<M9+cjUx<ygV?MK<49^0kmT2X8z)PVvUUpkO!mLZ)orp#7#?uO(Fu6?ktCf`{`Qr
z5=mPz4<j9j(IC%eDo<#2-ENF*Ld<FoX<Hj}zrKZ^g8Wy3YctHipR<D&`D9!?>jEe#
zx>``%Qb3wAeT~vX_hMu-h6k9ys`%iaEc_VFL$isv6k|UhYggPe1gv6j<Kui|(Z6GM
zvX4s<E=SDiDSy;2J-yMMN)?c!sqKik?j0aNrHpvEQ8T=Qkze70U%=acrmKI54RKoy
zXN7tCIve4T)3DLk5c6e(Nonx;*vmG3zKG_)PK&u?9Rcl%{W)=hJYsgIGXt+trAR7x
zGR=t#pLr20kK*iuNtSb$;midf#}|JWceEKGI&+XikwV8iKvUbadRu515axaIavaU(
zY$CY=;R^+@2{YHGteO^FQ@6MFK%9aDdp}m5Vu+U!4oa1Czya-n*2!_v)Lwt`dneLh
z=i%(-5I1SwRVoijFx#;10rGAwyAINZEuXae1G^BJSOA1Q{J^;!W)CfHN*w&Ym(r89
zRy4QF2ELLGPo|U~W3dyX)!wXP@8IKw2F>pkw=#BT5g_k!{XH`gexG&(O<?{=XX{K%
z(z%X4_3>#t$#Pkj8@A9$<K26|cN8W%lR&<RGddYkY#R~tTLPskz1s_=xOC_-nuUJ0
z;4>JfOyS^Uy;)D!UFQ!sc!gcdyi^OQbat&<c|NG`tG}I$f;;XWESyqq6kIf6Dsj06
zGlgsJdOu#j?8Xo$H(=OFBwy#c-i>jC7>2Gs7AiO4tYug~8lZgJWUdeQ6cp0eb1b-b
z>00tu))ch@%F*H`7e-W-Mz+;nrxc9?N@B<Z@=c*1IHs2IplStF97B}=jpo+b->R`t
zwr?xb9ajfPx!nHTKT~d|A`H?ZM{z~(o7tIIwQ`U6oflT;<wJSBok(I&=ihts)A`Qb
zgO$#!Jll?gx;^0Sqc?+`QWzlxT*I}CSHy(0Jye!3{-?jQA*M>pd#)zp=Y_L$vNP!)
zrxhid5l*WN$opu2_w9&Tn6dz^@Y}(iPuG%{e1;hpB7aW8x*vmhM689m2_uW>?7gX)
zb1DP!#jdaCWH6f`uHNZ@g4ZzINyL*hn%uYmS!pBBIfz++$n?S)TEwlL#r!*-D=OkO
zTgbayJX!6&4QFmnt8{YVm2fe2xnzD_`=i{?-##ewR{Er5_jbA#-&_rtB;3aG#J3T-
z2XS1I0!S=1%&^C@Te)v_zu`SC53!@|vawuKRu8C<Qac;5lWvJCbwWR~SB~Qa<o9|P
zYnF0w>uqs2o4H-6bU^ihbf;{AT;6>G&RhugEO1Ar-E5`vM*dw)4r5-&<~I;EtflMD
z7mCiSa_6xD@}RP_I}t;FR|8Fl`^K)yqf0*9|F4M7{(RB3e+^guV+Z8r$X;942BG|_
zaqe3?pi*(XJJt%WPV}jMfNBL&=XD<fs<T4tzTJlws=G?-yy1TVlP)fTubTd900000
LNkvXXu0mjf9-6z_

literal 477
zcmeAS@N?(olHy`uVBq!ia0vp^CLqkg3?x4-dwml~MFseTxB_X0*~JVqOBiO9FiZ!N
zKn4WODrJ~i3S|Qsv&$G3wLrNb1z;(l7NA}Tg6NuE&M>1Gs7!6qgIz$wWlMtmf*C}6
zzr3<M`16jT$HRHW8XWJ=AKx*hsVXZ{aUtJ|ns=NZ85kHvJzX3_JdVG;e7mSwL4fVS
z(+ym5i#@NZeEl20Ikt^0mvcw?Ta*93W_<Dw&T;+Mw|L>}R?RW9boxVqOVvyG7P@W}
zbltJwk%Io&Q|_(%<4zjzHnz1#8M&T!5|vbLsOyvR?zJwR;8?pqH^%q+Duw2>(0gx^
zn<rj7H^K3(m!x<><#PK=Q=b-_thK8WV#p7fD}Q)(a#L9A6riphzx8JAs>-`kb1$H_
zwPcAg$A#D{*9&JDibs`hTDNcev4yRP8dsm|s>ds<9Sges_qfPA-Q;J_e8lgE9^J3{
z^6dFo;mZzpSFOKa=IXQf(CiHd=FfC;@)8tlG51{X<L}B}x*QYxR|My{%uQ0R`s0)%
mvTV<ZkdK<@L)QP<Si=yz+%(DYPf{Z&o;+RsT-G@yGywoeOv*d}

diff --git a/src/static/images/icon/index/tab_9.png b/src/static/images/icon/index/tab_9.png
deleted file mode 100644
index d9c13e366386d930aa36e33e87d1104eae2b5c6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 696
zcmeAS@N?(olHy`uVBq!ia0vp^CLqkg3?x4-dwml~Wd`_!xB_X086^xeOF`uHVh{=9
zf)S80tDIp%KEup1kO)+~6s)+EVHQ{mND$1JRfeJ$q8=za1FFn+qgOf5E~SznzhH(R
z;kS97yz@!76J}MFJ-RR0XhY)Xi+vSZ+s`a6Tr;!Lt-WAx5YWwxcRXDjLp+YZoqD&Z
z$v~i$pJmE@1^aCaZiL<YuQ)r_>6#?-E1&A;<%iXtsI;Gb*I-`nwn|O^Bjf5nESIGo
zzLpBKy=D{kHgdAUqIBM6OIGr<H-x^HYI(LW!SbZc%4;SWXFhYCUM?9TFg0HJ-HfKc
zou}42YQH-&f5jdt9<^U=%KzqQMdaO7TmIBy@s4)aKb^0>&3P=b%(bP(=}y6%_X|A^
ze>}3vwxdF*O!j8t&c<nBX^U?AI_WI3wpwac|FP@3`b3sKn;kJFd!lL`*XXDBxkap-
z)7dlWI{y;~?P=^@lfN%q9xnL&A#<O;)a#C7&zC38&e~`GcuvrPpQqTPirXfbn_Paf
z;q()(=ej&Oc?JswLi6VHPda>QgYrDnIXAimWW|r0*7~rm?4Pyz<bpSACTPz3Zz9Ob
zIpauJ{%P@$M}3p@cg`)pn($@M`FY(-+uLV#r`mt7c(`h-i`0b2B6fF9XT9vpf7g94
z?^)``z}<EsPs+E=J<$LA!7M+MydbL`A;R)|+Prmt{+{)E$wgs)vxnYqcJS>myK$S9
z-@<>|;l$2WGPes7jeL`vlUv$dZf%>8s~4Iitm&K>o*=EM;U50jvukelXL%dnySe{Q
vg`J)t@li-Ib6v$mvjui_Q`a1s{r`cu@9I>~+yu*epd{$&>gTe~DWM4fvMx5c

diff --git a/src/subpackage/course/components/store_name/store_name.vue b/src/subpackage/course/components/store_name/store_name.vue
new file mode 100644
index 0000000..1924957
--- /dev/null
+++ b/src/subpackage/course/components/store_name/store_name.vue
@@ -0,0 +1,81 @@
+<template>
+    <picker class="store-name-picker" :range="storeList" range-key="name" @change="storeChange">
+        <view class="store-name" :style="{background:getThemeBg()}">
+            <image class="sn-logo" mode="aspectFit" :src="curStoreInfo.logo || ''"></image>
+            <view class="sn-txt" :style="{color:getThemeColor()}">{{curStoreInfo.name || '-'}}</view>
+            <image class="sn-arrow" mode="aspectFit"  :src="getThemeIcon()"></image>
+        </view>
+    </picker>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+    computed: {
+        ...mapState({
+            storeList: state => state.device.storeList,
+            curStoreInfo: state => state.device.curStoreInfo,
+        }),
+		getThemeIcon(){
+			return ()=> {return (this.theme=='light')?'/subpackage/course/static/images/icon/arrow_white.png':'/subpackage/course/static/images/icon/arrow_b2.png';}
+		},
+		getThemeColor(){
+			return ()=> {return (this.theme=='light')?'#FFFFFF':'#333333';}
+		},
+		getThemeBg(){
+			return ()=> {return (this.theme=='light')?'none':'none';} //
+		},
+    },
+	props: ["theme"],//定义主题字段,定制组件展示效果 "light":亮色  
+	created() {
+		console.log("store_name theme: ", this.theme);
+	},
+    methods: {
+        storeChange(e){
+            let { storeList, curStoreInfo } = this;
+            let _curSelect = storeList[e.detail.value];
+            if(_curSelect.id!==curStoreInfo.id)this.$store.commit('setStoreInfo', _curSelect);
+            console.log(e)
+        }
+    }
+}
+</script>
+
+<style>
+    .store-name-picker{
+        width: 100%;
+		z-index: 5;
+    }
+    .store-name{
+        display: flex;
+		flex-direction: row;
+        align-items: center;
+        justify-content: flex-start;
+        padding: 0 40upx;
+        height: 100upx;
+        /* background-color: #fff; */
+    }
+    .sn-logo{
+        flex-grow: 0;
+        flex-shrink: 0;
+        margin-right: 20upx;
+        width: 52upx;
+        height: 52upx;
+    }
+    .sn-txt{
+        /* flex-grow: 1; */
+        line-height: 40upx;
+        font-size: 28upx;
+        color: #1a1a1a;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .sn-arrow{
+        flex-shrink: 0;
+        flex-grow: 0;
+        margin-left: 20upx;
+        width: 28upx;
+        height: 28upx;
+    }
+</style>
\ No newline at end of file
diff --git a/src/subpackage/course/js/course_api.js b/src/subpackage/course/js/course_api.js
new file mode 100644
index 0000000..ce64999
--- /dev/null
+++ b/src/subpackage/course/js/course_api.js
@@ -0,0 +1,8 @@
+import { ORIGIN } from '../../../js/api';
+
+export const COURSE_API = { 
+    stadiumList:`${ORIGIN}/admin/stadium/list`,  //  店铺列表
+	
+}
+
+export default COURSE_API;
\ No newline at end of file
diff --git a/src/subpackage/course/js/course_server.js b/src/subpackage/course/js/course_server.js
new file mode 100644
index 0000000..9245726
--- /dev/null
+++ b/src/subpackage/course/js/course_server.js
@@ -0,0 +1,10 @@
+import { Server } from '../../../js/server';
+
+class DeviceServer extends Server {
+    constructor(props){
+        super(props)
+    }
+}
+
+
+export default new DeviceServer();
\ No newline at end of file
diff --git a/src/subpackage/course/pages/index/index.vue b/src/subpackage/course/pages/index/index.vue
new file mode 100644
index 0000000..1370525
--- /dev/null
+++ b/src/subpackage/course/pages/index/index.vue
@@ -0,0 +1,204 @@
+<template>
+	<view class="index-content">
+		<view class="ic-head">
+			<store-name :theme="'light'"></store-name>
+		</view>
+		<view class="ic-section">
+			<view class="is-box">
+				<view class="ib-line">
+					<view class="il-view">
+						<view>进行中</view>
+						<view>20</view>
+					</view>
+					<view class="il-cut"></view>
+					<view class="il-view">
+						<view>已结束</view>
+						<view>10</view>
+					</view>
+				</view>
+				<view class="ib-line">
+					<view class="il-view">
+						<view>今日待上课</view>
+						<view>6</view>
+					</view>
+					<view class="il-cut"></view>
+					<view class="il-view">
+						<view>今日已上课</view>
+						<view>3</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="ic-tablist" v-for="(e,i) in tabList" :key="i">
+			<view class="it-title">{{e.type}}</view>
+			<view class="it-tabs">
+				<view class="itt-item" v-for="(item,index) in e.itemList" :key="index" @click="tabChange(item.path)">
+					<view>
+						<image :src="'/subpackage/course/static/images/tab/tab_'+ e.id +'_'+ item.id + '.png'"></image>
+						<view>{{item.name}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+import { mapState } from 'vuex'
+import store_name from '../../components/store_name/store_name';
+const tabList = [
+	{
+		type: "更多操作",
+		id: 0,
+		itemList:[
+			{
+				id: 0,
+				name: "学员课程",
+				path: "",
+			},
+			{
+				id: 1,
+				name: "私教课上课记录",
+				path: "",
+			},
+			{
+				id: 2,
+				name: "大班上课记录",
+				path: "",
+			},
+			{
+				id: 3,
+				name: "班级管理",
+				path: "",
+			},
+		],
+	},
+]
+export default {
+	components: {
+	    'store-name': store_name
+	},
+	data() {
+		return {
+			tabList,
+		}
+	},
+	async onLoad(){
+	    try{
+	        util.showLoad();
+	        let _brandInfo = await this.$store.dispatch('getBrandInfo');
+	        await this.$store.dispatch('getStoreList');
+			// this.updateAC();
+	        util.hideLoad();
+	    }catch(err){
+	        util.hideLoad();
+	    }
+	    
+	},
+	methods: {
+		tabChange(path){
+			if(path=='')return util.showNone('开发中');
+			util.routeTo(path,'nT')
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #FFFFFF;
+}
+.index-content{
+	.ic-head{
+		width: 750rpx;
+		height: 218rpx;
+		background-color: #009874;
+	}
+	.ic-section{
+		position: relative;
+		width: 750rpx;
+		height: 320rpx;
+		background-color: #F2F2F7;
+		.is-box{
+			position: absolute;
+			top: -100rpx;
+			left: 40rpx;
+			width: 670rpx;
+			padding-bottom: 50rpx;
+			// height: 378rpx;
+			border-radius: 10rpx;
+			background-color: #FFFFFF;
+			.ib-line{
+				padding: 60rpx 0 10rpx;
+				@include centerFlex(flex-start);
+				.il-view{
+					margin-left: 60rpx;
+					flex-grow: 1;
+					>view{
+						&:first-child{
+							color: #9C9C9F;
+							font-size: 28rpx;
+							line-height: 40rpx;
+						}
+						&:nth-child(2){
+							color: #1A1A1A;
+							font-size: 40rpx;
+							line-height: 56rpx;
+							font-weight: 700;
+						}
+					}
+				}
+				.il-cut{
+					flex-shrink: 0;
+					width: 2rpx;
+					height: 92rpx;
+					background-color: #D8D8D8;
+				}
+			}
+		}
+	}
+	.ic-tablist{
+		padding-bottom: 24rpx;
+		background: #FFFFFF;
+		.it-title{
+			padding: 52rpx 40rpx 0rpx;
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.it-tabs{
+			display: flex;
+			flex-wrap: wrap;
+			.itt-item{
+				margin: 60rpx 0 20rpx;
+				flex-wrap: wrap;
+				flex-shrink: 0;
+				width: 33.33%;
+				>view{
+					display: flex;
+					flex-direction: column;
+					flex-wrap: wrap;
+					justify-content: center;
+					align-items: center;
+					>image{
+						width: 52rpx;
+						height: 52rpx;
+					}
+					>view{
+						margin-top: 20rpx;
+						color: #1A1A1A;
+						font-size: 28rpx;
+						line-height: 40rpx;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/static/images/icon/arrow_b2.png b/src/subpackage/course/static/images/icon/arrow_b2.png
new file mode 100644
index 0000000000000000000000000000000000000000..54df2b3b9b66beeb07c3830279efe65fe73e4f58
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK%K)DcS0KG($BwI4ubw(}YVY2?
zyLRn5di3b^>(_7GxN-dW@oU$v0i_NfK78WDiHjF6o<D#7%$YM+u3Xu)X;Z=-mmNUO
zLM1_d!3_WW&j0xHRD<V^vHhECJqz|F%{Nc&0m{aEx;TbdoPK-8o3BBE$2G8v;~Ia)
z_x%ycDOtZvn1tW`crr`h)o+5eONv8+Pyn0L(zlyV$3N}!VtP;}EBoR^Qr;C=@xty`
yHPYsH^N!6~{r+0Go`mj|qi;%P%$1v5U#2dj!n1u{y8tK9Dh5wiKbLh*2~7Zry>apY

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/icon/arrow_white.png b/src/subpackage/course/static/images/icon/arrow_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..13457065fde3eec1abd663ee678b82c6ab1dbbfc
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0005{Nkl<ZNK37j
z$xanP6o$W_!LaZN+z<y~p{{uVd<-=>0LlYsqH!sKHHpDQg%F2@F}g9ZAv}|b3l-&%
zb5lh+Wp!8g?e5LZO%GqbQ)d#%WoD9OW_AHs0TzLek`B#mQqsTloi6{C0ZvFdHM3RV
zHDJIW;Gv}VW;P}1Zx=}Q*&Hw$z5*TtzknIw1Xz=_+XtEhj>2YUw}9_}ht`cIgY7*@
z`{P3Y1G>JM#jxH1_5gqGG(bJPZn`%PGz(0i%i%2D)Dvc+k7+G1Kt~B;W_N+zAxs;A
z33L$CB5-KaR=^=mTLU|q)^?;$zy?z<8Nd8{>ymb2X{8;hGcW^v6Y4WUy=-nv`jG3r
zV*wNBQ(!YR2JgGxk&b~S9|A)e#`bpu_yqW`8+v1y1~w!;&xN(KVQgn+HV+&CR}#A~
zz_O&Danv<Vi>9#?&&15G17Cr;VCAoQD7_m!h~MZH(u&zaFuNS4h)2m`?|?^=PU<o=
zrg3qWCT8D&YpI!}`wsHPo-;eQF42ZEYXuzAtO%^Y>dx$~uOOu}YgLDp&CRp1*O?W8
zmGxp4I0CLF**KP2ZAdG?E#L|8JEZ-T*IC<atV_nGz4RsUEUbs#u6miZF}wt912=)s
zz>Bav(Nt%pGAk`n-a#%(`r(N*>J*s?P=ZwNp8?5hk1VKvQ)B=D002ovPDHLkV1h7>
B_#glP

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/tab/tab_0_0.png b/src/subpackage/course/static/images/tab/tab_0_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..12e7b58c8f7d8f0f230fbbb56ea71f81c68fdb0a
GIT binary patch
literal 2149
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
bbb$U3m7RuwvY=B`00000NkvXXu0mjfHxeTt

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/tab/tab_0_1.png b/src/subpackage/course/static/images/tab/tab_0_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d7f666bcb68077bf3d939e4eaf56128eaa08c07
GIT binary patch
literal 2527
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

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/tab/tab_0_2.png b/src/subpackage/course/static/images/tab/tab_0_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..08c5349e60414600018e129a69b8a85974a3000c
GIT binary patch
literal 2459
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
Z_P=%5?S0xE>#_g<002ovPDHLkV1hXPwSoWu

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/tab/tab_0_3.png b/src/subpackage/course/static/images/tab/tab_0_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d27be69fa86b7da0a140c68ee014f4b229873c4
GIT binary patch
literal 2245
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
T-pioD00000NkvXXu0mjf=%-_i

literal 0
HcmV?d00001


From ce223a2d486f47ce29f6ac5a1d897cff46f31ee8 Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Fri, 24 Sep 2021 15:09:28 +0800
Subject: [PATCH 02/11] add course style

---
 src/pages.json                                     |  76 +++-
 .../cancel_class_modal/cancel_class_modal.vue      | 147 +++++++
 .../class_reset_modal/class_reset_modal.vue        | 175 +++++++++
 .../bclass_reserve_item/bclass_reserve_item.vue    | 112 ++++++
 .../manage/class_manage_item/class_manage_item.vue |  93 +++++
 .../private_reserve_item/private_reserve_item.vue  | 108 +++++
 .../student_course_item/student_course_item.vue    |  72 ++++
 .../sclass_record_section.vue                      | 113 ++++++
 .../course/components/store_name/store_name.vue    |  20 +-
 .../course/components/tab_bar/tab_bar.vue          | 117 ++++++
 .../components/task_section/task_section.vue       | 193 +++++++++
 .../course/pages/arrange_class/arrange_class.vue   | 427 ++++++++++++++++++++
 .../pages/class_add_student/class_add_student.vue  | 222 +++++++++++
 .../class_student_detail/class_student_detail.vue  | 251 ++++++++++++
 .../pages/class_time_change/class_time_change.vue  | 268 +++++++++++++
 src/subpackage/course/pages/index/index.vue        |  11 +-
 .../bclass_reserve_detail.vue                      | 242 ++++++++++++
 .../class_manage_detail/class_manage_detail.vue    | 433 +++++++++++++++++++++
 .../private_reserve_detail.vue                     | 159 ++++++++
 .../student_course_detail.vue                      | 302 ++++++++++++++
 .../course/pages/manage_list/manage_list.vue       | 188 +++++++++
 .../course/pages/task_detail/task_detail.vue       | 132 +++++++
 .../pages/task_finish_list/task_finish_list.vue    | 147 +++++++
 .../course/static/images/icon/arrow_black.png      | Bin 0 -> 624 bytes
 .../course/static/images/icon/arrow_green.png      | Bin 0 -> 653 bytes
 .../course/static/images/icon/calendar.png         | Bin 0 -> 786 bytes
 .../course/static/images/icon/close_gray.png       | Bin 0 -> 667 bytes
 src/subpackage/course/static/images/icon/phone.png | Bin 0 -> 1137 bytes
 .../course/static/images/icon/triangle.png         | Bin 0 -> 428 bytes
 src/subpackage/course/static/images/no_order.png   | Bin 0 -> 14345 bytes
 30 files changed, 3994 insertions(+), 14 deletions(-)
 create mode 100644 src/subpackage/course/components/cancel_class_modal/cancel_class_modal.vue
 create mode 100644 src/subpackage/course/components/class_reset_modal/class_reset_modal.vue
 create mode 100644 src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue
 create mode 100644 src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue
 create mode 100644 src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue
 create mode 100644 src/subpackage/course/components/manage/student_course_item/student_course_item.vue
 create mode 100644 src/subpackage/course/components/sclass_record_section/sclass_record_section.vue
 create mode 100644 src/subpackage/course/components/tab_bar/tab_bar.vue
 create mode 100644 src/subpackage/course/components/task_section/task_section.vue
 create mode 100644 src/subpackage/course/pages/arrange_class/arrange_class.vue
 create mode 100644 src/subpackage/course/pages/class_add_student/class_add_student.vue
 create mode 100644 src/subpackage/course/pages/class_student_detail/class_student_detail.vue
 create mode 100644 src/subpackage/course/pages/class_time_change/class_time_change.vue
 create mode 100644 src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
 create mode 100644 src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue
 create mode 100644 src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue
 create mode 100644 src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue
 create mode 100644 src/subpackage/course/pages/manage_list/manage_list.vue
 create mode 100644 src/subpackage/course/pages/task_detail/task_detail.vue
 create mode 100644 src/subpackage/course/pages/task_finish_list/task_finish_list.vue
 create mode 100644 src/subpackage/course/static/images/icon/arrow_black.png
 create mode 100644 src/subpackage/course/static/images/icon/arrow_green.png
 create mode 100644 src/subpackage/course/static/images/icon/calendar.png
 create mode 100644 src/subpackage/course/static/images/icon/close_gray.png
 create mode 100644 src/subpackage/course/static/images/icon/phone.png
 create mode 100644 src/subpackage/course/static/images/icon/triangle.png
 create mode 100644 src/subpackage/course/static/images/no_order.png

diff --git a/src/pages.json b/src/pages.json
index 709fc16..6e7ee0f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -220,7 +220,7 @@
 				"navigationBarTitleText": "门店信息列表"
 			}
 		}
-		
+        
     ],
 	"subpackages": [
 		{
@@ -389,15 +389,79 @@
 		{
 			"root": "subpackage/course",
 			"pages": [
-			  {
+				{
 					"path": "pages/index/index",
 					"style" : {
-						"navigationBarTitleText": "课程管理" ,
-						"navigationBarBackgroundColor": "#009874",
-						"navigationBarTextStyle": "white"
+						"navigationBarTitleText": "课程管理" 
+						
+					}
+				},
+				{
+					"path": "pages/manage_list/manage_list",
+					"style" : {
+						"navigationBarTitleText": "课程管理列表"
+					}
+				},
+				{
+					"path": "pages/manage_detail/student_course_detail/student_course_detail",
+					"style" : {
+						"navigationBarTitleText": "学员课程详情"
+					}
+				},
+				{
+					"path": "pages/manage_detail/private_reserve_detail/private_reserve_detail",
+					"style" : {
+						"navigationBarTitleText": "私教约课记录详情"
+					}
+				},
+				{
+					"path": "pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail",
+					"style" : {
+						"navigationBarTitleText": "大班约课记录详情"
+					}
+				},
+				{
+					"path": "pages/manage_detail/class_manage_detail/class_manage_detail",
+					"style" : {
+						"navigationBarTitleText": "班级管理详情"
+					}
+				},
+				{
+					"path": "pages/task_detail/task_detail",
+					"style" : {
+						"navigationBarTitleText": "作业详情"
+					}
+				},
+				{
+					"path": "pages/arrange_class/arrange_class",
+					"style" : {
+						"navigationBarTitleText": "安排上课"
+					}
+				},
+				{
+					"path": "pages/class_add_student/class_add_student",
+					"style" : {
+						"navigationBarTitleText": "添加学员"
+					}
+				},
+				{
+					"path": "pages/class_student_detail/class_student_detail",
+					"style" : {
+						"navigationBarTitleText": "学员详情"
+					}
+				},
+				{
+					"path": "pages/class_time_change/class_time_change",
+					"style" : {
+						"navigationBarTitleText": "更改上课时间"
+					}
+				},
+				{
+					"path": "pages/task_finish_list/task_finish_list",
+					"style" : {
+						"navigationBarTitleText": "作业完成列表"
 					}
 				}
-				
 			]
 		}
 	],
diff --git a/src/subpackage/course/components/cancel_class_modal/cancel_class_modal.vue b/src/subpackage/course/components/cancel_class_modal/cancel_class_modal.vue
new file mode 100644
index 0000000..3647a3e
--- /dev/null
+++ b/src/subpackage/course/components/cancel_class_modal/cancel_class_modal.vue
@@ -0,0 +1,147 @@
+<template>
+	<!--弹框 取消上课 -->
+	<view class="cancel-class-modal" @click.stop="">
+		<view class="ox-dark-mask fixed-mask " @touchmove.stop.prevent="moveHandle">
+			<view class="mask-modal" @click.stop="">
+				<view class="mm-close">
+					<image src="/subpackage/course/static/images/icon/close_gray.png" @click="closeChange"></image>
+				</view>
+				<view class="mm-tit">取消上课</view>
+				<view class="mm-cause">
+					<textarea class="mc-textarea" @blur="bindTextAreaBlur" placeholder="请输入取消上课的原因（选填）" maxlength="25" v-model="causeTxt"></textarea>
+					<view class="mc-num">{{causeTxt.length || 0}}/25</view>
+				</view>
+				<view class="mm-btn">
+					<view class="mb-btn1" hover-class="hover-active" @click="confirmChange">确认</view>
+					<view class="mb-btn2" hover-class="hover-active" @click="closeChange">取消</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+export default {
+	props:{
+		orderInfo: {
+			type: Object,
+			default: ()=>({})
+		}
+	},
+	computed: {
+		
+	},
+	data(){
+	    return {
+			causeTxt: "",
+	    }
+	},
+	methods: {
+		moveHandle(){},
+		// 文本域
+		bindTextAreaBlur: function(e) {
+			// console.log( "文本域内容: " + e.detail.value)
+			this.causeTxt = e.detail.value
+			
+			this.$emit('bindTextAreaBlur', this.causeTxt)
+		},
+		
+		closeChange(){
+			this.$emit('reasonClose')
+		},
+		
+		confirmChange(){
+			this.$emit('reasonConfirm', this.causeTxt)
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.cancel-class-modal{
+	
+}
+// 黑半透遮罩
+.fixed-mask{
+	// position: fixed;
+	// left: 0;
+	// top: 0;
+	// right: 0;
+	// bottom: 0;
+	// background-color: rgba(0, 0, 0, .5);
+	z-index: 999;
+}
+.mask-modal{
+	position: absolute;
+	left: 50%;
+	top: 46%;
+	transform: translate(-50%, -50%);
+	width: 620rpx;
+	padding: 30rpx 0 82rpx;
+	border-radius: 10rpx;
+	background-color: #FFFFFF;
+	.mm-close{
+		@include centerFlex(flex-end);
+		>image{
+			margin-right: 30rpx;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+	.mm-tit{
+		margin: 16rpx auto 38rpx;
+		color: #333333;
+		font-size: 32rpx;
+		line-height: 44rpx;
+		text-align: center;
+		font-weight: 700;
+	}
+	.mm-cause{
+		margin: auto;
+		position: relative;
+		width: 538rpx;
+		height: 150rpx;
+		border-radius: 10rpx;
+		border: 2rpx solid #D8D8D8;
+		.mc-textarea{
+			margin: 24rpx 20rpx;
+			width: 498rpx;
+			height: 102rpx;
+			color: #333;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.mc-num{
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #9A9A9D;
+			font-size: 28rpx;
+		}
+	}
+	.mm-btn{
+		margin-top: 80rpx;
+		@include centerFlex(center);
+		>view{
+			margin: 0 10rpx;
+			padding: 22rpx 0;
+			width: 240rpx;
+			border-radius: 10rpx;
+			border: 2rpx solid #009874;
+			font-size: 32rpx;
+			line-height: 44rpx;
+			text-align: center;
+		}
+		.mb-btn1{
+			color: #FFFFFF;
+			background-color: #009874;
+		}
+		.mb-btn2{
+			color: #009874;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/class_reset_modal/class_reset_modal.vue b/src/subpackage/course/components/class_reset_modal/class_reset_modal.vue
new file mode 100644
index 0000000..257a2cd
--- /dev/null
+++ b/src/subpackage/course/components/class_reset_modal/class_reset_modal.vue
@@ -0,0 +1,175 @@
+<template>
+	<!-- 转班弹框 -->
+	<view class="class-reset-modal" @click.stop="">
+		<view class="ox-dark-mask fixed-mask" @touchmove.stop.prevent="moveHandle" v-if="isShowClass" @click="closeReset">
+			<view class="mask-modal" @click.stop="">
+				<view class="mm-close">
+					<image src="/subpackage/course/static/images/icon/close_gray.png" @click="closeReset"></image>
+				</view>
+				<view class="mm-tit">选择班级</view>
+				<view class="mm-line">课程名称：{{info.course_name || '-'}}</view>
+				<scroll-view class="mm-scroll" scroll-y>
+					<view class="ms-list" v-for="(e,i) in classList" :key="i">
+						<view class="ml-item" @click="selectClass(e)">
+							<image :class="[resetInfo.new_id==e.id?'mi-img':'mi-icon']" :src="resetInfo.new_id==e.id?'/static/images/icon/selected_987.png':''"></image>
+							<view class="mi-info">
+								<view>班级名称：{{e.name || '-'}}</view>
+								<view>班级人数：{{e.nums || 0}}</view>
+								<view>上课教练：{{e.coach || '-'}}</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="mm-btn" hover-class="hover-active" @click="confirmReset">确定</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+export default {
+	props:{
+		info: {
+			type: Object,
+			default: ()=>({})
+		},
+		canlist: {
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		isShowClass: {
+			type: Boolean,
+			default: false
+		}
+	},
+	computed: {
+		// userInfo(){
+		// 	return uni.getStorageSync('loginInfo') || {};
+		// },
+		
+		classList(){
+			let { info, canlist } = this
+			let _list = []
+			if(canlist.length > 0)_list = canlist.filter(e=>e.id != info.sclass_id);
+			return _list || [];
+		},
+	},
+	data() {
+		return {
+			resetInfo:{
+				new_id: "",  //新班级ID
+				// user_id: "",
+				// user_order_no: "",
+			},
+		}
+	},
+	methods: {
+		moveHandle(){},
+		
+		selectClass(item){
+			this.resetInfo.new_id = item.id
+		},
+		
+		closeReset(){
+			this.$emit('closeReset')
+		},
+		
+		confirmReset(){
+			let { resetInfo, classList } = this
+			if(classList.length == 0)return util.showNone('无可选班级！');
+			if(resetInfo.new_id == '')return util.showNone('请选择！');
+			this.$emit('confirmReset',resetInfo)
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.class-reset-modal{
+	.fixed-mask{
+		z-index: 999;
+	}
+	.mask-modal{
+		position: absolute;
+		left: 50%;
+		top: 45%;
+		transform: translate(-50%, -50%);
+		width: 558rpx;
+		padding: 20rpx 0;
+		border-radius: 10rpx;
+		background-color: #FFFFFF;
+		.mm-close{
+			@include centerFlex(flex-end);
+			>image{
+				margin-right: 22rpx;
+				width: 36rpx;
+				height: 36rpx;
+			}
+		}
+		.mm-tit{
+			margin: 6rpx auto 40rpx;
+			color: #1A1A1A;
+			font-size: 36rpx;
+			font-weight: 700;
+			text-align: center;
+		}
+		.mm-line{
+			flex-grow: 1;
+			margin: 0 38rpx;
+			color: #1A1A1A;
+			font-size: 32rpx;
+			padding-bottom: 20rpx;
+			border-bottom: 2rpx solid #E5E5E5;
+		}
+		.mm-scroll{
+			margin-left: 42rpx;
+			height: 368rpx;
+			.ms-list{
+				.ml-item{
+					padding-top: 28rpx;
+					display: flex;
+					align-items: center;
+					justify-content: flex-start;
+					>image{
+						flex-shrink: 0;
+						margin-right: 24rpx;
+						margin-top: 14rpx;
+					}
+					.mi-icon{
+						width: 36rpx;
+						height: 36rpx;
+						border-radius: 50%;
+						border: 2rpx solid #9C9C9F;
+					}
+					.mi-img{
+						width: 40rpx;
+						height: 40rpx;
+					}
+					.mi-info{
+						>view{
+							color: #1A1A1A;
+							font-size: 28rpx;
+							line-height: 52rpx;
+						}
+					}
+				}
+			}
+		}
+		.mm-btn{
+			margin: 60rpx auto;
+			padding: 18rpx 0;
+			width: 240rpx;
+			border-radius: 6rpx;
+			background-color: #009874;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			text-align: center;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue b/src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue
new file mode 100644
index 0000000..6989a52
--- /dev/null
+++ b/src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue
@@ -0,0 +1,112 @@
+<template>
+	<!-- 大班约课记录 -->
+	<view class="bclass-reserve-item" @click="toDetail">
+		<view class="bri-line">
+			<view class="bl-store">欧轩智能场馆(羽毛球馆永泰店)</view>
+			<view class="bl-status" :class="[false?'status-gray':false?'status-red':'']">待上课</view>
+		</view>
+		<view class="bri-view">已预约人数：<text>3人（上课区间：5-10）</text></view>
+		<view class="bri-view">上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
+		<view class="bri-view">上课地点：<text>羽毛球（3号场）</text></view>
+		<view class="bri-view">上课教练：<text>周扎米</text></view>
+		<view class="bri-view">课程名称：<text>羽毛球培训课</text></view>
+		<block v-if="false">
+			<view class="bri-view">取消时间：<text>2021.06.03 11:42:50</text></view>
+			<view class="bri-view">取消原因：<text>教练取消（大雨停课）</text></view>
+		</block>
+		<view class="bri-btn" v-if="true">
+			<view class="bb-btn1" hover-class="hover-active" @click.stop="">取消上课</view>
+			<view class="bb-btn2" hover-class="hover-active" @click.stop="">确认上课</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+export default {
+	props:{
+		orderInfo: {
+			type: Object,
+			default: ()=>({})
+		},
+	},
+	computed: {
+		
+	},
+	data(){
+	    return {
+	    }
+	},
+	methods: {
+		toDetail(){
+			let { orderInfo } = this
+			util.routeTo(`/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail`,'nT');
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.bclass-reserve-item{
+	padding: 26rpx 44rpx 34rpx;
+	background-color: #FFFFFF;
+	.bri-line{
+		margin-bottom: 20rpx;
+		padding: 0 0 32rpx 2rpx;
+		border-bottom: 2rpx solid #E5E5E5;
+		@include centerFlex(space-between);
+		.bl-store{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			font-weight: 700;
+			@include textHide(1);
+		}
+		.bl-status{
+			flex-shrink: 0;
+			color: #009874;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.status-gray{
+			color: #9C9C9F;
+		}
+		.status-red{
+			color: #EA5061;
+		}
+	}
+	.bri-view{
+		color: #9C9C9F;
+		font-size: 28rpx;
+		line-height: 52rpx;
+		>text{
+			color: #1A1A1A;
+		}
+	}
+	.bri-btn{
+		margin-top: 18rpx;
+		@include centerFlex(flex-end);
+		>view{
+			margin-left: 20rpx;
+			padding: 20rpx 0;
+			width: 192rpx;
+			border-radius: 6rpx;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			font-weight: 700;
+			text-align: center;
+		}
+		.bb-btn1{
+			color: #EA5061;
+			border: 2rpx solid #EA5061;
+			background-color: #FFFFFF;
+		}
+		.bb-btn2{
+			color: #FFFFFF;
+			border: 2rpx solid #009874;
+			background-color: #009874;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue b/src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue
new file mode 100644
index 0000000..8323279
--- /dev/null
+++ b/src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue
@@ -0,0 +1,93 @@
+<template>
+	<!-- 班级管理 -->
+	<view class="class-manage-item" @click="toDetail">
+		<view class="cmi-line">
+			<view class="cl-store">欧轩智能场馆(羽毛球馆永泰店)</view>
+			<view class="cl-status" :class="[false?'status-gray':false?'status-red':'']">进行中</view>
+		</view>
+		
+		<block v-if="true">
+			<view class="cmi-view">课程名称：<text>羽毛球培训课</text></view>
+			<view class="cmi-view">班级id：<text>2-3</text></view>
+			<view class="cmi-view">成班人数区间：<text>2-6人</text></view>
+			<view class="cmi-view">已报名人数：<text>2人</text></view>
+			<view class="cmi-view">报名截止时间：<text>2020.12.27  22:55:56</text></view>
+		</block>
+
+		<block v-if="false">
+			<view class="cmi-view">班级名称：<text>冲锋班</text></view>
+			<view class="cmi-view">班级人数：<text>20</text></view>
+			<view class="cmi-view">上课教练：<text>何其多</text></view>
+			<view class="cmi-view">上课地点：<text>欧轩智能场馆3号馆</text></view>
+			<view class="cmi-view">课程日期：<text>2021.08.08-2021.10.10</text></view>
+			<view class="cmi-view">课程名称：<text>羽毛球培训课</text></view>
+		</block>
+	
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+export default {
+	props:{
+		orderInfo: {
+			type: Object,
+			default: ()=>({})
+		},
+	},
+	computed: {
+		
+	},
+	data(){
+	    return {
+	    }
+	},
+	methods: {
+		toDetail(){
+			let { orderInfo } = this
+			util.routeTo(`/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail`,'nT');
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.class-manage-item{
+	padding: 26rpx 44rpx 30rpx;
+	background-color: #FFFFFF;
+	.cmi-line{
+		margin-bottom: 20rpx;
+		padding: 0 0 32rpx 2rpx;
+		border-bottom: 2rpx solid #E5E5E5;
+		@include centerFlex(space-between);
+		.cl-store{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			font-weight: 700;
+			@include textHide(1);
+		}
+		.cl-status{
+			flex-shrink: 0;
+			color: #009874;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.status-gray{
+			color: #9C9C9F;
+		}
+		.status-red{
+			color: #EA5061;
+		}
+	}
+	.cmi-view{
+		color: #9C9C9F;
+		font-size: 28rpx;
+		line-height: 52rpx;
+		>text{
+			color: #1A1A1A;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue b/src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue
new file mode 100644
index 0000000..d980d5a
--- /dev/null
+++ b/src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue
@@ -0,0 +1,108 @@
+<template>
+	<!-- 私教约课记录 -->
+	<view class="private-reserve-item" @click="toDetail">
+		<view class="pri-line">
+			<view class="pl-store">欧轩智能场馆(羽毛球馆永泰店)</view>
+			<view class="pl-status" :class="[false?'status-gray':false?'status-red':'']">待上课</view>
+		</view>
+		<view class="pri-view">学员信息：<text>张安（男 ）  18316536894</text></view>
+		<view class="pri-view">上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
+		<view class="pri-view">上课地点：<text>羽毛球（3号场）</text></view>
+		<view class="pri-view">上课教练：<text>张夏欧</text></view>
+		<view class="pri-view">课程名称：<text>羽毛球培训课</text></view>
+		<view class="pri-btn" v-if="true">
+			<view hover-class="hover-active" @click.stop="isCancelClass=true">取消上课</view>
+		</view>
+		
+		<cancel-class-modal
+			v-if="isCancelClass"
+			@reasonClose="isCancelClass=false"
+		></cancel-class-modal>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import cancel_class_modal from '../../cancel_class_modal/cancel_class_modal.vue';
+export default {
+	components: {
+		'cancel-class-modal': cancel_class_modal,
+	},
+	props:{
+		orderInfo: {
+			type: Object,
+			default: ()=>({})
+		},
+	},
+	computed: {
+		
+	},
+	data(){
+	    return {
+			isCancelClass: false,
+	    }
+	},
+	methods: {
+		toDetail(){
+			let { orderInfo } = this
+			util.routeTo(`/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail`,'nT');
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.private-reserve-item{
+	padding: 26rpx 44rpx 30rpx;
+	background-color: #FFFFFF;
+	.pri-line{
+		margin-bottom: 20rpx;
+		padding: 0 0 32rpx 2rpx;
+		border-bottom: 2rpx solid #E5E5E5;
+		@include centerFlex(space-between);
+		.pl-store{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			font-weight: 700;
+			@include textHide(1);
+		}
+		.pl-status{
+			flex-shrink: 0;
+			color: #009874;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.status-gray{
+			color: #9C9C9F;
+		}
+		.status-red{
+			color: #EA5061;
+		}
+	}
+	.pri-view{
+		color: #9C9C9F;
+		font-size: 28rpx;
+		line-height: 52rpx;
+		>text{
+			color: #1A1A1A;
+		}
+	}
+	.pri-btn{
+		margin-top: 6rpx;
+		@include centerFlex(flex-end);
+		>view{
+			padding: 20rpx 0;
+			width: 192rpx;
+			border-radius: 6rpx;
+			border: 2rpx solid #EA5061;
+			color: #EA5061;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			font-weight: 700;
+			text-align: center;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/manage/student_course_item/student_course_item.vue b/src/subpackage/course/components/manage/student_course_item/student_course_item.vue
new file mode 100644
index 0000000..3c7daf6
--- /dev/null
+++ b/src/subpackage/course/components/manage/student_course_item/student_course_item.vue
@@ -0,0 +1,72 @@
+<template>
+	<!-- 学员课程 -->
+	<view class="student-course-item" @click="toDetail">
+		<view class="sci-status" :class="[false?'status-gray':false?'status-red':'']">进行中</view>
+		<view class="sci-view">学员信息：<text>张安（男 ） 18316536894</text></view>
+		<view class="sci-view">剩余课时：<text>10课时 （2/12)</text></view>
+		<view class="sci-view">课程名称：<text>羽毛球培训课</text></view>
+		<view class="sci-view">有效期至：<text>2020.12.27</text></view>
+		<view class="sci-view">课程类型：<text>私教课</text></view>
+		<view class="sci-view">上课教练：<text>一级教练</text></view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+export default {
+	props:{
+		orderInfo: {
+			type: Object,
+			default: ()=>({})
+		},
+	},
+	computed: {
+		
+	},
+	data(){
+	    return {
+	    }
+	},
+	methods: {
+		toDetail(){
+			// this.$emit('closeChange')
+			let { orderInfo } = this
+			// ?query=${util.jsonStr(_query)}
+			util.routeTo(`/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail`,'nT');
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.student-course-item{
+	position: relative;
+	padding: 30rpx 44rpx;
+	background-color: #FFFFFF;
+	.sci-status{
+		position: absolute;
+		top: 30rpx;
+		right: 44rpx;
+		font-size: 28rpx;
+		line-height: 40rpx;
+		color: #009874;
+	}
+	.status-gray{
+		color: #9A9A9D;
+	}
+	.status-red{
+		color: #EA5061;
+	}
+	.sci-view{
+		// flex-shrink: 0;
+		margin-right: 84rpx;
+		color: #9C9C9F;
+		font-size: 28rpx;
+		line-height: 52rpx;
+		>text{
+			color: #1A1A1A;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/sclass_record_section/sclass_record_section.vue b/src/subpackage/course/components/sclass_record_section/sclass_record_section.vue
new file mode 100644
index 0000000..be3d81b
--- /dev/null
+++ b/src/subpackage/course/components/sclass_record_section/sclass_record_section.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="sclass-record-section">
+		<view class="cds-tab">
+			<view>课时编号</view>
+			<view>上课时间</view>
+			<view>考勤状态</view>
+		</view>
+		<view class="cds-list" v-for="(e,i) in 6" :key="i">
+			<view class="cl-item">
+				<view>第{{ i+1|| '-'}}节</view>
+				<!-- <view>{{formatDate({date: e.period_date, partition: '.'}) ||'-'}}{{`${' '+e.period_start_time || ''}-${e.period_end_time || ''}` ||''}}</view> -->
+				<view>2021.06.01  10:00-12:00</view>
+				<view
+					:class="[e.user_status==0?'ci-txt-green':
+					e.user_status==4?'ci-txt-red':'']"
+				>{{ '正常'||zh_status(e.user_status)}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+export default {
+	props:{
+		orderInfo: {
+			type: Object,
+			default: ()=>({})
+		},
+	},
+	computed: {
+		
+	},
+	data() {
+		return {
+			
+		}
+	},
+	methods: {
+		formatDate: util.formatDate,
+		zh_status(status){
+			let arr = ["待上课","已上课","申请请假中","已请假","缺勤"]
+			return arr[status] || '';
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.sclass-record-section{
+	.cds-tab{
+		margin: 0 24rpx;
+		border: 2rpx solid #E8E8E8;
+		background-color: #F6F8F8;
+		@include centerFlex(flex-start);
+		>view{
+			height: 110rpx;
+			color: #1A1A1A;
+			font-size: 28rpx;
+			text-align: center;
+			@include centerFlex(center);
+			&:first-child {
+				width: 166rpx;
+			}
+			&:nth-child(2){
+				width: 338rpx;
+				border-left: 2rpx solid #E8E8E8;
+				border-right: 2rpx solid #E8E8E8;
+			}
+			&:nth-child(3){
+				width: 194rpx;
+				// border-right: 2rpx solid #E8E8E8;
+			}
+			
+		}
+	}
+	.cds-list{
+		.cl-item{
+			margin: 0 24rpx;
+			border-left: 2rpx solid #E8E8E8;
+			border-right: 2rpx solid #E8E8E8;
+			border-bottom: 2rpx solid #E8E8E8;
+			background-color: #FFFFFF;
+			@include centerFlex(flex-start);
+			>view{
+				height: 110rpx;
+				color: #1A1A1A;
+				font-size: 28rpx;
+				text-align: center;
+				@include centerFlex(center);
+				&:first-child {
+					width: 166rpx;
+				}
+				&:nth-child(2){
+					width: 338rpx;
+					border-left: 2rpx solid #E8E8E8;
+					border-right: 2rpx solid #E8E8E8;
+				}
+				&:nth-child(3){
+					width: 194rpx;
+				}
+			}
+			.ci-txt-green{
+				color: #009874;
+			}
+			.ci-txt-red{
+				color: #EA5061;
+			}
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/store_name/store_name.vue b/src/subpackage/course/components/store_name/store_name.vue
index 1924957..2c906ab 100644
--- a/src/subpackage/course/components/store_name/store_name.vue
+++ b/src/subpackage/course/components/store_name/store_name.vue
@@ -1,9 +1,9 @@
 <template>
     <picker class="store-name-picker" :range="storeList" range-key="name" @change="storeChange">
         <view class="store-name" :style="{background:getThemeBg()}">
-            <image class="sn-logo" mode="aspectFit" :src="curStoreInfo.logo || ''"></image>
+            <image mode="aspectFit" :src="curStoreInfo.logo || ''" :class="[theme=='light'?'sn-logo':'sn-logo2']"></image>
             <view class="sn-txt" :style="{color:getThemeColor()}">{{curStoreInfo.name || '-'}}</view>
-            <image class="sn-arrow" mode="aspectFit"  :src="getThemeIcon()"></image>
+            <image :class="[theme=='light'?'sn-arrow':'sn-arrow2']" mode="aspectFit"  :src="getThemeIcon()"></image>
         </view>
     </picker>
 </template>
@@ -17,7 +17,7 @@ export default {
             curStoreInfo: state => state.device.curStoreInfo,
         }),
 		getThemeIcon(){
-			return ()=> {return (this.theme=='light')?'/subpackage/course/static/images/icon/arrow_white.png':'/subpackage/course/static/images/icon/arrow_b2.png';}
+			return ()=> {return (this.theme=='light')?'/subpackage/course/static/images/icon/arrow_white.png':'/subpackage/course/static/images/icon/arrow_black.png';}
 		},
 		getThemeColor(){
 			return ()=> {return (this.theme=='light')?'#FFFFFF':'#333333';}
@@ -62,6 +62,13 @@ export default {
         width: 52upx;
         height: 52upx;
     }
+	.sn-logo2{
+	    flex-grow: 0;
+	    flex-shrink: 0;
+	    margin-right: 10upx;
+	    width: 30upx;
+	    height: 30upx;
+	}
     .sn-txt{
         /* flex-grow: 1; */
         line-height: 40upx;
@@ -78,4 +85,11 @@ export default {
         width: 28upx;
         height: 28upx;
     }
+	.sn-arrow2{
+	    flex-shrink: 0;
+	    flex-grow: 0;
+	    margin-left: 20upx;
+	    width: 20upx;
+	    height: 20upx;
+	}
 </style>
\ No newline at end of file
diff --git a/src/subpackage/course/components/tab_bar/tab_bar.vue b/src/subpackage/course/components/tab_bar/tab_bar.vue
new file mode 100644
index 0000000..08e7bf1
--- /dev/null
+++ b/src/subpackage/course/components/tab_bar/tab_bar.vue
@@ -0,0 +1,117 @@
+<template>
+	<view class="tab-list">
+		<block v-for="(e,i) in tabList" :key="i">
+			<view :class="['tab_no', curTabID == e.id ? 'tab_yes':'']" @click="tabChange(e)">
+				<view class="tab-txt">{{e.name}}
+					<!-- <view class="tab-hint" v-if="e.hint"><text>{{hintValue}}</text></view> -->
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+const tabArr = [{name:'全部订单',id:0},{name:'待上课',id:1},{name:'已上课',id:2},{name:'已取消',id:3}];
+export default {
+	name: 'tabBar',
+	props: {
+		tabList:{
+		  type: Array,
+		  default: ()=>(tabArr),
+		},
+		curTabID:{
+		  type: Number,
+		  default:0
+		},
+		hintValue:{
+		  type: Number,
+		  default:0
+		},
+		isBottomBorder: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data(){
+		return {
+			// curTabID: 0
+		}
+	},
+	methods:{
+		tabChange(item){
+			// this.curTabID = ID;
+			this.$emit('change', item)
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.tab-list{
+	width: 750rpx;
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	.tab_no{
+		position: relative;
+		flex-shrink: 0;
+		flex-grow: 1;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		
+		.tab-txt{
+			position: relative;
+			display: inline-block;
+			font-size: 28rpx;
+			font-weight: 700;
+			color: #9A9A9D;
+			&::after{
+				content: '';
+				transition: all .2s;
+				position: absolute;
+				left: 50%;
+				bottom: 2rpx;
+				transform: translateX(-50%) translateY(50%);
+				display: block;
+				// width: 70%;
+				width: 40rpx;
+				height: 10rpx;
+				border-radius: 5rpx;
+				background-color: #009874;
+				opacity: 0;
+			}
+			
+			// .tab-hint{
+			// 	position: absolute;
+			// 	top: 20rpx;
+			// 	right: -36rpx;
+			// 	width: 36rpx;
+			// 	height: 36rpx;
+			// 	border-radius: 50%;
+			// 	background-color: #EA5061;
+				
+			// 	display: flex;
+			// 	align-items: center;
+			// 	justify-content: space-around;
+			// 	>text{
+			// 		color: #FFFFFF;
+			// 		font-size: 24rpx;
+			// 		font-weight: 400;
+			// 	}
+			// }
+		}
+		&.tab_yes{
+			.tab-txt{
+				color: #009874;
+				&::after{
+					opacity: 1;
+					transform: translateX(-50%) translateY(0);
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/components/task_section/task_section.vue b/src/subpackage/course/components/task_section/task_section.vue
new file mode 100644
index 0000000..01115d3
--- /dev/null
+++ b/src/subpackage/course/components/task_section/task_section.vue
@@ -0,0 +1,193 @@
+<template>
+	<view class="task-section">
+		<view class="ts-list" v-for="(e,i) in taskList" :key="i">
+			<view class="tl-item">
+				<view class="ti-line">
+					<!-- {{formatDate({date: e.created_at}) || '-'}} -->
+					<view>2020-09-08</view>
+					<view v-if="taskType==''" :class="[true?'status-red':'status-gray']">未完成</view>
+					<view v-if="taskType=='finish'" class="status-gray">完成情况：0/10</view>
+				</view>
+				
+				<view class="ti-desc" :class="e.expande?'desc-omit':''" :id="'noname'+i">
+					{{e.work_content || ''}}
+					<image class="td-img" @click="expandeChange(i)" v-if="e.isShowExpande"  src="/subpackage/course/static/images/icon/arrow_green.png"></image>
+				</view>
+				<view class="ti-end">
+					<view hover-class="hover-active" @click="toTaskDetail(e)">查看</view>
+				</view>
+					
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+export default {
+	props:{
+		// taskInfo: {
+		// 	type: Object,
+		// 	default: ()=>({})
+		// },
+		taskInfo:{
+			type: Array,
+			default() {
+				return [];
+			}
+		},
+		taskType:{
+		  type: String,
+		  default: ''   //finish
+		},
+	},
+	computed: {
+		
+	},
+	data() {
+		return {
+			taskList: [],
+		}
+	},
+	created() {
+		let _list = this.taskInfo || []
+		if(_list.length > 0){
+			_list.forEach((value,index)=>{
+				value['expande'] = false
+				value['isShowExpande'] = false
+			})
+			this.$nextTick(_=>{
+				this.taskList = _list
+			})
+		}
+	},
+	methods: {
+		formatDate: util.formatDate,
+		expandeChange(index){
+			this.taskList[index].isShowExpande = false
+			this.taskList[index].expande = false
+		},
+		async initDesc(){
+			let that = this
+			let { taskList } = this
+			
+			for(var i in taskList){
+				let res = await this.getQueryResult(i);
+				if(res==1){
+					this.taskList[i].isShowExpande = true
+					this.taskList[i].expande = true
+				}
+			}
+		},
+		getQueryResult(i){
+			let that = this
+			return new Promise((rs,rj)=>{
+				/**注意：
+				 * 自定义组件需使用uni.createSelectorQuery().in(this)方法，
+				 * 页面上直接使用uni.createSelectorQuery()方法即可。
+				 * **/
+				let query = uni.createSelectorQuery().in(this); //wx.createSelectorQuery();
+				//选择id
+				let _id = "noname"+i
+				query.select('#noname'+i).boundingClientRect()
+				query.exec(function (res) {
+					console.log("获取节点信息：",res)
+					//res就是 所有标签为mjltest的元素的信息的数组\
+					if (res[0].height / 20 > 3) {
+						rs(1)
+					} else {
+						rs(2)
+					}
+					rj(false)
+				})
+			})
+		},
+		
+		toTaskDetail(item){
+			// let _query = {
+			// 	work_number: item.work_number,
+			// 	work_coach_name: item.work_coach_name,
+			// 	created_at: item.created_at,
+			// }
+			
+			if(this.taskType == 'finish')return util.routeTo(`/subpackage/course/pages/task_finish_list/task_finish_list`,'nT');;
+			util.routeTo(`/subpackage/course/pages/task_detail/task_detail`,'nT');
+		},
+		
+		// toTaskDetail(item){
+			
+		// 	// util.routeTo(`/subpackage/manage/pages/student/task_detail/task_detail?query=${util.jsonStr(item)}`,'nT')
+		// 	// util.routeTo(`/subpackage/manage/pages/student/task_detail/task_detail?id=${item.id}`,'nT')
+		// },
+		
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.task-section{
+	.ts-list{
+		margin-bottom: 24rpx;
+		.tl-item{
+			// flex-grow: 1;
+			padding: 30rpx 42rpx;
+			background-color: #FFFFFF;
+			.ti-line{
+				margin-bottom: 20rpx;
+				@include centerFlex(space-between);
+				>view{
+					&:first-child{
+						color: #1A1A1A;
+						font-size: 32rpx;
+						font-weight: 700;
+						line-height: 44rpx;
+					}
+					&:nth-child(2){
+						margin: 0 6rpx;
+						font-size: 28rpx;
+						line-height: 40rpx;
+					}
+				}
+				.status-gray{
+					color: #9C9C9F;
+				}
+				.status-red{
+					color: #EA5061;
+				}
+			}
+			.ti-desc{
+				position: relative;
+				color: #1A1A1A;
+				font-size: 28rpx;
+				line-height: 20px;
+				.td-img{
+					position: absolute;
+					bottom: 0;
+					right: 0;
+					width: 24rpx;
+					height: 24rpx;
+				}
+			}
+			.desc-omit{
+				@include textHide(3);
+			}
+			.ti-end{
+				margin-top: 30rpx;
+				@include centerFlex(flex-end);
+				>view{
+					margin-left: 20rpx;
+					padding: 12rpx 0;
+					width: 156rpx;
+					border-radius: 6rpx;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					text-align: center;
+					color: #009874;
+					border: 2rpx solid #009874;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/pages/arrange_class/arrange_class.vue b/src/subpackage/course/pages/arrange_class/arrange_class.vue
new file mode 100644
index 0000000..e948268
--- /dev/null
+++ b/src/subpackage/course/pages/arrange_class/arrange_class.vue
@@ -0,0 +1,427 @@
+<template>
+	<view class="arrange-class">
+		<view class="ac-info">
+			<view>{{pageInfo.brand_name || ''}}（{{pageInfo.stadium_name ||'-'}}）</view>
+			<view>课程名称：{{pageInfo.course_name || '-'}}</view>
+			<view>上课教练：{{pageInfo.course_coach || '-'}}</view>
+			<view>
+				<text>学员信息：{{pageInfo.student_name || ''}}{{pageInfo.student_gender!=''?`（${pageInfo.student_gender||''}）`:''}} {{userInfo.type==2?(' '+pageInfo.student_phone) : ''}}</text>
+				<image v-if="userInfo.type==2" src="/subpackage/course/static/images/icon/phone.png"  @click="phoneCall(pageInfo.student_phone)"></image>
+			</view>
+			<view>剩余课时：{{pageInfo.period_nums_surplus || 0}}节 （共{{pageInfo.period_nums || 0}}节)</view>
+		</view>
+		
+		<view class="ac-section">
+			<view class="as-tit">第{{pageInfo.next_class_number || '-'}}节</view>
+			<!-- 上课教练 -->
+			<view class="as-line">
+				<view class="al-txt"><text>*</text>上课教练</view>
+				<picker class="al-picker" :value="coachName" :range="coachs" @change="coachBindChange">
+					<view class="al-view al-box">
+						<view>{{coachName || '请选择上课教练'}}</view>
+						<image src="/subpackage/course/static/images/icon/triangle.png"></image>
+					</view>
+				</picker>
+			</view>
+			<!-- 上课日期 -->
+			<view class="as-line">
+				<view class="al-txt"><text>*</text>上课日期</view>
+				<picker class="al-picker" mode="date" :value="submitInfo.date" :start="startDate" :end="endDate" @change="bindDateChange"  >
+					<view class="al-view al-date">
+						<view class="ad-txt">{{submitInfo.date}}</view>
+						<view class="ad-img">
+							<image src="/subpackage/course/static/images/icon/calendar.png"></image>
+						</view>
+					</view>
+				</picker>
+			</view>
+			<!-- 上课时间 -->
+			<view class="as-line">
+				<view class="al-txt"><text>*</text>上课时间</view>
+				<picker class="al-picker" :value="submitInfo.start" :range="timeList" @change="startBindChange">
+					<view class="al-view al-time">
+						<view>{{submitInfo.start}}</view>
+						<image src="/subpackage/course/static/images/icon/triangle.png"></image>
+					</view>
+				</picker>
+				<view class="al-to">至</view>
+				<picker class="al-picker" :value="submitInfo.end" :range="timeList" @change="endBindChange">
+					<view class="al-view al-time">
+						<view>{{submitInfo.end}}</view>
+						<image src="/subpackage/course/static/images/icon/triangle.png"></image>
+					</view>
+				</picker>
+			</view>
+			<!-- 上课场地 -->
+			<view class="as-line" v-if="pageInfo.is_booking_venue == true">
+				<view class="al-txt"><text>*</text>上课场地<view class="at-type">({{pageInfo.course_venue_type || '-'}})</view></view>
+				<picker class="al-picker" :value="venueName" :range="venues" @change="venueBindChange">
+					<view class="al-view al-box">
+						<view>{{venueName || '请选择场地'}}</view>
+						<image src="/subpackage/course/static/images/icon/triangle.png"></image>
+					</view>
+				</picker>
+			</view>
+		</view>
+		
+		<view class="ac-fixed">
+			<view hover-class="hover-active" @click="confirmChange">确定</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+export default {
+	computed: {
+		startDate() {
+			return this.getDate('start');
+		},
+		endDate() {
+			return this.getDate('end');
+		},
+		userInfo(){
+			return uni.getStorageSync('loginInfo') || {};
+		},
+		timeList(){
+			let _list = []
+			for(let i = 0; i<=24; i++){
+				_list.push(`${i<10?'0'+i:i}:00`)
+			}
+			return _list;
+		},
+		coachs(){
+			let { coachList } = this
+			let _arr = []
+			if(coachList.length > 0){
+				_arr = this.coachList.map(e=>e.name)
+			}
+			return _arr || [];
+		},
+		venues(){
+			let { venueList } = this
+			let _arr = []
+			if(venueList.length > 0){
+				_arr = this.venueList.map(e=>e.name)
+			}
+			return _arr || [];
+		},
+	},
+	
+	data() {
+		return {
+			coachList: [], //教练列表
+			coachName: "", //上课教练
+			venueList: [], //场地列表
+			venueName: "", //选择场地
+			
+			pageInfo: {},
+			
+			submitInfo: {
+				coach_id: "",
+				date: "",
+				start: "",
+				end: "",
+				venue_id: "",
+			},
+		}
+	},
+	async onLoad(options){
+		// let _query = util.jsonPar(options.query);
+		// this.pageInfo = _query
+		// this.getStuInfo(options.order_no)
+	},
+	methods: {
+		getDate(type) {
+			const date = new Date();
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+		
+			if (type === 'start') {
+				year = year - 60;
+			} else if (type === 'end') {
+				year = year + 2;
+			}
+			month = month > 9 ? month : '0' + month;
+			day = day > 9 ? day : '0' + day;
+			return `${year}-${month}-${day}`;
+		},
+		//日期
+		bindDateChange: function(e) {
+			let _selectDate = e.target.value
+			this.submitInfo.date = _selectDate
+		},
+		
+		startBindChange(e){
+			console.log(e);
+			let _list = this.timeList || [];
+			this.submitInfo.start = _list[e.detail.value] || ''
+		},
+		endBindChange(e){
+			console.log(e);
+			let _list = this.timeList || [];
+			this.submitInfo.end = _list[e.detail.value] || ''
+		},
+		
+		coachBindChange(e){
+			console.log(e);
+			let _list = this.coachs || [];
+			this.coachName = _list[e.detail.value] || ''
+			this.submitInfo.coach_id = this.coachList[e.detail.value].id
+		},
+		
+		venueBindChange(e){
+			console.log(e);
+			let _list = this.venues || [];
+			this.venueName = _list[e.detail.value] || ''
+			this.submitInfo.venue_id = this.venueList[e.detail.value].id
+		},
+		
+		phoneCall(mobile) {
+			let _phoneStr = mobile || ''
+			let _phoneArr =  _phoneStr.split(',') || [];
+			uni.showActionSheet({
+			    itemList: _phoneArr,
+			    success: res =>{
+			        uni.makePhoneCall({
+			            phoneNumber:　_phoneArr[res.tapIndex]
+			        })
+			    }
+			})
+		},
+		
+		confirmChange(){
+			let { pageInfo, submitInfo } = this
+			let { coach_id, date, start, end, venue_id } = this.submitInfo
+			
+			if(coach_id==''||date==""||start=="" ||end=="" || (pageInfo.is_booking_venue==true && venue_id==''))return util.showNone("请完善必选项！");
+			
+			let nowTime = util.formatDate(new Date(),'-')  //现在时间 格式为 2020-07-21
+			if(new Date(nowTime).getTime() > new Date(date).getTime())return util.showNone("上课日期不能小于当前系统日期！");
+			
+			// 主要比较两个时间段大小，2021-09-01这个日期随便给
+			if(Date.parse('2021-09-01 '+ start) >= Date.parse('2021-09-01 '+ end))return util.showNone("上课时间的结束时间不能小于起始时间！");
+			
+			let _data = {
+				order_no: pageInfo.order_no,
+				coach_id, //教练ID
+				date,     //日期
+				start,    //开始时间段
+				end,      //结束时间段
+			}
+			if(pageInfo.is_booking_venue == true)_data["venue_id"] = venue_id; //场馆ID
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.student.arrangeStudentAc, //安排上课[私教课]
+				data: _data,
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone("操作成功！");
+				setTimeout(_=>{ uni.navigateBack() }, 1200)
+			})
+		},
+		
+		// 我的学员-详情
+		getStuInfo(order_no){
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.student.stuInfo,
+				data: {
+					order_no,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.pageInfo = res
+				this.getArrangeAcCoach(res.order_no);
+				
+			})
+		},
+		
+		// 安排上课[私教课] - 获取教练
+		getArrangeAcCoach(order_no){
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.student.arrangeStudentAcCoach,
+				data: {
+					order_no,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.coachList = res.coachs || []
+				this.venueList = res.venues || []
+			})
+		},
+		
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #F2F2F7;
+}
+.arrange-class{
+	position: relative;
+	padding-bottom: 150rpx;
+	.ac-info{
+		padding: 28rpx 22rpx 30rpx;
+		background-color: #FFFFFF;
+		>view{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 52rpx;
+			&:first-child{
+				font-weight: 700;
+				margin-bottom: 4rpx;
+			}
+			&+view{
+				@include centerFlex(flex-start);
+				>image{
+					margin-left: 20rpx;
+					flex-shrink: 0;
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+		}
+	}
+	.ac-section{
+		margin: 12rpx 0;
+		padding: 30rpx 28rpx 50rpx;
+		background-color: #FFFFFF;
+		.as-tit{
+			padding-bottom: 4rpx;
+			color: #333333;
+			font-size: 36rpx;
+			font-weight: 700;
+			line-height: 50rpx;
+		}
+		.as-line{
+			margin: 20rpx 46rpx 0 6rpx;
+			@include centerFlex(flex-start);
+			.al-txt{
+				position: relative;
+				margin-right: 18rpx;
+				flex-shrink: 0;
+				color: #1A1A1A;
+				font-size: 28rpx;
+				line-height: 44rpx;
+				>text{
+					color: #EA5061;
+					font-size: 32rpx;
+				}
+				.at-type{
+					position: absolute;
+					bottom: -36rpx;
+					left: 0;
+					min-width: 130rpx;
+					text-align: center;
+					color: #9C9C9F;
+					font-size: 24rpx;
+					line-height: 34rpx;
+				}
+			}
+			.al-picker{
+				flex-grow: 1;
+			}
+			.al-view{
+				flex-grow: 1;
+				padding-left: 20rpx;
+				height: 76rpx;
+				border-radius: 10rpx;
+				background-color: #F2F2F7;
+				@include centerFlex(flex-start);
+			}
+			.al-box{
+				>view{
+					flex-grow: 1;
+					color: #9C9C9F;
+					font-size: 28rpx;
+					line-height: 40rpx;
+				}
+				>image{
+					margin: 0 18rpx;
+					flex-shrink: 0;
+					width: 22rpx;
+					height: 22rpx;
+				}
+			}
+			
+			.al-date{
+				.ad-txt{
+					flex-grow: 1;
+					color: #1A1A1A;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					border-right: 2rpx solid #D8D8D8;
+				}
+				.ad-img{
+					flex-shrink: 0;
+					height: 76rpx;
+					padding: 0 16rpx 0 18rpx;
+					@include centerFlex(center);
+					>image{
+						flex-shrink: 0;
+						width: 34rpx;
+						height: 34rpx;
+					}
+				}
+			}
+			.al-time{
+				>view{
+					flex-grow: 1;
+					color: #1A1A1A;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					min-width: 80rpx;
+				}
+				>image{
+					margin: 0 18rpx;
+					flex-shrink: 0;
+					width: 22rpx;
+					height: 22rpx;
+				}
+			}
+			.al-to{
+				margin: 0 28rpx;
+				flex-shrink: 0;
+				color: #B2B2B2;
+				font-size: 32rpx;
+				line-height: 44rpx;
+			}
+		}
+		
+	}
+	
+	.ac-fixed{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		padding: 20rpx 0;
+		width: 750rpx;
+		background-color: #FFFFFF;
+		>view{
+			margin: 0 auto;
+			padding: 24rpx 0;
+			width: 670rpx;
+			border-radius: 44rpx;
+			background-color: #009874;
+			color: #FFFFFF;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			text-align: center;
+			font-weight: 700;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/pages/class_add_student/class_add_student.vue b/src/subpackage/course/pages/class_add_student/class_add_student.vue
new file mode 100644
index 0000000..07fe6ef
--- /dev/null
+++ b/src/subpackage/course/pages/class_add_student/class_add_student.vue
@@ -0,0 +1,222 @@
+<template>
+	<view class="add-student">
+		<view class="as-search">
+			<view class="as-box">
+				<image src="/static/images/icon/search.png"></image>
+				<input class="ab-ipt" placeholder="请输入学员姓名/电话查找" confirm-type="search" v-model="searchText"  @change="searchChange"/>
+			</view>
+		</view>
+		<view class="as-name">课程名称：{{pageInfo.course_name||'-'}}</view>
+		<!-- studentList -->
+		<view class="as-list" v-for="(e,i) in 3" :key="i">
+			<view class="al-item" @click="itemChange(e,i)">
+				<image :class="[submitInfo.order_no==e.order_no?'ai-img':'ai-icon']" :src="submitInfo.order_no==e.order_no?'/static/images/icon/selected_987.png':''"></image>
+				<view class="ai-info">
+					<view>学员信息：{{e.student_name||'-'}}（{{e.student_gender || '-'}}） {{userInfo.type==2?e.student_phone:''}}</view>
+					<view>剩余课时：<text>{{e.course_period_nums_surplus || 0}}课时</text><text>（{{e.course_period_nums_use||0}}/{{e.course_period_nums_total||0}})</text></view>
+				</view>
+			</view>
+		</view>
+		<view class="as-fixed">
+			<view hover-class="hover-active" @click="btnChange(1)">确认添加学员</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+export default {
+	computed:{
+		
+	},
+	data() {
+		return {
+			pageInfo: {},
+			studentList: [],
+			searchText: "",
+			
+			submitInfo: {
+				order_no: "",
+				subscribe_no: "",
+			},
+			
+		}
+	},
+	onLoad(options) {
+		// this.submitInfo.subscribe_no = options.subscribe_no
+		// this.getSubStudent(options.subscribe_no)
+	},
+	methods: {
+		// 搜索
+		searchChange(e){
+			let { searchText, pageInfo } = this
+			if(searchText == '')return this.studentList = pageInfo.students;
+			this.studentList = pageInfo.students.filter(e=>e.student_name.indexOf(searchText)!=-1||e.student_phone.indexOf(searchText)!=-1 );
+		},
+		itemChange(info){
+			this.submitInfo.order_no = info.order_no
+		},
+		btnChange(type){
+			if(this.submitInfo.order_no=='')return util.showNone('请选择需要添加的学员！');
+			util.showModal({
+				title: '是否确认添加学员上课？',
+				content: '',
+				showCancel: true,
+				success: modalRes=>{
+					if(modalRes.confirm){
+						this.getSubAdd()
+					}
+				}
+			})
+		},
+		
+		// 添加学员
+		getSubAdd(){
+			let { order_no, subscribe_no} = this.submitInfo
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.appointment.subAdd,
+				data: {
+					order_no,
+					subscribe_no,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				setTimeout(_=>{
+					this.getSubStudent(subscribe_no);
+					util.previousPageFunction({
+						fnName: 'refreshList',
+						query: { isLoad: false},
+					});
+				},1200);
+			})
+		},
+		
+		// 获取可添加学员列表
+		getSubStudent(subscribe_no){
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.appointment.subStudent,
+				data: {
+					subscribe_no,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.searchText = ""
+				this.submitInfo.order_no = ""
+				this.pageInfo = res || {};
+				this.studentList = this.pageInfo.students || []
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #F2F2F7;
+}
+.add-student{
+	position: relative;
+	padding-bottom: 170rpx;
+	.as-search{
+		padding: 26rpx 24rpx;
+		background-color: #FFFFFF;
+		.as-box{
+			padding: 0rpx 20rpx;
+			height: 92rpx;
+			border-radius: 10rpx;
+			background-color: #F2F2F7;
+			@include centerFlex(flex-start);
+			>image{
+				flex-shrink: 0;
+				margin-right: 20rpx;
+				width: 40rpx;
+				height: 40rpx;
+			}
+			.ab-ipt{
+				flex-grow: 1;
+				color: #1A1A1A;
+				font-size: 32rpx;
+			}
+		}
+	}
+	.as-name{
+		margin-top: 2rpx;
+		padding: 26rpx 30rpx;
+		background-color: #FFFFFF;
+		color: #1A1A1A;
+		font-size: 28rpx;
+		font-weight: 700;
+	}
+	.as-list{
+		margin-top: 2rpx;
+		.al-item{
+			padding: 28rpx 40rpx;
+			display: flex;
+			justify-content: flex-start;
+			background-color: #FFFFFF;
+			>image{
+				flex-shrink: 0;
+				margin-right: 28rpx;
+			}
+			.ai-icon{
+				width: 36rpx;
+				height: 36rpx;
+				border-radius: 50%;
+				border: 2rpx solid #9A9A9D;
+			}
+			.ai-img{
+				width: 40rpx;
+				height: 40rpx;
+			}
+			.ai-info{
+				flex-grow: 1;
+				margin-top: -10rpx;
+				>view{
+					color: #1A1A1A;
+					font-size: 28rpx;
+					line-height: 52rpx;
+					>text{
+						&:first-child{
+							color: #009874;
+						}
+						&:nth-child(2){
+							color: #9C9C9F;
+						}
+					}
+				}
+			}
+		}
+	}
+	.as-fixed{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		padding: 22rpx 0;
+		width: 750rpx;
+		background-color: #FFFFFF;
+		border-top: 2rpx solid #F2F2F7;
+		>view{
+			margin: 0 auto;
+			padding: 34rpx 0;
+			width: 670rpx;
+			border-radius: 10rpx;
+			background-color: #009874;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			line-height: 44rpx;
+			text-align: center;
+		}
+		
+	}
+}
+</style>
diff --git a/src/subpackage/course/pages/class_student_detail/class_student_detail.vue b/src/subpackage/course/pages/class_student_detail/class_student_detail.vue
new file mode 100644
index 0000000..b902720
--- /dev/null
+++ b/src/subpackage/course/pages/class_student_detail/class_student_detail.vue
@@ -0,0 +1,251 @@
+<template>
+	<view class="class-student-detail">
+		<view class="csd-section">
+			<view class="cs-view">学员姓名：{{pageInfo.student_name||'-'}}（{{pageInfo.student_gender||'-'}}） </view>
+			<!-- 只有教务才有 -->
+			<view class="cs-view">
+				<text>学员电话：{{pageInfo.student_phone ||'-'}}</text>
+				<image src="/subpackage/course/static/images/icon/phone.png" @click="phoneCall(pageInfo.student_phone)"></image>
+			</view>
+			<view class="cs-view">剩余课时：{{pageInfo.course_period_residue ||0}}课时 （{{pageInfo.course_period_nums_use||0}}/{{pageInfo.course_period_nums||0}})</view>
+			<view class="cs-end">
+				<!-- 只有教务才有 -->
+				<view class="ce-btn1" hover-class="hover-active" @click="isShowClass=true">转班</view>
+			</view>
+		</view>
+		<view class="csd-record">
+			<view class="cr-tit">上课记录</view>
+			<sclass-record-section ></sclass-record-section>
+		</view>
+		<!-- 转班弹框 -->
+		<class-reset-modal
+			:isShowClass="isShowClass"
+			:info="pageInfo"
+			:canlist="classList" 
+			@confirmReset="confirmReset"
+			@closeReset="isShowClass=false"
+		></class-reset-modal>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+import class_reset_modal from '../../components/class_reset_modal/class_reset_modal.vue';
+import sclass_record_section from '../../components/sclass_record_section/sclass_record_section.vue';
+export default {
+	components: {
+		'class-reset-modal': class_reset_modal,
+		'sclass-record-section': sclass_record_section,
+	},
+	computed: {
+		
+	},
+	data() {
+		return {
+			pageInfo: {},
+			isShowClass: false,
+			classList: [],
+			resetInfo: {},
+		}
+	},
+	async onLoad(options){
+		// let _query = util.jsonPar(options.query);
+		// this.pageInfo = _query
+		// this.$nextTick(_=>{
+		// })
+	},
+	methods: {
+		formatDate: util.formatDate,
+		phoneCall(mobile) {
+			let _phoneStr = mobile || ''
+			let _phoneArr =  _phoneStr.split(',') || [];
+			uni.showActionSheet({
+			    itemList: _phoneArr,
+			    success: res =>{
+			        uni.makePhoneCall({
+			            phoneNumber:　_phoneArr[res.tapIndex]
+			        })
+			    }
+			})
+		},
+		
+		zh_status(status){
+			let arr = ["待上课","已上课","申请请假中","已请假","缺勤"]
+			return arr[status] || '';
+		},
+		// 去评价
+		toAppraise(){
+			let { pageInfo } = this
+			let _query = {
+				course_kind: "成班课",
+				course_name: pageInfo.course_name,
+				student_name: pageInfo.student_name,
+				student_gender: pageInfo.student_gender,
+				student_phone: pageInfo.student_phone,
+				sclass_name: pageInfo.sclass_name,
+				sclass_nums: pageInfo.sclass_nums,
+			}
+			util.routeTo(`/subpackage/manage/pages/appointment/appraise/appraise?order_no=${pageInfo.order_no}&query=${util.jsonStr(_query)}`,'nT');
+		},
+		
+		// 确认转班
+		confirmReset(e){
+			let { pageInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.class.reset,
+				data: {
+					old_id: pageInfo.sclass_id,
+					new_id: e.new_id,
+					user_id: pageInfo.user_id,
+					user_order_no: pageInfo.order_no,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				setTimeout(_=>{uni.navigateBack({delta:2})}, 1200)
+			})
+		},
+		
+		// 可换班级列表
+		getCanlist(course_id){
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.class.canlist,
+				data: {
+					course_id,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.classList = res.list || []
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #FFFFFF;
+}
+.class-student-detail{
+	position: relative;
+	padding-bottom: 160rpx;
+	.csd-section{
+		padding: 24rpx 22rpx 0;
+		.cs-view{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 52rpx;
+			@include centerFlex(flex-start);
+			>image{
+				margin-left: 30rpx;
+				flex-shrink: 0;
+				width: 32rpx;
+				height: 32rpx;
+			}
+		}
+		.cs-end{
+			margin-top: 16rpx;
+			padding: 30rpx 0;
+			border-top: 2rpx solid #E5E5E5;
+			@include centerFlex(flex-end);
+			>view{
+				margin-left: 20rpx;
+				padding: 12rpx 0;
+				width: 156rpx;
+				text-align: center;
+				font-size: 28rpx;
+				line-height: 40rpx;
+				border-radius: 6rpx;
+				border: 2rpx solid #009874;
+			}
+			.ce-btn1{
+				color: #009874;
+				background-color: #FFFFFF;
+			}
+			.ce-btn2{
+				color: #FFFFFF;
+				background-color: #009874;
+			}
+		}
+	}
+	.csd-record{
+		padding-bottom: 26rpx;
+		border-top: 24rpx solid #F2F2F7;
+		.cr-tit{
+			padding: 26rpx 22rpx;
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 52rpx;
+		}
+		.cds-tab{
+			margin: 0 24rpx;
+			border: 2rpx solid #E8E8E8;
+			background-color: #F6F8F8;
+			@include centerFlex(flex-start);
+			>view{
+				height: 110rpx;
+				color: #1A1A1A;
+				font-size: 28rpx;
+				text-align: center;
+				@include centerFlex(center);
+				&:first-child {
+					width: 166rpx;
+				}
+				&:nth-child(2){
+					width: 338rpx;
+					border-left: 2rpx solid #E8E8E8;
+					border-right: 2rpx solid #E8E8E8;
+				}
+				&:nth-child(3){
+					width: 194rpx;
+					// border-right: 2rpx solid #E8E8E8;
+				}
+				
+			}
+		}
+		.cds-list{
+			.cl-item{
+				margin: 0 24rpx;
+				border-left: 2rpx solid #E8E8E8;
+				border-right: 2rpx solid #E8E8E8;
+				border-bottom: 2rpx solid #E8E8E8;
+				background-color: #FFFFFF;
+				@include centerFlex(flex-start);
+				>view{
+					height: 110rpx;
+					color: #1A1A1A;
+					font-size: 28rpx;
+					text-align: center;
+					@include centerFlex(center);
+					&:first-child {
+						width: 166rpx;
+					}
+					&:nth-child(2){
+						width: 338rpx;
+						border-left: 2rpx solid #E8E8E8;
+						border-right: 2rpx solid #E8E8E8;
+					}
+					&:nth-child(3){
+						width: 194rpx;
+					}
+				}
+				.ci-txt-green{
+					color: #009874;
+				}
+				.ci-txt-red{
+					color: #EA5061;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/pages/class_time_change/class_time_change.vue b/src/subpackage/course/pages/class_time_change/class_time_change.vue
new file mode 100644
index 0000000..cc0a0b2
--- /dev/null
+++ b/src/subpackage/course/pages/class_time_change/class_time_change.vue
@@ -0,0 +1,268 @@
+<template>
+	<view class="class-time-change">
+		<view class="ctc-info">
+			<view class="ci-weight">{{pageInfo.brand_name||'-'}}</view>
+			<view>课程名称：{{pageInfo.course_name||'-'}}</view>
+			<view>所在班级：{{pageInfo.sclass_name||'-'}}</view>
+		</view>
+		<view class="ctc-section">
+			<view class="cs-tit">第{{pageInfo.lesson_no|| 0}}节</view>
+			<view class="cs-line">
+				<view class="cl-txt"><text>*</text>上课日期</view>
+				<picker class="cl-picker" mode="date" :value="pageInfo.period_date" :start="startDate" :end="endDate" @change="bindDateChange"  >
+					<view class="cl-box">
+						<view class="cb-txt">{{pageInfo.period_date}}</view>
+						<view class="cb-img">
+							<image src="/subpackage/course/static/images/icon/calendar.png"></image>
+						</view>
+					</view>
+				</picker>
+			</view>
+			<view class="cs-line">
+				<view class="cl-txt"><text>*</text>上课时间</view>
+				<picker class="cl-picker" :value="pageInfo.period_start_time" :range="timeList" @change="startBindChange">
+					<view class="cl-view">
+						<view>{{pageInfo.period_start_time}}</view>
+						<image src="/subpackage/course/static/images/icon/triangle.png"></image>
+					</view>
+				</picker>
+				<view class="cl-to">至</view>
+				<picker class="cl-picker" :value="pageInfo.period_end_time" :range="timeList" @change="endBindChange">
+					<view class="cl-view">
+						<view>{{pageInfo.period_end_time}}</view>
+						<image src="/subpackage/course/static/images/icon/triangle.png"></image>
+					</view>
+				</picker>
+			</view>
+		</view>
+		<view class="fixed-btn">
+			<view hover-class="hover-active" @click="sclassTimeChange">确认更改</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+export default {
+	computed: {
+		startDate() {
+			return this.getDate('start');
+		},
+		endDate() {
+			return this.getDate('end');
+		},
+		timeList(){
+			let _list = []
+			for(let i = 0; i<=24; i++){
+				_list.push(`${i<10?'0'+i:i}:00`)
+			}
+			return _list;
+		},
+	},
+	data() {
+		return {
+			pageInfo: {
+				period_date: "",
+				period_start_time: "",
+				period_end_time: "",
+			},
+		}
+	},
+	onLoad(options){
+		// let _query = util.jsonPar(options.query);
+		// this.pageInfo = _query
+	},
+	methods: {
+		getDate(type) {
+			const date = new Date();
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+		
+			if (type === 'start') {
+				year = year - 60;
+			} else if (type === 'end') {
+				year = year + 2;
+			}
+			month = month > 9 ? month : '0' + month;
+			day = day > 9 ? day : '0' + day;
+			return `${year}-${month}-${day}`;
+		},
+		//日期
+		bindDateChange: function(e) {
+			let _selectDate = e.target.value
+			this.pageInfo.period_date = _selectDate
+		},
+		
+		startBindChange(e){
+			console.log(e);
+			let _list = this.timeList || [];
+			this.pageInfo.period_start_time = _list[e.detail.value] || ''
+		},
+		endBindChange(e){
+			console.log(e);
+			let _list = this.timeList || [];
+			this.pageInfo.period_end_time = _list[e.detail.value] || ''
+		},
+		
+		// 成班课时间修改
+		sclassTimeChange(){
+			let { pageInfo } = this
+			if(pageInfo.period_date==''|| pageInfo.period_start_time==''|| pageInfo.period_end_time=='')return util.showNone("请完善必选项！");
+			let nowTime = util.formatDate(new Date(),'-')  //现在时间 格式为 2020-07-21
+			if(new Date(nowTime).getTime() > new Date(pageInfo.period_date).getTime())return util.showNone("上课日期不能小于当前系统日期！");
+			// 主要比较两个时间段大小，2021-09-01这个日期随便给
+			if(Date.parse('2021-09-01 '+ pageInfo.period_start_time) >= Date.parse('2021-09-01 '+ pageInfo.period_end_time))return util.showNone("上课时间的结束时间不能小于起始时间！");
+			this.$emit('closeChange')
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.schedule.sclassTimeChange,
+				data: {
+					id: pageInfo.sclass_id,
+					lesson_no: pageInfo.lesson_no,
+					period_date: pageInfo.period_date,
+					period_start_time: pageInfo.period_start_time,
+					period_end_time: pageInfo.period_end_time,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				setTimeout(_=>{ 
+					uni.navigateBack()
+					util.previousPageFunction({
+						fnName: 'refreshList',
+						query: { isLoad: false},
+					});
+				}, 1200)
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #F2F2F7;
+}
+.class-time-change{
+	position: relative;
+	padding-bottom: 160rpx;
+	.ctc-info{
+		padding: 24rpx 22rpx;
+		background-color: #FFFFFF;
+		>view{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 52rpx;
+		}
+		.ci-weight{
+			font-weight: 700;
+		}
+	}
+	.ctc-section{
+		margin: 12rpx 0;
+		padding: 30rpx 56rpx 58rpx 28rpx;
+		background-color: #FFFFFF;
+		.cs-tit{
+			color: #333333;
+			font-size: 36rpx;
+			font-weight: 700;
+			line-height: 50rpx;
+			margin-bottom: 16rpx;
+		}
+		.cs-line{
+			margin-top: 32rpx;
+			@include centerFlex(flex-start);
+			.cl-txt{
+				margin-right: 20rpx;
+				flex-shrink: 0;
+				color: #1A1A1A;
+				font-size: 32rpx;
+				line-height: 44rpx;
+				>text{
+					color: #EA5061;
+				}
+			}
+			.cl-box{
+				flex-grow: 1;
+				padding-left: 20rpx;
+				height: 88rpx;
+				border-radius: 10rpx;
+				background-color: #F2F2F7;
+				@include centerFlex(flex-start);
+				.cb-txt{
+					flex-grow: 1;
+					border-right: 2rpx solid #D8D8D8;
+					color: #1A1A1A;
+					font-size: 28rpx;
+				}
+				
+				.cb-img{
+					height: 88rpx;
+					padding: 0 22rpx 0 18rpx;
+					@include centerFlex(center);
+					>image{
+						width: 34rpx;
+						height: 34rpx;
+					}
+				}
+			}
+			.cl-picker{
+				flex-grow: 1;
+			}
+			.cl-view{
+				padding-left: 20rpx;
+				flex-grow: 1;
+				height: 88rpx;
+				border-radius: 10rpx;
+				background-color: #F2F2F7;
+				@include centerFlex(flex-end);
+				>view{
+					flex-grow: 1;
+					color: #1A1A1A;
+					font-size: 28rpx;
+					min-width: 80rpx;
+				}
+				>image{
+					margin: 0 18rpx;
+					flex-shrink: 0;
+					width: 22rpx;
+					height: 22rpx;
+				}
+			}
+			.cl-to{
+				margin: 0 26rpx;
+				flex-shrink: 0;
+				color: #B2B2B2;
+				font-size: 32rpx;
+				line-height: 44rpx;
+			}
+		}
+	}
+	.fixed-btn{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 750rpx;
+		padding: 20rpx 0 24rpx;
+		background-color: #FFFFFF;
+		z-index: 2;
+		>view{
+			margin: auto;
+			padding: 24rpx 0;
+			width: 670rpx;
+			border-radius: 10rpx;
+			background-color: #009874;
+			color: #FFFFFF;
+			font-size: 28rpx;
+			text-align: center;
+			font-weight: 700;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/pages/index/index.vue b/src/subpackage/course/pages/index/index.vue
index 1370525..ef1ada1 100644
--- a/src/subpackage/course/pages/index/index.vue
+++ b/src/subpackage/course/pages/index/index.vue
@@ -33,7 +33,7 @@
 		<view class="ic-tablist" v-for="(e,i) in tabList" :key="i">
 			<view class="it-title">{{e.type}}</view>
 			<view class="it-tabs">
-				<view class="itt-item" v-for="(item,index) in e.itemList" :key="index" @click="tabChange(item.path)">
+				<view class="itt-item" v-for="(item,index) in e.itemList" :key="index" @click="tabChange(e.id,item.id)">
 					<view>
 						<image :src="'/subpackage/course/static/images/tab/tab_'+ e.id +'_'+ item.id + '.png'"></image>
 						<view>{{item.name}}</view>
@@ -58,7 +58,7 @@ const tabList = [
 			{
 				id: 0,
 				name: "学员课程",
-				path: "",
+				path: "/subpackage/course/pages/manage_list/manage_list",
 			},
 			{
 				id: 1,
@@ -100,9 +100,10 @@ export default {
 	    
 	},
 	methods: {
-		tabChange(path){
-			if(path=='')return util.showNone('开发中');
-			util.routeTo(path,'nT')
+		tabChange(id1,id2){
+			// if(path=='')return util.showNone('开发中');
+			let _type_id = `${id1}-${id2}` 
+			util.routeTo(`/subpackage/course/pages/manage_list/manage_list?type_id=${_type_id}`,'nT')
 		},
 	}
 }
diff --git a/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue b/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
new file mode 100644
index 0000000..d091192
--- /dev/null
+++ b/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
@@ -0,0 +1,242 @@
+<template>
+	<view class="bclass-reserve-detail">
+		<view class="brd-line">
+			<view>欧轩智能场馆(羽毛球馆永泰店)</view>
+			<view :class="[false?'bl-gray':false?'bl-red':'bl-green']">待上课</view>
+		</view>
+		<view class="brd-section">
+			<view>预约单号：<text>yy202106031256568595</text></view>
+			<view>预约时间：<text>2021.06.03 11:42:50 </text></view>
+			<!-- 已取消才显示 -->
+			<block v-if="false">
+				<view>取消时间：<text>2021.06.03 11:42:50</text></view>
+				<view>取消原因：<text>学员取消（有事请假）</text></view>
+			</block>
+		</view>
+		<view class="brd-section">
+			<view>上课信息</view>
+			<view>上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
+			<view>上课地点：<text>羽毛球（3号场）</text></view>
+			<view>上课教练：<text>张瀚</text></view>
+			<view>课程名称：<text>羽毛球培训课</text></view>
+			<view>课程类型：<text>大班课</text></view>
+		</view>
+		<view class="brd-stu">
+			<view class="bs-tit">学员信息</view>
+			<view class="bs-line">
+				<view>已预约人数：3人<text>（上课区间：5-10）</text></view>
+				<!-- 待确认、待上课才显示 -->
+				<view v-if="true" @click="toAddStu">添加学员</view>
+			</view>
+			<view class="bs-list" v-for="i in 3" :key="i">
+				<view class="bl-item">
+					<view class="bi-info">
+						<view>熊启(男)
+							<text>18096895331</text>
+							<image src="/subpackage/course/static/images/icon/phone.png"></image>
+						</view>
+						<view>预约时间：2020.12.27 22:55:56</view>
+					</view>
+					<!-- 待确认、待上课才显示 -->
+					<view class="bi-btn" hover-class="hover-active" v-if="true">取消上课</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 待确认、待上课才显示 -->
+		<view class="brd-fixed" v-if="true">
+			<view class="bf-line">
+				<view class="bl-btn1" hover-class="hover-active" @click="isCancelClass=true">取消上课</view>
+				<!-- v-if="pageInfo.status_text=='待确认'" -->
+				<view class="bl-btn2" hover-class="hover-active" >确认上课</view>
+			</view>
+		</view>
+		
+		<cancel-class-modal
+			v-if="isCancelClass"
+			@reasonClose="isCancelClass=false"
+		></cancel-class-modal>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../../js/course_server';
+import { BOX_API } from '../../../js/course_api';
+import cancel_class_modal from '../../../components/cancel_class_modal/cancel_class_modal.vue';
+export default {
+	components: {
+		'cancel-class-modal': cancel_class_modal,
+	},
+	data() {
+		return {
+			isCancelClass: false,
+		}
+	},
+	methods: {
+		toAddStu(){
+			util.routeTo(`/subpackage/course/pages/class_add_student/class_add_student`,'nT');
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.bclass-reserve-detail{
+	position: relative;
+	padding-bottom: 150rpx;
+	.brd-line{
+		padding: 24rpx 44rpx 30rpx 30rpx;
+		background-color: #FFFFFF;
+		border-bottom: 2rpx solid #E5E5E5;
+		@include centerFlex(space-between);
+		>view{
+			font-size: 28rpx;
+			line-height: 40rpx;
+			&:first-child{
+				color: #1A1A1A;
+				font-weight: 700;
+			}
+			&:nth-child(2){
+				flex-shrink: 0;
+				margin-left: 10rpx;
+			}
+		}
+		.bl-green{
+			color: #009874;
+		}
+		.bl-gray{
+			color: #9C9C9F;
+		}
+		.bl-red{
+			color: #EA5061;
+		}
+	}
+	.brd-section{
+		margin-bottom: 2rpx;
+		padding: 25rpx 30rpx 30rpx;
+		background-color: #FFFFFF;
+		>view{
+			color: #9C9C9F;
+			font-size: 28rpx;
+			line-height: 52rpx;
+			>text{
+				color: #1A1A1A;
+			}
+		}
+	}
+	.brd-stu{
+		margin-top: 24rpx;
+		// padding: 26rpx 30rpx 38rpx;
+		background-color: #FFFFFF;
+		.bs-tit{
+			padding: 30rpx 30rpx 0;
+			color: #9A9A9D;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.bs-line{
+			padding: 12rpx 44rpx 26rpx 26rpx;
+			border-bottom: 2rpx solid #F2F2F7;
+			@include centerFlex(space-between);
+			>view{
+				font-size: 28rpx;
+				&:first-child{
+					color: #1A1A1A;
+					line-height: 52rpx;
+					>text{
+						color: #9C9C9F;
+					}
+				}
+				&:nth-child(2){
+					margin-left: 10rpx;
+					flex-shrink: 0;
+					color: #009874;
+					line-height: 40rpx;
+					text-decoration: underline;
+				}
+			}
+		}
+		.bs-list{
+			.bl-item{
+				margin: 0 30rpx;
+				padding: 30rpx 0rpx;
+				border-bottom: 2rpx solid #D8D8D8;
+				@include centerFlex(space-between);
+				.bi-info{
+					>view{
+						&:first-child{
+							color: #333333;
+							font-size: 32rpx;
+							line-height: 44rpx;
+							>text{
+								margin: 0 28rpx 0 40rpx;
+							}
+							>image{
+								flex-shrink: 0;
+								width: 32rpx;
+								height: 32rpx;
+							}
+						}
+						&:nth-child(2){
+							margin-top: 6rpx;
+							color: #B2B2B2;
+							font-size: 28rpx;
+							line-height: 40rpx;
+						}
+					}
+				}
+				.bi-btn{
+					padding: 12rpx 0;
+					width: 140rpx;
+					border: 2rpx solid #EA5061;
+					border-radius: 6rpx;
+					color: #EA5061;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+	.brd-fixed{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		padding: 30rpx 0;
+		width: 750rpx;
+		background-color: #FFFFFF;
+		.bf-line{
+			margin-right: 32rpx;
+			@include centerFlex(flex-end);
+			>view{
+				margin-left: 20rpx;
+				padding: 20rpx 0;
+				width: 192rpx;
+				font-size: 28rpx;
+				text-align: center;
+				font-weight: 700;
+				border-radius: 6rpx;
+			}
+			.bl-btn1{
+				color: #EA5061;
+				border: 2rpx solid #EA5061;
+				background-color: #FFFFFF;
+			}
+			.bl-btn2{
+				color: #FFFFFF;
+				border: 2rpx solid #009874;
+				background-color: #009874;
+			}
+			.bl-btn3{
+				color: #009874;
+				border: 2rpx solid #009874;
+				background-color: #FFFFFF;
+			}
+			
+		}
+	}
+}
+
+</style>
diff --git a/src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue b/src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue
new file mode 100644
index 0000000..9361008
--- /dev/null
+++ b/src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue
@@ -0,0 +1,433 @@
+<template>
+	<view class="class-manage-detail" :class="[curTabID==2?'cmd-content':'']">
+		<view class="cmd-tab">
+			<tab-bar :tabList="tabList" :curTabID="curTabID" @change="tabChange"></tab-bar>
+		</view>
+		
+		<!-- 班级详情 -->
+		<block v-if="curTabID==0">
+			<view class="cmd-status">课程状态：<text :class="[false?'cs-gray':false?'cs-red':'cs-green']">成班中</text></view>
+			<view class="cmd-section">
+				<view>课程信息</view>
+				<view>欧轩智能羽毛球馆（番禺店）</view>
+				<view><text>课程名称：</text>羽毛球培训课</view>
+				<view><text>课程课时数量：</text>10节课</view>
+				<view><text>课时时长：</text>1小时</view>
+				<view><text>课程有效期：</text>2021.06.30-2021.09.30</view>
+				<!-- 成班中、失败 -->
+				<block v-if="true">
+					<view><text>成班区间人数：</text>2-6人</view>
+					<view><text>报名截止时间：</text>2021.07.12  23:50:50</view>
+				</block>
+			</view>
+			<view class="cmd-section">
+				<view>班级信息</view>
+				<view><text>班级id：</text>2-3</view>
+				<view><text>班级名称：</text></view>
+				<view><text>班级人数：</text>20</view>
+				<view><text>上课教练：</text></view>
+				<view><text>上课地点：</text></view>
+				<view><text>课程日期：</text></view>
+			</view>
+			<view class="cmd-fixed">
+				<view hover-class="hover-active" @click="confirmClass()">确认成班</view>
+			</view>
+		</block>
+		
+		<!-- 班级学员 -->
+		<view class="cmd-stu" v-for="(item,i) in 3" :key="i" v-if="curTabID==1">
+			<view class="cs-item" @click="toStuDetail()">
+				<view class="ci-line">
+					<view>张安（男 ） 
+						<text>18316536894</text>
+						<image src="/subpackage/course/static/images/icon/phone.png"></image>
+					</view>
+					<image src="/subpackage/course/static/images/icon/arrow_black.png"></image>
+				</view>
+				<view class="ci-view">剩余课时：10节 （共12节)</view>
+				<view class="ci-view"><text>有效期：2020.12.27 22:55:56</text></view>
+				<view class="ci-btn">
+					<view hover-class="hover-active" @click.stop="isShowClass=true">转班</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 上课表 -->
+		<view class="cmd-schedule" v-if="curTabID==2">
+			<block v-if="true">
+				<view class="cs-tab">
+					<view>课时</view>
+					<view>上课时间</view>
+					<view>上课状态</view>
+					<view>操作</view>
+				</view>
+				<view class="cs-list" v-for="(e,i) in 6" :key="i">
+					<view class="cl-item">
+						<view>第{{e.lesson_no|| '-'}}节</view>
+						<!-- ${formatDate({date: e.period_date, partition: '.'}) ||'-'} -->
+						<view>{{`${' '+e.period_start_time || ''}-${e.period_end_time || ''}`}}</view>
+						<view
+							:class="[!e.status?'ci-txt-green':'']"
+						>{{e.status?'已上课':'待上课'}}</view>
+						<view>
+							<view  hover-class="hover-active" v-if="!e.status" @click="toChange(e)">更改</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			
+			<view class="cmd-no" v-if="false">
+				<image src="/subpackage/course/static/images/no_order.png"></image>
+				<view>暂未排课</view>
+			</view>
+		</view>
+		
+		<!-- 作业列表 -->
+		<view class="cmd-task" v-if="curTabID==3">
+			<task-section ref="refTask" :taskInfo="taskList" taskType="finish" v-if="true"></task-section>
+			<view class="cmd-no" v-if="false">
+				<image src="/subpackage/course/static/images/no_order.png"></image>
+				<view>暂未布置作业</view>
+			</view>
+		</view>
+		
+		<!-- 转班弹框 -->
+		<class-reset-modal
+			:isShowClass="isShowClass"
+			:info="6"
+			:canlist="canlist" 
+			@confirmReset="confirmReset"
+			@closeReset="isShowClass=false"
+		></class-reset-modal>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../../js/course_server';
+import { BOX_API } from '../../../js/course_api';
+import tabBar from '../../../components/tab_bar/tab_bar.vue';
+import class_reset_modal from '../../../components/class_reset_modal/class_reset_modal.vue';
+import task_section from '../../../components/task_section/task_section.vue';
+const tabList=[
+	{name: '班级详情', id: 0}, {name: '班级学员', id: 1}, {name: '上课表', id: 2}, {name: '作业列表', id: 3},
+];
+export default {
+	components: {
+		'tab-bar': tabBar,
+		'class-reset-modal': class_reset_modal,
+		'task-section': task_section,
+	},
+	data() {
+		return {
+			tabList,
+			curTabID: 0,
+			isShowClass: false,
+			canlist: [],
+			
+			taskList: [
+				{
+					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安",
+				},
+				{
+					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安排的不同，大部分在9日到10日间仍有部分科目的考试。今年新增的8个高考综合改革省份的考生，将在明天完成高中学业水平选考科目的考试后结束高考。",
+				},
+				{
+					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安今年第三批高考综合改革省份迎来“新高考”，目前省份，由于考试科目安",
+				}
+			],
+		}
+	},
+	methods: {
+		formatDate: util.formatDate,
+		tabChange: util.debounce(function(e){
+			this.curTabID = e.id;
+			this.refreshList();
+			this.$nextTick(() => {
+				if(this.curTabID==3 && this.taskList.length>0)this.$refs.refTask.initDesc();
+			});
+		}, 300, true),
+		refreshList(){
+			
+		},
+		confirmClass(){
+			util.showModal({
+			    title: '是否确认成班',
+			    content: '确认后代表用户报名成功，提前成立班级安排上课',
+			    showCancel: true,
+			    success: modalRes=>{
+			        if(modalRes.confirm){
+						// util.showLoad();
+						// boxServer.get({
+						// 	url: BOX_API.schedule.cancelBclassAc,
+						// 	data: {
+						// 		subscribe_no,
+						// 	},
+						// 	failMsg: '加载失败！'
+						// })
+						// .then(res=>{
+						// 	util.hideLoad();
+						// 	this.doSuccess()
+						// })
+					}
+			    }
+			})
+		},
+		
+		btnChange(){},
+		
+		toStuDetail(){
+			util.routeTo(`/subpackage/course/pages/class_student_detail/class_student_detail`,'nT');
+		},
+		// 转班
+		confirmReset(e){
+			// this.resetInfo["new_id"] = e.new_id
+			// this.$emit('confirmReset',this.resetInfo)
+		},
+		
+		toChange(){
+			util.routeTo(`/subpackage/course/pages/class_time_change/class_time_change`,'nT');
+		},
+		
+	
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.class-manage-detail{
+	position: relative;
+	padding: 102rpx 0 170rpx;
+	.cmd-tab{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 750rpx;
+		border-bottom: 2rpx solid #F2F2F7;
+		z-index: 10;
+	}
+	.cmd-status{
+		margin-top: 24rpx;
+		padding: 24rpx 48rpx;
+		background-color: #FFFFFF;
+		color: #1A1A1A;
+		font-size: 28rpx;
+		line-height: 52rpx;
+		font-weight: 700;
+		.cs-green{
+			color: #009874;
+		}
+		.cs-gray{
+			color: #9C9C9F;
+		}
+		.cs-red{
+			color: #EA5061;
+		}
+	}
+	.cmd-section{
+		margin-top: 2rpx;
+		padding: 38rpx 48rpx 30rpx;
+		background-color: #FFFFFF;
+		>view{
+			&:first-child{
+				margin-bottom: 20rpx;
+				color: #9C9C9F;
+				font-size: 32rpx;
+				line-height: 44rpx;
+			}
+			&+view{
+				color: #1A1A1A;
+				font-size: 28rpx;
+				line-height: 52rpx;
+				>text{
+					color: #9C9C9F;
+				}
+			}
+		}
+	}
+	.cmd-fixed{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		padding: 22rpx 0;
+		width: 750rpx;
+		background-color: #FFFFFF;
+		border-top: 2rpx solid #F2F2F7;
+		>view{
+			margin: 0 auto;
+			padding: 34rpx 0;
+			width: 670rpx;
+			border-radius: 10rpx;
+			background-color: #009874;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			line-height: 44rpx;
+			text-align: center;
+		}
+	}
+	.cmd-stu{
+		margin-top: 24rpx;
+		.cs-item{
+			position: relative;
+			flex-grow: 1;
+			margin-top: 2rpx;
+			padding: 26rpx 22rpx 20rpx;
+			background-color: #FFFFFF;
+			.ci-line{
+				margin: 0 26rpx;
+				@include centerFlex(space-between);
+				>view{
+					color: #1A1A1A;
+					font-size: 28rpx;
+					line-height: 52rpx;
+					>text{
+						margin: 0 30rpx;
+					}
+					>image{
+						flex-shrink: 0;
+						width: 32rpx;
+						height: 32rpx;
+					}
+				}
+				>image{
+					flex-shrink: 0;
+					width: 20rpx;
+					height: 20rpx;
+				}
+			}
+			.ci-view{
+				margin-left: 26rpx;
+				color: #1A1A1A;
+				font-size: 28rpx;
+				line-height: 52rpx;
+				>text{
+					color: #9C9C9F;
+				}
+			}
+			.ci-btn{
+				margin-top: 18rpx;
+				padding-top: 28rpx;
+				border-top: 2rpx solid #E5E5E5;
+				@include centerFlex(flex-end);
+				>view{
+					padding: 12rpx 0;
+					width: 156rpx;
+					border-radius: 6rpx;
+					border: 2rpx solid #009874;
+					color: #009874;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+	.cmd-schedule{
+		padding-top: 24rpx;
+		border-top: 24rpx solid #F2F2F7;
+		.cs-tab{
+			margin: 0 24rpx;
+			border: 2rpx solid #E8E8E8;
+			background-color: #F6F8F8;
+			@include centerFlex(flex-start);
+			>view{
+				height: 110rpx;
+				color: #1A1A1A;
+				font-size: 28rpx;
+				text-align: center;
+				@include centerFlex(center);
+				&:first-child {
+					width: 130rpx;
+				}
+				&:nth-child(2){
+					width: 204rpx;
+					border-left: 2rpx solid #E8E8E8;
+					border-right: 2rpx solid #E8E8E8;
+				}
+				&:nth-child(3){
+					width: 204rpx;
+					border-right: 2rpx solid #E8E8E8;
+				}
+				&:nth-child(4){
+					width: 158rpx;
+					
+				}
+			}
+		}
+		.cs-list{
+			.cl-item{
+				margin: 0 24rpx;
+				border-left: 2rpx solid #E8E8E8;
+				border-right: 2rpx solid #E8E8E8;
+				border-bottom: 2rpx solid #E8E8E8;
+				background-color: #FFFFFF;
+				@include centerFlex(flex-start);
+				>view{
+					height: 110rpx;
+					color: #1A1A1A;
+					font-size: 28rpx;
+					text-align: center;
+					@include centerFlex(center);
+					&:first-child {
+						width: 130rpx;
+					}
+					&:nth-child(2){
+						width: 204rpx;
+						border-left: 2rpx solid #E8E8E8;
+						border-right: 2rpx solid #E8E8E8;
+					}
+					&:nth-child(3){
+						width: 204rpx;
+						border-right: 2rpx solid #E8E8E8;
+					}
+					&:nth-child(4){
+						width: 158rpx;
+						>view{
+							padding: 4rpx 0;
+							width: 110rpx;
+							border-radius: 6rpx;
+							background-color: #009874;
+							color: #FFFFFF;
+							font-size: 28rpx;
+							font-weight: 700;
+							text-align: center;
+							line-height: 40rpx;
+						}
+					}
+				}
+				.ci-txt-green{
+					color: #009874;
+				}
+			}
+		}
+	}
+	.cmd-task{
+		margin-top: 24rpx;
+	}
+	.cmd-no{
+		display: flex;
+		flex-direction: row;
+		flex-direction: column;
+		flex-wrap: wrap;
+		justify-content: center;
+		align-items: center;
+		margin-top: 150rpx;
+		>image{
+			width: 346rpx;
+			height: 346rpx;
+		}
+		>view{
+			margin-top: 46rpx;
+			color: #9C9C9F;
+			font-size: 32rpx;
+			line-height: 44rpx;
+			text-align: center;
+		}
+	}
+}
+.cmd-content{
+	min-height: 100vh;
+	background-color: #FFFFFF;
+}
+</style>
diff --git a/src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue b/src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue
new file mode 100644
index 0000000..207193e
--- /dev/null
+++ b/src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="private-reserve-detail">
+		<view class="prd-line">
+			<view>欧轩智能场馆(羽毛球馆永泰店)</view>
+			<view :class="[false?'pl-gray':false?'pl-red':'pl-green']">待上课</view>
+		</view>
+		<view class="prd-section">
+			<view>预约单号：<text>yy202106031256568595</text></view>
+			<view>预约时间：<text>2021.06.03 11:42:50 </text></view>
+			<!-- 已取消才显示 -->
+			<block v-if="false">
+				<view>取消时间：<text>2021.06.03 11:42:50</text></view>
+				<view>取消原因：<text>学员取消（有事请假）</text></view>
+			</block>
+		</view>
+		<view class="prd-section">
+			<view>上课信息</view>
+			<view>上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
+			<view>上课地点：<text>羽毛球（3号场）</text></view>
+			<view>上课教练：<text>张瀚</text></view>
+			<view>课程名称：<text>羽毛球培训课</text></view>
+			<view>课程类型：<text>私教课</text></view>
+			<view>课程节数：<text>第3节，共12节</text></view>
+		</view>
+		<view class="prd-stu">
+			<view class="ps-tit">学员信息</view>
+			<view class="ps-line">
+				<view class="pl-info">
+					<view>熊启(男)
+						<text>18096895331</text>
+						<image src="/subpackage/course/static/images/icon/phone.png"></image>
+					</view>
+					<view>预约时间：2020.12.27 22:55:56</view>
+				</view>
+				<!-- 待上课才显示 -->
+				<view class="pl-btn" hover-class="hover-active" v-if="true" @click="isCancelClass=true">取消上课</view>
+			</view>
+		</view>
+		
+		<cancel-class-modal
+			v-if="isCancelClass"
+			@reasonClose="isCancelClass=false"
+		></cancel-class-modal>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../../js/course_server';
+import { BOX_API } from '../../../js/course_api';
+import cancel_class_modal from '../../../components/cancel_class_modal/cancel_class_modal.vue';
+export default {
+	components: {
+		'cancel-class-modal': cancel_class_modal,
+	},
+	data() {
+		return {
+			isCancelClass: false,
+		}
+	},
+	methods: {
+		
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.private-reserve-detail{
+	.prd-line{
+		padding: 24rpx 44rpx 30rpx 30rpx;
+		background-color: #FFFFFF;
+		border-bottom: 2rpx solid #E5E5E5;
+		@include centerFlex(space-between);
+		>view{
+			font-size: 28rpx;
+			line-height: 40rpx;
+			&:first-child{
+				color: #1A1A1A;
+				font-weight: 700;
+			}
+			&:nth-child(2){
+				flex-shrink: 0;
+				margin-left: 10rpx;
+			}
+		}
+		.pl-green{
+			color: #009874;
+		}
+		.pl-gray{
+			color: #9C9C9F;
+		}
+		.pl-red{
+			color: #EA5061;
+		}
+	}
+	.prd-section{
+		margin-bottom: 2rpx;
+		padding: 25rpx 30rpx 30rpx;
+		background-color: #FFFFFF;
+		>view{
+			color: #9C9C9F;
+			font-size: 28rpx;
+			line-height: 52rpx;
+			>text{
+				color: #1A1A1A;
+			}
+		}
+	}
+	.prd-stu{
+		margin-top: 24rpx;
+		padding: 26rpx 30rpx 38rpx;
+		background-color: #FFFFFF;
+		.ps-tit{
+			color: #9A9A9D;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.ps-line{
+			margin-top: 26rpx;
+			@include centerFlex(space-between);
+			.pl-info{
+				>view{
+					&:first-child{
+						color: #333333;
+						font-size: 32rpx;
+						line-height: 44rpx;
+						>text{
+							margin: 0 28rpx 0 40rpx;
+						}
+						>image{
+							flex-shrink: 0;
+							width: 32rpx;
+							height: 32rpx;
+						}
+					}
+					&:nth-child(2){
+						margin-top: 6rpx;
+						color: #B2B2B2;
+						font-size: 28rpx;
+						line-height: 40rpx;
+					}
+				}
+			}
+			.pl-btn{
+				padding: 12rpx 0;
+				width: 140rpx;
+				border: 2rpx solid #EA5061;
+				border-radius: 6rpx;
+				color: #EA5061;
+				font-size: 28rpx;
+				line-height: 40rpx;
+				text-align: center;
+			}
+		}
+	}
+}
+
+</style>
diff --git a/src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue b/src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue
new file mode 100644
index 0000000..de796fc
--- /dev/null
+++ b/src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue
@@ -0,0 +1,302 @@
+<template>
+	<view class="student-course-detail" :class="[false?'scd-content':'']">
+		<view class="scd-section">
+			<view class="ss-status">进行中</view>
+			<view class="ss-view">学员姓名：张安（男 ）</view>
+			<view class="ss-view">学员电话：18316536894
+				<image src="/subpackage/course/static/images/icon/phone.png"></image>
+			</view>
+			<view class="ss-view">剩余课时：10课时 （共12节)</view>
+			<!-- 私教课、大班课 才有安排上课 -->
+			<view class="ss-line" v-if="true">
+				<view hover-class="hover-active" @click="toArrangeClass">安排上课</view>
+			</view>
+		</view>
+		<view class="scd-tab">
+			<tab-bar :tabList="tabList" :curTabID="curTabID" @change="tabChange"></tab-bar>
+		</view>
+		<!-- 课程详情 -->
+		<view class="scd-info" v-if="curTabID==0">
+			<view class="si-tit">欧轩智能场馆(羽毛球馆永泰店)</view>
+			<view>羽毛球杀球训练（私教课）</view>
+			<view><text>课程类型：</text>私教课</view>
+			<view><text>总课时：</text>14</view>
+			<!-- 私教课、大班课 -->
+			<block v-if="true">
+				<view><text>购买课时：</text>10</view>
+				<view><text>赠送课时：</text>4</view>
+				<view><text>有效期至：</text>至2022.06.02</view>
+				<view><text>课时时长：</text>2小时/节</view>
+				<view><text>上课教练：</text>一级教练</view>
+				<!-- 私教课才有上课内容 -->
+				<view v-if="true"><text>上课内容：</text></view>
+				<view><text>上课是否需要场地：</text>是（不含场地费用）</view>
+			</block>
+			
+			<!-- 成班课 -->
+			<block v-if="false">
+				<view><text>课时时长：</text>45分钟/节</view>
+				<view><text>有效期至：</text>2022.06.02-2022.12.02</view>
+				<view class="si-tit si-mar">班级信息</view>
+				<view><text>班级id：</text>2-1</view>
+				<view><text>班级名称：</text>冲锋班</view>
+				<view><text>班级人数：</text>20</view>
+				<view><text>上课教练：</text>张三</view>
+				<view><text>上课地点：</text>欧轩智能场馆3号馆</view>
+				<view><text>课程日期：</text>2021.08.08-2021.10.10</view>
+			</block>
+			
+		</view>
+		<!-- 上课记录 -->
+		<view class="scd-record" v-if="curTabID==1">
+			<!-- 私教课、大班课 -->
+			<view class="sr-list" v-for="i in 3" :key="i" v-if="false">
+				<view class="sl-item">
+					<view>
+						<view class="si-box">
+							<view>预约单号：yy202106031256568595</view>
+							<view :class="[true?'sb-red':false?'sb-gray':'sb-green']">已取消</view>
+						</view>
+						<view class="si-time">2021.06.03 11:42:50   预约</view>
+					</view>
+					<view class="si-wei">课程节数：第3节，共12节</view>
+					<view><text>上课时间：</text>2021.06.02（周五）   14:00-16:00</view>
+					<view><text>上课地点：</text>羽毛球（3号场）</view>
+					<view><text>上课教练：</text>张三</view>
+					<!-- 已取消显示 -->
+					<block v-if="true">
+						<view><text>取消时间：</text>2021.06.03 11:42:50</view>
+						<view><text>取消原因：</text>教练取消</view>
+					</block>
+				</view>
+			</view>
+			<view class="sr-sclass" v-if="true">
+				<sclass-record-section ></sclass-record-section>
+			</view>
+		</view>
+		<!-- 作业列表 -->
+		<view class="scd-task" v-if="curTabID==2">
+			<task-section ref="refTask" :taskInfo="taskList"></task-section>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../../js/course_server';
+import { BOX_API } from '../../../js/course_api';
+import { mapState } from 'vuex';
+import tabBar from '../../../components/tab_bar/tab_bar.vue';
+import sclass_record_section from '../../../components/sclass_record_section/sclass_record_section.vue';
+import task_section from '../../../components/task_section/task_section.vue';
+const tabList=[
+	{name: '课程详情', id: 0}, {name: '上课记录', id: 1}, {name: '作业列表', id: 2},
+];
+export default {
+	components: {
+		'tab-bar': tabBar,
+		'sclass-record-section': sclass_record_section,
+		'task-section': task_section,
+	},
+	data() {
+		return {
+			tabList,
+			curTabID: 0,
+			
+			taskList: [
+				{
+					// isShowExpande: false,
+					// expande: false,
+					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安",
+				},
+				{
+					// isShowExpande: false,
+					// expande: false,
+					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安排的不同，大部分在9日到10日间仍有部分科目的考试。今年新增的8个高考综合改革省份的考生，将在明天完成高中学业水平选考科目的考试后结束高考。",
+				},
+				{
+					// isShowExpande: false,
+					// expande: false,
+					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安今年第三批高考综合改革省份迎来“新高考”，目前省份，由于考试科目安",
+				}
+			],
+		}
+	},
+	onLoad() {
+		
+	},
+	methods: {
+		tabChange: util.debounce(function(e){
+			this.curTabID = e.id;
+			this.refreshList();
+			
+			this.$nextTick(() => {
+				if(this.curTabID==2)this.$refs.refTask.initDesc();
+			});
+		}, 300, true),
+		refreshList(){
+			
+		},
+		toArrangeClass(){
+			util.routeTo(`/subpackage/course/pages/arrange_class/arrange_class`,'nT');
+		},
+		
+		
+		
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #F2F2F7;
+}
+.student-course-detail{
+	.scd-section{
+		border-bottom: 26rpx solid #F2F2F7;
+		position: relative;
+		padding: 24rpx 24rpx 18rpx;
+		background-color: #FFFFFF;
+		.ss-status{
+			position: absolute;
+			top: 24rpx;
+			right: 24rpx;
+			color: #009874;
+			font-size: 28rpx;
+			line-height: 52rpx;
+		}
+		.ss-view{
+			padding-right: 84rpx;
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 52rpx;
+			@include centerFlex(flex-start);
+			>image{
+				margin-left: 30rpx;
+				flex-shrink: 0;
+				width: 32rpx;
+				height: 32rpx;
+			}
+		}
+		.ss-line{
+			margin-top: 18rpx;
+			padding: 28rpx 0 12rpx;
+			border-top: 2rpx solid #E5E5E5;
+			@include centerFlex(flex-end);
+			>view{
+				padding: 12rpx 0;
+				width: 156rpx;
+				border-radius: 6rpx;
+				background-color: #009874;
+				color: #FFFFFF;
+				font-size: 28rpx;
+				line-height: 40rpx;
+				text-align: center;
+			}
+		}
+	}
+	.scd-tab{
+		border-bottom: 2rpx solid #F2F2F7;
+	}
+	.scd-info{
+		padding: 26rpx 44rpx 30rpx;
+		background-color: #FFFFFF;
+		>view{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 52rpx;
+			>text{
+				color: #9C9C9F;
+			}
+		}
+		.si-tit{
+			margin: 0 2rpx 14rpx;
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			font-weight: 700;
+		}
+		.si-view{
+			color: #9C9C9F;
+			font-size: 28rpx;
+			line-height: 52rpx;
+			>text{
+				color: #1A1A1A;
+			}
+		}
+		.si-mar{
+			margin-top: 40rpx;
+		}
+	}
+	.scd-record{
+		.sr-list{
+			margin-bottom: 24rpx;
+			.sl-item{
+				padding: 24rpx 44rpx 30rpx;
+				background-color: #FFFFFF;
+				>view{
+					&:first-child{
+						margin-bottom: 18rpx;
+						padding-bottom: 26rpx;
+						border-bottom: 2rpx solid #E8E8E8;
+					}
+					&+view{
+						color: #1A1A1A;
+						font-size: 28rpx;
+						line-height: 52rpx;
+						>text{
+							color: #9A9A9D;
+						}
+					}
+				}
+				.si-box{
+					@include centerFlex(space-between);
+					>view{
+						font-size: 28rpx;
+						line-height: 40rpx;
+						&:first-child{
+							color: #333333;
+							font-weight: 700;
+						}
+						&:nth-child(2){
+							flex-shrink: 0;
+						}
+					}
+					.sb-green{
+						color: #009874;
+					}
+					.sb-gray{
+						color: #9C9C9F;
+					}
+					.sb-red{
+						color: #EA5061;
+					}
+					
+				}
+				.si-time{
+					margin-top: 12rpx;
+					color: #9A9A9D;
+					font-size: 24rpx;
+					line-height: 34rpx;
+				}
+				.si-wei{
+					font-weight: 700;
+				}
+			}
+		}
+		.sr-sclass{
+			padding: 20rpx 0 100rpx;
+			background-color: #FFFFFF;
+		}
+	}
+	
+	.scd-task{
+		margin-top: 24rpx;
+	}
+}
+.scd-content{
+	min-height: 100vh;
+	background-color: #FFFFFF;
+}
+</style>
diff --git a/src/subpackage/course/pages/manage_list/manage_list.vue b/src/subpackage/course/pages/manage_list/manage_list.vue
new file mode 100644
index 0000000..4ebc440
--- /dev/null
+++ b/src/subpackage/course/pages/manage_list/manage_list.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="manage-list">
+		<block v-if="true">
+			<view class="ml-head">
+				<store-name></store-name>
+				<view class="mh-view">
+					<image class="mv-icon" src="/static/images/icon/search.png"></image>
+					<input class="mv-ipt" :placeholder="plaTxt" />
+				</view>
+				<tab-bar :tabList="tabList" :curTabID="curTabID" @change="tabChange"></tab-bar>
+			</view>
+			<view class="ml-list" v-for="(e,i) in 6" :key="i" v-if="true">
+				<student-course-item :orderInfo="e" v-if="typeId == '0-0'"></student-course-item>
+				<private-reserve-item :orderInfo="e" v-if="typeId == '0-1'"></private-reserve-item>
+				<bclass-reserve-item :orderInfo="e" v-if="typeId == '0-2'"></bclass-reserve-item>
+				<class-manage-item :orderInfo="e" v-if="typeId == '0-3'"></class-manage-item>
+			</view>
+			<view class="no-item no-list" v-if="false">
+				<image src="/subpackage/course/static/images/no_order.png"></image>
+				<view>{{ tipsText }}</view>
+			</view>
+		</block>
+		
+		<view class="no-list" v-if="false">
+			<image src="/subpackage/course/static/images/no_order.png"></image>
+			<view>{{ tipsText }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+import { mapState } from 'vuex';
+import tabBar from '../../components/tab_bar/tab_bar.vue';
+import store_name from '../../components/store_name/store_name';
+import student_course_item from '../../components/manage/student_course_item/student_course_item.vue';
+import private_reserve_item from '../../components/manage/private_reserve_item/private_reserve_item.vue';
+import bclass_reserve_item from '../../components/manage/bclass_reserve_item/bclass_reserve_item.vue';
+import class_manage_item from '../../components/manage/class_manage_item/class_manage_item.vue';
+export default {
+	components: {
+		'tab-bar': tabBar,
+		'store-name': store_name,
+		'student-course-item': student_course_item,
+		'private-reserve-item': private_reserve_item,
+		'bclass-reserve-item': bclass_reserve_item,
+		'class-manage-item': class_manage_item,
+	},
+	computed:{
+		// ...mapState([ 'storeInfo' ]),
+	    titleName(){
+	        let { typeId  } = this;
+	        if(typeId == '0-0')return '学员管理';
+	        if(typeId == '0-1')return '私教约课记录';
+	        if(typeId == '0-2')return '大班约课记录';
+			if(typeId == '0-3')return '班级管理';
+	        return '订单管理列表';
+	    },
+		tipsText(){
+			let { typeId } = this;
+			if(typeId == '0-0')return '暂无学员';
+			if(typeId == '0-1')return '暂无约课记录';
+			if(typeId == '0-2')return '暂无约课记录';
+			if(typeId == '0-3')return '暂无班级';
+			return '';
+		},
+		plaTxt(){
+			let { typeId } = this;
+			if(typeId == '0-0')return '请输入课程名称/学员姓名/电话查找';
+			if(typeId == '0-1')return '请输入课程名称/学员姓名/电话查找';
+			if(typeId == '0-2')return '请输入教练姓名查找';
+			if(typeId == '0-3')return '请输入课程名称/班级名称查找';
+			return '';
+		},
+		tabList(){
+			let _list0 = [{name: '全部', id: 0}, {name: '进行中', id: 1}, {name: '已结束', id: 2}, {name: '已退款', id: 3}];
+			let _list1 = [{name: '全部', id: 0}, {name: '待上课', id: 1}, {name: '已上课', id: 2}, {name: '已取消', id: 3}];
+			let _list2 = [{name: '全部', id: 0}, {name: '待确认', id: 1}, {name: '待上课', id: 2}, {name: '已上课', id: 3}, {name: '已取消', id: 4}];
+			let _list3 = [{name: '全部', id: 0}, {name: '成班中', id: 1}, {name: '进行中', id: 2}, {name: '已结束', id: 3}, {name: '失败', id: 4}];
+			
+			let { typeId } = this;
+			if(typeId == '0-0')return _list0;
+			if(typeId == '0-1')return _list1;
+			if(typeId == '0-2')return _list2;
+			if(typeId == '0-3')return _list3;
+			return [];
+		},
+	},
+	data() {
+		return {
+			curTabID: 0,
+			page: 1,
+			typeId: "",
+		}
+	},
+	onLoad(options){
+		// let _query = util.jsonPar(options.query);
+		// this.optionsQuery = _query
+		this.typeId = options.type_id || ''
+		this.$nextTick(_=>{
+		    uni.setNavigationBarTitle({
+		        title: this.titleName
+		    })
+			// this.getCommentList({});
+		})
+	},
+	methods: {
+		tabChange: util.debounce(function(e){
+			this.curTabID = e.id;
+			this.refreshList();
+		}, 300, true),
+		refreshList(){
+			this.page = 1;
+			// this.subList = [];
+			// this.getSubscribeList({});
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #F2F2F7;
+}
+.manage-list{
+	position: relative;
+	padding-top: 292rpx;
+	padding-bottom: 24rpx;
+	.ml-head{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 750rpx;
+		background-color: #FFFFFF;
+		border-bottom: 2rpx solid #F2F2F7;
+		z-index: 6;
+		.mh-view{
+			margin: 0 24rpx;
+			padding: 0 20rpx;
+			flex-grow: 1;
+			height: 92rpx;
+			border-radius: 10rpx;
+			background-color: #F2F2F7;
+			@include centerFlex(flex-start);
+			.mv-icon{
+				margin-right: 20rpx;
+				flex-shrink: 0;
+				width: 40rpx;
+				height: 40rpx;
+			}
+			.mv-ipt{
+				flex-grow: 1;
+				color: #333;
+				font-size: 32rpx;
+				line-height: 44rpx;
+			}
+		}
+	}
+	.ml-list{
+		margin-top: 24rpx;
+	}
+	.no-item{
+		margin-top: 128rpx;
+	}
+	.no-list{
+		display: flex;
+		flex-direction: row;
+		flex-direction: column;
+		flex-wrap: wrap;
+		justify-content: center;
+		align-items: center;
+		>image{
+			width: 346rpx;
+			height: 346rpx;
+		}
+		>view{
+			margin: 46rpx 0;
+			color: #9C9C9F;
+			font-size: 32rpx;
+			line-height: 44rpx;
+			text-align: center;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/pages/task_detail/task_detail.vue b/src/subpackage/course/pages/task_detail/task_detail.vue
new file mode 100644
index 0000000..e4a5ae1
--- /dev/null
+++ b/src/subpackage/course/pages/task_detail/task_detail.vue
@@ -0,0 +1,132 @@
+<template>
+	<view class="task-detail">
+		<view class="td-info">
+			<view class="td-txt">布置作业时间：{{formatDate({date: pageInfo.created_at, partition: '/'}) || '-'}}</view>
+			<view class="td-txt">发布人：{{pageInfo.work_coach_name || '-'}}</view>
+			<view class="td-txt td-tit">作业内容</view>
+			<view class="td-txt">{{pageInfo.work_content || '-'}}</view>
+			<view class="td-line">
+				<view>视频链接：{{pageInfo.work_video || '无'}}</view>
+				<view @click="copyOrder(pageInfo.work_video)">复制</view>
+			</view>
+			<image class="td-img" mode="aspectFill" v-for="(e,i) in pageInfo.work_imgs" :key="i" :src="e || ''" @tap="previewImageWork(e)"></image>
+		</view>
+		
+		<view class="td-info">
+			<view class="td-txt">作业提交时间：{{pageInfo.student_work_at!=''?formatDate({date: pageInfo.student_work_at, partition: '/'}) : ''}}</view>
+			<view class="td-txt">提交人：{{pageInfo.student_name || '-'}}</view>
+			<view class="td-txt td-tit">完成情况</view>
+			<view class="td-txt">{{pageInfo.student_work_content ||'无'}}</view>
+			<view class="td-line">
+				<view>视频链接：{{pageInfo.student_work_video || '无'}}</view>
+				<view @click="copyOrder(pageInfo.student_work_video)">复制</view>
+			</view>
+			<image class="td-img" mode="aspectFill" v-for="(e,i) in pageInfo.student_work_imgs" :key="i" :src="e || ''" @tap="previewImageStu(e)"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+export default {
+	data() {
+		return {
+			pageInfo: {},
+		}
+	},
+	async onLoad(options){
+		// let _query = util.jsonPar(options.query);
+		// this.pageInfo = _query
+		// this.getWorkInfo(options.id)
+	},
+	methods: {
+		formatDate: util.formatDate,
+		copyOrder(data){
+			uni.setClipboardData({ data })
+		},
+		previewImageWork(img){
+			uni.previewImage({
+				current: img,
+				urls: this.pageInfo.work_imgs
+			})
+		},
+		// 查看大图片
+		previewImageStu(img) {
+			// var current = e.target.dataset.src
+			uni.previewImage({
+				current: img,
+				urls: this.pageInfo.student_work_imgs
+			})
+		},
+		
+		// 作业 - 详情
+		getWorkInfo(id){
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.student.workInfo,
+				data: {
+					id,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.pageInfo = res
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+// page{
+// 	background: #F2F2F7;
+// }
+.task-detail{
+	.td-info{
+		margin-bottom: 12rpx;
+		padding: 24rpx 0 30rpx;
+		background-color: #FFFFFF;
+		.td-txt{
+			margin: 0 60rpx 0 24rpx;
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+		.td-tit{
+			font-weight: 700;
+			margin: 44rpx 24rpx 20rpx;
+		}
+		.td-line{
+			margin: 30rpx 60rpx 0 26rpx;
+			flex-grow: 1;
+			padding: 30rpx 4rpx 6rpx;
+			border-top: 2rpx solid #D8D8D8;
+			@include centerFlex(flex-start);
+			>view{
+				font-size: 28rpx;
+				&:first-child{
+					color: #9A9A9D;
+					line-height: 40rpx;
+					@include textHide(1);
+				}
+				&:nth-child(2){
+					margin-left: 20rpx;
+					flex-shrink: 0;
+					color: #009874;
+				}
+			}
+		}
+		.td-img{
+			margin: 24rpx 16rpx 0 30rpx;
+			display: inline-block;
+			width: 200rpx;
+			height: 200rpx;
+			border-radius: 10rpx;
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/pages/task_finish_list/task_finish_list.vue b/src/subpackage/course/pages/task_finish_list/task_finish_list.vue
new file mode 100644
index 0000000..3fd336e
--- /dev/null
+++ b/src/subpackage/course/pages/task_finish_list/task_finish_list.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="task-finish-list">
+		<!-- v-if="workList.length>0" -->
+		<block >
+			<view class="tfl-box">
+				<view>布置作业时间：{{formatDate({date: pageInfo.created_at, partition: '/'}) || '-'}}</view>
+				<view>发布人：{{pageInfo.work_coach_name||'-'}}</view>
+			</view>
+			<!-- workList -->
+			<view class="tfl-list" v-for="(e,i) in 3" :key="i">
+				<view class="tl-item" @click="toDetail(e)">
+					<view class="ti-info">
+						<view>{{e.student_name||'-'}}（{{e.student_gender||'-'}}）</view>
+						<view>{{'-'}}</view>
+					</view>
+					<view class="ti-section">
+						<view v-if="e.work_status==1">{{formatDate({date: pageInfo.student_work_at,}) ||'-'}}</view>
+						<view class="ts-line">
+							<view :class="[e.work_status==1?'':'tl-txt']">{{e.work_status==1?'已完成':'未完成'}}</view>
+							<image src="/subpackage/course/static/images/icon/arrow_black.png"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- <view class="fixed-btn">
+				<view hover-class="hover-active" @click="batchRemind">批量提醒完成</view>
+			</view> -->
+		</block>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import boxServer from '../../js/course_server';
+import { BOX_API } from '../../js/course_api';
+export default {
+	computed:{
+		
+	},
+	data() {
+		return {
+			pageInfo: {},
+			workList: [],
+		}
+	},
+	onLoad(options) {
+		// let _query = util.jsonPar(options.query);
+		// this.pageInfo = _query
+		// let { work_number } = options
+		// this.pageInfo = options
+		// this.$nextTick(_=>{
+		// 	this.getClassWork()
+		// })
+	},
+	methods: {
+		formatDate: util.formatDate,
+		// 作业-完成情况
+		getClassWork(){
+			let { work_number } = this.pageInfo
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.class.classWork,
+				data: {
+					work_number,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				let _list = res || []
+				this.workList = _list
+				if(_list.length>0){
+					this.pageInfo["created_at"] = _list[0].created_at
+					this.pageInfo["work_coach_name"] = _list[0].work_coach_name
+				}
+			})
+		},
+		
+		toDetail(item){
+			util.routeTo(`/subpackage/manage/pages/student/task_detail/task_detail?id=${item.id}`,'nT')
+		},
+		
+		// 批量提醒
+		batchRemind(){
+			util.showNone('开发中！');
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+page{
+	background: #F2F2F7;
+}
+.task-finish-list{
+	position: relative;
+	padding-bottom: 160rpx;
+	.tfl-box{
+		flex-grow: 1;
+		padding: 24rpx 22rpx;
+		background-color: #FFFFFF;
+		border-bottom: 12rpx solid #F2F2F7;
+		>view{
+			color: #1A1A1A;
+			font-size: 28rpx;
+			line-height: 52rpx;
+		}
+	}
+	.tfl-list{
+		.tl-item{
+			padding: 20rpx 36rpx 20rpx 46rpx;
+			background-color: #FFFFFF;
+			border-bottom: 2rpx solid #F2F2F7;
+			@include centerFlex(space-between);
+			.ti-info{
+				>view{
+					color: #1A1A1A;
+					font-size: 28rpx;
+					line-height: 52rpx;
+				}
+			}
+			.ti-section{
+				color: #9C9C9F;
+				font-size: 28rpx;
+				line-height: 52rpx;
+				.ts-time{
+					
+				}
+				.ts-line{
+					@include centerFlex(flex-end);
+					>image{
+						margin: 0 2rpx 0 20rpx;
+						flex-shrink: 0;
+						width: 20rpx;
+						height: 20rpx;
+					}
+					.tl-txt{
+						color: #EA5061;
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/course/static/images/icon/arrow_black.png b/src/subpackage/course/static/images/icon/arrow_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..137e9b859aac131acead0c0a4716e55af5d315a9
GIT binary patch
literal 624
zcmV-$0+0QPP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0006vNkl<ZI8T*S
zzl#%55dLOQFA@moHKK(`3X2pX?0X40K>}itKVapM$YCc4f~FJ{v=>e}Y!pP11B0lI
za)pw{G<k0e(Jp_0Bw)1ExNl^Z-LQB0c@MVOeKX&F-^@2dn0*KU1MmR2IdOZgBq=>{
zVx>|!9!1d>Gp`ZRZDY*0AP81ktyZ)Q=oqk8s~u{$+y8vu-vsbHVfTZG0%OdV^nMZO
z1VgR$Ip^GG0LPN#U(CD_hT-lqOtXNJAIsKSUvSRt05~b{MDz#1Rb$MX1XOA&^_@8T
z0kfdO^euqXNmE8dbi)|)Y#!5TfJhU{<?@**idq290{9DH6+qKk`!G=>1ok*!DxgGV
znsfrdI{;+>(&-fd53IF!0i@O%OP>jtM8q|%R;z2H(dacZUj#4$a2UX&LZQ$UXJmmF
z0gmO@>-Ai}-+uw%az_45YwhE#`40p*7z~~=a|3{MJ?DAey>7RAe`&z9Ilk|oBBC8;
zUQZ<x(R*gzwATJ!MluCK;K{gYt=FA%uM+#DP1!0Ii_K}{I8CyAlgBBgHkkPdfTM{$
zB4)l7hT(P+6USxUJqwVPQg@hH>LU{&R{2Rp4P(s5#8Sd`Vp_6*v8PI<(rP}Rmu+)B
z?Isa@cg|f2!|>}oFkw2eZM4=6=iJM*lK?*Ca=B}rPN#pM<&Xv|r7kh^uKdjNyzSv|
z*zEOsVw0s7?fx3ZvXxTjiRehT+x;}F__OxnB4Z1yi3Kok$^Hj-&J-k(h=I5O0000<
KMNUMnLSTX-MH^lK

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/icon/arrow_green.png b/src/subpackage/course/static/images/icon/arrow_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff4fdf0f2bcf507e09bd320970e1a00c48dfaa82
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00071Nkl<ZNK5UM
zy=zlp6vlt&=7U-*B7%tji$g&Kom5P4s7TSI)(lci8e7o3L4`I69YktA?BGy`gwm;l
z6a;bgKX7pn5eJDN(%2-gy!ZMhH!&u0=pvr&-uImIJm)zd!U3BcaDM(J0F6+KIId)o
zS{p(Cm3;pAXsu;q2TP=sLq?g9@j#4cRtZYA`$_cz6jSF3a+1d3Dhc%s12iD0CyDjh
zSUdvlD6PN;;;S#a6(|)%sV3#*8MN%W55gv~+*Pt!8Cr>9Zmd>ysK0%I)=|LxohF`t
zO*IlQWqAOGy|4r90TYO9@Nx2{`!=W&`>#|A;k>KRmTSNdAdDktiRE@pZjXV%G<rWv
zuF#Tn$5He;@j}8d>1n)Q^Kz<)X3m%V0kPbDo3q;k3sOq1gUojWbe>pY(XGNX-k5D@
zIkkpn!RPy!SmAbuu&cH;Te6Yt)b}D<UkCPq5W+*^`Fn09#>^O&QjdV;jt`VM_WqXp
z=99E{ifrkbjHZ${O}o-%#}cvpiVIM=vrOAD0G{S%DB}5<PL;m#{(TQDdUfFt_24F&
zi$D_y5|9L<g(gor|3q&Qnwnu&?F|}+;fq#Vo1p$_3$4$2Y$fa|sy*q@JA|h$Gpicz
zN)A}eKOZ}zx2tvfDAL?UJJY}PHV7fad4=W@bE{w7-uTXge-VdYQ!Cf=rQ<aAx6yLi
zTSR$-GkJj<>dUBYAAPPZyQj$$1o4{O<Sz4t&%>AxKX&~W%bo<QasT&_vpc#1|DN<O
n+8FnIe1I{M4RZMpFjBamfO-WkXh!mt00000NkvXXu0mjfP&PM%

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/icon/calendar.png b/src/subpackage/course/static/images/icon/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b43783e5f82d589846b1886534d3ca73f9e865e6
GIT binary patch
literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0008nNkl<ZSV!%c
z&r4KM6vsdJ{h0ifX=Gr(BX=!anNUb%LHk1gfJlZm?W{=1S1>`jYa@fvAE4AeC?ll6
zT)AjxL_dX$6!Yi2_vXgE&vAY|$5Cc#gwE#j-hJnu?>pz7@44p+lt=^u$s?zp8n+SO
zlh~HjbDle_N6YTkqw5JhZYG8FO-rz3&vM<FPuUI@jmK@o)E(e5lKOQU0la4YESN?T
zfGbuC=?mt8r^uFjM5FE+klq+@8(0M~m$oC-{Jyp4pCGmdghKkV0oVoHCpyq4h~L};
z@-@g-guH~5V<hc5BFO~4S%>r{1CLm(nEnF7Hj8qIbp25Mgb~4T7Z9QYDV~9t1aVgI
zxbG-_;*H)Ve&iI_V&53<GU*=ii90p0_$x46yO*f5w7#DTp-JtzF#XipgM9}v6Yq4m
z&Bz($kt2|Nt9}{NZs%(36OLoi@A%wx1kJx+Xq(f!FVOEu{jL~EeVeau;y7O50Cyau
z2gd1aAhzAcmDm>?$G~xt+MWUxj9xMJ^S;T|Pp$o=?=Y@A5ds7gjCP_AKI_nQjRZhS
zEhAk<5Oy7jalp^<2quPTqvzq*ERU2LNXjEaHx7}M6JbDXgw;XA)CXpos<HN$$0Obk
zgQl5f=2}i5y)i|Rfky^!9mDWPf#bl6rmnvuij%5<k0i~`3Iej8zWn3Rq=8h-X3bAu
zRq`@LF=nQ0XMXea6&5K%QwEj7>`7IW($e^TRdaw6#WmZRSNx=YU}Hkd0HWCN!18ls
zvU4qyl<6u2ujm;#uYnBpzC?0vYxBk^->WZbmfl%FDkwDRqE~8i+q~#y?U4!rQbD2l
zpEbczu>uLLLN;qE#Y$0Ia%<DhO5e<O0?Kn#1Qqs>b|S37%4{df#jGI>R({KAR@GvZ
z$s<V&{FTN0mQ($4e4{43)b7YSW#u&C8psCM66M4ZdMy!lQBzJ3As01&0HeXqJ)z32
Q0RR9107*qoM6N<$f?#TUGXMYp

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/icon/close_gray.png b/src/subpackage/course/static/images/icon/close_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..434fe2db8a0bb3e4f64e0a1df7a5133cb4a0d755
GIT binary patch
literal 667
zcmV;M0%ZM(P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0007FNkl<ZSVz@Z
z%Wl&^6g@L>k*H8UBocfFus}#C-XNMdiA&)RP`eljwV%MFacZ}SjU$1&g8!(L|7cY}
zBF<biCKDXj?>ri28O_`|_xRj%=Z0ZJ7K`E_A~qZj`Dip!ze^#6Tm?=c1P8zyjRrNF
zP01LeIUw;%)q!P$NsBoL#P|KXmzO^d0QP{0z1!VweG@_$LWp1)%;;Fh$ES}Nqt}e#
zqF&#AYntY-5Qy*lHPbXFj^iB>$u|H9z?gI6Ww*QIEdz{>F&Lb+r3^j-*aE;9!(p%2
zIS7I1O^)M!C8DPQegfE5IsxaF-EE&O0!E+h54;^n=_-BvyMukPZR?o^5^AB}cOL_E
z4!{5~0Z;?*dl6<5n79*(9T3%?C<)9oqD2&;P9IR{sR}a*OoY{#kRXqXHPlLk!nA|A
z0?uG!E-|go8|7OxK$d1oFfmIg(MPHT(&b$>kyJyg5^#|O@|-oKu83x)HV{-5dnS;m
z$K+k0_7(x0=F+)9qF_=k3Jim_)V?5~(})L^D*Hk}GMG`Gpkj=tVpX=S+Jgd7$_NVs
zNnl20ua>$vy8g!Gyj7+(lmar(%%|s4j=kxp(C-$-M8Nr0yW4&7xlDihKY_%2;&whw
ziovZ{tT~Rkp7Jef^(!^BGQDGE7GIQ!Xo;2q9=H0<eFjuvB4HjX+_g0`oA*@Qh{v-A
zaqHv6#tc|#BWJC~_d1=nTc(Sq&B!{&$%$u8Ch~(GIRSQL+t&V#A^hs<dLQ8T0eau-
zS>KldBL2d69QPr>UIFr=UcYxZ8^SZPSlizce*jG-aa5<0P+kB4002ovPDHLkV1nPq
BD!c#y

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/icon/phone.png b/src/subpackage/course/static/images/icon/phone.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ac41699c90c4c55e984fe99c5257bc936a1ff0b
GIT binary patch
literal 1137
zcmV-%1djWOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CyNkl<ZSVy&&
zU1(cn7{`ClNrJjv2vZTkFC5-<7gA)xE*!cG1@S^BRnS3|E={e1TbpEc6Fn0*Ym<tb
z+K(ins25^Ul!1b5bJdG65EZ0DWH&<HggF)33C^AOk@uYQwx?Orc96U`Cm~PX=l}el
zum2Hz-^2F}6NTIH7(-<f9<$)}ksUt9$6YBNoeF5vk?`Ky&UFNtqo8*H)>#TThnmgw
zjh<{Lh!{X|lt2f7i$FR7;xK2{-XAig2!ghn2w}3Y9^nYeEr0>M*h%zRWQg98*YN!`
zzHb4x^a!<LH-WyFh~7D{(F({sYVM=2e7qg05GM0uAWtV~PevFsBHxi_3q2!qtxknd
z-Ss`jbV8Wls3w-4s3=9p=q*39&^0YegfLnB9rXHT09aQM6G}IIrT1G2LZ}qxQP!>y
zP{fYNS+2-*(!KAuR;5Cy6#qf>sucjlX&}H$ZDjlK53ORs0yu^0`X(u`)Z6G&VK=1B
z06pbutD?6-3)TEIMm9GA;Hdu+O%0HH_2*VPj{sB(C6s(!8@i5|Bc;39UVbY~k=q+B
z>VOEqL~$#kpVR?}_kkWHSAH&Z+%Y5VSW3e9(5-mp2<UBzQ5=t9KBKqva62M*Bu0a$
zQW!_+YcLHj;<1Hn>DzXJhyYZF?!*Kq;x+8R#bema0QZm^{i7Wq?1GKfY^Cra$`eg$
z;Zt(uM?%}Ea#mi;tF)Dc4L32^fq2uvwRJ7&>fr#rr5zy)FZuTR<{*;VVFmjrA}70Q
zg%=6f+n^;ah!p4x<jVU(`>rXoEQs1rCu+`;9hqIue(Co6+E4S#`LBR`8x*8<=pkkg
z+0p%BI`;Y!swH=vXn7}}C6Edt=fLbBTej&Hrn<cPR$c_)SeSUe0|}0SURS4(9OYJ|
z9OTTJouP9#oZPdrYXfS&0oKK-G<a0;q!{XnI+44S0rz7yzYQZF!~m>K(#|cW&&mAv
zBu~BZ_Y#ULg+nM0CjJ|zPkuyAf2gby>|H8A9Ei#M9*|e!R9KzpY%LQOL>lBL)a1fT
z?WyITC6G58Fc*Okna5*4vujGBzVv;skpfzr`PD)h!(i;t+B(5%-8uPw0pSbaSCnnQ
zHLKXH(`e9dC4XZ8$%3g4?#6hQ38#$gJ44;DTKL{f)+OyN8&>-NiLkXX0BfGC@>>3J
z0yz-R2pf4l8%{SQQ?=aAjO$2dngehkT<h5CM#oXTJI=ASNT%d+mvjK~@A3fLm98+~
z^{*s2UnIc3MP0qnW|uOuQuLOw3?7G82f$uu`#gHaFS7D7s*feQ!_sPNz@;JCH4&eS
z(%%a^DC0e}dI0rx5w@Kjw?Qw42Y{Pbl>?Dec={0+Qm@lL{MY3HNT%fE23=T6Zx7r=
zCUqCWCh#_b-iUGosDjKPavC)!FdQc%hv^wP?HK(Z#Z~5HgGDZH00000NkvXXu0mjf
D=WZK<

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/icon/triangle.png b/src/subpackage/course/static/images/icon/triangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a53e9464d4a78111732825f5639a13c9031e47a
GIT binary patch
literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0004VNkl<ZNK5UL
zu}*|Q5QhInAfdSgOTfZ}>Yl*D&dSbv0%PqH*w~m@Ty3oF^aZZE$~UmHg)3Gs*IbMW
ziN}r^!d?g*2bf&vRLf@en}7Zp1a=f+M_l}a*UmOs(bpoX&Z;k<^Q^02;kxd?ah#tn
z1j8^WO;b|{L5s!Wv;3wE<}>-ee@jGH06qZh0gao(?eiN8z`2z25r6?eae*3mI2_u`
z<?;!@s7T`EO`*XzQp)Rswf4GZ1*;CjaF8U)gous-WQCG4d{roYkWyY$p;g8DA-A7-
zo_7G?8Nguy=X(w=#OG<2Wuy6g{#CX>Lz=cC_saMEBO;mr*w@}ML<sR>S=MP3Mem!`
zHYwIcO#rJP2u4aN_ME>BB6_oJ`y`Iz*FrgWP>Z%b&f%WtT>`iR@NJsr*=#nOZiBWd
z)+%yaf*=?xr6MWieH*kZnDZE}SBbmKcXeB|SyBC&Izjs=ZWGvhc)fvbd;DkM&cVMT
Wt8N!}Cc~%z0000<MNUMnLSTYiM#eAz

literal 0
HcmV?d00001

diff --git a/src/subpackage/course/static/images/no_order.png b/src/subpackage/course/static/images/no_order.png
new file mode 100644
index 0000000000000000000000000000000000000000..98d3c779f3b376a281ef953ceadf44b20b89c4be
GIT binary patch
literal 14345
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

literal 0
HcmV?d00001


From 53914a54de400c6083625f2fa60f0e51d64b75e3 Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Fri, 24 Sep 2021 16:37:55 +0800
Subject: [PATCH 03/11] add course api

---
 src/subpackage/course/js/course_api.js      | 25 +++++++++++++++++++++++++
 src/subpackage/course/js/course_server.js   |  4 ++--
 src/subpackage/course/pages/index/index.vue | 29 +++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/subpackage/course/js/course_api.js b/src/subpackage/course/js/course_api.js
index ce64999..0469ebb 100644
--- a/src/subpackage/course/js/course_api.js
+++ b/src/subpackage/course/js/course_api.js
@@ -3,6 +3,31 @@ import { ORIGIN } from '../../../js/api';
 export const COURSE_API = { 
     stadiumList:`${ORIGIN}/admin/stadium/list`,  //  店铺列表
 	
+	courseHome:`${ORIGIN}/admin/assistant/venueCourse/home`,  //课程首页
+	
+	stuCourse:`${ORIGIN}/admin/assistant/venueCourse/student`,                       //学员课程
+	stuInfo:`${ORIGIN}/admin/assistant/venueCourse/studentInfo`,                     //学员课程 - 详情
+	stuWorkInfo:`${ORIGIN}/admin/assistant/venueCourse/studentWorkInfo`,             //学员作业详情
+	arrangeStuAcCoach:`${ORIGIN}/admin/assistant/venueCourse/arrangeStudentAcCoach`, //学员课程 - 详情 - 安排上课[私教课] - 获取教练
+	arrangeStuAc:`${ORIGIN}/admin/assistant/venueCourse/arrangeStudentAc`,           //学员课程 - 详情 - 安排上课[私教课]
+	
+	subscribePri:`${ORIGIN}/admin/assistant/venueCourse/subscribePri`,       //约课记录 - 私教课
+	subscribeBclass:`${ORIGIN}/admin/assistant/venueCourse/subscribeBclass`, //约课记录 - 大班课
+	subscribeInfo:`${ORIGIN}/admin/assistant/venueCourse/subscribeInfo`,     //约课记录 - 详情
+	setBclassAc:`${ORIGIN}/admin/assistant/venueCourse/setBclassAc`,         //约课记录 - 大班课提前确认上课
+	cancelBclassAc:`${ORIGIN}/admin/assistant/venueCourse/cancelBclassAc`,   //约课记录 - 大班课取消上课
+	cancelStuAc:`${ORIGIN}/admin/assistant/venueCourse/cancelStudentAc`,     //约课记录 - 详情 - 某个学员取消上课
+	bclassStus:`${ORIGIN}/admin/assistant/venueCourse/bclassStudents`,       //约课记录 - 详情 - 获取大班课可添加学员
+	bclassStuAdd:`${ORIGIN}/admin/assistant/venueCourse/bclassStudentAdd`,   //约课记录 - 详情 - 大班课添加学员
+	
+	sclassManage:`${ORIGIN}/admin/assistant/venueCourse/sclass`,                       //班级管理
+	sclassInfo:`${ORIGIN}/admin/assistant/venueCourse/sclassInfo`,                     //班级管理 - 详情
+	sclassConfirm:`${ORIGIN}/admin/assistant/venueCourse/sclassConfirm`,               //班级管理 - 成班课确认成班
+	stuCanChangeSclass:`${ORIGIN}/admin/assistant/venueCourse/studentCanChangeSclass`, //班级管理 - 学员详情 - 可换班级列表
+	resetStuSclass:`${ORIGIN}/admin/assistant/venueCourse/resetStudentSclass`,         //班级管理 - 学员详情 - 换班
+	sclassStuWork:`${ORIGIN}/admin/assistant/venueCourse/sclassStudentWork`,           //班级管理 - 作业完成情况
+	sclassTimeChange:`${ORIGIN}/admin/assistant/venueCourse/sclassTimeChange`,         //班级管理 - 修改上课时间
+
 }
 
 export default COURSE_API;
\ No newline at end of file
diff --git a/src/subpackage/course/js/course_server.js b/src/subpackage/course/js/course_server.js
index 9245726..069cd29 100644
--- a/src/subpackage/course/js/course_server.js
+++ b/src/subpackage/course/js/course_server.js
@@ -1,10 +1,10 @@
 import { Server } from '../../../js/server';
 
-class DeviceServer extends Server {
+class CourseServer extends Server {
     constructor(props){
         super(props)
     }
 }
 
 
-export default new DeviceServer();
\ No newline at end of file
+export default new CourseServer();
\ No newline at end of file
diff --git a/src/subpackage/course/pages/index/index.vue b/src/subpackage/course/pages/index/index.vue
index ef1ada1..bcad34b 100644
--- a/src/subpackage/course/pages/index/index.vue
+++ b/src/subpackage/course/pages/index/index.vue
@@ -47,7 +47,7 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
 import { mapState } from 'vuex'
 import store_name from '../../components/store_name/store_name';
 const tabList = [
@@ -82,17 +82,22 @@ export default {
 	components: {
 	    'store-name': store_name
 	},
+	computed:{
+		...mapState([ 'brandInfo', 'storeInfo' ]),
+	},
 	data() {
 		return {
 			tabList,
 		}
 	},
 	async onLoad(){
+		// console.log("得到的：",this.brandInfo)
+		// this.getCourseHome();
 	    try{
 	        util.showLoad();
 	        let _brandInfo = await this.$store.dispatch('getBrandInfo');
 	        await this.$store.dispatch('getStoreList');
-			// this.updateAC();
+			// this.getCourseHome();
 	        util.hideLoad();
 	    }catch(err){
 	        util.hideLoad();
@@ -105,6 +110,26 @@ export default {
 			let _type_id = `${id1}-${id2}` 
 			util.routeTo(`/subpackage/course/pages/manage_list/manage_list?type_id=${_type_id}`,'nT')
 		},
+		
+		getCourseHome(){
+			let { brandInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.courseHome,
+				data: {
+					brand_id: brandInfo.brand.id,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				// this.pageInfo = res
+				// console.log("阿桑要花费的：",res)
+			})
+			.catch(util.hideLoad)
+		
+			
+		},
 	}
 }
 </script>

From d01a0f4b4d3479dbb63825a7f8ee3701e028ff98 Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Thu, 14 Oct 2021 09:16:22 +0800
Subject: [PATCH 04/11] add api course

---
 src/pages/index/index.vue                          |   2 +-
 src/store/index.js                                 |   1 +
 .../bclass_reserve_item/bclass_reserve_item.vue    |  59 +++--
 .../manage/class_manage_item/class_manage_item.vue |  32 +--
 .../private_reserve_item/private_reserve_item.vue  |  35 ++-
 .../student_course_item/student_course_item.vue    |  32 ++-
 .../sclass_record_section.vue                      |  17 +-
 .../course/components/store_name/store_name.vue    |   2 +-
 .../components/task_section/task_section.vue       |  11 +-
 .../course/pages/arrange_class/arrange_class.vue   |  23 +-
 .../pages/class_add_student/class_add_student.vue  |  24 +-
 .../class_student_detail/class_student_detail.vue  |  57 ++---
 .../pages/class_time_change/class_time_change.vue  |  16 +-
 src/subpackage/course/pages/index/index.vue        |  51 +++--
 .../bclass_reserve_detail.vue                      | 172 +++++++++++---
 .../class_manage_detail/class_manage_detail.vue    | 249 +++++++++++++++------
 .../private_reserve_detail.vue                     | 115 ++++++++--
 .../student_course_detail.vue                      | 155 +++++++------
 .../course/pages/manage_list/manage_list.vue       | 216 +++++++++++++++---
 .../course/pages/task_detail/task_detail.vue       |  12 +-
 .../pages/task_finish_list/task_finish_list.vue    |  35 ++-
 21 files changed, 946 insertions(+), 370 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 9d03d23..63cdaf9 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -130,7 +130,7 @@
 			id: 8,
 			name: '课程管理',
 			path: '/subpackage/course/pages/index/index',
-			serverKey: 1011  // 后端对应权限编号
+			serverKey: 1011  // 后端对应权限编号 1013
 		}
 	];
 	
diff --git a/src/store/index.js b/src/store/index.js
index a97ca4c..792fdc3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -29,6 +29,7 @@ export default new Vuex.Store({
             '1010': '设备管理',
             '1011': '商品零售',
 			'1012': '订单管理',
+			'1013': '课程管理',
         },
 
         // 场地占用提交页面信息
diff --git a/src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue b/src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue
index 6989a52..9a084ff 100644
--- a/src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue
+++ b/src/subpackage/course/components/manage/bclass_reserve_item/bclass_reserve_item.vue
@@ -2,28 +2,39 @@
 	<!-- 大班约课记录 -->
 	<view class="bclass-reserve-item" @click="toDetail">
 		<view class="bri-line">
-			<view class="bl-store">欧轩智能场馆(羽毛球馆永泰店)</view>
-			<view class="bl-status" :class="[false?'status-gray':false?'status-red':'']">待上课</view>
+			<view class="bl-store">{{orderInfo.brand_name ||''}}({{orderInfo.stadium_name||'-'}})</view>
+			<view class="bl-status" :class="[orderInfo.status_text=='已上课'?'status-gray':orderInfo.status_text=='已取消'?'status-red':'']">{{orderInfo.status_text||'-'}}</view>
 		</view>
-		<view class="bri-view">已预约人数：<text>3人（上课区间：5-10）</text></view>
-		<view class="bri-view">上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
-		<view class="bri-view">上课地点：<text>羽毛球（3号场）</text></view>
-		<view class="bri-view">上课教练：<text>周扎米</text></view>
-		<view class="bri-view">课程名称：<text>羽毛球培训课</text></view>
-		<block v-if="false">
-			<view class="bri-view">取消时间：<text>2021.06.03 11:42:50</text></view>
-			<view class="bri-view">取消原因：<text>教练取消（大雨停课）</text></view>
+		<view class="bri-view">已预约人数：<text>{{orderInfo.bclass_nums||0}}人（上课区间：{{orderInfo.bclass_nums_min||0}}-{{orderInfo.bclass_nums_max||0}}）</text></view>
+		<view class="bri-view">上课时间：<text>{{ formatDate({date: orderInfo.date, partition: '.'}) || ''}}（{{orderInfo.week||'-'}}）   {{orderInfo.start_duration||''}}-{{orderInfo.end_duration||''}}</text></view>
+		<view class="bri-view">上课地点：<text>{{orderInfo.addr||''}}</text></view>
+		<view class="bri-view">上课教练：<text>{{orderInfo.coach_name||''}}</text></view>
+		<view class="bri-view">课程名称：<text>{{orderInfo.course_name||''}}</text></view>
+		<block v-if="orderInfo.status_text=='已取消'">
+			<view class="bri-view">取消时间：<text>{{orderInfo.cancel_time||''}}</text></view>
+			<view class="bri-view">取消原因：<text>{{orderInfo.cancel_reason||''}}</text></view>
 		</block>
-		<view class="bri-btn" v-if="true">
-			<view class="bb-btn1" hover-class="hover-active" @click.stop="">取消上课</view>
-			<view class="bb-btn2" hover-class="hover-active" @click.stop="">确认上课</view>
+		<view class="bri-btn" v-if="orderInfo.status_text=='待确认'||orderInfo.status_text=='待上课'">
+			<view class="bb-btn1" hover-class="hover-active" @click.stop="isCancelClass=true">取消上课</view>
+			<view class="bb-btn2" hover-class="hover-active" @click.stop="confirmClass" v-if="orderInfo.status_text=='待确认'">确认上课</view>
 		</view>
+		
+		<!-- 弹框 取消上课 -->
+		<cancel-class-modal
+			v-if="isCancelClass"
+			@reasonConfirm="reasonConfirm"
+			@reasonClose="isCancelClass=false"
+		></cancel-class-modal>
 	</view>
 </template>
 
 <script>
 import util from '@/utils/util';
+import cancel_class_modal from '../../cancel_class_modal/cancel_class_modal.vue';
 export default {
+	components: {
+		'cancel-class-modal': cancel_class_modal,
+	},
 	props:{
 		orderInfo: {
 			type: Object,
@@ -35,12 +46,32 @@ export default {
 	},
 	data(){
 	    return {
+			isCancelClass: false,
 	    }
 	},
 	methods: {
+		formatDate: util.formatDate,
 		toDetail(){
 			let { orderInfo } = this
-			util.routeTo(`/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail`,'nT');
+			util.routeTo(`/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail?id=${orderInfo.id}`,'nT');
+		},
+		
+		// 取消上课
+		reasonConfirm(e){
+			this.isCancelClass = false
+			let { orderInfo } = this
+			let _info = {
+				id: orderInfo.id,
+				reason: e,
+				course_kind: orderInfo.course_kind,
+			}
+			this.$emit('bclassCancel', _info)
+		},
+		
+		// 确认上课
+		confirmClass(){
+			let { orderInfo } = this
+			this.$emit('bclassConfirm', orderInfo.subscribe_no)
 		},
 	},
 }
diff --git a/src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue b/src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue
index 8323279..854d445 100644
--- a/src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue
+++ b/src/subpackage/course/components/manage/class_manage_item/class_manage_item.vue
@@ -2,25 +2,25 @@
 	<!-- 班级管理 -->
 	<view class="class-manage-item" @click="toDetail">
 		<view class="cmi-line">
-			<view class="cl-store">欧轩智能场馆(羽毛球馆永泰店)</view>
-			<view class="cl-status" :class="[false?'status-gray':false?'status-red':'']">进行中</view>
+			<view class="cl-store">{{orderInfo.barnd_name||''}}({{orderInfo.stadium_name||'-'}})</view>
+			<view class="cl-status" :class="[orderInfo.sclass_status_text=='已结束'?'status-gray':orderInfo.sclass_status_text=='成班失败'?'status-red':'']">{{orderInfo.sclass_status_text||'-'}}</view>
 		</view>
 		
-		<block v-if="true">
-			<view class="cmi-view">课程名称：<text>羽毛球培训课</text></view>
-			<view class="cmi-view">班级id：<text>2-3</text></view>
-			<view class="cmi-view">成班人数区间：<text>2-6人</text></view>
-			<view class="cmi-view">已报名人数：<text>2人</text></view>
-			<view class="cmi-view">报名截止时间：<text>2020.12.27  22:55:56</text></view>
+		<block v-if="orderInfo.sclass_status_text=='成班中'||orderInfo.sclass_status_text=='成班失败'">
+			<view class="cmi-view">课程名称：<text>{{orderInfo.course_name||''}}</text></view>
+			<view class="cmi-view">班级id：<text>{{orderInfo.sclass_no||''}}</text></view>
+			<view class="cmi-view">成班人数区间：<text>{{orderInfo.sclass_min_nums||0}}-{{orderInfo.sclass_max_nums||0}}人</text></view>
+			<view class="cmi-view">已报名人数：<text>{{orderInfo.sclass_nums||0}}人</text></view>
+			<view class="cmi-view">报名截止时间：<text>{{orderInfo.sclass_join_deadline||''}}</text></view>
 		</block>
 
-		<block v-if="false">
-			<view class="cmi-view">班级名称：<text>冲锋班</text></view>
-			<view class="cmi-view">班级人数：<text>20</text></view>
-			<view class="cmi-view">上课教练：<text>何其多</text></view>
-			<view class="cmi-view">上课地点：<text>欧轩智能场馆3号馆</text></view>
-			<view class="cmi-view">课程日期：<text>2021.08.08-2021.10.10</text></view>
-			<view class="cmi-view">课程名称：<text>羽毛球培训课</text></view>
+		<block v-if="orderInfo.sclass_status_text=='进行中'||orderInfo.sclass_status_text=='已结束'">
+			<view class="cmi-view">班级名称：<text>{{orderInfo.sclass_name||''}}</text></view>
+			<view class="cmi-view">班级人数：<text>{{orderInfo.sclass_nums||0}}</text></view>
+			<view class="cmi-view">上课教练：<text>{{orderInfo.sclass_coach||''}}</text></view>
+			<view class="cmi-view">上课地点：<text>{{orderInfo.sclass_addr||''}}</text></view>
+			<view class="cmi-view">课程日期：<text>{{orderInfo.sclass_stime||''}}-{{orderInfo.sclass_etime||''}}</text></view>
+			<view class="cmi-view">课程名称：<text>{{orderInfo.course_name||''}}</text></view>
 		</block>
 	
 	</view>
@@ -45,7 +45,7 @@ export default {
 	methods: {
 		toDetail(){
 			let { orderInfo } = this
-			util.routeTo(`/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail`,'nT');
+			util.routeTo(`/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail?id=${orderInfo.id}`,'nT');
 		},
 	},
 }
diff --git a/src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue b/src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue
index d980d5a..d5a9f3c 100644
--- a/src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue
+++ b/src/subpackage/course/components/manage/private_reserve_item/private_reserve_item.vue
@@ -2,20 +2,25 @@
 	<!-- 私教约课记录 -->
 	<view class="private-reserve-item" @click="toDetail">
 		<view class="pri-line">
-			<view class="pl-store">欧轩智能场馆(羽毛球馆永泰店)</view>
-			<view class="pl-status" :class="[false?'status-gray':false?'status-red':'']">待上课</view>
+			<view class="pl-store">{{orderInfo.brand_name||''}}({{orderInfo.stadium_name||'-'}})</view>
+			<view class="pl-status" :class="[orderInfo.status_text=='已上课'?'status-gray':orderInfo.status_text=='已取消'?'status-red':'']">{{orderInfo.status_text||'-'}}</view>
 		</view>
-		<view class="pri-view">学员信息：<text>张安（男 ）  18316536894</text></view>
-		<view class="pri-view">上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
-		<view class="pri-view">上课地点：<text>羽毛球（3号场）</text></view>
-		<view class="pri-view">上课教练：<text>张夏欧</text></view>
-		<view class="pri-view">课程名称：<text>羽毛球培训课</text></view>
-		<view class="pri-btn" v-if="true">
+		<view class="pri-view">学员信息：<text>{{orderInfo.student_name||'-'}}（{{orderInfo.student_gender||'-'}}）  {{orderInfo.student_phone||''}}</text></view>
+		<view class="pri-view">上课时间：<text>{{ formatDate({date: orderInfo.date, partition: '.'}) || ''}}（{{orderInfo.week||'-'}}）   {{orderInfo.start_duration||''}}-{{orderInfo.end_duration||''}}</text></view>
+		<view class="pri-view">上课地点：<text>{{orderInfo.addr||''}}</text></view>
+		<view class="pri-view">上课教练：<text>{{orderInfo.coach_name||''}}</text></view>
+		<view class="pri-view">课程名称：<text>{{orderInfo.course_name||''}}</text></view>
+		<block v-if="orderInfo.status_text=='已取消'">
+			<view class="pri-view">取消时间：<text>{{orderInfo.cancel_time||''}}</text></view>
+			<view class="pri-view">取消原因：<text>{{orderInfo.cancel_reason||''}}</text></view>
+		</block>
+		<view class="pri-btn" v-if="orderInfo.status_text=='待上课'">
 			<view hover-class="hover-active" @click.stop="isCancelClass=true">取消上课</view>
 		</view>
 		
 		<cancel-class-modal
 			v-if="isCancelClass"
+			@reasonConfirm="reasonConfirm"
 			@reasonClose="isCancelClass=false"
 		></cancel-class-modal>
 	</view>
@@ -43,9 +48,21 @@ export default {
 	    }
 	},
 	methods: {
+		formatDate: util.formatDate,
 		toDetail(){
 			let { orderInfo } = this
-			util.routeTo(`/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail`,'nT');
+			util.routeTo(`/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail?id=${orderInfo.id}`,'nT');
+		},
+		
+		reasonConfirm(e){
+			this.isCancelClass = false
+			let { orderInfo } = this
+			let _info = {
+				subscribe_no: orderInfo.subscribe_no,
+				reason: e,
+				course_kind: orderInfo.course_kind,
+			}
+			this.$emit('priclassCancel', _info)
 		},
 	},
 }
diff --git a/src/subpackage/course/components/manage/student_course_item/student_course_item.vue b/src/subpackage/course/components/manage/student_course_item/student_course_item.vue
index 3c7daf6..1d0186b 100644
--- a/src/subpackage/course/components/manage/student_course_item/student_course_item.vue
+++ b/src/subpackage/course/components/manage/student_course_item/student_course_item.vue
@@ -1,13 +1,13 @@
 <template>
 	<!-- 学员课程 -->
 	<view class="student-course-item" @click="toDetail">
-		<view class="sci-status" :class="[false?'status-gray':false?'status-red':'']">进行中</view>
-		<view class="sci-view">学员信息：<text>张安（男 ） 18316536894</text></view>
-		<view class="sci-view">剩余课时：<text>10课时 （2/12)</text></view>
-		<view class="sci-view">课程名称：<text>羽毛球培训课</text></view>
-		<view class="sci-view">有效期至：<text>2020.12.27</text></view>
-		<view class="sci-view">课程类型：<text>私教课</text></view>
-		<view class="sci-view">上课教练：<text>一级教练</text></view>
+		<view class="sci-status" :class="[orderInfo.order_status==2?'status-gray':orderInfo.order_status==3?'status-red':'']">{{zh_order_status()}}</view>
+		<view class="sci-view">学员信息：<text>{{orderInfo.student_name || '-'}}（{{orderInfo.student_gender||'-'}}） {{orderInfo.student_phone||''}}</text></view>
+		<view class="sci-view">剩余课时：<text>{{orderInfo.period_nums_surplus||0}}课时 （{{orderInfo.period_nums_use||0}}/{{orderInfo.period_nums||0}})</text></view>
+		<view class="sci-view">课程名称：<text>{{orderInfo.course_name||''}}</text></view>
+		<view class="sci-view">有效期至：<text>{{ formatDate({date: orderInfo.course_end, partition: '.'}) || ''}}</text></view>
+		<view class="sci-view">课程类型：<text>{{orderInfo.course_kind||''}}</text></view>
+		<view class="sci-view" v-if="orderInfo.course_kind!='成班课'">上课教练：<text>{{orderInfo.course_coach||''}}</text></view>
 	</view>
 </template>
 
@@ -28,11 +28,25 @@ export default {
 	    }
 	},
 	methods: {
+		formatDate: util.formatDate,
+		zh_order_status(){
+			let { orderInfo } = this
+			if(orderInfo.order_status==2)return "已结束";
+			if(orderInfo.order_status==3)return "已退款";
+			if(orderInfo.sclass_status){
+				if(orderInfo.sclass_status==0)return "成班中";
+				if(orderInfo.sclass_status==1)return "进行中";
+				if(orderInfo.sclass_status==2)return "已结束";
+				if(orderInfo.sclass_status==3)return "成班失败";
+				if(orderInfo.sclass_status==4)return "已退款";
+			}
+			return "进行中";
+			
+		},
 		toDetail(){
 			// this.$emit('closeChange')
 			let { orderInfo } = this
-			// ?query=${util.jsonStr(_query)}
-			util.routeTo(`/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail`,'nT');
+			util.routeTo(`/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail?order_no=${orderInfo.order_no}`,'nT');
 		},
 	},
 }
diff --git a/src/subpackage/course/components/sclass_record_section/sclass_record_section.vue b/src/subpackage/course/components/sclass_record_section/sclass_record_section.vue
index be3d81b..cfe374a 100644
--- a/src/subpackage/course/components/sclass_record_section/sclass_record_section.vue
+++ b/src/subpackage/course/components/sclass_record_section/sclass_record_section.vue
@@ -5,15 +5,14 @@
 			<view>上课时间</view>
 			<view>考勤状态</view>
 		</view>
-		<view class="cds-list" v-for="(e,i) in 6" :key="i">
+		<view class="cds-list" v-for="(e,i) in recordInfo" :key="i">
 			<view class="cl-item">
-				<view>第{{ i+1|| '-'}}节</view>
-				<!-- <view>{{formatDate({date: e.period_date, partition: '.'}) ||'-'}}{{`${' '+e.period_start_time || ''}-${e.period_end_time || ''}` ||''}}</view> -->
-				<view>2021.06.01  10:00-12:00</view>
+				<view>第{{ e.user_lesson|| '-'}}节</view>
+				<view>{{e.period_date!=''?formatDate({date: e.period_date, partition: '.'}) :'-'}}{{`${' '+e.period_start_time || ''}-${e.period_end_time || ''}` ||''}}</view>
 				<view
 					:class="[e.user_status==0?'ci-txt-green':
 					e.user_status==4?'ci-txt-red':'']"
-				>{{ '正常'||zh_status(e.user_status)}}</view>
+				>{{ zh_status(e.user_status)}}</view>
 			</view>
 		</view>
 	</view>
@@ -23,9 +22,11 @@
 import util from '@/utils/util';
 export default {
 	props:{
-		orderInfo: {
-			type: Object,
-			default: ()=>({})
+		recordInfo: {
+			type: Array,
+			default() {
+				return [];
+			}
 		},
 	},
 	computed: {
diff --git a/src/subpackage/course/components/store_name/store_name.vue b/src/subpackage/course/components/store_name/store_name.vue
index 2c906ab..6cf2d61 100644
--- a/src/subpackage/course/components/store_name/store_name.vue
+++ b/src/subpackage/course/components/store_name/store_name.vue
@@ -28,7 +28,7 @@ export default {
     },
 	props: ["theme"],//定义主题字段,定制组件展示效果 "light":亮色  
 	created() {
-		console.log("store_name theme: ", this.theme);
+		// console.log("store_name theme: ", this.theme);
 	},
     methods: {
         storeChange(e){
diff --git a/src/subpackage/course/components/task_section/task_section.vue b/src/subpackage/course/components/task_section/task_section.vue
index 01115d3..8162776 100644
--- a/src/subpackage/course/components/task_section/task_section.vue
+++ b/src/subpackage/course/components/task_section/task_section.vue
@@ -3,10 +3,9 @@
 		<view class="ts-list" v-for="(e,i) in taskList" :key="i">
 			<view class="tl-item">
 				<view class="ti-line">
-					<!-- {{formatDate({date: e.created_at}) || '-'}} -->
-					<view>2020-09-08</view>
-					<view v-if="taskType==''" :class="[true?'status-red':'status-gray']">未完成</view>
-					<view v-if="taskType=='finish'" class="status-gray">完成情况：0/10</view>
+					<view>{{e.created_at!=''?formatDate({date: e.created_at}) : '-'}}</view>
+					<view v-if="taskType==''" :class="[e.work_status==0?'status-red':'status-gray']">{{e.work_status==0?'未完成':e.work_status==1?'已完成':'-'}}</view>
+					<view v-if="taskType=='finish'" class="status-gray">完成情况：{{e.complete_nums||0}}/{{e.total_nums||0}}</view>
 				</view>
 				
 				<view class="ti-desc" :class="e.expande?'desc-omit':''" :id="'noname'+i">
@@ -110,8 +109,8 @@ export default {
 			// 	created_at: item.created_at,
 			// }
 			
-			if(this.taskType == 'finish')return util.routeTo(`/subpackage/course/pages/task_finish_list/task_finish_list`,'nT');;
-			util.routeTo(`/subpackage/course/pages/task_detail/task_detail`,'nT');
+			if(this.taskType == 'finish')return util.routeTo(`/subpackage/course/pages/task_finish_list/task_finish_list?work_number=${item.work_number}`,'nT');;
+			util.routeTo(`/subpackage/course/pages/task_detail/task_detail?id=${item.id}`,'nT');
 		},
 		
 		// toTaskDetail(item){
diff --git a/src/subpackage/course/pages/arrange_class/arrange_class.vue b/src/subpackage/course/pages/arrange_class/arrange_class.vue
index e948268..2e5ffbc 100644
--- a/src/subpackage/course/pages/arrange_class/arrange_class.vue
+++ b/src/subpackage/course/pages/arrange_class/arrange_class.vue
@@ -5,8 +5,8 @@
 			<view>课程名称：{{pageInfo.course_name || '-'}}</view>
 			<view>上课教练：{{pageInfo.course_coach || '-'}}</view>
 			<view>
-				<text>学员信息：{{pageInfo.student_name || ''}}{{pageInfo.student_gender!=''?`（${pageInfo.student_gender||''}）`:''}} {{userInfo.type==2?(' '+pageInfo.student_phone) : ''}}</text>
-				<image v-if="userInfo.type==2" src="/subpackage/course/static/images/icon/phone.png"  @click="phoneCall(pageInfo.student_phone)"></image>
+				<text>学员信息：{{pageInfo.student_name || ''}}{{pageInfo.student_gender!=''?`（${pageInfo.student_gender||''}）`:''}} {{' '+(pageInfo.student_phone||'')}}</text>
+				<image  src="/subpackage/course/static/images/icon/phone.png"  @click="phoneCall(pageInfo.student_phone)"></image>
 			</view>
 			<view>剩余课时：{{pageInfo.period_nums_surplus || 0}}节 （共{{pageInfo.period_nums || 0}}节)</view>
 		</view>
@@ -26,7 +26,8 @@
 			<!-- 上课日期 -->
 			<view class="as-line">
 				<view class="al-txt"><text>*</text>上课日期</view>
-				<picker class="al-picker" mode="date" :value="submitInfo.date" :start="startDate" :end="endDate" @change="bindDateChange"  >
+				<!-- :start="startDate" :end="endDate" -->
+				<picker class="al-picker" mode="date" :value="submitInfo.date"  @change="bindDateChange" >
 					<view class="al-view al-date">
 						<view class="ad-txt">{{submitInfo.date}}</view>
 						<view class="ad-img">
@@ -73,9 +74,11 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
+import { mapState } from 'vuex';
 export default {
 	computed: {
+		...mapState([ 'brandInfo',]),
 		startDate() {
 			return this.getDate('start');
 		},
@@ -131,7 +134,7 @@ export default {
 	async onLoad(options){
 		// let _query = util.jsonPar(options.query);
 		// this.pageInfo = _query
-		// this.getStuInfo(options.order_no)
+		this.getStuInfo(options.order_no)
 	},
 	methods: {
 		getDate(type) {
@@ -215,7 +218,7 @@ export default {
 			if(pageInfo.is_booking_venue == true)_data["venue_id"] = venue_id; //场馆ID
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.student.arrangeStudentAc, //安排上课[私教课]
+				url: BOX_API.arrangeStuAc, //安排上课[私教课]
 				data: _data,
 				failMsg: '加载失败！'
 			})
@@ -228,10 +231,12 @@ export default {
 		
 		// 我的学员-详情
 		getStuInfo(order_no){
+			let { brandInfo } = this
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.student.stuInfo,
+				url: BOX_API.stuInfo,
 				data: {
+					brand_id: brandInfo.brand.id,
 					order_no,
 				},
 				failMsg: '加载失败！'
@@ -246,10 +251,12 @@ export default {
 		
 		// 安排上课[私教课] - 获取教练
 		getArrangeAcCoach(order_no){
+			let { brandInfo } = this
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.student.arrangeStudentAcCoach,
+				url: BOX_API.arrangeStuAcCoach,
 				data: {
+					brand_id: brandInfo.brand.id,
 					order_no,
 				},
 				failMsg: '加载失败！'
diff --git a/src/subpackage/course/pages/class_add_student/class_add_student.vue b/src/subpackage/course/pages/class_add_student/class_add_student.vue
index 07fe6ef..4721ed1 100644
--- a/src/subpackage/course/pages/class_add_student/class_add_student.vue
+++ b/src/subpackage/course/pages/class_add_student/class_add_student.vue
@@ -7,8 +7,7 @@
 			</view>
 		</view>
 		<view class="as-name">课程名称：{{pageInfo.course_name||'-'}}</view>
-		<!-- studentList -->
-		<view class="as-list" v-for="(e,i) in 3" :key="i">
+		<view class="as-list" v-for="(e,i) in studentList" :key="i">
 			<view class="al-item" @click="itemChange(e,i)">
 				<image :class="[submitInfo.order_no==e.order_no?'ai-img':'ai-icon']" :src="submitInfo.order_no==e.order_no?'/static/images/icon/selected_987.png':''"></image>
 				<view class="ai-info">
@@ -18,7 +17,7 @@
 			</view>
 		</view>
 		<view class="as-fixed">
-			<view hover-class="hover-active" @click="btnChange(1)">确认添加学员</view>
+			<view hover-class="hover-active" @click="btnChange()">确认添加学员</view>
 		</view>
 	</view>
 </template>
@@ -26,10 +25,11 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
+import { mapState } from 'vuex';
 export default {
 	computed:{
-		
+		...mapState([ 'brandInfo',]),
 	},
 	data() {
 		return {
@@ -45,8 +45,8 @@ export default {
 		}
 	},
 	onLoad(options) {
-		// this.submitInfo.subscribe_no = options.subscribe_no
-		// this.getSubStudent(options.subscribe_no)
+		this.submitInfo.subscribe_no = options.subscribe_no
+		this.getSubStudent(options.subscribe_no)
 	},
 	methods: {
 		// 搜索
@@ -58,7 +58,7 @@ export default {
 		itemChange(info){
 			this.submitInfo.order_no = info.order_no
 		},
-		btnChange(type){
+		btnChange(){
 			if(this.submitInfo.order_no=='')return util.showNone('请选择需要添加的学员！');
 			util.showModal({
 				title: '是否确认添加学员上课？',
@@ -74,11 +74,13 @@ export default {
 		
 		// 添加学员
 		getSubAdd(){
+			let { brandInfo } = this
 			let { order_no, subscribe_no} = this.submitInfo
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.appointment.subAdd,
+				url: BOX_API.bclassStuAdd,
 				data: {
+					brand_id: brandInfo.brand.id,
 					order_no,
 					subscribe_no,
 				},
@@ -99,10 +101,12 @@ export default {
 		
 		// 获取可添加学员列表
 		getSubStudent(subscribe_no){
+			let { brandInfo } = this
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.appointment.subStudent,
+				url: BOX_API.bclassStus,
 				data: {
+					brand_id: brandInfo.brand.id,
 					subscribe_no,
 				},
 				failMsg: '加载失败！'
diff --git a/src/subpackage/course/pages/class_student_detail/class_student_detail.vue b/src/subpackage/course/pages/class_student_detail/class_student_detail.vue
index b902720..68888ad 100644
--- a/src/subpackage/course/pages/class_student_detail/class_student_detail.vue
+++ b/src/subpackage/course/pages/class_student_detail/class_student_detail.vue
@@ -8,14 +8,14 @@
 				<image src="/subpackage/course/static/images/icon/phone.png" @click="phoneCall(pageInfo.student_phone)"></image>
 			</view>
 			<view class="cs-view">剩余课时：{{pageInfo.course_period_residue ||0}}课时 （{{pageInfo.course_period_nums_use||0}}/{{pageInfo.course_period_nums||0}})</view>
-			<view class="cs-end">
+			<view class="cs-end" v-if="pageInfo.order_status==0||pageInfo.order_status==1">
 				<!-- 只有教务才有 -->
-				<view class="ce-btn1" hover-class="hover-active" @click="isShowClass=true">转班</view>
+				<view class="ce-btn1" hover-class="hover-active" @click="isShowClass=true" >转班</view>
 			</view>
 		</view>
 		<view class="csd-record">
 			<view class="cr-tit">上课记录</view>
-			<sclass-record-section ></sclass-record-section>
+			<sclass-record-section :recordInfo="pageInfo.student_period_time"></sclass-record-section>
 		</view>
 		<!-- 转班弹框 -->
 		<class-reset-modal
@@ -31,7 +31,8 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
+import { mapState } from 'vuex';
 import class_reset_modal from '../../components/class_reset_modal/class_reset_modal.vue';
 import sclass_record_section from '../../components/sclass_record_section/sclass_record_section.vue';
 export default {
@@ -40,7 +41,7 @@ export default {
 		'sclass-record-section': sclass_record_section,
 	},
 	computed: {
-		
+		...mapState([ 'brandInfo',]),
 	},
 	data() {
 		return {
@@ -51,13 +52,13 @@ export default {
 		}
 	},
 	async onLoad(options){
-		// let _query = util.jsonPar(options.query);
-		// this.pageInfo = _query
-		// this.$nextTick(_=>{
-		// })
+		let _query = util.jsonPar(options.query);
+		this.pageInfo = _query
+		this.$nextTick(_=>{
+			this.getCanlist(this.pageInfo.course_id);
+		})
 	},
 	methods: {
-		formatDate: util.formatDate,
 		phoneCall(mobile) {
 			let _phoneStr = mobile || ''
 			let _phoneArr =  _phoneStr.split(',') || [];
@@ -71,32 +72,14 @@ export default {
 			})
 		},
 		
-		zh_status(status){
-			let arr = ["待上课","已上课","申请请假中","已请假","缺勤"]
-			return arr[status] || '';
-		},
-		// 去评价
-		toAppraise(){
-			let { pageInfo } = this
-			let _query = {
-				course_kind: "成班课",
-				course_name: pageInfo.course_name,
-				student_name: pageInfo.student_name,
-				student_gender: pageInfo.student_gender,
-				student_phone: pageInfo.student_phone,
-				sclass_name: pageInfo.sclass_name,
-				sclass_nums: pageInfo.sclass_nums,
-			}
-			util.routeTo(`/subpackage/manage/pages/appointment/appraise/appraise?order_no=${pageInfo.order_no}&query=${util.jsonStr(_query)}`,'nT');
-		},
-		
 		// 确认转班
 		confirmReset(e){
-			let { pageInfo } = this
+			let { brandInfo, pageInfo } = this
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.class.reset,
+				url: BOX_API.resetStuSclass,
 				data: {
+					brand_id: brandInfo.brand.id,
 					old_id: pageInfo.sclass_id,
 					new_id: e.new_id,
 					user_id: pageInfo.user_id,
@@ -107,16 +90,24 @@ export default {
 			.then(res=>{
 				util.hideLoad();
 				util.showNone('操作成功！');
-				setTimeout(_=>{uni.navigateBack({delta:2})}, 1200)
+				setTimeout(_=>{
+					uni.navigateBack({delta:2})
+					util.previousPageFunction({
+						fnName: 'refreshList',
+						query: { isLoad: false},
+					});
+				}, 1200)
 			})
 		},
 		
 		// 可换班级列表
 		getCanlist(course_id){
+			let { brandInfo, pageInfo } = this
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.class.canlist,
+				url: BOX_API.stuCanChangeSclass,
 				data: {
+					brand_id: brandInfo.brand.id,
 					course_id,
 				},
 				failMsg: '加载失败！'
diff --git a/src/subpackage/course/pages/class_time_change/class_time_change.vue b/src/subpackage/course/pages/class_time_change/class_time_change.vue
index cc0a0b2..bb9d883 100644
--- a/src/subpackage/course/pages/class_time_change/class_time_change.vue
+++ b/src/subpackage/course/pages/class_time_change/class_time_change.vue
@@ -9,7 +9,8 @@
 			<view class="cs-tit">第{{pageInfo.lesson_no|| 0}}节</view>
 			<view class="cs-line">
 				<view class="cl-txt"><text>*</text>上课日期</view>
-				<picker class="cl-picker" mode="date" :value="pageInfo.period_date" :start="startDate" :end="endDate" @change="bindDateChange"  >
+				<!-- :start="startDate" :end="endDate" -->
+				<picker class="cl-picker" mode="date" :value="pageInfo.period_date" @change="bindDateChange"  >
 					<view class="cl-box">
 						<view class="cb-txt">{{pageInfo.period_date}}</view>
 						<view class="cb-img">
@@ -44,9 +45,11 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
+import { mapState } from 'vuex';
 export default {
 	computed: {
+		...mapState([ 'brandInfo',]),
 		startDate() {
 			return this.getDate('start');
 		},
@@ -71,8 +74,8 @@ export default {
 		}
 	},
 	onLoad(options){
-		// let _query = util.jsonPar(options.query);
-		// this.pageInfo = _query
+		let _query = util.jsonPar(options.query);
+		this.pageInfo = _query
 	},
 	methods: {
 		getDate(type) {
@@ -109,7 +112,7 @@ export default {
 		
 		// 成班课时间修改
 		sclassTimeChange(){
-			let { pageInfo } = this
+			let { pageInfo, brandInfo } = this
 			if(pageInfo.period_date==''|| pageInfo.period_start_time==''|| pageInfo.period_end_time=='')return util.showNone("请完善必选项！");
 			let nowTime = util.formatDate(new Date(),'-')  //现在时间 格式为 2020-07-21
 			if(new Date(nowTime).getTime() > new Date(pageInfo.period_date).getTime())return util.showNone("上课日期不能小于当前系统日期！");
@@ -118,8 +121,9 @@ export default {
 			this.$emit('closeChange')
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.schedule.sclassTimeChange,
+				url: BOX_API.sclassTimeChange,
 				data: {
+					brand_id: brandInfo.brand.id,
 					id: pageInfo.sclass_id,
 					lesson_no: pageInfo.lesson_no,
 					period_date: pageInfo.period_date,
diff --git a/src/subpackage/course/pages/index/index.vue b/src/subpackage/course/pages/index/index.vue
index bcad34b..e321dc9 100644
--- a/src/subpackage/course/pages/index/index.vue
+++ b/src/subpackage/course/pages/index/index.vue
@@ -8,23 +8,23 @@
 				<view class="ib-line">
 					<view class="il-view">
 						<view>进行中</view>
-						<view>20</view>
+						<view>{{pageInfo.ongoing_nums || 0}}</view>
 					</view>
 					<view class="il-cut"></view>
 					<view class="il-view">
 						<view>已结束</view>
-						<view>10</view>
+						<view>{{pageInfo.ended_nums || 0}}</view>
 					</view>
 				</view>
 				<view class="ib-line">
 					<view class="il-view">
 						<view>今日待上课</view>
-						<view>6</view>
+						<view>{{pageInfo.dsk_nums || 0}}</view>
 					</view>
 					<view class="il-cut"></view>
 					<view class="il-view">
 						<view>今日已上课</view>
-						<view>3</view>
+						<view>{{pageInfo.ysk_nums || 0}}</view>
 					</view>
 				</view>
 			</view>
@@ -58,22 +58,19 @@ const tabList = [
 			{
 				id: 0,
 				name: "学员课程",
-				path: "/subpackage/course/pages/manage_list/manage_list",
+				// path: "/subpackage/course/pages/manage_list/manage_list",
 			},
 			{
 				id: 1,
 				name: "私教课上课记录",
-				path: "",
 			},
 			{
 				id: 2,
 				name: "大班上课记录",
-				path: "",
 			},
 			{
 				id: 3,
 				name: "班级管理",
-				path: "",
 			},
 		],
 	},
@@ -83,26 +80,42 @@ export default {
 	    'store-name': store_name
 	},
 	computed:{
-		...mapState([ 'brandInfo', 'storeInfo' ]),
+		...mapState([ 'brandInfo',]),
+		...mapState({
+		    curStoreInfo: state => state.device.curStoreInfo,
+		}),
+	},
+	watch: {
+		curStoreInfo(newVal, oldVal) {
+			this.pageInfo = {};
+			this.getCourseHome({
+				stadium_id: newVal.id,
+			})
+		}
 	},
 	data() {
 		return {
 			tabList,
+			pageInfo: {},
+			isShowAgain: false,
 		}
 	},
 	async onLoad(){
-		// console.log("得到的：",this.brandInfo)
-		// this.getCourseHome();
+		// console.log("品牌信息：",this.brandInfo)
 	    try{
 	        util.showLoad();
 	        let _brandInfo = await this.$store.dispatch('getBrandInfo');
 	        await this.$store.dispatch('getStoreList');
-			// this.getCourseHome();
+			this.getCourseHome({
+				stadium_id: this.curStoreInfo.id,
+			})
 	        util.hideLoad();
 	    }catch(err){
 	        util.hideLoad();
 	    }
-	    
+	},
+	onShow() {
+		if(this.isShowAgain)this.getCourseHome({stadium_id: this.curStoreInfo.id,});
 	},
 	methods: {
 		tabChange(id1,id2){
@@ -111,24 +124,24 @@ export default {
 			util.routeTo(`/subpackage/course/pages/manage_list/manage_list?type_id=${_type_id}`,'nT')
 		},
 		
-		getCourseHome(){
+		getCourseHome({stadium_id}){
 			let { brandInfo } = this
-			util.showLoad();
+			// util.showLoad();
 			boxServer.get({
 				url: BOX_API.courseHome,
 				data: {
 					brand_id: brandInfo.brand.id,
+					stadium_id,
 				},
 				failMsg: '加载失败！'
 			})
 			.then(res=>{
-				util.hideLoad();
-				// this.pageInfo = res
-				// console.log("阿桑要花费的：",res)
+				// util.hideLoad();
+				this.pageInfo = res
+				this.isShowAgain = true
 			})
 			.catch(util.hideLoad)
 		
-			
 		},
 	}
 }
diff --git a/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue b/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
index d091192..e7ca66d 100644
--- a/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
+++ b/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
@@ -1,59 +1,66 @@
 <template>
 	<view class="bclass-reserve-detail">
 		<view class="brd-line">
-			<view>欧轩智能场馆(羽毛球馆永泰店)</view>
-			<view :class="[false?'bl-gray':false?'bl-red':'bl-green']">待上课</view>
+			<view>{{pageInfo.brand_name||''}}({{pageInfo.stadium_name||'-'}})</view>
+			<view :class="[pageInfo.status_text=='已上课'?'bl-gray':pageInfo.status_text=='已取消'?'bl-red':'bl-green']">{{pageInfo.status_text||'-'}}</view>
 		</view>
 		<view class="brd-section">
-			<view>预约单号：<text>yy202106031256568595</text></view>
-			<view>预约时间：<text>2021.06.03 11:42:50 </text></view>
+			<view>预约单号：<text>{{pageInfo.subscribe_no||''}}</text></view>
+			<view>预约时间：<text>{{pageInfo.subscribe_at||''}} </text></view>
 			<!-- 已取消才显示 -->
-			<block v-if="false">
-				<view>取消时间：<text>2021.06.03 11:42:50</text></view>
-				<view>取消原因：<text>学员取消（有事请假）</text></view>
+			<block v-if="pageInfo.status_text=='已取消'">
+				<view>取消时间：<text>{{pageInfo.cancel_time||''}}</text></view>
+				<view>取消原因：<text>{{pageInfo.cancel_reason||''}}</text></view>
 			</block>
 		</view>
 		<view class="brd-section">
 			<view>上课信息</view>
-			<view>上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
-			<view>上课地点：<text>羽毛球（3号场）</text></view>
-			<view>上课教练：<text>张瀚</text></view>
-			<view>课程名称：<text>羽毛球培训课</text></view>
-			<view>课程类型：<text>大班课</text></view>
+			<view>上课时间：<text>{{pageInfo.date||''}}（{{pageInfo.week||''}}）   {{pageInfo.start_duration||''}}-{{pageInfo.end_duration||''}}</text></view>
+			<view>上课地点：<text>{{pageInfo.addr||''}}</text></view>
+			<view>上课教练：<text>{{pageInfo.coach_name||''}}</text></view>
+			<view>课程名称：<text>{{pageInfo.course_name||''}}</text></view>
+			<view>课程类型：<text>{{pageInfo.course_kind||''}}</text></view>
 		</view>
 		<view class="brd-stu">
 			<view class="bs-tit">学员信息</view>
 			<view class="bs-line">
-				<view>已预约人数：3人<text>（上课区间：5-10）</text></view>
+				<view>已预约人数：{{pageInfo.bclass_nums||0}}人<text>（上课区间：{{pageInfo.bclass_nums_min||0}}-{{pageInfo.bclass_nums_max||0}}）</text></view>
 				<!-- 待确认、待上课才显示 -->
-				<view v-if="true" @click="toAddStu">添加学员</view>
+				<view v-if="pageInfo.status_text=='待确认'||pageInfo.status_text=='待上课'" @click="toAddStu">添加学员</view>
 			</view>
-			<view class="bs-list" v-for="i in 3" :key="i">
+			<view class="bs-list" v-for="(e,i) in pageInfo.students" :key="i">
 				<view class="bl-item">
 					<view class="bi-info">
-						<view>熊启(男)
-							<text>18096895331</text>
-							<image src="/subpackage/course/static/images/icon/phone.png"></image>
+						<view>{{e.student_name||'-'}}({{e.student_gender||'-'}})
+							<block v-if="e.student_phone!=''">
+								<text>{{e.student_phone||'-'}}</text>
+								<image src="/subpackage/course/static/images/icon/phone.png" @click="phoneCall(e.student_phone)"></image>
+							</block>
 						</view>
-						<view>预约时间：2020.12.27 22:55:56</view>
+						<view>预约时间：{{e.subscribe_at||''}}</view>
 					</view>
 					<!-- 待确认、待上课才显示 -->
-					<view class="bi-btn" hover-class="hover-active" v-if="true">取消上课</view>
+					<view 
+						class="bi-btn" 
+						hover-class="hover-active" 
+						v-if="pageInfo.status_text=='待确认'||pageInfo.status_text=='待上课'" 
+						@click="cancelClassStuChange(1,e)"
+					>取消上课</view>
 				</view>
 			</view>
 		</view>
 		
 		<!-- 待确认、待上课才显示 -->
-		<view class="brd-fixed" v-if="true">
+		<view class="brd-fixed" v-if="pageInfo.status_text=='待确认'||pageInfo.status_text=='待上课'">
 			<view class="bf-line">
-				<view class="bl-btn1" hover-class="hover-active" @click="isCancelClass=true">取消上课</view>
-				<!-- v-if="pageInfo.status_text=='待确认'" -->
-				<view class="bl-btn2" hover-class="hover-active" >确认上课</view>
+				<view class="bl-btn1" hover-class="hover-active" @click="cancelClassChange(0)">取消上课</view>
+				<view class="bl-btn2" hover-class="hover-active" v-if="pageInfo.status_text=='待确认'">确认上课</view>
 			</view>
 		</view>
 		
 		<cancel-class-modal
 			v-if="isCancelClass"
+			@reasonConfirm="reasonConfirm"
 			@reasonClose="isCancelClass=false"
 		></cancel-class-modal>
 	</view>
@@ -62,20 +69,133 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../../js/course_server';
-import { BOX_API } from '../../../js/course_api';
+import BOX_API from '../../../js/course_api';
+import { mapState } from 'vuex';
 import cancel_class_modal from '../../../components/cancel_class_modal/cancel_class_modal.vue';
 export default {
 	components: {
 		'cancel-class-modal': cancel_class_modal,
 	},
+	computed:{
+		...mapState([ 'brandInfo',]),
+	},
 	data() {
 		return {
 			isCancelClass: false,
+			pageInfo: {},
+			cancelType: "", 
+			submitInfo: {
+				type: "", //取消上课类型 0取消全部  1取消某个学员
+				id: -1,
+				subscribe_no: "",
+			},
+			
 		}
 	},
+	onLoad(options) {
+		this.submitInfo.id = options.id
+		this.getDetail(options.id)
+	},
 	methods: {
+		getDetail(id){
+			let { brandInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.subscribeInfo,
+				data: {
+					brand_id: brandInfo.brand.id,
+					id,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.pageInfo = res
+			})
+		},
+		
+		refreshList(){
+			let { submitInfo } = this
+			this.getDetail(submitInfo.id)
+		},
+		
 		toAddStu(){
-			util.routeTo(`/subpackage/course/pages/class_add_student/class_add_student`,'nT');
+			let { pageInfo } = this
+			util.routeTo(`/subpackage/course/pages/class_add_student/class_add_student?subscribe_no=${pageInfo.subscribe_no}`,'nT');
+		},
+		
+		// 取消上课-整个班级
+		cancelClassChange(type){
+			this.submitInfo.type = type
+			this.isCancelClass = true
+		},
+		
+		// 取消上课-某个学员
+		cancelClassStuChange(type,info){
+			this.submitInfo.type = type
+			this.submitInfo.subscribe_no = info.student_no
+			this.isCancelClass = true
+		},
+		
+		reasonConfirm(e){
+			this.isCancelClass = false
+			let { submitInfo } = this
+			
+			if(submitInfo.type == 0){
+				
+				this.getCancelPabAc({
+					id: submitInfo.id,
+					reason: e,
+				})
+				return;
+			}
+			if(submitInfo.type == 1){
+				this.getCancelPabAc({
+					subscribe_no: submitInfo.subscribe_no,
+					reason: e,
+				})
+				return;
+			}
+		},
+		
+		// 取消上课[私教课/大班课]
+		getCancelPabAc({subscribe_no, id, reason}){
+			let { brandInfo, submitInfo } = this
+			let _data = {
+				brand_id: brandInfo.brand.id,
+				reason, //取消原因
+			}
+			if(submitInfo.type == 0)_data["id"] = id;
+			if(submitInfo.type == 1)_data["subscribe_no"] = subscribe_no;
+			util.showLoad();
+			boxServer.get({
+				url: submitInfo.type == 0? BOX_API.cancelBclassAc:submitInfo.type == 1? BOX_API.cancelStuAc:'',
+				data: _data,
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				setTimeout(_=>{ 
+					this.refreshList() 
+					util.previousPageFunction({
+						fnName: 'refreshList',
+						query: { isLoad: false},
+					});
+				}, 1200)
+			})
+		},
+		phoneCall(mobile) {
+			let _phoneStr = mobile || ''
+			let _phoneArr =  _phoneStr.split(',') || [];
+			uni.showActionSheet({
+			    itemList: _phoneArr,
+			    success: res =>{
+			        uni.makePhoneCall({
+			            phoneNumber:　_phoneArr[res.tapIndex]
+			        })
+			    }
+			})
 		},
 	}
 }
diff --git a/src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue b/src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue
index 9361008..1381321 100644
--- a/src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue
+++ b/src/subpackage/course/pages/manage_detail/class_manage_detail/class_manage_detail.vue
@@ -6,77 +6,78 @@
 		
 		<!-- 班级详情 -->
 		<block v-if="curTabID==0">
-			<view class="cmd-status">课程状态：<text :class="[false?'cs-gray':false?'cs-red':'cs-green']">成班中</text></view>
+			<view class="cmd-status">课程状态：<text :class="[pageInfo.sclass_status==2?'cs-gray':pageInfo.sclass_status==3?'cs-red':'cs-green']">{{zh_sclass_status(pageInfo.sclass_status)||'-'}}</text></view>
 			<view class="cmd-section">
 				<view>课程信息</view>
-				<view>欧轩智能羽毛球馆（番禺店）</view>
-				<view><text>课程名称：</text>羽毛球培训课</view>
-				<view><text>课程课时数量：</text>10节课</view>
-				<view><text>课时时长：</text>1小时</view>
-				<view><text>课程有效期：</text>2021.06.30-2021.09.30</view>
+				<view>{{pageInfo.brand_name||''}}（{{pageInfo.stadium_name||'-'}}）</view>
+				<view><text>课程名称：</text>{{pageInfo.course_name||''}}</view>
+				<view><text>课程课时数量：</text>{{pageInfo.course_number ||0}}节课</view>
+				<view><text>课时时长：</text>{{pageInfo.course_time_length}}分钟</view>
+				<view><text>课程有效期：</text>{{pageInfo.course_valid_period||''}}</view>
 				<!-- 成班中、失败 -->
-				<block v-if="true">
-					<view><text>成班区间人数：</text>2-6人</view>
-					<view><text>报名截止时间：</text>2021.07.12  23:50:50</view>
+				<block v-if="pageInfo.sclass_status==0||pageInfo.sclass_status==3">
+					<view><text>成班区间人数：</text>{{pageInfo.sclass_min_nums||''}}-{{pageInfo.sclass_max_nums||''}}人</view>
+					<view><text>报名截止时间：</text>{{pageInfo.sclass_join_deadline||''}}</view>
 				</block>
 			</view>
 			<view class="cmd-section">
 				<view>班级信息</view>
-				<view><text>班级id：</text>2-3</view>
-				<view><text>班级名称：</text></view>
-				<view><text>班级人数：</text>20</view>
-				<view><text>上课教练：</text></view>
-				<view><text>上课地点：</text></view>
-				<view><text>课程日期：</text></view>
+				<view><text>班级id：</text>{{pageInfo.sclass_number||''}}</view>
+				<view><text>班级名称：</text>{{pageInfo.sclass_name||''}}</view>
+				<view><text>班级人数：</text>{{pageInfo.sclass_nums||''}}</view>
+				<view><text>上课教练：</text>{{pageInfo.sclass_coach||''}}</view>
+				<view><text>上课地点：</text>{{pageInfo.sclass_addr||''}}</view>
+				<view><text>课程日期：</text>{{pageInfo.sclass_date||''}}</view>
 			</view>
-			<view class="cmd-fixed">
+			<view class="cmd-fixed" v-if="pageInfo.sclass_status==0">
 				<view hover-class="hover-active" @click="confirmClass()">确认成班</view>
 			</view>
 		</block>
 		
 		<!-- 班级学员 -->
-		<view class="cmd-stu" v-for="(item,i) in 3" :key="i" v-if="curTabID==1">
-			<view class="cs-item" @click="toStuDetail()">
+		<view class="cmd-stu" v-for="(e,i) in pageInfo.students" :key="i" v-if="curTabID==1">
+			<view class="cs-item" @click="toStuDetail(e)">
 				<view class="ci-line">
-					<view>张安（男 ） 
-						<text>18316536894</text>
-						<image src="/subpackage/course/static/images/icon/phone.png"></image>
+					<view>{{e.student_name||'-'}}（{{e.student_gender||'-'}}） 
+						<block v-if="e.student_phone!=''">
+							<text>{{e.student_phone||'-'}}</text>
+							<image src="/subpackage/course/static/images/icon/phone.png" @click.stop="phoneCall(e.student_phone)"></image>
+						</block>
 					</view>
 					<image src="/subpackage/course/static/images/icon/arrow_black.png"></image>
 				</view>
-				<view class="ci-view">剩余课时：10节 （共12节)</view>
-				<view class="ci-view"><text>有效期：2020.12.27 22:55:56</text></view>
-				<view class="ci-btn">
-					<view hover-class="hover-active" @click.stop="isShowClass=true">转班</view>
+				<view class="ci-view">剩余课时：{{e.course_period_residue||0}}节 （共{{e.course_period_nums||0}}节)</view>
+				<view class="ci-view"><text>有效期：{{e.end_at || ''}}</text></view>
+				<view class="ci-btn" v-if="e.order_status==0||e.order_status==1">
+					<view hover-class="hover-active" @click.stop="resetBtn(e)" >转班</view>
 				</view>
 			</view>
 		</view>
 		
 		<!-- 上课表 -->
 		<view class="cmd-schedule" v-if="curTabID==2">
-			<block v-if="true">
+			<block v-if="pageInfo.sclass_period_time.length > 0">
 				<view class="cs-tab">
 					<view>课时</view>
 					<view>上课时间</view>
 					<view>上课状态</view>
 					<view>操作</view>
 				</view>
-				<view class="cs-list" v-for="(e,i) in 6" :key="i">
+				<view class="cs-list" v-for="(e,i) in pageInfo.sclass_period_time" :key="i">
 					<view class="cl-item">
 						<view>第{{e.lesson_no|| '-'}}节</view>
-						<!-- ${formatDate({date: e.period_date, partition: '.'}) ||'-'} -->
-						<view>{{`${' '+e.period_start_time || ''}-${e.period_end_time || ''}`}}</view>
+						<view>{{e.period_date!=''?formatDate({date: e.period_date, partition: '.'}):'-'}}{{`${' '+e.period_start_time || ''}-${e.period_end_time || ''}`}}</view>
 						<view
 							:class="[!e.status?'ci-txt-green':'']"
 						>{{e.status?'已上课':'待上课'}}</view>
 						<view>
-							<view  hover-class="hover-active" v-if="!e.status" @click="toChange(e)">更改</view>
+							<view hover-class="hover-active" v-if="!e.status" @click="toChangeTime(e)">更改</view>
 						</view>
 					</view>
 				</view>
 			</block>
 			
-			<view class="cmd-no" v-if="false">
+			<view class="cmd-no" v-if="pageInfo.sclass_period_time.length == 0">
 				<image src="/subpackage/course/static/images/no_order.png"></image>
 				<view>暂未排课</view>
 			</view>
@@ -84,8 +85,8 @@
 		
 		<!-- 作业列表 -->
 		<view class="cmd-task" v-if="curTabID==3">
-			<task-section ref="refTask" :taskInfo="taskList" taskType="finish" v-if="true"></task-section>
-			<view class="cmd-no" v-if="false">
+			<task-section ref="refTask" :taskInfo="pageInfo.work_list" taskType="finish" v-if="pageInfo.work_list.length>0"></task-section>
+			<view class="cmd-no" v-if="pageInfo.work_list.length==0">
 				<image src="/subpackage/course/static/images/no_order.png"></image>
 				<view>暂未布置作业</view>
 			</view>
@@ -94,8 +95,8 @@
 		<!-- 转班弹框 -->
 		<class-reset-modal
 			:isShowClass="isShowClass"
-			:info="6"
-			:canlist="canlist" 
+			:info="pageInfo"
+			:canlist="classList" 
 			@confirmReset="confirmReset"
 			@closeReset="isShowClass=false"
 		></class-reset-modal>
@@ -105,7 +106,8 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../../js/course_server';
-import { BOX_API } from '../../../js/course_api';
+import BOX_API from '../../../js/course_api';
+import { mapState } from 'vuex';
 import tabBar from '../../../components/tab_bar/tab_bar.vue';
 import class_reset_modal from '../../../components/class_reset_modal/class_reset_modal.vue';
 import task_section from '../../../components/task_section/task_section.vue';
@@ -118,77 +120,182 @@ export default {
 		'class-reset-modal': class_reset_modal,
 		'task-section': task_section,
 	},
+	computed:{
+		...mapState([ 'brandInfo',]),
+	},
 	data() {
 		return {
 			tabList,
 			curTabID: 0,
 			isShowClass: false,
-			canlist: [],
+			classList: [],
 			
-			taskList: [
-				{
-					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安",
-				},
-				{
-					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安排的不同，大部分在9日到10日间仍有部分科目的考试。今年新增的8个高考综合改革省份的考生，将在明天完成高中学业水平选考科目的考试后结束高考。",
-				},
-				{
-					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安今年第三批高考综合改革省份迎来“新高考”，目前省份，由于考试科目安",
-				}
-			],
+			pageInfo: {
+				students: [],    		//班级学员
+				work_list: [],          //作业列表
+				sclass_period_time: [], //上课表
+			},
+			optionsId: -1,
+			resetInfo: {}, //转班信息
 		}
 	},
+	onLoad(options) {
+		this.optionsId = options.id
+		this.getDetail(options.id)
+	},
 	methods: {
 		formatDate: util.formatDate,
+		getDetail(id){
+			let { brandInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.sclassInfo,
+				data: {
+					brand_id: brandInfo.brand.id,
+					id,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				let _res = res
+				_res.students = res.students || []
+				_res.work_list = res.work_list || []
+				_res.sclass_period_time = res.sclass_period_time || []
+				this.pageInfo = _res
+				this.getCanlist(res.course_id);
+			})
+		},
+		
+		zh_sclass_status(status){
+			let _arr = ["成班中","进行中","已结束","成班失败"]
+			return _arr[status] || '-';
+		},
+		
 		tabChange: util.debounce(function(e){
 			this.curTabID = e.id;
-			this.refreshList();
 			this.$nextTick(() => {
-				if(this.curTabID==3 && this.taskList.length>0)this.$refs.refTask.initDesc();
+				if(this.curTabID==3 && this.pageInfo.work_list.length>0)this.$refs.refTask.initDesc();
 			});
 		}, 300, true),
 		refreshList(){
-			
+			this.curTabID = 0
+			this.getDetail(this.optionsId)
 		},
+		// 成班课确认成班
 		confirmClass(){
+			let { brandInfo, pageInfo } = this
 			util.showModal({
 			    title: '是否确认成班',
 			    content: '确认后代表用户报名成功，提前成立班级安排上课',
 			    showCancel: true,
 			    success: modalRes=>{
 			        if(modalRes.confirm){
-						// util.showLoad();
-						// boxServer.get({
-						// 	url: BOX_API.schedule.cancelBclassAc,
-						// 	data: {
-						// 		subscribe_no,
-						// 	},
-						// 	failMsg: '加载失败！'
-						// })
-						// .then(res=>{
-						// 	util.hideLoad();
-						// 	this.doSuccess()
-						// })
+						util.showLoad();
+						boxServer.get({
+							url: BOX_API.sclassConfirm,
+							data: {
+								brand_id: brandInfo.brand.id,
+								id: pageInfo.sclass_id,
+							},
+							failMsg: '加载失败！'
+						})
+						.then(res=>{
+							util.hideLoad();
+							util.showNone('操作成功！');
+							setTimeout(_=>{this.refreshList()}, 1200)
+						})
 					}
 			    }
 			})
 		},
 		
-		btnChange(){},
-		
-		toStuDetail(){
-			util.routeTo(`/subpackage/course/pages/class_student_detail/class_student_detail`,'nT');
+		toStuDetail(item){
+			let { pageInfo } = this
+			let _query = item
+			_query["course_id"] = pageInfo.course_id
+			_query["course_name"] = pageInfo.course_name
+			// _query["sclass_name"] = pageInfo.sclass_name
+			// _query["sclass_nums"] = pageInfo.sclass_nums
+			_query["sclass_id"] = pageInfo.sclass_id
+			console.log("的点点滴滴：", _query)
+			util.routeTo(`/subpackage/course/pages/class_student_detail/class_student_detail?query=${util.jsonStr(_query)}`,'nT')
 		},
-		// 转班
+		// 可换班级列表
+		getCanlist(course_id){
+			let { brandInfo, pageInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.stuCanChangeSclass,
+				data: {
+					brand_id: brandInfo.brand.id,
+					course_id,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.classList = res.list || []
+			})
+		},
+		// 转班按钮
+		resetBtn(item){
+			this.isShowClass = true
+			this.resetInfo.user_id = item.user_id
+			this.resetInfo.order_no = item.order_no
+		},
+		// 转班确认
 		confirmReset(e){
 			// this.resetInfo["new_id"] = e.new_id
-			// this.$emit('confirmReset',this.resetInfo)
+			let { brandInfo, pageInfo, resetInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.resetStuSclass,
+				data: {
+					brand_id: brandInfo.brand.id,
+					old_id: pageInfo.sclass_id,
+					new_id: e.new_id,
+					user_id: resetInfo.user_id,
+					user_order_no: resetInfo.order_no,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				this.isShowClass = false
+				setTimeout(_=>{this.refreshList()}, 1200)
+			})
 		},
 		
-		toChange(){
-			util.routeTo(`/subpackage/course/pages/class_time_change/class_time_change`,'nT');
+		// 更改上课时间
+		toChangeTime(item){
+			let { pageInfo } = this
+			let _query = {
+				brand_name: `${pageInfo.brand_name||''}（${pageInfo.stadium_name||''}）`,
+				course_name: pageInfo.course_name,
+				sclass_name: pageInfo.sclass_name,
+				sclass_id: pageInfo.sclass_id,
+				lesson_no: item.lesson_no,
+				period_date: item.period_date,
+				period_start_time: item.period_start_time,
+				period_end_time: item.period_end_time,
+			}
+			util.routeTo(`/subpackage/course/pages/class_time_change/class_time_change?query=${util.jsonStr(_query)}`,'nT');
 		},
 		
+		phoneCall(mobile) {
+			let _phoneStr = mobile || ''
+			let _phoneArr =  _phoneStr.split(',') || [];
+			uni.showActionSheet({
+			    itemList: _phoneArr,
+			    success: res =>{
+			        uni.makePhoneCall({
+			            phoneNumber:　_phoneArr[res.tapIndex]
+			        })
+			    }
+			})
+		},
 	
 	}
 }
diff --git a/src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue b/src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue
index 207193e..aab4539 100644
--- a/src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue
+++ b/src/subpackage/course/pages/manage_detail/private_reserve_detail/private_reserve_detail.vue
@@ -1,44 +1,47 @@
 <template>
 	<view class="private-reserve-detail">
 		<view class="prd-line">
-			<view>欧轩智能场馆(羽毛球馆永泰店)</view>
-			<view :class="[false?'pl-gray':false?'pl-red':'pl-green']">待上课</view>
+			<view>{{pageInfo.brand_name||''}}({{pageInfo.stadium_name||'-'}})</view>
+			<view :class="[pageInfo.status_text=='已上课'?'pl-gray':pageInfo.status_text=='已取消'?'pl-red':'pl-green']">{{pageInfo.status_text||'-'}}</view>
 		</view>
 		<view class="prd-section">
-			<view>预约单号：<text>yy202106031256568595</text></view>
-			<view>预约时间：<text>2021.06.03 11:42:50 </text></view>
+			<view>预约单号：<text>{{pageInfo.subscribe_no||''}}</text></view>
+			<view>预约时间：<text>{{pageInfo.subscribe_at||''}}</text></view>
 			<!-- 已取消才显示 -->
-			<block v-if="false">
-				<view>取消时间：<text>2021.06.03 11:42:50</text></view>
-				<view>取消原因：<text>学员取消（有事请假）</text></view>
+			<block v-if="pageInfo.status_text=='已取消'">
+				<view>取消时间：<text>{{pageInfo.cancel_time||''}}</text></view>
+				<view>取消原因：<text>{{pageInfo.cancel_reason||''}}</text></view>
 			</block>
 		</view>
 		<view class="prd-section">
 			<view>上课信息</view>
-			<view>上课时间：<text>2021.06.02（周五）   14:00-16:00</text></view>
-			<view>上课地点：<text>羽毛球（3号场）</text></view>
-			<view>上课教练：<text>张瀚</text></view>
-			<view>课程名称：<text>羽毛球培训课</text></view>
-			<view>课程类型：<text>私教课</text></view>
-			<view>课程节数：<text>第3节，共12节</text></view>
+			<view>上课时间：<text>{{pageInfo.date||''}}（{{pageInfo.week||'-'}}）   {{pageInfo.start_duration||''}}-{{pageInfo.end_duration||''}}</text></view>
+			<view>上课地点：<text>{{pageInfo.addr||''}}</text></view>
+			<view>上课教练：<text>{{pageInfo.coach_name||''}}</text></view>
+			<view>课程名称：<text>{{pageInfo.course_name||''}}</text></view>
+			<view>课程类型：<text>{{pageInfo.course_kind||''}}</text></view>
+			<view>课程节数：<text>第{{pageInfo.course_period_number_cur||0}}节，共{{pageInfo.course_period_number||0}}节</text></view>
 		</view>
 		<view class="prd-stu">
 			<view class="ps-tit">学员信息</view>
 			<view class="ps-line">
 				<view class="pl-info">
-					<view>熊启(男)
-						<text>18096895331</text>
-						<image src="/subpackage/course/static/images/icon/phone.png"></image>
+					<view>{{pageInfo.student_name||'-'}}({{pageInfo.student_gender||'-'}})
+						<block v-if="pageInfo.student_phone!=''">
+							<text>{{pageInfo.student_phone||'-'}}</text>
+							<image src="/subpackage/course/static/images/icon/phone.png" @click="phoneCall(pageInfo.student_phone)"></image>
+						</block>
 					</view>
-					<view>预约时间：2020.12.27 22:55:56</view>
+					<view>预约时间：{{pageInfo.subscribe_at||''}}</view>
 				</view>
 				<!-- 待上课才显示 -->
-				<view class="pl-btn" hover-class="hover-active" v-if="true" @click="isCancelClass=true">取消上课</view>
+				<view class="pl-btn" hover-class="hover-active" v-if="pageInfo.status_text=='待上课'" @click="isCancelClass=true">取消上课</view>
 			</view>
 		</view>
 		
 		<cancel-class-modal
 			v-if="isCancelClass"
+			@reasonConfirm="reasonConfirm"
 			@reasonClose="isCancelClass=false"
 		></cancel-class-modal>
 	</view>
@@ -47,19 +50,93 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../../js/course_server';
-import { BOX_API } from '../../../js/course_api';
+import BOX_API from '../../../js/course_api';
+import { mapState } from 'vuex';
 import cancel_class_modal from '../../../components/cancel_class_modal/cancel_class_modal.vue';
 export default {
 	components: {
 		'cancel-class-modal': cancel_class_modal,
 	},
+	computed:{
+		...mapState([ 'brandInfo',]),
+	},
 	data() {
 		return {
 			isCancelClass: false,
+			pageInfo: {},
+			optionsId: -1,
 		}
 	},
+	onLoad(options) {
+		this.optionsId = options.id
+		this.getDetail(options.id)
+	},
 	methods: {
+		getDetail(id){
+			let { brandInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.subscribeInfo,
+				data: {
+					brand_id: brandInfo.brand.id,
+					id,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.pageInfo = res
+			})
+		},
+		
+		// 取消上课[私教课/大班课]
+		getCancelPabAc({ subscribe_no, reason}){
+			let { brandInfo } = this
+			let _data = {
+				brand_id: brandInfo.brand.id,
+				reason, //取消原因
+				subscribe_no,
+			}
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.cancelStuAc,
+				data: _data,
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				setTimeout(_=>{ 
+					this.getDetail(this.optionsId) 
+					util.previousPageFunction({
+						fnName: 'refreshList',
+						query: { isLoad: false},
+					});
+				}, 1200)
+			})
+		},
+		
+		reasonConfirm(e){
+			this.isCancelClass = false
+			let { pageInfo } = this
+			this.getCancelPabAc({
+				subscribe_no: pageInfo.subscribe_no,
+				reason: e,
+			})
+		},
 		
+		phoneCall(mobile) {
+			let _phoneStr = mobile || ''
+			let _phoneArr =  _phoneStr.split(',') || [];
+			uni.showActionSheet({
+			    itemList: _phoneArr,
+			    success: res =>{
+			        uni.makePhoneCall({
+			            phoneNumber:　_phoneArr[res.tapIndex]
+			        })
+			    }
+			})
+		},
 	}
 }
 </script>
diff --git a/src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue b/src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue
index de796fc..2c6ae83 100644
--- a/src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue
+++ b/src/subpackage/course/pages/manage_detail/student_course_detail/student_course_detail.vue
@@ -1,82 +1,83 @@
 <template>
 	<view class="student-course-detail" :class="[false?'scd-content':'']">
 		<view class="scd-section">
-			<view class="ss-status">进行中</view>
-			<view class="ss-view">学员姓名：张安（男 ）</view>
-			<view class="ss-view">学员电话：18316536894
-				<image src="/subpackage/course/static/images/icon/phone.png"></image>
+			<view class="ss-status" :class="[pageInfo.order_status==2?'ss-gary':'']">{{pageInfo.order_status==1?'进行中':pageInfo.order_status==2?'已结束':''}}</view>
+			<view class="ss-view">学员姓名：{{pageInfo.student_name || ''}}（{{pageInfo.student_gender ||'-'}}）</view>
+			<view class="ss-view">学员电话：{{pageInfo.student_phone||''}}
+				<image src="/subpackage/course/static/images/icon/phone.png" @click="phoneCall(pageInfo.student_phone)"></image>
 			</view>
-			<view class="ss-view">剩余课时：10课时 （共12节)</view>
+			<view class="ss-view">剩余课时：{{pageInfo.period_nums_surplus||0}}课时 （共{{pageInfo.period_nums||0}}节)</view>
 			<!-- 私教课、大班课 才有安排上课 -->
-			<view class="ss-line" v-if="true">
+			<view class="ss-line" v-if="pageInfo.order_status==1&&(pageInfo.course_kind=='私教课'||pageInfo.course_kind=='大班课')">
 				<view hover-class="hover-active" @click="toArrangeClass">安排上课</view>
 			</view>
 		</view>
 		<view class="scd-tab">
 			<tab-bar :tabList="tabList" :curTabID="curTabID" @change="tabChange"></tab-bar>
 		</view>
+		
 		<!-- 课程详情 -->
 		<view class="scd-info" v-if="curTabID==0">
-			<view class="si-tit">欧轩智能场馆(羽毛球馆永泰店)</view>
-			<view>羽毛球杀球训练（私教课）</view>
-			<view><text>课程类型：</text>私教课</view>
-			<view><text>总课时：</text>14</view>
+			<view class="si-tit">{{pageInfo.brand_name || ''}}({{pageInfo.stadium_name||'-'}})</view>
+			<view>{{pageInfo.course_name||''}}</view>
+			<view><text>课程类型：</text>{{pageInfo.course_kind||''}}</view>
+			<view><text>总课时：</text>{{pageInfo.period_nums||0}}</view>
 			<!-- 私教课、大班课 -->
-			<block v-if="true">
-				<view><text>购买课时：</text>10</view>
-				<view><text>赠送课时：</text>4</view>
-				<view><text>有效期至：</text>至2022.06.02</view>
-				<view><text>课时时长：</text>2小时/节</view>
-				<view><text>上课教练：</text>一级教练</view>
+			<block v-if="pageInfo.course_kind=='私教课'||pageInfo.course_kind=='大班课'">
+				<view><text>购买课时：</text>{{pageInfo.period_nums_gm||0}}</view>
+				<view><text>赠送课时：</text>{{pageInfo.period_nums_zs||0}}</view>
+				<view><text>有效期至：</text>{{pageInfo.course_end||''}}</view>
+				<view><text>课时时长：</text>{{pageInfo.period_time||'-'}}/节</view>
+				<view><text>上课教练：</text>{{pageInfo.course_coach||''}}</view>
 				<!-- 私教课才有上课内容 -->
-				<view v-if="true"><text>上课内容：</text></view>
+				<view v-if="pageInfo.course_kind=='私教课'"><text>上课内容：</text></view>
 				<view><text>上课是否需要场地：</text>是（不含场地费用）</view>
 			</block>
-			
 			<!-- 成班课 -->
-			<block v-if="false">
-				<view><text>课时时长：</text>45分钟/节</view>
-				<view><text>有效期至：</text>2022.06.02-2022.12.02</view>
+			<block v-if="pageInfo.course_kind=='成班课'">
+				<view><text>课时时长：</text>{{pageInfo.period_time||'-'}}/节</view>
+				<view><text>有效期至：</text>{{pageInfo.course_end||''}}</view>
 				<view class="si-tit si-mar">班级信息</view>
-				<view><text>班级id：</text>2-1</view>
-				<view><text>班级名称：</text>冲锋班</view>
-				<view><text>班级人数：</text>20</view>
-				<view><text>上课教练：</text>张三</view>
-				<view><text>上课地点：</text>欧轩智能场馆3号馆</view>
-				<view><text>课程日期：</text>2021.08.08-2021.10.10</view>
+				<view><text>班级id：</text>{{pageInfo.sclass_no||''}}</view>
+				<view><text>班级名称：</text>{{pageInfo.sclass_name||''}}</view>
+				<view><text>班级人数：</text>{{pageInfo.sclass_nums||0}}</view>
+				<view><text>上课教练：</text>{{pageInfo.course_coach||''}}</view>
+				<view><text>上课地点：</text>{{pageInfo.sclass_addr||''}}</view>
+				<view><text>课程日期：</text>{{pageInfo.sclass_date||''}}</view>
 			</block>
-			
 		</view>
+		
 		<!-- 上课记录 -->
 		<view class="scd-record" v-if="curTabID==1">
 			<!-- 私教课、大班课 -->
-			<view class="sr-list" v-for="i in 3" :key="i" v-if="false">
+			<view class="sr-list" v-for="(e,i) in pageInfo.subscribe_period_time" :key="i" v-if="pageInfo.course_kind=='私教课'||pageInfo.course_kind=='大班课'">
 				<view class="sl-item">
 					<view>
 						<view class="si-box">
-							<view>预约单号：yy202106031256568595</view>
-							<view :class="[true?'sb-red':false?'sb-gray':'sb-green']">已取消</view>
+							<view>预约单号：{{e.subscribe_no}}</view>
+							<view :class="[e.status_text=='已取消'?'sb-red':e.status_text=='已上课'?'sb-gray':'sb-green']">{{e.status_text||'-'}}</view>
 						</view>
-						<view class="si-time">2021.06.03 11:42:50   预约</view>
+						<view class="si-time">{{e.created_at||'-'}}   预约</view>
 					</view>
-					<view class="si-wei">课程节数：第3节，共12节</view>
-					<view><text>上课时间：</text>2021.06.02（周五）   14:00-16:00</view>
-					<view><text>上课地点：</text>羽毛球（3号场）</view>
-					<view><text>上课教练：</text>张三</view>
+					<view class="si-wei">课程节数：第{{e.lesson_no||0}}节，共{{e.lesson_no_total||0}}节</view>
+					<view><text>上课时间：</text>{{e.date||''}}（{{e.week||'-'}}）   {{e.start_duration||''}}-{{e.end_duration||''}}</view>
+					<view><text>上课地点：</text>{{e.addr||''}}</view>
+					<view><text>上课教练：</text>{{e.coach_name||''}}</view>
 					<!-- 已取消显示 -->
-					<block v-if="true">
-						<view><text>取消时间：</text>2021.06.03 11:42:50</view>
-						<view><text>取消原因：</text>教练取消</view>
+					<block v-if="e.status_text=='已取消'">
+						<view><text>取消时间：</text>{{e.cancel_time||''}}</view>
+						<view><text>取消原因：</text>{{e.cancel_reason||''}}</view>
 					</block>
 				</view>
 			</view>
-			<view class="sr-sclass" v-if="true">
-				<sclass-record-section ></sclass-record-section>
+			<view class="sr-sclass" v-if="pageInfo.course_kind=='成班课'">
+				<sclass-record-section :recordInfo="pageInfo.sclass_period_time"></sclass-record-section>
 			</view>
 		</view>
+		
 		<!-- 作业列表 -->
 		<view class="scd-task" v-if="curTabID==2">
-			<task-section ref="refTask" :taskInfo="taskList"></task-section>
+			<task-section ref="refTask" :taskInfo="pageInfo.student_work_list"></task-section>
 		</view>
 	</view>
 </template>
@@ -84,7 +85,7 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../../js/course_server';
-import { BOX_API } from '../../../js/course_api';
+import BOX_API from '../../../js/course_api';
 import { mapState } from 'vuex';
 import tabBar from '../../../components/tab_bar/tab_bar.vue';
 import sclass_record_section from '../../../components/sclass_record_section/sclass_record_section.vue';
@@ -98,34 +99,41 @@ export default {
 		'sclass-record-section': sclass_record_section,
 		'task-section': task_section,
 	},
+	computed:{
+		...mapState([ 'brandInfo',]),
+	},
 	data() {
 		return {
 			tabList,
 			curTabID: 0,
-			
-			taskList: [
-				{
-					// isShowExpande: false,
-					// expande: false,
-					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安",
-				},
-				{
-					// isShowExpande: false,
-					// expande: false,
-					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安排的不同，大部分在9日到10日间仍有部分科目的考试。今年新增的8个高考综合改革省份的考生，将在明天完成高中学业水平选考科目的考试后结束高考。",
-				},
-				{
-					// isShowExpande: false,
-					// expande: false,
-					work_content: "今年第三批高考综合改革省份迎来“新高考”，目前，全国实施新高考的省份达到了14个。实施新高考的省份，由于考试科目安今年第三批高考综合改革省份迎来“新高考”，目前省份，由于考试科目安",
-				}
-			],
+			pageInfo: {
+				subscribe_period_time: [], //[私教课/大班课]上课信息
+				sclass_period_time: [],    //[成班课]上课时间
+				student_work_list: [],     //作业列表
+			},
 		}
 	},
-	onLoad() {
-		
+	onLoad(options) {
+		this.getDetail(options.order_no)
 	},
 	methods: {
+		getDetail(order_no){
+			let { brandInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.stuInfo,
+				data: {
+					brand_id: brandInfo.brand.id,
+					order_no,
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				this.pageInfo = res
+			})
+		},
+		
 		tabChange: util.debounce(function(e){
 			this.curTabID = e.id;
 			this.refreshList();
@@ -138,11 +146,21 @@ export default {
 			
 		},
 		toArrangeClass(){
-			util.routeTo(`/subpackage/course/pages/arrange_class/arrange_class`,'nT');
+			let { pageInfo } = this
+			util.routeTo(`/subpackage/course/pages/arrange_class/arrange_class?order_no=${pageInfo.order_no}`,'nT');
+		},
+		phoneCall(mobile) {
+			let _phoneStr = mobile || ''
+			let _phoneArr =  _phoneStr.split(',') || [];
+			uni.showActionSheet({
+			    itemList: _phoneArr,
+			    success: res =>{
+			        uni.makePhoneCall({
+			            phoneNumber:　_phoneArr[res.tapIndex]
+			        })
+			    }
+			})
 		},
-		
-		
-		
 	}
 }
 </script>
@@ -166,6 +184,9 @@ page{
 			font-size: 28rpx;
 			line-height: 52rpx;
 		}
+		.ss-gary{
+			color: #9A9A9D;
+		}
 		.ss-view{
 			padding-right: 84rpx;
 			color: #1A1A1A;
diff --git a/src/subpackage/course/pages/manage_list/manage_list.vue b/src/subpackage/course/pages/manage_list/manage_list.vue
index 4ebc440..816fc16 100644
--- a/src/subpackage/course/pages/manage_list/manage_list.vue
+++ b/src/subpackage/course/pages/manage_list/manage_list.vue
@@ -1,27 +1,29 @@
 <template>
 	<view class="manage-list">
-		<block v-if="true">
-			<view class="ml-head">
-				<store-name></store-name>
+		<view class="ml-head">
+			<store-name></store-name>
+			<block v-if="isShowOrder">
 				<view class="mh-view">
 					<image class="mv-icon" src="/static/images/icon/search.png"></image>
-					<input class="mv-ipt" :placeholder="plaTxt" />
+					<input class="mv-ipt" :placeholder="plaTxt" confirm-type="search" v-model="searchText" @confirm="onSearch"/>
 				</view>
 				<tab-bar :tabList="tabList" :curTabID="curTabID" @change="tabChange"></tab-bar>
-			</view>
-			<view class="ml-list" v-for="(e,i) in 6" :key="i" v-if="true">
+			</block>
+		</view>
+		<block v-if="isShowOrder">
+			<view class="ml-list" v-for="(e,i) in orderList" :key="i" v-if="orderList.length > 0">
 				<student-course-item :orderInfo="e" v-if="typeId == '0-0'"></student-course-item>
-				<private-reserve-item :orderInfo="e" v-if="typeId == '0-1'"></private-reserve-item>
-				<bclass-reserve-item :orderInfo="e" v-if="typeId == '0-2'"></bclass-reserve-item>
+				<private-reserve-item :orderInfo="e" v-if="typeId == '0-1'" @priclassCancel="cancelCalss"></private-reserve-item>
+				<bclass-reserve-item :orderInfo="e" v-if="typeId == '0-2'" @bclassCancel="cancelCalss" @bclassConfirm="bclassConfirm"></bclass-reserve-item>
 				<class-manage-item :orderInfo="e" v-if="typeId == '0-3'"></class-manage-item>
 			</view>
-			<view class="no-item no-list" v-if="false">
+			<view class="no-item no-list" v-if="orderList.length == 0">
 				<image src="/subpackage/course/static/images/no_order.png"></image>
 				<view>{{ tipsText }}</view>
 			</view>
 		</block>
 		
-		<view class="no-list" v-if="false">
+		<view class="no-list" v-if="!isShowOrder">
 			<image src="/subpackage/course/static/images/no_order.png"></image>
 			<view>{{ tipsText }}</view>
 		</view>
@@ -31,7 +33,7 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
 import { mapState } from 'vuex';
 import tabBar from '../../components/tab_bar/tab_bar.vue';
 import store_name from '../../components/store_name/store_name';
@@ -49,7 +51,10 @@ export default {
 		'class-manage-item': class_manage_item,
 	},
 	computed:{
-		// ...mapState([ 'storeInfo' ]),
+		...mapState([ 'brandInfo',]),
+		...mapState({
+		    curStoreInfo: state => state.device.curStoreInfo,
+		}),
 	    titleName(){
 	        let { typeId  } = this;
 	        if(typeId == '0-0')return '学员管理';
@@ -75,10 +80,10 @@ export default {
 			return '';
 		},
 		tabList(){
-			let _list0 = [{name: '全部', id: 0}, {name: '进行中', id: 1}, {name: '已结束', id: 2}, {name: '已退款', id: 3}];
-			let _list1 = [{name: '全部', id: 0}, {name: '待上课', id: 1}, {name: '已上课', id: 2}, {name: '已取消', id: 3}];
-			let _list2 = [{name: '全部', id: 0}, {name: '待确认', id: 1}, {name: '待上课', id: 2}, {name: '已上课', id: 3}, {name: '已取消', id: 4}];
-			let _list3 = [{name: '全部', id: 0}, {name: '成班中', id: 1}, {name: '进行中', id: 2}, {name: '已结束', id: 3}, {name: '失败', id: 4}];
+			let _list0 = [{name: '全部', id: 0, status: ''}, {name: '进行中', id: 1, status: 1}, {name: '已结束', id: 2, status: 2}, {name: '已退款', id: 3, status: 3}];
+			let _list1 = [{name: '全部', id: 0, status: 'all'}, {name: '待上课', id: 1, status: 'dsk'}, {name: '已上课', id: 2, status: 'ysk'}, {name: '已取消', id: 3, status: 'yqx'}];
+			let _list2 = [{name: '全部', id: 0, status: 'all'}, {name: '待确认', id: 1, status: 'dqr'}, {name: '待上课', id: 2, status: 'dsk'}, {name: '已上课', id: 3, status: 'ysk'}, {name: '已取消', id: 4, status: 'yqx'}];
+			let _list3 = [{name: '全部', id: 0, status: ''}, {name: '成班中', id: 1, status: 0}, {name: '进行中', id: 2, status: 1}, {name: '已结束', id: 3, status: 2}, {name: '失败', id: 4, status: 3}];
 			
 			let { typeId } = this;
 			if(typeId == '0-0')return _list0;
@@ -88,34 +93,193 @@ export default {
 			return [];
 		},
 	},
+	watch: {
+		curStoreInfo(newVal, oldVal) {
+			this.orderList = [];
+			// console.log("门店信息：", newVal)
+			this.storeInfo = newVal
+			// this.$nextTick(_=>{
+			// })
+			this.getOrderList({})
+		}
+	},
 	data() {
 		return {
+			typeId: "",
 			curTabID: 0,
+			curStatus: "",
+			searchText: "",
+			storeInfo: {},
+			isShowOrder: false,
+			orderList: [],
 			page: 1,
-			typeId: "",
 		}
 	},
-	onLoad(options){
+	async onLoad(options){
 		// let _query = util.jsonPar(options.query);
 		// this.optionsQuery = _query
-		this.typeId = options.type_id || ''
-		this.$nextTick(_=>{
-		    uni.setNavigationBarTitle({
-		        title: this.titleName
-		    })
-			// this.getCommentList({});
+		
+		try{
+		    util.showLoad();
+		    let _brandInfo = await this.$store.dispatch('getBrandInfo');
+		    await this.$store.dispatch('getStoreList');
+		    util.hideLoad();
+			
+			this.typeId = options.type_id || ''
+			this.storeInfo.id = this.curStoreInfo.id || ''
+			this.$nextTick(_=>{
+			    uni.setNavigationBarTitle({
+			        title: this.titleName
+			    })
+				this.getOrderList({})
+			})
+			
+		}catch(err){
+		    util.hideLoad();
+		}
+		
+		
+	},
+	onReachBottom(){
+		let { page } = this;
+		this.getOrderList({
+			page: ++page
 		})
 	},
 	methods: {
 		tabChange: util.debounce(function(e){
 			this.curTabID = e.id;
+			this.curStatus = e.status
 			this.refreshList();
 		}, 300, true),
 		refreshList(){
 			this.page = 1;
-			// this.subList = [];
-			// this.getSubscribeList({});
+			this.orderList = [];
+			this.getOrderList({});
+		},
+		
+		// 搜索
+		onSearch(){
+			this.page = 1
+			this.orderList = []
+			this.getOrderList({})
 		},
+		
+		getApi(){
+			let { typeId } = this
+			if(typeId == '0-0')return BOX_API.stuCourse; //学员管理
+			if(typeId == '0-1')return BOX_API.subscribePri;  //私教约课记录
+			if(typeId == '0-2')return BOX_API.subscribeBclass;  //大班约课记录
+			if(typeId == '0-3')return BOX_API.sclassManage;  //班级管理
+		},
+	
+		getOrderList({page=1, page_size=20}){
+			let { brandInfo, storeInfo, curTabID, typeId, curStatus, searchText } = this
+			let _data = {
+				page,
+				page_size,
+				stadium_id: storeInfo.id,
+				brand_id: brandInfo.brand.id,
+			}
+			if(searchText!='')_data["keyword"] = searchText;
+			if(typeId=='0-0')_data["order_status"] = curStatus;
+			if(typeId!='0-0')_data["status"] = curStatus;
+			util.showLoad();
+			boxServer.get({
+				url: this.getApi(),
+				data: _data,
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				
+				let _list = res.list || [];
+				if(page == 1){
+					this.orderList = _list;
+					if(curTabID==0 && this.orderList.length==0)this.isShowOrder = false;
+					else this.isShowOrder = true;
+					return;
+				}
+				if(_list.length<=0)return util.showNone('没有更多！');
+				this.page = page;
+				this.orderList = [...this.orderList, ...res.list];
+				
+			})
+		},
+		
+		// 私教课、大班课取消上课
+		cancelCalss(e){
+			if(e.course_kind=='私教课'){
+				this.getCancelPabAc({
+					course_kind: e.course_kind,
+					subscribe_no: e.subscribe_no,
+					reason: e.reason,
+				})
+				return;
+			}
+			if(e.course_kind=='大班课'){
+				this.getCancelPabAc({
+					course_kind: e.course_kind,
+					id: e.id,
+					reason: e.reason,
+				})
+				return;
+			}
+		},
+		// 取消上课[私教课/大班课]
+		getCancelPabAc({ course_kind, subscribe_no, id, reason}){
+			let { brandInfo } = this
+			let _data = {
+				brand_id: brandInfo.brand.id,
+				reason, //取消原因
+			}
+			if(course_kind=='私教课')_data["subscribe_no"] = subscribe_no;
+			if(course_kind=='大班课')_data["id"] = id;
+			util.showLoad();
+			boxServer.get({
+				url: course_kind=='大班课'? BOX_API.cancelBclassAc:course_kind=='私教课'? BOX_API.cancelStuAc:'',
+				data: _data,
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				setTimeout(_=>{ this.refreshList() }, 1200)
+			})
+		},
+		
+		// 大班课确认上课
+		bclassConfirm(e){
+			util.showModal({
+			    title: '提示',
+			    content: '是否确认上课？',
+			    showCancel: true,
+			    success: modalRes=>{
+			        if(modalRes.confirm){
+						this.getBclassAc({subscribe_no: e})
+					}
+			    }
+			})
+		},
+		// 大班课提前确认上课
+		getBclassAc({ subscribe_no}){
+			let { brandInfo } = this
+			util.showLoad();
+			boxServer.get({
+				url: BOX_API.setBclassAc,
+				data: {
+					brand_id: brandInfo.brand.id,
+					subscribe_no, //大班课预约单号
+				},
+				failMsg: '加载失败！'
+			})
+			.then(res=>{
+				util.hideLoad();
+				util.showNone('操作成功！');
+				setTimeout(_=>{ this.refreshList() }, 1200)
+			})
+		},
+		
 	}
 }
 </script>
diff --git a/src/subpackage/course/pages/task_detail/task_detail.vue b/src/subpackage/course/pages/task_detail/task_detail.vue
index e4a5ae1..e472339 100644
--- a/src/subpackage/course/pages/task_detail/task_detail.vue
+++ b/src/subpackage/course/pages/task_detail/task_detail.vue
@@ -29,8 +29,12 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
+import { mapState } from 'vuex';
 export default {
+	computed:{
+		...mapState([ 'brandInfo',]),
+	},
 	data() {
 		return {
 			pageInfo: {},
@@ -39,7 +43,7 @@ export default {
 	async onLoad(options){
 		// let _query = util.jsonPar(options.query);
 		// this.pageInfo = _query
-		// this.getWorkInfo(options.id)
+		this.getWorkInfo(options.id)
 	},
 	methods: {
 		formatDate: util.formatDate,
@@ -63,10 +67,12 @@ export default {
 		
 		// 作业 - 详情
 		getWorkInfo(id){
+			let { brandInfo } = this
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.student.workInfo,
+				url: BOX_API.stuWorkInfo,
 				data: {
+					brand_id: brandInfo.brand.id,
 					id,
 				},
 				failMsg: '加载失败！'
diff --git a/src/subpackage/course/pages/task_finish_list/task_finish_list.vue b/src/subpackage/course/pages/task_finish_list/task_finish_list.vue
index 3fd336e..429a20a 100644
--- a/src/subpackage/course/pages/task_finish_list/task_finish_list.vue
+++ b/src/subpackage/course/pages/task_finish_list/task_finish_list.vue
@@ -1,20 +1,18 @@
 <template>
 	<view class="task-finish-list">
-		<!-- v-if="workList.length>0" -->
-		<block >
+		<block v-if="workList.length>0">
 			<view class="tfl-box">
-				<view>布置作业时间：{{formatDate({date: pageInfo.created_at, partition: '/'}) || '-'}}</view>
+				<view>布置作业时间：{{ pageInfo.created_at!=''?formatDate({date: pageInfo.created_at, partition: '/'}) : '-'}}</view>
 				<view>发布人：{{pageInfo.work_coach_name||'-'}}</view>
 			</view>
-			<!-- workList -->
-			<view class="tfl-list" v-for="(e,i) in 3" :key="i">
+			<view class="tfl-list" v-for="(e,i) in workList" :key="i">
 				<view class="tl-item" @click="toDetail(e)">
 					<view class="ti-info">
 						<view>{{e.student_name||'-'}}（{{e.student_gender||'-'}}）</view>
-						<view>{{'-'}}</view>
+						<view>{{e.student_phone ||'-'}}</view>
 					</view>
 					<view class="ti-section">
-						<view v-if="e.work_status==1">{{formatDate({date: pageInfo.student_work_at,}) ||'-'}}</view>
+						<view v-if="e.work_status==1">{{e.student_work_at!=''?formatDate({date: e.student_work_at,}) :'-'}}</view>
 						<view class="ts-line">
 							<view :class="[e.work_status==1?'':'tl-txt']">{{e.work_status==1?'已完成':'未完成'}}</view>
 							<image src="/subpackage/course/static/images/icon/arrow_black.png"></image>
@@ -33,10 +31,11 @@
 <script>
 import util from '@/utils/util';
 import boxServer from '../../js/course_server';
-import { BOX_API } from '../../js/course_api';
+import BOX_API from '../../js/course_api';
+import { mapState } from 'vuex';
 export default {
 	computed:{
-		
+		...mapState([ 'brandInfo',]),
 	},
 	data() {
 		return {
@@ -45,23 +44,23 @@ export default {
 		}
 	},
 	onLoad(options) {
-		// let _query = util.jsonPar(options.query);
-		// this.pageInfo = _query
-		// let { work_number } = options
-		// this.pageInfo = options
-		// this.$nextTick(_=>{
-		// 	this.getClassWork()
-		// })
+		let { work_number } = options
+		this.pageInfo = options
+		this.$nextTick(_=>{
+			this.getClassWork()
+		})
 	},
 	methods: {
 		formatDate: util.formatDate,
 		// 作业-完成情况
 		getClassWork(){
+			let { brandInfo } = this
 			let { work_number } = this.pageInfo
 			util.showLoad();
 			boxServer.get({
-				url: BOX_API.class.classWork,
+				url: BOX_API.sclassStuWork,
 				data: {
+					brand_id: brandInfo.brand.id,
 					work_number,
 				},
 				failMsg: '加载失败！'
@@ -78,7 +77,7 @@ export default {
 		},
 		
 		toDetail(item){
-			util.routeTo(`/subpackage/manage/pages/student/task_detail/task_detail?id=${item.id}`,'nT')
+			util.routeTo(`/subpackage/course/pages/task_detail/task_detail?id=${item.id}`,'nT')
 		},
 		
 		// 批量提醒

From 51046c7723ebc002f66afffbd14e4214afe001a6 Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Tue, 19 Oct 2021 16:11:31 +0800
Subject: [PATCH 05/11] fix all

---
 src/pages/index/index.vue                          |  2 +-
 src/subpackage/course/pages/index/index.vue        |  1 -
 .../bclass_reserve_detail.vue                      | 36 +++++++++++++++++++++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 63cdaf9..1f338d4 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -130,7 +130,7 @@
 			id: 8,
 			name: '课程管理',
 			path: '/subpackage/course/pages/index/index',
-			serverKey: 1011  // 后端对应权限编号 1013
+			serverKey: 1013  // 后端对应权限编号 1013
 		}
 	];
 	
diff --git a/src/subpackage/course/pages/index/index.vue b/src/subpackage/course/pages/index/index.vue
index e321dc9..2921feb 100644
--- a/src/subpackage/course/pages/index/index.vue
+++ b/src/subpackage/course/pages/index/index.vue
@@ -58,7 +58,6 @@ const tabList = [
 			{
 				id: 0,
 				name: "学员课程",
-				// path: "/subpackage/course/pages/manage_list/manage_list",
 			},
 			{
 				id: 1,
diff --git a/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue b/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
index e7ca66d..9b24688 100644
--- a/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
+++ b/src/subpackage/course/pages/manage_detail/bclass_reserve_detail/bclass_reserve_detail.vue
@@ -54,7 +54,7 @@
 		<view class="brd-fixed" v-if="pageInfo.status_text=='待确认'||pageInfo.status_text=='待上课'">
 			<view class="bf-line">
 				<view class="bl-btn1" hover-class="hover-active" @click="cancelClassChange(0)">取消上课</view>
-				<view class="bl-btn2" hover-class="hover-active" v-if="pageInfo.status_text=='待确认'">确认上课</view>
+				<view class="bl-btn2" hover-class="hover-active" @click="bclassConfirm" v-if="pageInfo.status_text=='待确认'">确认上课</view>
 			</view>
 		</view>
 		
@@ -185,6 +185,40 @@ export default {
 				}, 1200)
 			})
 		},
+		// 大班课确认上课
+		bclassConfirm(){
+			let { brandInfo, pageInfo } = this
+			util.showModal({
+			    title: '提示',
+			    content: '是否确认上课？',
+			    showCancel: true,
+			    success: modalRes=>{
+			        if(modalRes.confirm){
+						util.showLoad();
+						boxServer.get({
+							url: BOX_API.setBclassAc,
+							data: {
+								brand_id: brandInfo.brand.id,
+								subscribe_no: pageInfo.subscribe_no, //大班课预约单号
+							},
+							failMsg: '加载失败！'
+						})
+						.then(res=>{
+							util.hideLoad();
+							util.showNone('操作成功！');
+							setTimeout(_=>{ 
+								this.refreshList() 
+								util.previousPageFunction({
+									fnName: 'refreshList',
+									query: { isLoad: false},
+								});
+							}, 1200)
+						})
+					}
+			    }
+			})
+		},
+		
 		phoneCall(mobile) {
 			let _phoneStr = mobile || ''
 			let _phoneArr =  _phoneStr.split(',') || [];

From 771e5dc2476d3bf6935ce250d17e0c3a6d3d9156 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 26 Oct 2021 09:56:15 +0800
Subject: [PATCH 06/11] fix book modal

---
 src/components/site/order_modal/order_modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index 0d06d4f..7b4b6a9 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -69,7 +69,7 @@
 			<view class="om-info-line">
 				<view class="oil-view">预订项目：</view>
 				<view class="oil-view">
-					<view class="ov-view">{{ orderInfo.stadium_name || ' ' }}</view>
+					<view class="ov-view">{{ orderInfo.project || ' ' }}</view>
 				</view>
 			</view>
 			<view class="om-info-line">

From 732a3cce9442ae533cb58222c8aa09442ec91530 Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Tue, 26 Oct 2021 14:22:03 +0800
Subject: [PATCH 07/11] fix all

---
 .../course/pages/arrange_class/arrange_class.vue   | 27 +---------------------
 .../pages/class_time_change/class_time_change.vue  | 24 +------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/src/subpackage/course/pages/arrange_class/arrange_class.vue b/src/subpackage/course/pages/arrange_class/arrange_class.vue
index 2e5ffbc..20d1ef4 100644
--- a/src/subpackage/course/pages/arrange_class/arrange_class.vue
+++ b/src/subpackage/course/pages/arrange_class/arrange_class.vue
@@ -26,7 +26,6 @@
 			<!-- 上课日期 -->
 			<view class="as-line">
 				<view class="al-txt"><text>*</text>上课日期</view>
-				<!-- :start="startDate" :end="endDate" -->
 				<picker class="al-picker" mode="date" :value="submitInfo.date"  @change="bindDateChange" >
 					<view class="al-view al-date">
 						<view class="ad-txt">{{submitInfo.date}}</view>
@@ -79,18 +78,9 @@ import { mapState } from 'vuex';
 export default {
 	computed: {
 		...mapState([ 'brandInfo',]),
-		startDate() {
-			return this.getDate('start');
-		},
-		endDate() {
-			return this.getDate('end');
-		},
-		userInfo(){
-			return uni.getStorageSync('loginInfo') || {};
-		},
 		timeList(){
 			let _list = []
-			for(let i = 0; i<=24; i++){
+			for(let i = 0; i<24; i++){
 				_list.push(`${i<10?'0'+i:i}:00`)
 			}
 			return _list;
@@ -137,21 +127,6 @@ export default {
 		this.getStuInfo(options.order_no)
 	},
 	methods: {
-		getDate(type) {
-			const date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth() + 1;
-			let day = date.getDate();
-		
-			if (type === 'start') {
-				year = year - 60;
-			} else if (type === 'end') {
-				year = year + 2;
-			}
-			month = month > 9 ? month : '0' + month;
-			day = day > 9 ? day : '0' + day;
-			return `${year}-${month}-${day}`;
-		},
 		//日期
 		bindDateChange: function(e) {
 			let _selectDate = e.target.value
diff --git a/src/subpackage/course/pages/class_time_change/class_time_change.vue b/src/subpackage/course/pages/class_time_change/class_time_change.vue
index bb9d883..a91a4f1 100644
--- a/src/subpackage/course/pages/class_time_change/class_time_change.vue
+++ b/src/subpackage/course/pages/class_time_change/class_time_change.vue
@@ -9,7 +9,6 @@
 			<view class="cs-tit">第{{pageInfo.lesson_no|| 0}}节</view>
 			<view class="cs-line">
 				<view class="cl-txt"><text>*</text>上课日期</view>
-				<!-- :start="startDate" :end="endDate" -->
 				<picker class="cl-picker" mode="date" :value="pageInfo.period_date" @change="bindDateChange"  >
 					<view class="cl-box">
 						<view class="cb-txt">{{pageInfo.period_date}}</view>
@@ -50,15 +49,9 @@ import { mapState } from 'vuex';
 export default {
 	computed: {
 		...mapState([ 'brandInfo',]),
-		startDate() {
-			return this.getDate('start');
-		},
-		endDate() {
-			return this.getDate('end');
-		},
 		timeList(){
 			let _list = []
-			for(let i = 0; i<=24; i++){
+			for(let i = 0; i<24; i++){
 				_list.push(`${i<10?'0'+i:i}:00`)
 			}
 			return _list;
@@ -78,21 +71,6 @@ export default {
 		this.pageInfo = _query
 	},
 	methods: {
-		getDate(type) {
-			const date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth() + 1;
-			let day = date.getDate();
-		
-			if (type === 'start') {
-				year = year - 60;
-			} else if (type === 'end') {
-				year = year + 2;
-			}
-			month = month > 9 ? month : '0' + month;
-			day = day > 9 ? day : '0' + day;
-			return `${year}-${month}-${day}`;
-		},
 		//日期
 		bindDateChange: function(e) {
 			let _selectDate = e.target.value

From 9f3fe2dbf8cb416f19c0df004c44436bb7481e88 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 26 Oct 2021 18:01:19 +0800
Subject: [PATCH 08/11] fix order

---
 src/components/order_list/device/device.vue        |   4 +--
 src/components/order_list/mall/mall.vue            |  10 +++++-
 src/pages/order_list/order_list.vue                |  40 ++++++++++++++++-----
 src/static/images/order_null.png                   | Bin 0 -> 8736 bytes
 .../order/pages/devices/detail/detail.vue          |   4 +--
 src/subpackage/order/pages/mall/detail/detail.vue  |   6 +++-
 .../pages/mall/refund_operate/refund_operate.vue   |  23 +++++++-----
 .../order/pages/mall/send_out/send_out.vue         |  12 +++----
 8 files changed, 70 insertions(+), 29 deletions(-)
 create mode 100644 src/static/images/order_null.png

diff --git a/src/components/order_list/device/device.vue b/src/components/order_list/device/device.vue
index 07073b8..91ff181 100644
--- a/src/components/order_list/device/device.vue
+++ b/src/components/order_list/device/device.vue
@@ -1,10 +1,10 @@
 <template>
  <!-- 售货柜/浴室/咖啡/储物柜订单 -->
     <view class="device-container" @click="toInfo">
-        <a-header :source="orderInfo.source" :status="status_txt(orderInfo.pay_status)">
+        <a-header :source="orderInfo.stadium_name" :status="status_txt(orderInfo.pay_status)">
             <view slot="line" class="dc-line">
                 <image class="dl-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
-                <view class="dl-view">{{ orderInfo.extension.hardware_name || '-' }}</view>
+                <view class="dl-view">{{ orderInfo.hardware_name || '-' }}</view>
             </view> 
         </a-header>
         <view class="dc-info">
diff --git a/src/components/order_list/mall/mall.vue b/src/components/order_list/mall/mall.vue
index 59f0c93..58bebb9 100644
--- a/src/components/order_list/mall/mall.vue
+++ b/src/components/order_list/mall/mall.vue
@@ -23,15 +23,23 @@
         <view class="mo-total"><text class="mt-txt">商品金额合计：</text>¥{{ orderInfo.pay_amount || 0 }}</view>
         <view class="mo-bot">
             <view class="mb-express">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
-            <view class="mb-btn" @click.stop="toSendOut">发货</view>
+            <view class="mb-btn" v-if="orderInfo.status == 1" @click.stop="toSendOut">发货</view>
         </view>
     </view>
 </template>
 
 <script>
+// 订单状态，0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6
 import util from '../../../utils/util';
 export default {
+    computed: {
+        isShowSendMethods(){
+            let { orderInfo } = this;
+            return orderInfo.status == 2 || orderInfo.status == 3 || orderInfo.status == 5 || orderInfo.status == 6
+        },         
+    },
     props: {
+        
         orderInfo: {
             default: {
                 extension: {}
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index cc6bf85..33323b1 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -45,7 +45,7 @@
               </view>
           </view>
       </view>
-      <view class="ol-order-list">
+      <view class="ol-order-list" v-if="orderList&&orderList.length">
             <view class="ool-item" v-for="(e,i) in orderList" :key="i" >
                 <reservation-order :order-info="e" v-if="orderType == 3"></reservation-order>
                 <membership-order :order-info="e" v-if="orderType == 4"></membership-order>
@@ -71,6 +71,10 @@
             </view> -->
             
       </view>
+      <view class="ol-order-null" v-else>
+          <image mode="aspectFit" src="/static/images/order_null.png"></image>
+          <view>暂无内容</view>
+      </view>
       <!-- 分类tab -->
       <view class="ox-dark-mask" v-if="isShowClassify" @click="hideClassify">
           <view class="ol-classify" @click.stop="()=>false">
@@ -161,12 +165,14 @@
             isStoreInfo(){
                 let { orderType } = this;
                 return (
-                    orderType == 3 || orderType == 4 || 
-                    orderType == 1 || orderType == 10 ||
+                    orderType == 3  || orderType == 4  || 
+                    orderType == 1  || orderType == 10 ||
                     orderType == 18 || orderType == 12 ||
                     orderType == 18 || orderType == 12 ||
                     orderType == 15 || orderType == 16 ||
-                    orderType == 8
+                    orderType == 8  || orderType == 7  ||
+                    orderType == 11 || orderType == 6  || 
+                    orderType == 9
                 )
             },
             // 分类列表
@@ -426,9 +432,10 @@
 
                 let { brandInfo, curTabID, periodInfo, orderType, curSelectedStore, appointOrderType, selectedOrderType } = this;
                 let _curSelectedStore = curSelectedStore || {};
+                let _startTime = periodInfo.start ? periodInfo.start + ' ' + '00:00:00' : '', _endTime = periodInfo.end ? periodInfo.end + ' ' + '23:59:59' : ''; // 20211026 后端接口需要整形
                 let _obj = {
-                    begin: periodInfo.start || '',
-                    end: periodInfo.end || '',
+                    begin: _startTime,
+                    end: _endTime,
                     status: curTabID, 
                     brand_id: brandInfo.brand.id,
                     stadium_id: _curSelectedStore.id || ''
@@ -444,8 +451,8 @@
                 // 助手约玩订单修改, 按后端荣升0430重写接口重新定制字段.后续后端家兴0507重新接手该接口的修改(涉及约玩订单列表及订单详情)
                 if(orderType == "10"){ 
 					_obj['type'] = selectedOrderType;
-					_obj['filter_start_time'] = periodInfo.start;
-					_obj['filter_end_time'] = periodInfo.end;
+					_obj['filter_start_time'] = _startTime;
+					_obj['filter_end_time'] = _endTime;
 					_obj['pay_status'] = curTabID;
 				};
 
@@ -665,6 +672,23 @@
             margin-bottom: 24upx;
         }
     }
+    .ol-order-null{
+        padding-top: 114upx;
+        >image{
+            margin: 0 auto 70upx;
+            display: block;
+            width: 380upx;
+            height: 380upx;
+        }
+        >view{
+            text-align: center;
+            line-height: 44upx;
+            font-size: 32upx;
+            color: #9A9A9D;
+
+        }        
+
+    }
     .ol-classify{
         position: absolute;
         right: 0;
diff --git a/src/static/images/order_null.png b/src/static/images/order_null.png
new file mode 100644
index 0000000000000000000000000000000000000000..51835332f4c5b64fc75fe8816190f4e4e2203988
GIT binary patch
literal 8736
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
H|BL!Rgr_n;

literal 0
HcmV?d00001

diff --git a/src/subpackage/order/pages/devices/detail/detail.vue b/src/subpackage/order/pages/devices/detail/detail.vue
index a31d26a..79003b9 100644
--- a/src/subpackage/order/pages/devices/detail/detail.vue
+++ b/src/subpackage/order/pages/devices/detail/detail.vue
@@ -4,8 +4,8 @@
         <o-header
             :logo='orderInfo.stadium_logo'
             :source='orderInfo.stadium_name'
-            :phone='orderInfo.phone'
-            :name='orderInfo.name'
+            :phone='orderInfo.mobile'
+            :name='orderInfo.nickname'
             :status='pay_txt(orderInfo.pay_status)'
         ></o-header>
         <view class="rent-info dcd-box">
diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue
index 2eb4869..fa67c1f 100644
--- a/src/subpackage/order/pages/mall/detail/detail.vue
+++ b/src/subpackage/order/pages/mall/detail/detail.vue
@@ -81,7 +81,7 @@
             <view class="ms-fixed-bar">
                 <view class="mfb-btns">
                     <!-- <view>查看退款</view> -->
-                    <view v-if="orderInfo.status == 1" class="red" @click="toRefund">主动退款</view>
+                    <view v-if="isRufundBtn" class="red" @click="toRefund">主动退款</view>
                     <view v-if="orderInfo.status == 1" class="green" @click="toSendOut">发货</view>
                 </view>
             </view>
@@ -98,6 +98,10 @@ import server from '../../../js/server';
 import util from '../../../../../utils/util';
 export default {
     computed: {
+        isRufundBtn(){
+            let { orderInfo } = this;
+            return (orderInfo.status!=6 || orderInfo.status != 7)
+        },
         order_custom(){
             let { orderInfo } = this;
             if(orderInfo&&orderInfo.product_order_custom)return (orderInfo.product_order_custom || {})
diff --git a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
index 3303e04..4f95bab 100644
--- a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
+++ b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
@@ -7,10 +7,13 @@
                 <view>{{ refundLs[0].product_name || '-' }}</view>
             </view>
             <view class="rgi-list" v-else>
-                <view class="rl-item" v-for="(e, i) in refundLs" :key="i">
-                    <image mode="aspectFill" :src="e.product_imgs"></image>
-                    <view>{{ e.product_name || '-' }}</view>
-                </view>
+                <block v-for="(e, i) in refundLs" :key="i">
+                    <view class="rl-item" v-if="i<=2">
+                        <image mode="aspectFill" :src="e.product_imgs"></image>
+                        <view>{{ e.product_name || '-' }}</view>
+                    </view>
+                </block>
+                
             </view>
             
             <view class="rgi-total">
@@ -19,8 +22,8 @@
             </view>
         </view>
         <view class="ro-box ro-refund-info">
-            <view class="rri-txt">最大可退金额 <text>￥{{ orderInfo.pay_amount || 0 }}</text>（含运费￥{{ orderInfo.product_logistics_price || 0 }}）</view>
-            <view class="rri-txt">可退积分：{{ orderInfo.deduction_integral || 0 }} 积分</view>
+            <view class="rri-txt">最大可退金额 <text>￥{{ orderInfo.extension.refundable_amount || 0 }}</text>（含运费￥{{ orderInfo.product_logistics_price || 0 }}）</view>
+            <view class="rri-txt">可退积分：{{ orderInfo.extension.refundable_integral || 0 }} 积分</view>
             <!-- 不支持部分退款 -->
             <!-- <view class="rri-line">
                 <view class="rl-name"><text>*</text>退款金额</view>
@@ -69,7 +72,9 @@ export default {
     },
     data(){
         return {
-            orderInfo: {},
+            orderInfo: {
+                extension: {}
+            },
             selectedLs: '',
             refundAmount: '',
             refundIntegral: '',
@@ -91,8 +96,8 @@ export default {
                         brand_id: orderInfo.brand_id,
                         order_no: orderInfo.order_no,
                         product_cart_id: orderInfo.product_order_goods.map(ele=>ele.product_cart_id).join(','),
-                        integral: orderInfo.integral,
-                        amount: orderInfo.amount,
+                        integral: orderInfo.extension.refundable_integral || 0,
+                        amount: orderInfo.extension.refundable_amount || 0,
                     })
                 }
             })
diff --git a/src/subpackage/order/pages/mall/send_out/send_out.vue b/src/subpackage/order/pages/mall/send_out/send_out.vue
index 5c45aaa..df81259 100644
--- a/src/subpackage/order/pages/mall/send_out/send_out.vue
+++ b/src/subpackage/order/pages/mall/send_out/send_out.vue
@@ -42,7 +42,7 @@
                         <view class="og-list">
                             <view class="ol-item" v-for="(e, i) in waitdeliverLs" :key="i" @click="goodsItemClick(e)">
                                 <view class="oi-select">
-                                    <image v-if="selectedSendOutIds.includes(e.product_id)" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
+                                    <image v-if="selectedSendOutIds.includes(e.product_cart_id)" mode="aspectFit" src="/subpackage/order/static/images/selected.png"></image>
                                 </view>
                                 <image mode="aspecfFill" :src="e.product_imgs"></image>
                                 <view class="oi-info">
@@ -177,14 +177,14 @@ export default {
         // 选中发货 id列表
         selectedSendOutIds(){
             let { selectedSendOutLs } = this;
-            return selectedSendOutLs.map(e=>e.product_id);
+            return selectedSendOutLs.map(e=>e.product_cart_id);
         },  
         // 待发货列表全选
         isSelectedAllSendOut(){
             let { selectedSendOutIds, waitdeliverLs } = this;
             let _unLs = []; // 未被选中列表
             if(!waitdeliverLs.length)return false;
-            _unLs = waitdeliverLs.filter(ele => !selectedSendOutIds.includes(ele.product_id));
+            _unLs = waitdeliverLs.filter(ele => !selectedSendOutIds.includes(ele.product_cart_id));
             return _unLs.length == 0;
         }
     },
@@ -230,10 +230,10 @@ export default {
             this.getInfo(order_no);
         },
         confirmSendOutBtn: util.debounce(function(){
-            let { order_no, selectedSendOutLs, selectedWarehouse, sendOutMethod, curlogisticsName, logisticsOrderNum, sendOutRemark } = this;
+            let { order_no,  selectedSendOutLs, selectedSendOutIds, selectedWarehouse, sendOutMethod, curlogisticsName, logisticsOrderNum, sendOutRemark } = this;
             let _query = {
                 order_no,
-                ids: selectedSendOutLs.map(ele=>ele.product_cart_id),
+                ids: selectedSendOutIds,
                 esh_type: selectedWarehouse.erp_type,
                 esh_id: selectedWarehouse.erp_id,
                 logistics_type: sendOutMethod,
@@ -285,7 +285,7 @@ export default {
         },
         goodsItemClick(e){
             let { selectedSendOutIds, selectedSendOutLs } = this;
-            if(selectedSendOutIds.includes(e.product_id))return this.selectedSendOutLs = selectedSendOutLs.filter(ele=>ele.product_id !=e.product_id);
+            if(selectedSendOutIds.includes(e.product_cart_id))return this.selectedSendOutLs = selectedSendOutLs.filter(ele=>ele.product_cart_id !=e.product_cart_id);
             this.selectedSendOutLs = [ ...selectedSendOutLs, e];
         },
         tabChange(idx){

From bd75573fea9a98ec3eb17ca72b2e0feb915b01d3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 27 Oct 2021 16:44:43 +0800
Subject: [PATCH 09/11] fix order

---
 .../order_list/club_rental/club_rental.vue         | 11 +++++---
 src/components/order_list/device/device.vue        |  2 +-
 src/components/order_list/locker/locker.vue        |  4 +--
 .../spectacular_monent/spectacular_monent.vue      |  2 +-
 src/pages/order_list/order_list.vue                | 33 +++++++++++++---------
 src/pages/order_search/order_search.vue            | 25 +++++++++-------
 src/subpackage/order/js/api.js                     |  2 +-
 .../order/pages/club_rental/detail/detail.vue      | 12 +++++++-
 .../order/pages/devices/detail/detail.vue          |  6 ++--
 .../pages/mall/refund_operate/refund_operate.vue   |  2 +-
 .../order/pages/rent_and_sale/detail/detail.vue    |  6 ++--
 .../pages/spectacular_monent/detail/detail.vue     |  2 +-
 12 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/src/components/order_list/club_rental/club_rental.vue b/src/components/order_list/club_rental/club_rental.vue
index c2ece31..a5565d2 100644
--- a/src/components/order_list/club_rental/club_rental.vue
+++ b/src/components/order_list/club_rental/club_rental.vue
@@ -1,6 +1,7 @@
 <template>
+    <!-- 租球机 -->
     <view class="club-rental-container" @click="toInfo">
-        <a-header :source="orderInfo.source || '-'" :status="getStatusTxt(orderInfo.pay_status)">
+        <a-header :source="orderInfo.source || '-'" :status="orderInfo.extension.status_text || '-'">
             <view slot="line" class="crc-line">
                 <image class="cl-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
                 <view class="cl-view">{{ orderInfo.hardware_name || '-' }}</view>
@@ -47,7 +48,9 @@ export default {
     },
     props: {
         orderInfo: {
-            default: {},
+            default: {
+                extension: {}
+            },
             type: Object
         }
     },
@@ -58,9 +61,9 @@ export default {
             let { orderInfo } = this;
             util.routeTo(`/subpackage/order/pages/club_rental/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
         },
-        getStatusTxt(status = 0){
+        getStatusTxt(status = -1){
             let _obj = {
-                1: '寄存中',
+                0: '租用中',
                 2: '已完成',
                 4: '已退款',
             }
diff --git a/src/components/order_list/device/device.vue b/src/components/order_list/device/device.vue
index 91ff181..dae5b1a 100644
--- a/src/components/order_list/device/device.vue
+++ b/src/components/order_list/device/device.vue
@@ -1,5 +1,5 @@
 <template>
- <!-- 售货柜/浴室/咖啡/储物柜订单 -->
+ <!-- 售货柜/浴室/咖啡/ -->
     <view class="device-container" @click="toInfo">
         <a-header :source="orderInfo.stadium_name" :status="status_txt(orderInfo.pay_status)">
             <view slot="line" class="dc-line">
diff --git a/src/components/order_list/locker/locker.vue b/src/components/order_list/locker/locker.vue
index 78adfeb..2a2ed37 100644
--- a/src/components/order_list/locker/locker.vue
+++ b/src/components/order_list/locker/locker.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="locker-container" @click="toInfo">
-        <a-header :source="orderInfo.source" :status="status_txt(orderInfo.pay_status)">
+        <a-header :source="orderInfo.stadium_name" :status="status_txt(orderInfo.pay_status)">
             <view slot="line" class="lc-line">
                 <image class="ll-img" mode="aspectFit" src="/static/images/icon/location.png"></image>
-                <view class="ll-view">{{ orderInfo.extension.hardware_name || '-' }}</view>
+                <view class="ll-view">{{ orderInfo.hardware_name || '-' }}</view>
             </view> 
         </a-header>
         <view class="lc-info">
diff --git a/src/components/order_list/spectacular_monent/spectacular_monent.vue b/src/components/order_list/spectacular_monent/spectacular_monent.vue
index 27699ca..cd6498a 100644
--- a/src/components/order_list/spectacular_monent/spectacular_monent.vue
+++ b/src/components/order_list/spectacular_monent/spectacular_monent.vue
@@ -11,7 +11,7 @@
             <a-line :value="orderInfo.price_type_text || '-'">
                 <block slot="name">类型：</block> 
             </a-line>
-            <block v-if="orderInfo.order_type == 0">
+            <block v-if="orderInfo.order_type == 0 || orderInfo.order_type == 2">
                 <a-line :value="orderInfo.venue_name || '-'">
                     <block slot="name">场地：</block> 
                 </a-line>
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 33323b1..cbdf843 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -99,7 +99,7 @@
                   <view class="op-time">
                       <text>开始时间</text>
                       <view>
-                          <input placeholder="选择时间" disabled :value="tempTimer.start" />
+                          <input placeholder="选择时间" disabled :value="tempTimer.start || periodInfo.start" />
                           <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
                       </view>
                   </view>
@@ -108,7 +108,7 @@
                   <view class="op-time">
                       <text>截止时间</text>
                       <view>
-                          <input placeholder="选择时间" disabled :value="tempTimer.end" />
+                          <input placeholder="选择时间" disabled :value="tempTimer.end || periodInfo.end" />
                           <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
                       </view>
                   </view>
@@ -310,8 +310,8 @@
                 let _obj = { start: '', end: '' };
 
                 if(type == 3 ){
-                    _obj['start']=util.formatDate({});
-                    _obj['end'] = util.formatDate({date: _afterSeven});
+                    _obj['start']=util.formatDate({date: _beforeSeven});
+                    _obj['end'] = util.formatDate({});
                 }
 
                 if(type == 4 || type == 1){
@@ -344,13 +344,20 @@
             },
             confirmPeriod(){
                 let { start, end } = this.tempTimer;
+                let { tempTimer, periodInfo } = this;
+                let _start = tempTimer.start || periodInfo.start || '';
+                let _end = tempTimer.end || periodInfo.end || '';
+                this.periodInfo = { 
+                    start: _start,
+                    end: _end,
+                 };
 
                 if(
-                    !start || !end || 
-                    new Date(start.replace(/\-/g,'/')).getTime()>=new Date(end.replace(/\-/g,'/')).getTime()
+                    // !start || !end || 
+                    new Date(start.replace(/\-/g,'/')).getTime()> new Date(end.replace(/\-/g,'/')).getTime()
                 )return util.showNone('请选择合理时间！');
 
-                this.periodInfo = { ...this.tempTimer };
+                
                 this.hidePeriodModal();
                 this.$nextTick(this.refreshList);
             },
@@ -563,14 +570,14 @@
             case 11:  // 浴室 筛选 status  ：  全部 1,4    交易成功 1  退款完成 4
             case 9:  // 咖啡机 筛选 status  ：  全部 1,4    交易成功 1  退款完成 4
                 return [ {id: '1,4', name: '全部'}, {id: 1, name: '交易成功'}, {id: 4, name: '退款完成 '}];
-            case 7:  // 储物柜 筛选  status ：  全部 1,2,4    寄存中 1  已完成 2   退款完成 4
-                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成 '}];
+            case 7:  // 储物柜 筛选  status ：  全部 1,2,4    寄存中 1  已完成 2   退款完成 4   
+                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成'}];
             case 14:  // 赛事订单列表 订单状态  全部1,2,4   1=进行中   4=已退款     2=已完成 
-                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款 '}];
-            case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6
-                return [ {id: '1,2,3,6', name: '全部'}, {id: 0, name: '待支付'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '已完成 '}, {id: 4, name: '已关闭 '}, {id: 5, name: '退款中 '}, {id: 6, name: '已退款 '}];
+                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}];
+            case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6  // 测试： 不显示全部分组
+                return [ {id: '0,1,2,3,4,5,6', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}];
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
-                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成 '}, {id: 4, name: '已退款 '},{id: 5, name: '已购买 '}];
+                return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
             default:  
                 return []
         }
diff --git a/src/pages/order_search/order_search.vue b/src/pages/order_search/order_search.vue
index 274ca4b..348a502 100644
--- a/src/pages/order_search/order_search.vue
+++ b/src/pages/order_search/order_search.vue
@@ -156,18 +156,20 @@ export default {
         }){
             let { brandInfo } = this;
             util.showLoad();
+            let _data = {
+                key,
+                begin: '',
+                end: '',
+                status: '',
+                brand_id: brandInfo.brand.id,
+                stadium_id: '',
+                page,
+                page_size,
+            }
+            if(orderType in deviceTypeObj())_data['type'] = deviceTypeObj()[orderType];
             servers.get({
                 url: this.getApiUrl(orderType),
-                data: {
-                    key,
-                    begin: '',
-                    end: '',
-                    status: '',
-                    brand_id: brandInfo.brand.id,
-                    stadium_id: '',
-                    page,
-                    page_size,
-                },
+                data: _data,
                 failMsg: '加载失败！'
             })
             .then(res=>{
@@ -184,6 +186,9 @@ export default {
             })
             .catch(util.hideLoad)
         },
+        getReqQuery(){
+
+        }
     }
 }
 
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index 1f67d9c..6665d7c 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -9,7 +9,7 @@ export const ORDER_API = {
 	userValueCardRecharge:`${ORIGIN}/admin/userValueCard/recharge`,  // 用户储值卡-充值_copy
 	momentOrderInfo:`${ORIGIN}/admin/perfect/moment/order/get`,  // 后台-高光时刻订单详情_copy
 	hardwareOrderInfo:`${ORIGIN}/admin/assistant/hardware/order/get`,  // 硬件管理-订单详情_copy
-	rentballRefundDeposit:`${ORIGIN}/admin/stadium/rentball/order/refundDeposit`,  // 退押金-后台
+	rentballRefundDeposit:`${ORIGIN}/admin/assistant/rentball/refundDeposit`,  // 退押金-后台
 	hardwareOrderGet:`${ORIGIN}/admin/assistant/hardware/order/get`,  // 硬件订单详情 储物柜/售货柜/水阀/咖啡机/租售柜
 	lockEndBill:`${ORIGIN}/admin/stadium/locker/endBill`,  // 储物柜-结束计费
 	currentUser:`${ORIGIN}/admin/assistant/currentUser`,  // 获取当前用户信息
diff --git a/src/subpackage/order/pages/club_rental/detail/detail.vue b/src/subpackage/order/pages/club_rental/detail/detail.vue
index 264c0d7..413ce8f 100644
--- a/src/subpackage/order/pages/club_rental/detail/detail.vue
+++ b/src/subpackage/order/pages/club_rental/detail/detail.vue
@@ -196,6 +196,16 @@ export default {
             })
         },
         depositRefundBtn: util.debounce(function(){
+            util.showModal({
+                title: '提示',
+                content: '是否确认退回押金',
+                success: mRes=>{
+                    if(mRes.confirm)this.refundReq();
+                }
+            })
+            
+        }, 300, true),
+        refundReq(){
             util.showLoad();
             let { orderInfo } = this;
             server.post({
@@ -215,7 +225,7 @@ export default {
                 }   
             })
             .catch(util.hideLoad)
-        }, 300, true)
+        }
     },
 }
 </script>
diff --git a/src/subpackage/order/pages/devices/detail/detail.vue b/src/subpackage/order/pages/devices/detail/detail.vue
index 79003b9..813a72b 100644
--- a/src/subpackage/order/pages/devices/detail/detail.vue
+++ b/src/subpackage/order/pages/devices/detail/detail.vue
@@ -27,9 +27,9 @@
             </a-line>
             <view class="ri-line"></view>
             <view class="ri-price">
-                <s-line :keyname="'积分抵扣'" :value="orderInfo.deduction_amount || '0'"></s-line>
-                <s-line :keyname="'折扣金额'" :value="orderInfo.discount_amount || '0'"></s-line>
-                <s-line :keyname="'优惠券优惠'" :value="orderInfo.coupons_amount || '0'"></s-line>
+                <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.deduction_amount || '0')"></s-line>
+                <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.discount_amount || '0')"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
                 <view class="rp-total"><text>合计支付：</text>￥{{orderInfo.pay_amount || '0'}}</view>
             </view>
         </view>
diff --git a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
index 4f95bab..3b34291 100644
--- a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
+++ b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
@@ -125,7 +125,7 @@ export default {
                 util.hideLoad();
                 if(res.data.code == 0){
                     util.showNone(res.data.message || '操作成功！');
-                    setInterval(util.routeTo, 1200);
+                    setTimeout(util.routeTo, 1200);
                 }else{
                     util.showNone(res.data.message || '操作失败！');
                 }
diff --git a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
index 9e7da77..2d85e03 100644
--- a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
+++ b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
@@ -42,9 +42,9 @@
                     <block slot="name">产生费用：</block> 
                 </a-line>
                 <block v-if="orderInfo.pay_status == 2">
-                    <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.deduction_amount || '0')"></s-line>
-                    <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.discount_amount || '0')"></s-line>
-                    <s-line :keyname="'优惠券优惠'" :value="'￥'+ (orderInfo.coupons_amount || '0')"></s-line>
+                    <s-line :keyname="'积分抵扣'" :value="'-￥' + (orderInfo.deduction_amount || '0')"></s-line>
+                    <s-line :keyname="'折扣金额'" :value="'-￥' + (orderInfo.discount_amount || '0')"></s-line>
+                    <s-line :keyname="'优惠券优惠'" :value="'-￥'+ (orderInfo.coupons_amount || '0')"></s-line>
                     <view class="rpi-total"><text>合计支付：</text>￥{{ orderInfo.rent_amount || '0' }}</view>
                     <view class="ras-border"></view>
                     <view class="rpi-refund-info">
diff --git a/src/subpackage/order/pages/spectacular_monent/detail/detail.vue b/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
index 031f41d..fc205bf 100644
--- a/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
+++ b/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
@@ -18,7 +18,7 @@
             <a-line :value="orderInfo.price_type_text || '-'">
                 <block slot="name">产品名称：</block> 
             </a-line>
-            <block v-if="orderInfo.order_type == 0">
+            <block v-if="orderInfo.order_type == 0 || orderInfo.order_type == 2">
                 <a-line :value="orderInfo.venue_name || '-'">
                     <block slot="name">场地：</block> 
                 </a-line>

From 1ab6c98e9cb4b7e5de9d2b5da7c93242a91ae419 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Thu, 28 Oct 2021 15:07:11 +0800
Subject: [PATCH 10/11] fix order bug

---
 src/pages/order_list/order_list.vue                                    | 2 +-
 .../device/components/order/organize_detail/organize_detail.vue        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index cbdf843..aa31185 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -575,7 +575,7 @@
             case 14:  // 赛事订单列表 订单状态  全部1,2,4   1=进行中   4=已退款     2=已完成 
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}];
             case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6  // 测试： 不显示全部分组
-                return [ {id: '0,1,2,3,4,5,6', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}];
+                return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}];
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
             default:  
diff --git a/src/subpackage/device/components/order/organize_detail/organize_detail.vue b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
index 3f603a8..b67e180 100644
--- a/src/subpackage/device/components/order/organize_detail/organize_detail.vue
+++ b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
@@ -34,7 +34,8 @@
 			<view class="tb-title">约玩信息</view>
 			<view class="tb-line">
 				<view>约玩主题：<text>{{ orderInfo.theme || '-' }}</text></view>
-				<block v-if="orderInfo.type == 'Main'">
+				<!-- 20211028 测试： 参与也要显示订场信息 -->
+				<block v-if="orderInfo.type == 'Main' || orderInfo.type == 'Sub'"> 
 					<view class="yw-place-box" v-if="orderInfo.original_order&&orderInfo.original_order.sessions">
 						<view class="yw-title">预定场地：</view>
 						<view class="yw-place">

From 53301714d1bf9bab6c5e67989c1ee010765bc739 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 29 Oct 2021 15:15:56 +0800
Subject: [PATCH 11/11] fix order bug

---
 src/components/order_list/mall/mall.vue                      | 12 ++++++++++--
 src/components/organize_order/organize_order.vue             |  4 ++--
 src/pages/order_list/order_list.vue                          |  2 +-
 .../components/order/organize_detail/organize_detail.vue     |  3 +--
 src/subpackage/order/pages/mall/detail/detail.vue            |  4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/order_list/mall/mall.vue b/src/components/order_list/mall/mall.vue
index 58bebb9..63ac4c5 100644
--- a/src/components/order_list/mall/mall.vue
+++ b/src/components/order_list/mall/mall.vue
@@ -4,6 +4,7 @@
             <view class="mn-view">订单号：{{ orderInfo.order_no || '-' }}</view>
             <view class="mn-view">{{ orderInfo.status_text || '-' }}</view>
         </view>
+        <view class="mo-after-sale-tip" v-if="orderInfo.after_sale_status == 1">{{ orderInfo.after_sale_status_text || '-' }}</view>
         <view class="mo-goods-ls">
             <view class="rgi-single" v-if="orderInfo.goods_nums == 1">
                 <image class="rs-img"  mode="aspectFill"  :src="orderInfo.goods[0].product_imgs"></image>
@@ -22,8 +23,8 @@
         </view>
         <view class="mo-total"><text class="mt-txt">商品金额合计：</text>¥{{ orderInfo.pay_amount || 0 }}</view>
         <view class="mo-bot">
-            <view class="mb-express">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
-            <view class="mb-btn" v-if="orderInfo.status == 1" @click.stop="toSendOut">发货</view>
+            <view class="mb-express" v-if="orderInfo.status == 2">配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}</view>
+            <view class="mb-btn" v-if="orderInfo.status == 1&&orderInfo.after_sale_status == 0" @click.stop="toSendOut">发货</view>
         </view>
     </view>
 </template>
@@ -87,6 +88,13 @@ export default {
             }
         }
     }
+    .mo-after-sale-tip{
+        margin-bottom: 12upx;
+        text-align: right;
+        font-size: 24upx;
+        line-height: 30upx;
+        color: #EA5061;
+    }
     .mo-goods-ls{
         margin-bottom: 30upx;
         @include centerFlex(space-between);
diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue
index b57dfd6..74dda8a 100644
--- a/src/components/organize_order/organize_order.vue
+++ b/src/components/organize_order/organize_order.vue
@@ -30,12 +30,12 @@
 			         <view class="rv-view">{{orderInfo.label.Date+" "+ orderInfo.label.StartTime+" "+orderInfo.label.EndTime || '-'}}</view>
 			    </view>
 			</view>
-			<view class="rs-line" v-if="orderInfo.status=='End'">
+			<!-- <view class="rs-line" v-if="orderInfo.status=='End'">
 			    <view class="rl-view">未发放：</view>
 			    <view class="rl-view">
 			         <view class="rv-view">{{orderInfo.un_amount_already_amount || '-'}}</view>
 			    </view>
-			</view>
+			</view> -->
 
 		</view>
 		<view class="ro-bot" v-if="orderInfo.original_order&&orderInfo.original_order.pay_status != 0">
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index aa31185..4f20478 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -575,7 +575,7 @@
             case 14:  // 赛事订单列表 订单状态  全部1,2,4   1=进行中   4=已退款     2=已完成 
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}];
             case 2:  // 商城订单  0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款  商家助手全部1,2,3,6  // 测试： 不显示全部分组
-                return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}];
+                return [ {id: 'assistant_all', name: '全部'},  {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 'after_sale', name: '申请售后中'}, {id: 6, name: '退款完成'}];
             case 8:  // 租售柜 筛选的 status   全部 1,2,4    租用中 1   已完成 2    已退款4    已购买5
                 return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}];
             default:  
diff --git a/src/subpackage/device/components/order/organize_detail/organize_detail.vue b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
index b67e180..d6aea86 100644
--- a/src/subpackage/device/components/order/organize_detail/organize_detail.vue
+++ b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
@@ -44,8 +44,8 @@
 							</view>
 						</view>
 					</view>
-					<view>订场费用：<text>￥{{ orderInfo.original_order.pay_amount || 0 }}</text></view>
 				</block>
+				<view v-if="orderInfo.type == 'Main'">订场费用：<text>￥{{ orderInfo.original_order.pay_amount || 0 }}</text></view>
 				
 				<view v-if="orderInfo.type == 'Sub'">报名费用：<text>￥{{orderInfo.price_per_person || 0}}</text></view>
 			</view>
@@ -268,7 +268,6 @@ export default {
 				flex-shrink: 0;
 				width: 40rpx;
 				height: 40rpx;
-				background-color: skyblue;
 				
 			}
 			>view{
diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue
index fa67c1f..ad7aeff 100644
--- a/src/subpackage/order/pages/mall/detail/detail.vue
+++ b/src/subpackage/order/pages/mall/detail/detail.vue
@@ -82,7 +82,7 @@
                 <view class="mfb-btns">
                     <!-- <view>查看退款</view> -->
                     <view v-if="isRufundBtn" class="red" @click="toRefund">主动退款</view>
-                    <view v-if="orderInfo.status == 1" class="green" @click="toSendOut">发货</view>
+                    <view v-if="orderInfo.status == 1&&orderInfo.after_sale_status == 0" class="green" @click="toSendOut">发货</view>
                 </view>
             </view>
         </view>
@@ -100,7 +100,7 @@ export default {
     computed: {
         isRufundBtn(){
             let { orderInfo } = this;
-            return (orderInfo.status!=6 || orderInfo.status != 7)
+            return (orderInfo.status!=6 || orderInfo.status != 7) && orderInfo.after_sale_status == 0
         },
         order_custom(){
             let { orderInfo } = this;