Commit ab758c95 authored by 罗超's avatar 罗超

2

parent ff2bd7bc
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</view> </view>
</view> </view>
<bottom></bottom> <bottom></bottom>
<canvas type="2d" canvas-id="myCanvas" class="canvas" style="position:absolute;left: -1000px;"></canvas> <canvas canvas-id="myCanvas" class="canvas" style="position:absolute;left: -1000px;"></canvas>
<van-toast id="van-toast" /> <van-toast id="van-toast" />
</view> </view>
</template> </template>
......
...@@ -45,26 +45,26 @@ ...@@ -45,26 +45,26 @@
<view class="title">课程信息</view> <view class="title">课程信息</view>
<view class="statistic"> <view class="statistic">
<view class="statisticItem"> <view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.TotalHours }} <view class="time">{{ pageData.CourseInfo.TotalHours||0 }}
<text class="unit"></text> <!-- <text class="unit"></text> -->
</view> </view>
<view class="statisticName">总共课时</view> <view class="statisticName">总共课时</view>
</view> </view>
<view class="statisticItem"> <view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.CompleteHours }} <view class="time">{{ pageData.CourseInfo.CompleteHours||0 }}
<text class="unit"></text> <!-- <text class="unit"></text> -->
</view> </view>
<view class="statisticName">已学课时</view> <view class="statisticName">已学课时</view>
</view> </view>
<view class="statisticItem"> <view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.AbsenceNum }} <view class="time">{{ pageData.CourseInfo.AbsenceNum||0 }}
<text class="unit"></text> <!-- <text class="unit"></text> -->
</view> </view>
<view class="statisticName">缺勤课时</view> <view class="statisticName">缺勤课时</view>
</view> </view>
<view class="statisticItem"> <view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.LeaveNum }} <view class="time">{{ pageData.CourseInfo.LeaveNum||0 }}
<text class="unit"></text> <!-- <text class="unit"></text> -->
</view> </view>
<view class="statisticName">请假课时</view> <view class="statisticName">请假课时</view>
</view> </view>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<view class="Grade" style="margin-bottom:20rpx">{{ <view class="Grade" style="margin-bottom:20rpx">{{
pageData.CourseInfo.ClassName pageData.CourseInfo.ClassName
}}</view> }}</view>
<view class="Grade">等级:{{ pageData.CourseInfo.CourseRate }}</view> <view class="Grade">等级:{{ pageData.CourseInfo.CourseRate||'' }}</view>
<view><text class="Grade">状态:</text> <view><text class="Grade">状态:</text>
<text class="StatusName">{{ <text class="StatusName">{{
pageData.CourseInfo.ClassStatusName pageData.CourseInfo.ClassStatusName
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</view> </view>
<view class="serviceInfo flex_between_center"> <view class="serviceInfo flex_between_center">
<view class="flex_start_around" style="width:380rpx;height:100%"> <view class="flex_start_around" style="width:380rpx;height:100%">
<view class="flex_start_center" style="height:32rpx"> <view class="flex_start_center" style="height:32rpx;width:100%">
<text class="EmployeeName">{{ item.EmployeeName }}</text><text <text class="EmployeeName">{{ item.EmployeeName }}</text><text
class="AssistTypeName">{{ item.AssistTypeName }}</text> class="AssistTypeName">{{ item.AssistTypeName }}</text>
</view> </view>
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
.statisticItem .time { .statisticItem .time {
width: 100%; width: 100%;
font-size: 46rpx; font-size: 46rpx;
line-height: 30rpx; /* line-height: 30rpx; */
font-weight: 800; font-weight: 800;
font-style: italic; font-style: italic;
color: #111111; color: #111111;
......
...@@ -233,9 +233,8 @@ export let getImageColor = async (canvasID, imgID, imgSrc) => { ...@@ -233,9 +233,8 @@ 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 => {
console.log(234,res) imgWidth = res?.width??100;
imgWidth = res?.width??10; imgHeight = res?.height??100;
imgHeight = res?.height??10;
resolve() resolve()
}).exec() }).exec()
}) })
...@@ -309,7 +308,7 @@ export let netUrlTobase64= async (url,suc)=> { ...@@ -309,7 +308,7 @@ export let netUrlTobase64= async (url,suc)=> {
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