Merge branch 'dev-video' into dev

.env.js

-;
 (function () {
 	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;

src/pages/learn/section.vue

@@ -33,17 +33,14 @@
                         </view>
                     </view>
                     <u-line color="#F4F5F7" margin="30rpx 0 0 0" />
-                    <view class="learn-view-title">目录</view>
-                    <view class="scroll_box">
-                        <scroll-view scroll-x @scroll="scroll" :scroll-left="scrollValue">
-                            <view class="item_list" :class="{'item_list_active': item.isActive}"
-                             v-for="(item, index) in sectionList" :key="index" @click="goNext(item)">
-                                    <view class="" style="font-size: 24rpx;">{{ item.title }}</view>
-                                    <view class="" style="font-size: 26rpx;margin-top: 16rpx;">
-                                        {{ item.intro }}
-                                    </view>
-                            </view>
-                        </scroll-view>
+                    <view class="learn-view-title u-margin-bottom-0">目录</view>
+                    <view class="scroll_box u-padding-bottom-50">
+                        <view class="item_list" :class="{'item_list_active': item.isActive,
+                         'u-margin-left-30':(index%2==1), 'is-learned': item.isLearned && !item.isActive}"
+                         v-for="(item, index) in sectionList" :key="index" @click="goNext(item)">
+                                <view class="item-title-1">{{ item.title }}</view>
+                                <view class="item-title-2">{{ item.intro }}</view>
+                        </view>
                     </view>
                 </view>
             </view>
@@ -399,7 +396,7 @@
         // margin-bottom: 20rpx;
         font-size: 32rpx;
         color: #333333;
-        height: 820rpx;
+        // height: 820rpx;
         padding: 0 30rpx;
 
         .learn-view-title {
@@ -478,30 +475,27 @@
             background-color: blue;
         }
     }
-
-    .scroll_box {
-        width: 100%;
-        height: 150rpx;
-        overflow: hidden;
-        background: #fff;
-        margin-top: 30rpx;
-        white-space: nowrap;
-    }
-
-    .scroll_box scroll-view {
-        height: 100%;
-        width: auto;
-        overflow: hidden;
-    }
-
+    
     .item_list {
-        width: 280rpx;
+        width: 330rpx;
         height: 150rpx;
-        margin-right: 23rpx;
         display: inline-block;
-        background-color: #F4F5F7;
         border-radius: 12rpx;
         padding: 20rpx;
+        margin-top: 30rpx;
+        border: 1px solid #999999;
+        color: #666666;
+        
+        .item-title-1 {
+            font-size: 24rpx;
+            color: #333333;
+        }
+        
+        .item-title-2 {
+            font-size: 26rpx;
+            margin-top: 16rpx;
+            color: #666666;
+        }
     }
     
     .item_list_active {
@@ -509,6 +503,31 @@
         color: #2272FF;
         border: 2rpx solid #2272FF;
         box-sizing: border-box;
+        
+        .item-title-1 {
+            font-size: 24rpx;
+            color: #2272FF;
+        }
+        
+        .item-title-2 {
+            font-size: 26rpx;
+            margin-top: 16rpx;
+            color: #2272FF;
+        }
+    }
+    
+    .is-learned {
+        border: 1px solid #EEEEEE;
+        .item-title-1 {
+            font-size: 24rpx;
+            color: #999999;
+        }
+        
+        .item-title-2 {
+            font-size: 26rpx;
+            margin-top: 16rpx;
+            color: #999999;
+        }
     }
     
     .teacher-intro {