Commit a379dcda authored by Mac's avatar Mac

1

parent 375fd982
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
} }
.btn { .btn {
width: 100%; width: 60vw;
height: 60rpx; height: 60rpx;
border-radius: 30rpx; border-radius: 30rpx;
background: #4C50E7; background: #4C50E7;
......
...@@ -7,7 +7,10 @@ ...@@ -7,7 +7,10 @@
首页 首页
</view> </view>
<view class="loginBox"> <view class="loginBox">
<indexassembly @success='againdata' v-if="userData.AccountId==0"> <view class="" v-if="userData && userData.AccountName && userData.AccountId>0">
{{userData.AccountName}}
</view>
<indexassembly @success='againdata' v-else>
<view class="flex_start_center"> <view class="flex_start_center">
<image <image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/login2x.png" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/login2x.png"
...@@ -15,9 +18,6 @@ ...@@ -15,9 +18,6 @@
登录 登录
</view> </view>
</indexassembly> </indexassembly>
<view class="" v-else>
{{userData.AccountName}}
</view>
</view> </view>
<view class="scanBox"> <view class="scanBox">
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<view class="gardenCon" v-for="(item1,index1) in item.List" :key="index1" id="img"> <view class="gardenCon" v-for="(item1,index1) in item.List" :key="index1" id="img">
<image :src="item1.Img" mode="aspectFill" <image :src="item1.Img" mode="aspectFill"
style="width: 100%;height:100%;border-radius: 24rpx 24rpx 0 0;"></image> style="width: 100%;height:100%;border-radius: 24rpx 24rpx 0 0;"></image>
<view class="gardenTextBox" :style="{background:'linear-gradient(to bottom,0deg,'+item1.bgcolor}"> <view class="gardenTextBox" :style="{background:'linear-gradient(to bottom,0deg,'+item1.bgcolor+')'}">
<view class="gardenTitle one_line"> <view class="gardenTitle one_line">
{{item1.Title}} {{item1.Title}}
</view> </view>
...@@ -192,9 +192,9 @@ ...@@ -192,9 +192,9 @@
if(data.pageData.LearningGardenList.length>0){ if(data.pageData.LearningGardenList.length>0){
data.pageData.LearningGardenList.forEach(x=>{ data.pageData.LearningGardenList.forEach(x=>{
if(x.List.length>0){ if(x.List.length>0){
x.List.forEach(item=>{ x.List.forEach((item,index)=>{
this.getColor(item.Img).then(v=>{ this.getColor(item.Img).then(v=>{
item.bgcolor = v item.bgcolor = v;
}) })
}) })
} }
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
async getColor(src) { async getColor(src) {
let res = await getImageColor('myCanvas', 'img', src) let res = await getImageColor('myCanvas', 'img', src)
const formatres = `rgba(${res.r},${res.g},${res.b},1)` const formatres = `rgba(${res.r},${res.g},${res.b},1)`
console.log(168, formatres) // console.log(168, formatres)
return formatres return formatres
}, },
againdata() { againdata() {
......
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