Commit 7ce8d06d authored by 罗超's avatar 罗超

2

parent 73910377
...@@ -60,12 +60,16 @@ ...@@ -60,12 +60,16 @@
<view class="wordDuration" style="visibility: hidden;"> <view class="wordDuration" style="visibility: hidden;">
预计用时10分钟 预计用时10分钟
</view> </view>
<view style="text-align: center;font-size: 22rpx;color: #4C50E7;" v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)"> 暂无新词</view> <view style="text-align: center;font-size: 22rpx;color: #4C50E7;"
v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)">
暂无新词</view>
<view class="wordBtn" v-else <view class="wordBtn" v-else
@click="jumpPage(`/pages/word/word?CourseId=${pageData.Words.CourseId||0}&&ChapterId=${pageData.Words.NextCourseNo||0}&&ReviewChapterId=${pageData.Words.ReviewCourseNo||0}&&ClassId=${pageData.Words.ClassId||0}`)"> @click="jumpPage(`/pages/word/word?CourseId=${pageData.Words.CourseId||0}&&ChapterId=${pageData.Words.NextCourseNo||0}&&ReviewChapterId=${pageData.Words.ReviewCourseNo||0}&&ClassId=${pageData.Words.ClassId||0}`)">
开始学习 开始学习
</view> </view>
</view> </view>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/coffee/xbkbanner2.png"
mode="widthFix" class="starbucks" @click="jumpJiahemini"></image>
<view class="courseBox"> <view class="courseBox">
<view class="courseInnerBox" @click="jumpTimetable"> <view class="courseInnerBox" @click="jumpTimetable">
<view class="top"> <view class="top">
...@@ -177,7 +181,7 @@ ...@@ -177,7 +181,7 @@
}, },
ActivityList: [], ActivityList: [],
pageData: { pageData: {
LearningGardenList:[] LearningGardenList: []
}, },
userData: {} userData: {}
}); });
...@@ -220,14 +224,19 @@ ...@@ -220,14 +224,19 @@
if (data.pageData.LearningGardenList.length > 0) { if (data.pageData.LearningGardenList.length > 0) {
data.pageData.LearningGardenList.forEach((x, y) => { data.pageData.LearningGardenList.forEach((x, y) => {
if (x.List.length > 0) { if (x.List.length > 0) {
x.List.forEach( async (item, index) => { x.List.forEach(async (item, index) => {
await this.getColor(item.Img, index, y).then(v => { await this.getColor(item.Img, index, y).then(v => {
data.pageData.LearningGardenList[v.y].List[ data.pageData.LearningGardenList[v.y]
.List[
v.index].bgcolor = v.formatres; v.index].bgcolor = v.formatres;
data.pageData.LearningGardenList[v.y].List[ data.pageData.LearningGardenList[v.y]
v.index].bgcolor1 = v.formatres1; .List[
data.pageData.LearningGardenList[v.y].List[ v.index].bgcolor1 = v
v.index].bgcolor2 = v.formatres2; .formatres1;
data.pageData.LearningGardenList[v.y]
.List[
v.index].bgcolor2 = v
.formatres2;
}) })
}) })
...@@ -261,6 +270,17 @@ ...@@ -261,6 +270,17 @@
// url:"/pages/learningGarden/learningGardenList" // url:"/pages/learningGarden/learningGardenList"
// }) // })
} }
},
jumpJiahemini() {
let userinfo=uni.getStorageSync('userInfo');
wx.navigateToMiniProgram({
appId: 'wx38e054ee42b054f4',
path: '',//为空则打开首页
extraData: {
Id:userinfo.Id||0
}
})
} }
}; };
...@@ -415,7 +435,7 @@ ...@@ -415,7 +435,7 @@
/* height: 390rpx; */ /* height: 390rpx; */
background-color: #EBEBEB; background-color: #EBEBEB;
padding: 60rpx 30rpx; padding: 60rpx 30rpx;
margin-bottom: 80rpx; margin-bottom: 20rpx;
} }
.wordTitle { .wordTitle {
...@@ -619,4 +639,14 @@ ...@@ -619,4 +639,14 @@
margin-top: 15rpx; margin-top: 15rpx;
white-space: nowrap; white-space: nowrap;
} }
.starbucks {
display: block;
width: 700rpx;
height: auto;
box-sizing: border-box;
overflow: hidden;
border-radius: 20rpx;
margin: 60rpx auto;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment