2.2提交
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
<view class="segmented-control">
|
||||
<view
|
||||
class="tab-item"
|
||||
:class="{ active: activeTab === 0 }"
|
||||
:class="{ active: activeTab == 0 }"
|
||||
@click="switchTab(0)"
|
||||
>
|
||||
<text class="tab-text">领取福利</text>
|
||||
@@ -36,7 +36,7 @@
|
||||
<view class="divider"></view>
|
||||
<view
|
||||
class="tab-item"
|
||||
:class="{ active: activeTab === 1 }"
|
||||
:class="{ active: activeTab == 1 }"
|
||||
@click="switchTab(1)"
|
||||
>
|
||||
<text class="tab-text">使用福利</text>
|
||||
@@ -44,25 +44,25 @@
|
||||
<view class="divider"></view>
|
||||
<view
|
||||
class="tab-item"
|
||||
:class="{ active: activeTab === 2 }"
|
||||
:class="{ active: activeTab == 2 }"
|
||||
@click="switchTab(2)"
|
||||
>
|
||||
<text class="tab-text">兑福利卡</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- v-if="(benefit.name != 'upan') || (getFirstNum(benefit.left_result) > 0 && benefit.name == 'upan')" -->
|
||||
<!-- 福利卡片列表 -->
|
||||
<view class="scrollbox">
|
||||
<scroll-view class="benefits-list" scroll-y="true" :show-scrollbar="false">
|
||||
<scroll-view class="scrollbox" scroll-y="true" :show-scrollbar="false">
|
||||
<view
|
||||
class="benefit-card"
|
||||
|
||||
v-show="(benefit.name != 'upan') || (getFirstNum(benefit.left_result) > 0 && benefit.name == 'upan')"
|
||||
v-for="(benefit, index) in benefitsList"
|
||||
:key="index"
|
||||
:class="fotmatType(benefit.name)"
|
||||
@click="claimBenefit(benefit)"
|
||||
:class="fotmatType(benefit)"
|
||||
|
||||
|
||||
>
|
||||
<view class="card-title">{{ benefit.title }}</view>
|
||||
<view class="card-title" :class="fotmatType(benefit)">{{ benefit.title }}</view>
|
||||
<!-- <view class="card-bg">
|
||||
|
||||
</view> -->
|
||||
@@ -70,7 +70,8 @@
|
||||
<image :src="jifenBgImg" mode="widthFix" class="card-img" v-if="benefit.name == 'jifen'"></image>
|
||||
<image :src="videoImg" mode="widthFix" class="card-img" v-if="benefit.name == 'video'"></image>
|
||||
<image :src="kejianImg" mode="widthFix" class="card-img" v-if="benefit.name == 'kejian'"></image>
|
||||
<image :src="upanImg" mode="widthFix" class="card-img" v-if="benefit.name == 'upan'"></image>
|
||||
<image :src="upanImg" mode="widthFix" class="card-img" v-if="benefit.name == 'upan' && (!(benefit.right_tip =='已领取' || benefit.right_result =='已领取') || activeTab == 1)"></image>
|
||||
<image :src="upanNoimg" mode="widthFix" class="card-img" v-if="benefit.name == 'upan' && ((benefit.right_tip =='已领取' || benefit.right_result =='已领取') && activeTab == 0)"></image>
|
||||
<image :src="wanfangImg" mode="widthFix" class="card-img" v-if="benefit.name == 'wanfang'"></image>
|
||||
<image :src="wenxianImg" mode="widthFix" class="card-img" v-if="benefit.name == 'daicha'"></image>
|
||||
<view class="card-details">
|
||||
@@ -78,17 +79,19 @@
|
||||
<text class="condition">{{ benefit.left_tip }}</text>
|
||||
<text class="requirement">{{ benefit.left_result }}</text>
|
||||
</view>
|
||||
<view class="right-section">
|
||||
<view class="right-section" @click="claimBenefit(benefit)">
|
||||
<text class="reward-type">{{ benefit.right_tip }}</text>
|
||||
<text class="reward-value">{{ benefit.right_result }}</text>
|
||||
<text class="reward-value" v-if="activeTab == 0 && !benefit.flag && benefit.name != 'upan'">{{ benefit.right_result }}</text>
|
||||
<text class="reward-value" v-else-if="activeTab == 0 && benefit.name == 'upan' && !(benefit.right_tip =='已领取' || benefit.right_result =='已领取') && benefit.right_result !='立即领取'">{{ benefit.right_result }}</text>
|
||||
<!-- <text class="reward-value" v-if="activeTab == 1">{{ benefit.right_result }}个</text> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="panbox" v-if="benefit.name == 'upan'">知识U盘</view>
|
||||
<view class="panbox" :class="{'disabled': ((benefit.right_tip =='已领取' || benefit.right_result =='已领取') && activeTab== 0)}" v-if="benefit.name == 'upan'">知识U盘</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 底部导航栏 -->
|
||||
<view class="bottom-nav">
|
||||
@@ -112,7 +115,7 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from 'vue';
|
||||
import {onShow,onBackPress} from '@dcloudio/uni-app';
|
||||
import {onShow,onBackPress,onLoad,onHide} from '@dcloudio/uni-app';
|
||||
import docUrl from '@/utils/docUrl.js';
|
||||
onBackPress(() => {
|
||||
plus.runtime.quit();
|
||||
@@ -132,6 +135,7 @@
|
||||
import upanImg from "@/static/flupan_big2.png"
|
||||
import wanfangImg from "@/static/flwanfang_big.png"
|
||||
import wenxianImg from "@/static/flwen_big.png"
|
||||
import upanNoimg from "@/static/flupannull_big.png"
|
||||
const showDialog = ref(false);
|
||||
const content = ref('肝胆相照平台协助查找文献次数已经用完,谢谢您的支持!');
|
||||
const confirmDialog = () => {
|
||||
@@ -195,13 +199,21 @@
|
||||
icon: 'none'
|
||||
});
|
||||
};
|
||||
const fotmatType = (name) => {
|
||||
const fotmatType = (benefit) => {
|
||||
let name = benefit.name;
|
||||
let name1 = benefit.right_tip;
|
||||
let name2 = benefit.right_result;
|
||||
if(name == 'video'){
|
||||
return 'video';
|
||||
}else if(name == 'kejian'){
|
||||
return 'kejian';
|
||||
}else if(name == 'upan'){
|
||||
return 'upan';
|
||||
if((name1 == '已领取' && name2 == '已领取') && activeTab.value == 0){
|
||||
return 'upan_disabled';
|
||||
}else{
|
||||
return 'upan';
|
||||
|
||||
}
|
||||
}else if(name == 'wanfang'){
|
||||
return 'wanfang';
|
||||
}else if(name=='jifen'){
|
||||
@@ -213,19 +225,32 @@
|
||||
const switchTab = (index) => {
|
||||
|
||||
|
||||
if (index === 0) {
|
||||
if (index == 0) {
|
||||
activeTab.value = index;
|
||||
getWelfarePage();
|
||||
} else if (index === 1) {
|
||||
} else if (index == 1) {
|
||||
activeTab.value = index;
|
||||
useWelfarePage();
|
||||
} else if (index === 2) {
|
||||
} else if (index == 2) {
|
||||
uni.setStorageSync('lookWelfare', '');
|
||||
navTo({
|
||||
url: '/pages_app/myWelfareCard/myWelfareCard'
|
||||
url: '/pages_app/myWelfareCard/myWelfareCard?from=myWelfare'
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
onLoad((options) => {
|
||||
getWelfarePage();
|
||||
});
|
||||
onHide(() => {
|
||||
uni.setStorageSync('lookWelfare', '');
|
||||
});
|
||||
onShow(() => {
|
||||
let lookWelfare = uni.getStorageSync('lookWelfare');
|
||||
if(lookWelfare){
|
||||
activeTab.value =1;
|
||||
switchTab(activeTab.value);
|
||||
}
|
||||
});
|
||||
const claimBenefit = (benefit) => {
|
||||
console.log(benefit);
|
||||
console.log(activeTab.value);
|
||||
@@ -243,8 +268,9 @@
|
||||
url: '/pages_app/ppt/ppt'
|
||||
});
|
||||
}else if(benefit.name == 'upan'){
|
||||
let num = getFirstNum(benefit.left_result) || benefit.num;
|
||||
navTo({
|
||||
url: '/pages_app/buyUpan/buyUpan?restNum='+benefit.num
|
||||
url: '/pages_app/buyUpan/buyUpan?restNum='+num
|
||||
});
|
||||
|
||||
}else if(benefit.name == 'wanfang'){
|
||||
@@ -276,6 +302,11 @@
|
||||
|
||||
//}
|
||||
}
|
||||
}else if(activeTab.value == 0){
|
||||
if(benefit.flag){
|
||||
receiveWelfare(benefit.name);
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
@@ -299,7 +330,7 @@
|
||||
// console.log(ret);
|
||||
// })
|
||||
navTo({
|
||||
url: '/pages_app/myCode/myCode'
|
||||
url: '/pages_app/myCode/myCode?from=myWelfare'
|
||||
})
|
||||
};
|
||||
const goRules = () => {
|
||||
@@ -308,6 +339,40 @@
|
||||
url: '/pages_app/webview/webview?url='+encodeURIComponent('https://doc.igandan.com/app/integral/integral_welfare.html')+'&title=福利规则'
|
||||
})
|
||||
};
|
||||
|
||||
const receiveWelfare = (name) => {
|
||||
let type = '';
|
||||
if(name == 'jifen'){
|
||||
type = 0;
|
||||
}else if(name == 'video'){
|
||||
type = 1;
|
||||
}else if(name == 'kejian'){
|
||||
type = 2;
|
||||
}else if(name == 'upan'){
|
||||
type = 5;
|
||||
}else if(name == 'wanfang'){
|
||||
return false;
|
||||
}else if(name == 'daicha'){
|
||||
return false;
|
||||
}
|
||||
|
||||
api.receiveWelfare({
|
||||
type: type
|
||||
}).then(res => {
|
||||
if(res.code == 200){
|
||||
uni.showToast({
|
||||
title:'领取成功',
|
||||
icon: 'success'
|
||||
});
|
||||
getWelfarePage();
|
||||
}
|
||||
})
|
||||
}
|
||||
const getFirstNum = (str) => {
|
||||
if(!str) return '';
|
||||
let num = str.substring(0,1);
|
||||
return Number(num);
|
||||
}
|
||||
const useWelfarePage = () => {
|
||||
api.useWelfarePage().then(res => {
|
||||
if (res.code === '200' && res.data) {
|
||||
@@ -353,9 +418,7 @@
|
||||
});
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
getWelfarePage();
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -374,9 +437,9 @@
|
||||
|
||||
|
||||
.benefits-page {
|
||||
min-height: 100vh;
|
||||
height: 100vh;
|
||||
background-color: $bg-color;
|
||||
padding-top: $nav-height; // 为固定导航栏预留空间
|
||||
|
||||
}
|
||||
|
||||
.status-bar {
|
||||
@@ -461,7 +524,7 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 0 30rpx;
|
||||
border-bottom: 1rpx solid $border-color;
|
||||
border-bottom: 1rpx solid #eee;
|
||||
|
||||
.tab-item {
|
||||
flex: 1;
|
||||
@@ -489,37 +552,39 @@
|
||||
.divider {
|
||||
width: 2rpx;
|
||||
height: 40rpx;
|
||||
background-color: $divider-color;
|
||||
background-color:#eee;
|
||||
}
|
||||
}
|
||||
.scrollbox{
|
||||
position: fixed;
|
||||
top: calc(#{$nav-height} + #{$segmented-height});
|
||||
left: 30rpx;
|
||||
right: 30rpx;
|
||||
width:100%;
|
||||
top: calc(var(--status-bar-height) + 44px + 82rpx);
|
||||
height:calc(100vh - var(--status-bar-height) - 44px - 82rpx - 100rpx);
|
||||
box-sizing: border-box;
|
||||
bottom: $bottom-nav-height;
|
||||
margin: 30rpx 0 ;
|
||||
overflow-y: scroll;
|
||||
// bottom: 100rpx;
|
||||
padding-bottom: 50rpx;
|
||||
margin: 30rpx 0 0;
|
||||
|
||||
}
|
||||
.benefits-list {
|
||||
|
||||
|
||||
|
||||
.benefit-card {
|
||||
background: $white;
|
||||
border-radius: 20rpx;
|
||||
padding: 30rpx;
|
||||
margin-bottom: 30rpx;
|
||||
margin:0 30rpx 30rpx;
|
||||
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
border:2rpx solid #fff;
|
||||
&.jifen{
|
||||
border:2rpx solid #ffad17;
|
||||
border:2rpx solid #ef828f;
|
||||
background:#feeae9;
|
||||
}
|
||||
&.wenxian{
|
||||
border:2rpx solid #33c966;
|
||||
background:#fdeafe;
|
||||
background:#efffe9;
|
||||
}
|
||||
&.video{
|
||||
border:2rpx solid #ff951d;
|
||||
@@ -548,7 +613,33 @@
|
||||
left:20rpx;
|
||||
z-index:0;
|
||||
}
|
||||
|
||||
.card-title {
|
||||
font-size: 32rpx;
|
||||
|
||||
margin-bottom: 30rpx;
|
||||
line-height: 1.4;
|
||||
&.jifen{
|
||||
color: #ef828f;
|
||||
}
|
||||
&.video{
|
||||
color: #ff951d;
|
||||
}
|
||||
&.kejian{
|
||||
color: #f17dff;
|
||||
}
|
||||
&.upan{
|
||||
color: #40cdc5;
|
||||
}
|
||||
&.upan_disabled{
|
||||
color: #cccccc;
|
||||
}
|
||||
&.wanfang{
|
||||
color: #4aa2fe;
|
||||
}
|
||||
&.wenxian{
|
||||
color: #33c966;
|
||||
}
|
||||
}
|
||||
.card-content {
|
||||
margin-top: 30rpx;
|
||||
position: relative;
|
||||
@@ -563,13 +654,7 @@
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.card-title {
|
||||
font-size: 32rpx;
|
||||
color: $white;
|
||||
font-weight: 600;
|
||||
margin-bottom: 30rpx;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.panbox{
|
||||
|
||||
margin-top: 20rpx;
|
||||
@@ -582,6 +667,9 @@
|
||||
border-radius: 10rpx;
|
||||
padding: 0 20rpx;
|
||||
text-align: center;
|
||||
&.disabled{
|
||||
background: #cccccc;
|
||||
}
|
||||
}
|
||||
.card-details {
|
||||
position: relative;
|
||||
@@ -591,7 +679,28 @@
|
||||
align-items: center;
|
||||
padding:0 40rpx;
|
||||
height: 220rpx;
|
||||
.left-section,
|
||||
.left-section{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: flex-start;
|
||||
.condition,
|
||||
.reward-type {
|
||||
font-size: 32rpx;
|
||||
color: rgba(255, 255, 255, 11);
|
||||
}
|
||||
|
||||
.requirement,
|
||||
.reward-value {
|
||||
margin-top: 8rpx;
|
||||
font-size: 42rpx;
|
||||
color: $white;
|
||||
font-weight: bold;
|
||||
}
|
||||
.requirement{
|
||||
margin-top: 40rpx;
|
||||
}
|
||||
}
|
||||
.right-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -639,7 +748,7 @@
|
||||
background-color: #FF9800;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.bottom-nav {
|
||||
position: fixed;
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
|
||||
<!-- 空数据状态 -->
|
||||
<view v-if="!loading && filteredList.length === 0" class="empty-wrap">
|
||||
<text class="empty-text">暂无数据</text>
|
||||
<empty />
|
||||
</view>
|
||||
|
||||
<!-- 加载更多提示 -->
|
||||
@@ -68,9 +68,9 @@
|
||||
</view>
|
||||
|
||||
<!-- 没有更多数据提示 -->
|
||||
<view v-if="isLastPage && filteredList.length > 0" class="no-more">
|
||||
<!-- <view v-if="isLastPage && filteredList.length > 0" class="no-more">
|
||||
<text>没有更多数据了</text>
|
||||
</view>
|
||||
</view> -->
|
||||
</scroll-view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -80,6 +80,7 @@
|
||||
import navBar from '@/components/navBar/navBar.vue';
|
||||
import api from '@/api/api';
|
||||
import dayjs from 'dayjs';
|
||||
import empty from '@/components/empty/empty.vue';
|
||||
|
||||
// 当前选中的 Tab(0: 视频下载, 1: 课件下载, 2: 查找文献)
|
||||
const activeTab = ref(1);
|
||||
@@ -321,7 +322,7 @@
|
||||
right: 0;
|
||||
top: calc(var(--status-bar-height) + 44px + $segmented-height + $table-header-height);
|
||||
height: calc(100vh - var(--status-bar-height) - 44px - $segmented-height - $table-header-height);
|
||||
background-color: #f5f5f5;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
// 列表行
|
||||
@@ -330,8 +331,8 @@
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 24rpx 30rpx;
|
||||
border-bottom: 1rpx solid #f0f0f0;
|
||||
background-color: #f5f5f5;
|
||||
border-bottom: 2rpx solid #eee;
|
||||
// background-color: #f5f5f5;
|
||||
font-size: 28rpx;
|
||||
color: $text-primary;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user