Merge branch 'master' of http://git.cc-lotus.info/ball-court/ball-applet

pages/schAdmin/coach/list.wxml

@@ -26,7 +26,7 @@
                         </view>
                         <view class="btn">
                             <button bindtap="toEdit" data-item="{{item}}">信息维护</button>
-                            <button bindtap="toBind" data-item="{{item}}" wx:if="{{item.user_id==null}}">绑定账号</button>
+                            <button bindtap="toBind" data-item="{{item}}" wx:if="{{item.coach_id_user_id==null}}">绑定账号</button>
                             <button bindtap="toDel" data-item="{{item}}">删除信息</button>
                         </view>
                     </view>

pages/schAdmin/course/add.js

@@ -81,9 +81,9 @@ Page({
         const params = e.detail.value;
         const form = that.data.form;
         params.school_id = that.data.school_id;
-        params.time_start = form.start_date + '-' + form.start_time;
-        params.time_end = form.end_date + '-' + form.end_time;
-        params.refund_hour = form.refund_date + '-' + form.refund_time;
+        params.time_start = form.start_date + ' ' + form.start_time;
+        params.time_end = form.end_date + ' ' + form.end_time;
+        params.refund_hour = form.refund_date + ' ' + form.refund_time;
         if (!this.WxValidate.checkForm(params)) {
             const error = this.WxValidate.errorList[0];
             wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })

pages/schAdmin/course/info.js

@@ -1,66 +1,130 @@
-// pages/schAdmin/course/info.js
+const app = getApp()
+const moment = require("../../../utils/moment.min")
 Page({
-
-    /**
-     * 页面的初始数据
-     */
     data: {
-
+        frameStyle: { useTop: true, name: '详细信息', leftArrow: true, useBar: false },
+        id: '',
+        form: {},
+        user: {},
+        //是否试课
+        is_try: '0',
+        //状态
+        statusList: [],
+        //学员
+        student: {},
+        // 教练
+        coach: {},
+        // 选中
+        tabs: {
+            active: '0',
+            menu: [
+                { title: '课程信息', active: '0' },
+                { title: '教练人员', active: '1' },
+                { title: '学生人员', active: '2' },
+            ]
+        },
+    },
+    // 跳转菜单
+    back(e) {
+        wx.navigateBack({ delta: 1 })
+    },
+    // 选项卡选择
+    tabsChange: function (e) {
+        const that = this;
+        let data = e.detail;
+        that.setData({ 'tabs.active': data.active })
     },
-
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad(options) {
-
+    onLoad: async function (options) {
+        const that = this;
+        await that.setData({ id: options.id || null })
+        // 查询其他信息
+        await that.searchOther();
+        // 监听用户是否登录
+        await that.watchLogin();
+    },
+    searchOther: async function () {
+        const that = this;
+        let arr;
+        // 状态
+        arr = await app.$get(`/dict`, { code: 'lesson_status' });
+        if (arr.errcode == '0' && arr.total > 0) that.setData({ statusList: arr.data[0].list });
+    },
+    // 监听用户是否登录
+    watchLogin: async function () {
+        const that = this;
+        let statusList = that.data.statusList;
+        wx.getStorage({
+            key: 'user',
+            success: async res => {
+                that.setData({ user: res.data })
+                if (that.data.id) {
+                    const arr = await app.$get(`/lesson/${that.data.id}`);
+                    if (arr.errcode == '0') {
+                        // 课程状态
+                        let status = statusList.find(i => i.value == arr.data.status)
+                        if (status) arr.data.zhStatus = status.label;
+                        // 学校名称
+                        const school = await app.$get(`/school/${arr.data.school_id}`)
+                        if (school.errcode == '0') arr.data.zhSchool = school.data.name;
+                        // 课程信息
+                        that.setData({ form: arr.data })
+                        // 教练信息
+                        const coach = await app.$get(`/lessonCoach`, { lesson_id: that.data.id })
+                        if (coach.errcode == '0') that.setData({ coach: coach.data })
+                        // 学员信息
+                        const student = await app.$get(`/lessonStudent`, { lesson_id: that.data.id, is_pay: '1' })
+                        if (student.errcode == '0') that.setData({ student: student.data })
+                    }
+                    else { wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 }) }
+                }
+            },
+            fail: async res => {
+                wx.redirectTo({ url: '/pages/index/index' })
+            }
+        })
     },
-
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
-    onReady() {
-
-    },
-
+    onReady: function () { },
     /**
      * 生命周期函数--监听页面显示
      */
-    onShow() {
+    onShow: function () {
 
     },
 
+    /**
+     * 页面上拉触底事件的处理函数
+     */
     /**
      * 生命周期函数--监听页面隐藏
      */
-    onHide() {
+    onHide: function () {
 
     },
 
     /**
      * 生命周期函数--监听页面卸载
      */
-    onUnload() {
+    onUnload: function () {
 
     },
 
     /**
      * 页面相关事件处理函数--监听用户下拉动作
      */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
+    onPullDownRefresh: function () {
 
     },
 
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage() {
+    onShareAppMessage: function () {
 
     }
 })

pages/schAdmin/course/info.json

@@ -1,3 +1,7 @@
 {
-    "usingComponents": {}
-}
+    "component": true,
+    "usingComponents": {
+      "mobile-main": "/commpents/mobile-frame/index",
+      "s-tab": "/commpents/tabs/index"
+    }
+  }

pages/schAdmin/course/info.less

@@ -0,0 +1,123 @@
+.main {
+    height: var(--twoHeight);
+    background-color: var(--mainColor);
+
+    .one {
+        width: 100vw;
+        margin: 0 0 2vw 0;
+    }
+
+    .two {
+        position: relative;
+        flex-grow: 1;
+
+        .a {
+            height: 83vh;
+
+            .one {
+                width: 96vw;
+                padding: 0 2vw;
+
+                .one_1 {
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+                    border: 1px dashed var(--f85Color);
+                    border-radius: 5px;
+                    margin: 0 0 10px 0;
+                    padding: 10px;
+
+                    .text {
+                        color: var(--f85Color);
+                        font-size: var(--font16Size);
+                    }
+
+                    .text1 {
+                        font-size: var(--font16Size);
+                    }
+
+                    .image {
+                        width: 15vw;
+                        height: 15vw;
+                    }
+
+                    .name {
+                        display: flex;
+                        flex-direction: column;
+                    }
+
+                    button {
+                        font-size: var(--font14Size);
+                        margin: 0;
+                        background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+                    }
+                }
+
+                .btn {
+                    width: 92vw;
+                    text-align: center;
+                    margin: 2vw 0 0 0;
+
+                    button {
+                        font-size: var(--font14Size);
+                        background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+                    }
+                }
+            }
+        }
+
+        .b {
+            height: 83vh;
+
+            .list {
+                background-color: var(--f9Color);
+                margin: 0 0 2vw 0;
+                padding: 2vw;
+                margin: 0 2vw 2vw 2vw;
+                border-radius: 5px;
+                border: 1px dashed var(--f85Color);
+
+                .name {
+                    font-size: var(--font18Szie);
+                    font-weight: bold;
+                    margin: 0 0 1vw 0;
+                }
+
+                .other {
+                    margin: 0 0 1vw 0;
+
+                    .other_1 {
+                        margin: 0 0 1vw 0;
+                        font-size: var(--font16Size);
+
+                        text:first-child {
+                            color: var(--f85Color);
+                        }
+                    }
+                }
+
+                .btn {
+                    text-align: center;
+
+                    button {
+                        margin: 0 2vw;
+                        font-size: var(--font14Size);
+                    }
+                }
+            }
+        }
+    }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
+}

pages/schAdmin/course/info.wxml

@@ -1,2 +1,95 @@
-<!--pages/schAdmin/course/info.wxml-->
-<text>pages/schAdmin/course/info.wxml</text>
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="container main">
+        <view class="one">
+            <s-tab tabs="{{tabs}}" bind:tabsChange="tabsChange"></s-tab>
+        </view>
+        <view class="two">
+            <view wx:if="{{tabs.active=='0'}}" class="a">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        <form class="one" catchsubmit="onSubmit">
+                            <view class="one_1">
+                                <text class="text">课程标题：</text>
+                                <text class="text1">{{form.title||'暂无'}}</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">学校名称：</text>
+                                <text class="text1">{{form.zhSchool||'暂无'}}</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">人数上限：</text>
+                                <text class="text1">{{form.limit||'暂无'}}人</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">开始时间：</text>
+                                <text class="text1">{{form.time_start||'暂无'}}</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">结束时间：</text>
+                                <text class="text1">{{form.time_end||'暂无'}}</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">状态：</text>
+                                <text class="text1">{{form.zhStatus||'暂无'}}</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">课程费(元)：</text>
+                                <text class="text1">{{form.money||'暂无'}}</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">退款期限：</text>
+                                <text class="text1">{{form.refund_hour||'暂无'}}</text>
+                            </view>
+                            <view class="one_1">
+                                <text class="text">简介：</text>
+                                <text class="text1">{{form.brief||'暂无'}}</text>
+                            </view>
+                        </form>
+                    </view>
+                </scroll-view>
+            </view>
+            <view wx:elif="{{tabs.active=='1'}}" class="b">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        <view class="list" wx:for="{{coach}}" wx:key="index">
+                            <view class="name">{{item.coach_id_name||'暂无'}}</view>
+                            <view class="other">
+                                <view class="other_1">
+                                    <text>课程名称：</text>
+                                    <text>{{item.lesson_id_title||'暂无'}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>所属学校：</text>
+                                    <text>{{item.school_id_name||'暂无'}}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </scroll-view>
+            </view>
+            <view wx:elif="{{tabs.active=='2'}}" class="b">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        <view class="list" wx:for="{{student}}" wx:key="index">
+                            <view class="name">{{item.student_id_name||'暂无'}}</view>
+                            <view class="other">
+                                <view class="other_1">
+                                    <text>是否试课：</text>
+                                    <text>{{item.is_try=='0'?'非试课':item.is_try=='1'?'试课':'暂无'}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>缴费金额：</text>
+                                    <text>{{item.money||'0'}}元</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>所属学院：</text>
+                                    <text>{{item.school_id_name||'暂无'}}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </scroll-view>
+            </view>
+        </view>
+    </view>
+</mobile-main>

pages/schAdmin/course/info.wxss

@@ -1 +1,101 @@
-/* pages/schAdmin/course/info.wxss */
+.main {
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
+}
+.main .one {
+  width: 100vw;
+  margin: 0 0 2vw 0;
+}
+.main .two {
+  position: relative;
+  flex-grow: 1;
+}
+.main .two .a {
+  height: 83vh;
+}
+.main .two .a .one {
+  width: 96vw;
+  padding: 0 2vw;
+}
+.main .two .a .one .one_1 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border: 1px dashed var(--f85Color);
+  border-radius: 5px;
+  margin: 0 0 10px 0;
+  padding: 10px;
+}
+.main .two .a .one .one_1 .text {
+  color: var(--f85Color);
+  font-size: var(--font16Size);
+}
+.main .two .a .one .one_1 .text1 {
+  font-size: var(--font16Size);
+}
+.main .two .a .one .one_1 .image {
+  width: 15vw;
+  height: 15vw;
+}
+.main .two .a .one .one_1 .name {
+  display: flex;
+  flex-direction: column;
+}
+.main .two .a .one .one_1 button {
+  font-size: var(--font14Size);
+  margin: 0;
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+}
+.main .two .a .one .btn {
+  width: 92vw;
+  text-align: center;
+  margin: 2vw 0 0 0;
+}
+.main .two .a .one .btn button {
+  font-size: var(--font14Size);
+  background: -webkit-linear-gradient(right, lightblue, #53C9F8);
+}
+.main .two .b {
+  height: 83vh;
+}
+.main .two .b .list {
+  background-color: var(--f9Color);
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  margin: 0 2vw 2vw 2vw;
+  border-radius: 5px;
+  border: 1px dashed var(--f85Color);
+}
+.main .two .b .list .name {
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+}
+.main .two .b .list .other {
+  margin: 0 0 1vw 0;
+}
+.main .two .b .list .other .other_1 {
+  margin: 0 0 1vw 0;
+  font-size: var(--font16Size);
+}
+.main .two .b .list .other .other_1 text:first-child {
+  color: var(--f85Color);
+}
+.main .two .b .list .btn {
+  text-align: center;
+}
+.main .two .b .list .btn button {
+  margin: 0 2vw;
+  font-size: var(--font14Size);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}

pages/schAdmin/course/list.js

@@ -27,12 +27,20 @@ Page({
         that.setData({ skip: 0, page: 0, list: [] })
         wx.navigateTo({ url: `/pages/schAdmin/course/add?id=${item._id}` })
     },
+    // 教练
     toCoach: function (e) {
         const that = this;
         let { item } = e.currentTarget.dataset;
         that.setData({ skip: 0, page: 0, list: [] })
         wx.navigateTo({ url: `/pages/schAdmin/course/coachlist?id=${item._id}` })
     },
+    // 详情
+    toInfo: function (e) {
+        const that = this;
+        let { item } = e.currentTarget.dataset;
+        that.setData({ skip: 0, page: 0, list: [] })
+        wx.navigateTo({ url: `/pages/schAdmin/course/info?id=${item._id}` })
+    },
     // 删除
     toDel: async function (e) {
         const that = this;

pages/schAdmin/course/list.less

@@ -93,7 +93,7 @@
                 button {
                     width: 23vw;
                     margin: 0 1vw 1vw 1vw;
-                    padding: 2vw;
+                    padding: 1vw;
                     font-size: var(--font14Size);
                     color: var(--whiteColor);
                     border-radius: 50px;

pages/schAdmin/course/list.wxml

@@ -19,8 +19,6 @@
                                 <view class="other">课程状态：<text>{{item.zhstatus||'暂无'}}</text></view>
                                 <view class="other">开课时间：{{item.time_start||'暂无'}}
                                 </view>
-                                <view class="other">人数上限：{{item.limit||'暂无'}}
-                                </view>
                                 <view class="other">金额：<text>{{item.money||'0.00'}}</text>元
                                 </view>
                             </view>
@@ -28,7 +26,7 @@
                         <view class="btn">
                             <button bindtap="toEdit" size="mini" data-item="{{item}}">信息维护</button>
                             <button bindtap="toCoach" size="mini" data-item="{{item}}">教练管理</button>
-                            <button bindtap="toCoach" size="mini" data-item="{{item}}">详细信息</button>
+                            <button bindtap="toInfo" size="mini" data-item="{{item}}">详细信息</button>
                             <button bindtap="toDel" size="mini" data-item="{{item}}">删除信息</button>
                         </view>
                     </view>

pages/schAdmin/course/list.wxss

@@ -80,7 +80,7 @@
 .main .two .list .btn button {
   width: 23vw;
   margin: 0 1vw 1vw 1vw;
-  padding: 2vw;
+  padding: 1vw;
   font-size: var(--font14Size);
   color: var(--whiteColor);
   border-radius: 50px;

pages/schAdmin/student/list.wxml

@@ -27,7 +27,7 @@
                         </view>
                         <view class="btn">
                             <button bindtap="toEdit" data-item="{{item}}">信息维护</button>
-                            <button bindtap="toBind" data-item="{{item}}" wx:if="{{item.user_id==null}}">绑定账号</button>
+                            <button bindtap="toBind" data-item="{{item}}" wx:if="{{item.student_id_user_id==null}}">绑定账号</button>
                             <button bindtap="toDel" data-item="{{item}}">删除信息</button>
                         </view>
                     </view>