diff --git a/.env.js b/.env.js index 1587ba8ee8702b9a074b825120e3b8b6006f112c..16a8c30e4417f172346cdff28890f8d753868a6d 100644 --- a/.env.js +++ b/.env.js @@ -1,4 +1,3 @@ -; (function () { let NODE_ENV = 'test'; // dev:å¼€å‘环境 | test:测试环境 | prod:生产环境 let ENV_VAR = null; diff --git a/src/pages/learn/section.vue b/src/pages/learn/section.vue index d41d03ddb9beb237bef4313e14395a3b9f09832e..bb395eeb4578c0d008039fd4779b9c7e07d4cbde 100644 --- a/src/pages/learn/section.vue +++ b/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 { diff --git a/src/pages/order/document.vue b/src/pages/order/document.vue index 0dedb9f490176081c09aa5ef19046e6cd02ecb17..3ca91c04294be2933c1d3f3a5c306ac7d1e6a177 100644 --- a/src/pages/order/document.vue +++ b/src/pages/order/document.vue @@ -144,6 +144,11 @@ }, // 分享 handleShare(item) { + // 分享资料事件 + getApp().track('share_document', { + id: self.vuex_user.id, + url: item.url + }); uni.showLoading({ title: 'åŠ è½½ä¸' }) @@ -164,6 +169,11 @@ }, // 查看 handlePreview(item) { + // 查看资料事件 + getApp().track('preview_document', { + id: self.vuex_user.id, + url: item.url + }); uni.showLoading({ title: 'åŠ è½½ä¸' })