Skip to content

T
thinkApp
Commit efceaef5 authored by 罗超's avatar 罗超
Browse files
Options

调整

parent e670c83e
Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 129 deletions
src/App.vue
View file @ efceaef5
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
/*每个页面公共css */ /*每个页面公共css */
@import "wxcomponents/vant/common/index.wxss"; @import "wxcomponents/vant/common/index.wxss";
@import "static/css/common.css"; @import "static/css/common.css";
@import "static/font/iconfont.css"; @import url("/static/font/iconfont.css");
*{ *{
box-sizing: border-box; box-sizing: border-box;
} }
......
src/components/index/course-card.vue 0 → 100644
View file @ efceaef5
<template>
<view class="course-card">
<view class="course-item">
<view style="width:287rpx;">
<view class="course-name">
成都2022科学益智L4-05乐思会
</view>
<van-progress percentage="75" :show-pivot="false" track-color="#EFEFEF" color="#282828"
stroke-width="5" />
<view class="course-progress">
上课进度 5/12
</view>
<view class="course-opera">
<van-button class-prefix="iconfont" icon=" icon-qiehuan1" round type="default" size="mini"
custom-style="color:#E23B4A;font-size: 24rpx;padding-left:10rpx;padding-right:10px;">切换课程
</van-button>
</view>
</view>
<image class="illustration"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_494.png"
mode="widthFix"></image>
</view>
<image class="end"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_413.png"
mode="widthFix"></image>
</view>
</template>
<script>
import {
ref,
reactive,
toRefs,
toRef,
getCurrentInstance,
watch,
computed,
onMounted,
} from "vue";
export default {
props: {},
setup() {
let data = reactive({
statusBarHeight: 24
});
const os = uni.getSystemInfoSync();
data.statusBarHeight = os.statusBarHeight
return {
...toRefs(data),
};
},
};
</script>
<style scoped>
.course-card {
padding: 70rpx 50rpx;
}
.course-card .course-item {
height: 294rpx;
background: linear-gradient(37deg, #C91727, #E64150);
padding: 40rpx 35rpx;
border-radius: 50rpx;
position: relative;
box-sizing: border-box;
}
.course-card .course-item .illustration {
position: absolute;
left: 350rpx;
top: -11rpx;
width: 340rpx;
}
.course-card .end {
width: 550rpx;
margin: 0 auto;
display: block;
}
.course-card .course-item .course-name {
font-size: 30rpx;
font-weight: bold;
color: #FFFFFF;
line-height: 42rpx;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
margin-bottom: 20rpx;
}
.course-card .course-item .course-progress {
font-size: 20rpx;
font-weight: 400;
color: #FDC4CA;
line-height: 45rpx;
}
.course-card .course-item .course-opera {
margin-top: 20rpx;
}
</style>
src/pages.json
View file @ efceaef5
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
} }
], ],
"subPackages": [], "subPackages": [],
// "tabBar": { // "tabBar": {
......
src/pages/index/index.vue
View file @ efceaef5
<template> <template>
<view class="indexpage" :class="[{'no-scroll':SurveyObj.ActivitySurveyId>0}]"> <view class="indexpage" :class="[{'no-scroll':SurveyObj.ActivitySurveyId>0}]">
<navbar class="navbarSticky" bg="#F5F5F5"> <view v-if="false">
<view class="navbarCon"> <navbar class="navbarSticky" bg="#F5F5F5">
<view class="pagetitle"> <view class="navbarCon">
首页 <view class="pagetitle">
</view> 首页
<view class="loginBox">
<view v-if="userData && userData.AccountName && userData.AccountId>0">
{{userData.AccountName}}
</view> </view>
<indexassembly @success='againdata' v-else> <view class="loginBox">
<view class="flex_start_center"> <view v-if="userData && userData.AccountName && userData.AccountId>0">
<image {{userData.AccountName}}
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/login2x.png"
mode="aspectFit" class="loginIcon" id="loadImg"></image>
登录
</view> </view>
</indexassembly> <indexassembly @success='againdata' v-else>
</view> <view class="flex_start_center">
<!-- 扫码登陆 --> <image
<view class="scanBox" @click="scan"> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/login2x.png"
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/scan2x.png" mode="aspectFit" class="loginIcon" id="loadImg"></image>
mode="aspectFit" class="scanIcon"> 登录
</image> </view>
</indexassembly>
</view>
<!-- 扫码登陆 -->
<view class="scanBox" @click="scan">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/scan2x.png"
mode="aspectFit" class="scanIcon">
</image>
</view> </view>
</view>
</navbar>
<view class="activeContent" v-if="ActivityList.length > 0">
<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" indicator-color="#CCCCCC"
indicator-active-color="#000000" :vertical="true" circular>
<swiper-item v-for="(item, index) in ActivityList" :key="index" @click="goActiveDetail(item.Id)">
<view class="swiperList" :style="{
'background-image': item.CoverImg
? `url(${item.CoverImg})`
: `url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/defaultBgimg.png)`,
}">
<view class="swiper_Time">{{ item.BMStart }}</view>
<view class="swiper_Name">{{ item.ActivityName }}</view>
</view>
</swiper-item>
</swiper>
</view> </view>
</navbar> <view class="wordBox">
<view class="activeContent" v-if="ActivityList.length > 0"> <view class="wordTitle">
<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" indicator-color="#CCCCCC" 单词练习
indicator-active-color="#000000" :vertical="true" circular> </view>
<swiper-item v-for="(item, index) in ActivityList" :key="index" @click="goActiveDetail(item.Id)"> <view class="flex_around_center ">
<view class="swiperList" :style="{ <view class="wordItem">
'background-image': item.CoverImg <text class="wordItemTitle">今日新词</text>
? `url(${item.CoverImg})` <text class="wordItemText">{{pageData.Words.NextWord||0}}<text
: `url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/defaultBgimg.png)`, class="wordItemTextUnit">词</text></text>
}"> </view>
<view class="swiper_Time">{{ item.BMStart }}</view> <view class="wordItem">
<view class="swiper_Name">{{ item.ActivityName }}</view> <text class="wordItemTitle">复习词语</text>
<text class="wordItemText">{{pageData.Words.ReviewWord||0}} <text
class="wordItemTextUnit">词</text></text>
</view> </view>
</swiper-item>
</swiper>
</view>
<view class="wordBox">
<view class="wordTitle">
单词练习
</view>
<view class="flex_around_center ">
<view class="wordItem">
<text class="wordItemTitle">今日新词</text>
<text class="wordItemText">{{pageData.Words.NextWord||0}}<text
class="wordItemTextUnit">词</text></text>
</view> </view>
<view class="wordItem"> <view class="wordDuration" style="visibility: hidden;">
<text class="wordItemTitle">复习词语</text> 预计用时10分钟
<text class="wordItemText">{{pageData.Words.ReviewWord||0}} <text
class="wordItemTextUnit">词</text></text>
</view> </view>
</view> <view style="text-align: center;font-size: 22rpx;color: #4C50E7;"
<view class="wordDuration" style="visibility: hidden;"> v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)">
预计用时10分钟 暂无新词</view>
</view> <view class="wordBtn" v-else
<view style="text-align: center;font-size: 22rpx;color: #4C50E7;" @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}`)">
v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)"> 开始学习
暂无新词</view>
<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}`)">
开始学习
</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="courseInnerBox" @click="jumpTimetable">
<view class="top">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classtime.png"
mode="aspectFit" class="courseIcon"></image>
<text class="courseDateStr"
style="margin: 0 16rpx 0 8rpx;">{{pageData.ClassNext.DateStr||'暂无'}}</text>
<text class="courseDateStr"
v-if="pageData.ClassNext.DateStart">{{pageData.ClassNext.DateStart}}</text>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classroom.png"
mode="aspectFit" class="courseIcon" style="margin: 0 12rpx 0 50rpx;"></image>
<text class="courseDateStr"
style="margin-right: 30rpx;">{{pageData.ClassNext.RoomName||'暂无'}}</text>
</view> </view>
<view class="flex"> </view>
<view class="courseNameBox"> <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/coffee/xbkbanner2.png"
<view class="className one_line"> mode="widthFix" class="starbucks" @click="jumpJiahemini"></image>
{{pageData.ClassNext.ClassName||'暂无'}} <view class="courseBox">
</view> <view class="courseInnerBox" @click="jumpTimetable">
<view class="courseName one_line"> <view class="top">
{{pageData.ClassNext.CourseName||'暂无'}} <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classtime.png"
mode="aspectFit" class="courseIcon"></image>
<text class="courseDateStr"
style="margin: 0 16rpx 0 8rpx;">{{pageData.ClassNext.DateStr||'暂无'}}</text>
<text class="courseDateStr"
v-if="pageData.ClassNext.DateStart">{{pageData.ClassNext.DateStart}}</text>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classroom.png"
mode="aspectFit" class="courseIcon" style="margin: 0 12rpx 0 50rpx;"></image>
<text class="courseDateStr"
style="margin-right: 30rpx;">{{pageData.ClassNext.RoomName||'暂无'}}</text>
</view>
<view class="flex">
<view class="courseNameBox">
<view class="className one_line">
{{pageData.ClassNext.ClassName||'暂无'}}
</view>
<view class="courseName one_line">
{{pageData.ClassNext.CourseName||'暂无'}}
</view>
</view> </view>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/female2x.png"
mode="aspectFit" class="courseIcon2"></image>
</view> </view>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/female2x.png" </view>
mode="aspectFit" class="courseIcon2"></image> <view class="courseTitle">
<text v-if="pageData.ClassNext.ClassPlanState==1">上课中</text>
<text v-else-if="pageData.ClassNext.ClassPlanState==2">下节课</text>
<text v-else>暂无</text>
</view> </view>
</view> </view>
<view class="courseTitle"> <view class="learningGarden" v-if="pageData.LearningGardenList.length>0">
<text v-if="pageData.ClassNext.ClassPlanState==1">上课中</text> <view class="learningGardenSbutitle">
<text v-else-if="pageData.ClassNext.ClassPlanState==2">下节课</text> 扩展学习
<text v-else>暂无</text>
</view>
</view>
<view class="learningGarden" v-if="pageData.LearningGardenList.length>0">
<view class="learningGardenSbutitle">
扩展学习
</view>
<view v-for="(item,index) in pageData.LearningGardenList" :key="index" v-if="item.List.length>0">
<view class="learningGardenTitle">
<text>{{item.Name}}</text>
<view style="
height: 60rpx;
font-size: 24rpx;
font-weight: 500;
color: #4C50E7;display: flex;align-items: center;" @click="jumpGarden(item.Id)">查看更多
<van-icon name="arrow" />
</view>
</view> </view>
<view class="gardenCon" v-for="(item1,index1) in item.List" :key="index1" id="img" <view v-for="(item,index) in pageData.LearningGardenList" :key="index" v-if="item.List.length>0">
@click="jumpPage(`/pages/learningGarden/learningGardenDetails?Id=${item1.Id}`)"> <view class="learningGardenTitle">
<image :src="item1.Img" mode="aspectFill" :id="'img'+index1" <text>{{item.Name}}</text>
style="width: 100%;height:100%;border-radius: 24rpx 24rpx 0 0;"></image> <view style="
<view class="gardenTextBox" height: 60rpx;
:style="{'background':`linear-gradient(to bottom,${item1.bgcolor},${item1.bgcolor1} , ${item1.bgcolor2})` }"> font-size: 24rpx;
<view class="gardenTitle one_line"> font-weight: 500;
{{item1.Title}} color: #4C50E7;display: flex;align-items: center;" @click="jumpGarden(item.Id)">查看更多
<van-icon name="arrow" />
</view> </view>
<view class="gardenDigest one_line"> </view>
{{item1.Digest}} <view class="gardenCon" v-for="(item1,index1) in item.List" :key="index1" id="img"
@click="jumpPage(`/pages/learningGarden/learningGardenDetails?Id=${item1.Id}`)">
<image :src="item1.Img" mode="aspectFill" :id="'img'+index1"
style="width: 100%;height:100%;border-radius: 24rpx 24rpx 0 0;"></image>
<view class="gardenTextBox"
:style="{'background':`linear-gradient(to bottom,${item1.bgcolor},${item1.bgcolor1} , ${item1.bgcolor2})` }">
<view class="gardenTitle one_line">
{{item1.Title}}
</view>
<view class="gardenDigest one_line">
{{item1.Digest}}
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<bottom></bottom>
<canvas canvas-id="myCanvas" class="canvas" style="position:absolute;left: -1000px;"></canvas>
<van-toast id="van-toast" />
<view class="diaocha-box" v-if="SurveyObj.ActivitySurveyId>0">
<image @click="goTongji()" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1652251724000_835.png" mode="widthFix"></image>
</view>
</view> </view>
<bottom></bottom> <view>
<canvas canvas-id="myCanvas" class="canvas" style="position:absolute;left: -1000px;"></canvas> <view class="navbarCon">
<van-toast id="van-toast" />
<view class="diaocha-box" v-if="SurveyObj.ActivitySurveyId>0"> </view>
<image @click="goTongji()" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1652251724000_835.png" mode="widthFix"></image> <course-card></course-card>
</view> </view>
</view> </view>
</template> </template>
...@@ -171,6 +179,7 @@ ...@@ -171,6 +179,7 @@
import indexassembly from './components/indexassembly.vue' import indexassembly from './components/indexassembly.vue'
import navbar from '../../components/navbar.vue' import navbar from '../../components/navbar.vue'
import bottom from '../../components/bottom.vue' import bottom from '../../components/bottom.vue'
import courseCard from '../../components/index/course-card.vue'
export default { export default {
// data(){ // data(){
// return{ // return{
...@@ -180,7 +189,8 @@ ...@@ -180,7 +189,8 @@
components: { components: {
indexassembly, indexassembly,
navbar, navbar,
bottom bottom,
courseCard
}, },
setup(props) { setup(props) {
let { let {
......
src/static/font/iconfont.css
View file @ efceaef5
@font-face { @font-face {
font-family: "iconfont"; /* Project id 2734547 */ font-family: "iconfont"; /* Project id 2734547 */
src: url('//at.alicdn.com/t/font_2734547_vr2ckwvviob.woff2?t=1643341931052') format('woff2'), src: url('~@/static/font/iconfont.ttf');
url('//at.alicdn.com/t/font_2734547_vr2ckwvviob.woff?t=1643341931052') format('woff'),
url('//at.alicdn.com/t/font_2734547_vr2ckwvviob.ttf?t=1643341931052') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +11,14 @@ ...@@ -13,6 +11,14 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-qiehuan1:before {
content: "\e62a";
}
.icon-qiehuan:before {
content: "\e65b";
}
.icon-moreandroid:before { .icon-moreandroid:before {
content: "\e6a5"; content: "\e6a5";
} }
...@@ -44,3 +50,4 @@ ...@@ -44,3 +50,4 @@
.icon-radio1:before { .icon-radio1:before {
content: "\e600"; content: "\e600";
} }
src/utils/request.js
View file @ efceaef5
...@@ -33,9 +33,9 @@ let request = (param) => { ...@@ -33,9 +33,9 @@ let request = (param) => {
icon: "none", icon: "none",
}); });
uni.removeStorageSync('userInfo'); uni.removeStorageSync('userInfo');
uni.reLaunch({ // uni.reLaunch({
url:"/pages/login/login" // url:"/pages/login/login"
}) // })
reject() reject()
}else{ }else{
uni.showToast({ uni.showToast({
......
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