|
|
@@ -17,7 +17,7 @@
|
|
|
<view class="dot" :class="{'active':index == current}" v-for="(swiper,index) in list" :key="index"></view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="content" :class="{'botms': isLogin && (isFollow != 1) && curClose}">
|
|
|
+ <view class="content">
|
|
|
<!-- <view class="notice" v-if="infoNums">
|
|
|
<view class="notice__content">
|
|
|
<image src="/static/icon/msg_icon1.png" class="icon"></image>
|
|
|
@@ -174,8 +174,13 @@
|
|
|
<u-icon name="close"></u-icon>
|
|
|
<official-account @load='bindload'></official-account>
|
|
|
</view> -->
|
|
|
- <view v-if="isLogin && (isFollow != 1) && curClose" class="officials">
|
|
|
- <view class="weixin_official_account" :style="{'opacity':opacity}">
|
|
|
+ <!-- v-if="isLogin && (isFollow != 1) && curClose" -->
|
|
|
+ <!-- <view class="officialsss">
|
|
|
+ <text>asdsufd</text>
|
|
|
+ <official-account></official-account>
|
|
|
+ </view> -->
|
|
|
+ <view :style="{'opacity':opacity}" class="officials">
|
|
|
+ <view class="weixin_official_account">
|
|
|
<image class="off_logo" src="/static/index/official.png"></image>
|
|
|
<view>
|
|
|
<view class="one">关注 “祥粤学校” 公众号</view>
|
|
|
@@ -295,7 +300,7 @@ export default {
|
|
|
onShow() {
|
|
|
this.getInfo() // 判断有没有关注公众号
|
|
|
this.isClickOff() //关注公众号，每天最多显示1次；当天学员关闭弹窗后，无需再显示
|
|
|
-
|
|
|
+ console.log('this.$store.state.scene', this.$store.state.scene)
|
|
|
uni.removeStorageSync('goPath')
|
|
|
this.courseList();
|
|
|
this.bankList();
|
|
|
@@ -334,10 +339,11 @@ export default {
|
|
|
// /app/user/getInfo 登录用户信息
|
|
|
this.$api.getInfo().then(res => {
|
|
|
if(res.data.code == 200){
|
|
|
- console.log('---res', res.data)
|
|
|
this.$store.state.userInfo = res.data.data
|
|
|
this.isFollow = res.data.data.userFollowWx // 不是1就是没关注
|
|
|
- console.log('有没有关注', this.isFollow)
|
|
|
+ console.log('有没有关注', this.isFollow, this.isFollow != 1)
|
|
|
+ this.opacity = [1011,1017,1025,1047,1124].includes(this.$store.state.scene) && this.isLogin && (this.isFollow != 1) && this.curClose ? 1 : 0
|
|
|
+ console.log('this.opacity', this.opacity)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -357,9 +363,10 @@ export default {
|
|
|
}else{
|
|
|
uni.setStorageSync("endTime", end) //存入当天晚上23：59：59秒的毫秒数
|
|
|
}
|
|
|
+ this.opacity = [1011,1017,1025,1047,1124].includes(this.$store.state.scene) && this.isLogin && (this.isFollow != 1) && this.curClose ? 1 : 0
|
|
|
+ console.log('this.opacity-', this.opacity)
|
|
|
},
|
|
|
closeOff() {
|
|
|
- console.log('关闭')
|
|
|
this.curClose = false
|
|
|
uni.setStorageSync("curClose", '1')
|
|
|
},
|
|
|
@@ -772,7 +779,7 @@ page {
|
|
|
overflow: hidden;
|
|
|
padding:0 16rpx;
|
|
|
background: rgba(234, 238, 241, 1);
|
|
|
-
|
|
|
+ padding-bottom: 100rpx;
|
|
|
.notice {
|
|
|
background:#fff;
|
|
|
border-radius: 16rpx;
|
|
|
@@ -1044,9 +1051,9 @@ page {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- .botms {
|
|
|
- padding-bottom: 100rpx;
|
|
|
- }
|
|
|
+ // .botms {
|
|
|
+ // padding-bottom: 100rpx;
|
|
|
+ // }
|
|
|
|
|
|
.my-list {
|
|
|
margin:32rpx 0;
|
|
|
@@ -1241,13 +1248,19 @@ page {
|
|
|
font-weight: bold;
|
|
|
color: #32467B;
|
|
|
}
|
|
|
+.officialsss {
|
|
|
+ position: fixed;
|
|
|
+ left: 0;
|
|
|
+ bottom: 100rpx;
|
|
|
+ width: 100%;
|
|
|
+}
|
|
|
.officials {
|
|
|
width:100%;
|
|
|
height: 104rpx;
|
|
|
position:fixed;
|
|
|
bottom: 0;
|
|
|
left: 0;
|
|
|
- z-index: 20211208;
|
|
|
+ z-index: 999;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
|
@@ -1258,7 +1271,7 @@ page {
|
|
|
left: 0;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
+ // justify-content: space-between;
|
|
|
width: 718rpx;
|
|
|
height: 104rpx;
|
|
|
padding: 0 32rpx;
|
|
|
@@ -1281,6 +1294,8 @@ page {
|
|
|
}
|
|
|
.btn {
|
|
|
position: relative;
|
|
|
+ top: 0;
|
|
|
+ left: 35rpx;
|
|
|
width: 128rpx;
|
|
|
height: 56rpx;
|
|
|
line-height: 56rpx;
|
|
|
@@ -1294,7 +1309,7 @@ page {
|
|
|
|
|
|
.official-account {
|
|
|
position: absolute;
|
|
|
- z-index: 20211209;
|
|
|
+ z-index: 1000;
|
|
|
right: -9px;
|
|
|
top: -38px;
|
|
|
opacity: 0;
|
xuqiaoying