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

pagesSchool/common/lessoninfo.js

@@ -44,9 +44,6 @@ Page({
                         // 课程状态
                         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 })
                     }

pagesSchool/common/lessoninfo.less

@@ -19,31 +19,25 @@
             padding: 10px;
 
             .text {
+                width: 25vw;
                 color: var(--f85Color);
                 font-size: var(--font16Size);
             }
 
             .text1 {
+                width: 70vw;
+                text-align: right;
                 font-size: var(--font16Size);
             }
 
+            .textx {
+                color: var(--redColor);
+            }
+
             .name {
                 display: flex;
                 flex-direction: column;
             }
         }
     }
-}
-
-.scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-
-    .list-scroll-view {
-        display: flex;
-        flex-direction: column;
-    }
 }

pagesSchool/common/lessoninfo.wxml

@@ -1,46 +1,38 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
     <view slot="info" class="container main">
-        <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 class="one">
+            <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.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="textx">{{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>
+        </view>
     </view>
 </mobile-main>

pagesSchool/common/lessoninfo.wxss

@@ -18,24 +18,19 @@
   padding: 10px;
 }
 .main .one .one_1 .text {
+  width: 25vw;
   color: var(--f85Color);
   font-size: var(--font16Size);
 }
 .main .one .one_1 .text1 {
+  width: 70vw;
+  text-align: right;
   font-size: var(--font16Size);
 }
-.main .one .one_1 .name {
-  display: flex;
-  flex-direction: column;
+.main .one .one_1 .textx {
+  color: var(--redColor);
 }
-.scroll-view {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-.scroll-view .list-scroll-view {
+.main .one .one_1 .name {
   display: flex;
   flex-direction: column;
 }