Commit 856d4c82 authored by 罗超's avatar 罗超

2

parent bab83384
...@@ -165,7 +165,6 @@ ...@@ -165,7 +165,6 @@
} }
} }
onMounted(()=>{ onMounted(()=>{
console.log(137,props.item)
}) })
let that = methods; let that = methods;
return { return {
......
...@@ -96,7 +96,9 @@ ...@@ -96,7 +96,9 @@
</view> </view>
</view> </view>
<view class="courseTitle"> <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="learningGarden" v-if="pageData.LearningGardenList.length>0"> <view class="learningGarden" v-if="pageData.LearningGardenList.length>0">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- <view class="date"> <!-- <view class="date">
2021年12月30日 2021年12月30日
</view> --> </view> -->
<view class="name"> Hello,{{ pageData.StuName }} </view> <view class="name"> Hello,{{ pageData.StuName||'' }} </view>
</view> </view>
<view class="right"> <view class="right">
<image :src="pageData.StuIcon" mode="aspectFill" style="width:100%;height:100%;border-radius: 50%;"> <image :src="pageData.StuIcon" mode="aspectFill" style="width:100%;height:100%;border-radius: 50%;">
...@@ -171,8 +171,10 @@ ...@@ -171,8 +171,10 @@
}; };
}, },
onShow() { onShow() {
if(this.$isLogin()){
this.getData(); this.getData();
} }
}
}; };
</script> </script>
......
...@@ -176,6 +176,8 @@ ...@@ -176,6 +176,8 @@
font-size: 20rpx; font-size: 20rpx;
color: #333333; color: #333333;
text-align: center; text-align: center;
box-sizing: border-box;
padding: 5rpx 8rpx;
} }
@keyframes to-mini @keyframes to-mini
......
...@@ -640,8 +640,9 @@ ...@@ -640,8 +640,9 @@
}; };
}, },
onShow() { onShow() {
if(this.$isLogin()){
this.getCourseList()//我的课程列表 this.getCourseList()//我的课程列表
}
}, },
} }
......
...@@ -81,14 +81,14 @@ ...@@ -81,14 +81,14 @@
style="width: 90%" style="width: 90%"
v-if="isShowAllDay" v-if="isShowAllDay"
> >
<van-icon name="arrow-up" color="#00ACF9" @click="changeCalendar" /> <van-icon name="arrow-up" size="40rpx" color="#00ACF9" @click="changeCalendar"/>
</van-divider> </van-divider>
<van-divider <van-divider
contentPosition="center" contentPosition="center"
style="width: 90%" style="width: 90%"
v-if="!isShowAllDay" v-if="!isShowAllDay"
> >
<van-icon name="arrow-down" color="#00ACF9" @click="changeCalendar" /> <van-icon name="arrow-down" size="40rpx" color="#00ACF9" @click="changeCalendar"/>
</van-divider> </van-divider>
</view> </view>
</view> </view>
...@@ -190,8 +190,9 @@ export default { ...@@ -190,8 +190,9 @@ export default {
let isShowAllDay = ref(false); let isShowAllDay = ref(false);
let sliceWeekArr = ref([]); let sliceWeekArr = ref([]);
let sliceWeek = (item) => { let sliceWeek = (item) => {
let w =item.$orig?.week??item.week let w =item.week||item.$orig?.week
let d = item.$orig?.day||item.day let d =item.day||item.$orig?.day
let newArr = calendar.value.slice(emptyArr.length, calendar.value.length); let newArr = calendar.value.slice(emptyArr.length, calendar.value.length);
let s = d - (w + 1) <= 0 ? 0 : d - (w + 1); let s = d - (w + 1) <= 0 ? 0 : d - (w + 1);
let e = d + (6 - w); let e = d + (6 - w);
...@@ -322,10 +323,12 @@ export default { ...@@ -322,10 +323,12 @@ export default {
const indexData=uni.getStorageSync('indexData') const indexData=uni.getStorageSync('indexData')
// this.msg.ClassId = JSON.parse(options.classId); // this.msg.ClassId = JSON.parse(options.classId);
this.msg.ClassId = indexData.ClassId this.msg.ClassId = indexData.ClassId
this.getAllData()
this.msg.StartTime = getToday(); this.msg.StartTime = getToday();
this.msg.EndTime = getToday(); this.msg.EndTime = getToday();
if(this.$isLogin()){
this.getAllData()
this.getData(); this.getData();
}
}, },
}; };
</script> </script>
......
...@@ -5,7 +5,7 @@ export let getWeek = (year, month) => { ...@@ -5,7 +5,7 @@ export let getWeek = (year, month) => {
let maxDay = d.getDate(); let maxDay = d.getDate();
let arr = [] let arr = []
for (let i = 1; i <= maxDay; i++) { for (let i = 1; i <= maxDay; i++) {
let date = new Date(year + '-' + month + '-' + i) let date = new Date(year + '/' + month + '/' + i)// '/'兼容ios
let week = date.getDay() let week = date.getDay()
let weekStr = "" let weekStr = ""
let isToday = 0 let isToday = 0
......
...@@ -201,24 +201,13 @@ export let changeNumToHan = (num) => { ...@@ -201,24 +201,13 @@ export let changeNumToHan = (num) => {
return result; return result;
} }
// 判断登录 // 判断登录
export let isLogin = () => { export const isLogin = () => {
let userinfo = uni.getStorageSync('userInfo'); const userinfo = uni.getStorageSync('userInfo');
if (!userinfo || userinfo === "") { if (userinfo && userinfo.Id > 0) {
uni.showToast({ return true
title: '请登录账号', }
duration: 2000, else{
icon: "error", return false
// success: () => {
// setTimeout(() => {
// uni.navigateTo({
// url: '/pages/login/login'
// });
// clearTimeout();
// }, 2000)
// }
});
} }
} }
export let getImageColor = async (canvasID, imgID, imgSrc) => { export let getImageColor = async (canvasID, imgID, imgSrc) => {
...@@ -233,13 +222,13 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => { ...@@ -233,13 +222,13 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => {
await new Promise(resolve => { await new Promise(resolve => {
uni.createSelectorQuery().select("#" + imgID).boundingClientRect(res => { uni.createSelectorQuery().select("#" + imgID).boundingClientRect(res => {
imgWidth = res?.width??100; imgWidth = res?.width ?? 100;
imgHeight = res?.height??100; imgHeight = res?.height ?? 100;
resolve() resolve()
}).exec() }).exec()
}) })
canvas.fillRect(0, 0, imgWidth, imgHeight) canvas.fillRect(0, 0, imgWidth, imgHeight)
let base64Img= await netUrlTobase64(imgSrc) let base64Img = await netUrlTobase64(imgSrc)
canvas.drawImage(base64Img, 0, 0, imgWidth, imgHeight) canvas.drawImage(base64Img, 0, 0, imgWidth, imgHeight)
res = await new Promise((resolve, reject) => { res = await new Promise((resolve, reject) => {
canvas.draw(true, (e) => { canvas.draw(true, (e) => {
...@@ -298,22 +287,22 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => { ...@@ -298,22 +287,22 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => {
return res return res
} }
// 网络图片转base64 // 网络图片转base64
export let netUrlTobase64= async (url,suc)=> { export let netUrlTobase64 = async (url, suc) => {
let toBase64Url=""; let toBase64Url = "";
let newUrl=url let newUrl = url
let flag = url.indexOf('https') let flag = url.indexOf('https')
if(flag==-1){ if (flag == -1) {
newUrl=url.replace(/http/,'https') newUrl = url.replace(/http/, 'https')
} }
toBase64Url= await new Promise(resolve => { toBase64Url = await new Promise(resolve => {
uni.request({ uni.request({
url: newUrl, url: newUrl,
method: 'GET', method: 'GET',
responseType: 'arraybuffer', responseType: 'arraybuffer',
success(res) { success(res) {
const base64 = wx.arrayBufferToBase64(res.data); //把arraybuffer转成base64 const base64 = wx.arrayBufferToBase64(res.data); //把arraybuffer转成base64
const conType =res.header['Content-Type'] const conType = res.header['Content-Type']
toBase64Url = 'data:'+conType+';base64,' + base64; toBase64Url = 'data:' + conType + ';base64,' + base64;
resolve(toBase64Url) resolve(toBase64Url)
} }
}); });
......
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