Merge branch 'main' of 123.207.203.228:shang/yfs

This commit is contained in:
zpc 2025-04-09 20:27:41 +08:00
commit 7979cfd80c
3 changed files with 53 additions and 31 deletions

View File

@ -1,5 +1,5 @@
{
"name" : "一番赏",
"name" : "友达赏",
"appid" : "__UNI__2E6CB39",
"description" : "",
"versionName" : "1.0.1",

View File

@ -109,9 +109,9 @@
</view>
<view class="task-r">
<view v-if="item.is_complete == 0" class="btn"
@click="$c.to({ type: 3, url: '/pages/shouye/index' })">
<view v-if="item.is_complete == 0" class="btn" @click="toPage(item.id)">
<text>去完成</text>
</view>
<view v-if="item.is_complete == 1" class="btn act" @click="completeTask(item)">
@ -703,7 +703,22 @@
}
}
})
},
//
toPage(id) {
if (id == 1) {
this.$c.to({
url: '/pages/user/tui-guang'
})
} else {
this.$c.to({
type: 3,
url: '/pages/shouye/index'
})
}
}
}
}
</script>

View File

@ -3,14 +3,10 @@
<uni-nav-bar left-icon="left" title="邀请好友" color="#000000" backgroundColor="transparent" :fixed="true"
:statusBar="true" :border="false" @clickLeft="$c.back"></uni-nav-bar>
<mescroll-body ref="mescrollRef" :down="downOption" @init="mescrollInit" @down="downCallback" @up="upCallback">
<view
style="width: 640rpx; height: 220rpx; background-color: #F8DDAD; margin: 60rpx auto 0; border-radius: 16rpx 16rpx 0rpx 0rpx; position: relative;">
<view class="top-bg">
<text style="position: absolute; left: 34rpx; top: 36rpx; color: #333333; font-size: 40rpx;">邀请好友
领奖励</text>
@ -49,13 +45,12 @@
</view>
</view>
<!-- // -->
<!-- <view class="" style="flex-direction: row; display: flex;">
<button v-if="!ish5" open-type="share" class="invite-btn"></button>
<button class="invite-btn2" style="margin-left: 20rpx;" @click="showPosterPopup"></button>
</view> -->
</view>
<!-- // -->
<view class="" style="flex-direction: row; display: flex; width: 686rpx; margin: 40rpx auto;">
<button v-if="!ish5" open-type="share" class="invite-btn">立即邀请</button>
<button class="invite-btn2" style="margin-left: 20rpx;" @click="showPosterPopup">生成海报</button>
</view>
<view class="invite-log">
@ -64,7 +59,7 @@
<!-- <text class="ml10" style="font-size: 28rpx;">({{ total }})</text> -->
</view>
<view style="height: 2rpx; background-color: #F3F3F3;">
</view>
<view class="list-wrap">
<view v-for="(item, i) of listdata" :key="i" class="list-wrap-item">
@ -312,12 +307,16 @@
}
.top-bg {
width: 712rpx;
height: 526rpx;
width: 640rpx;
height: 220rpx;
margin: 60rpx auto 0;
border-radius: 16rpx 16rpx 0rpx 0rpx;
position: relative;
margin: 0 auto;
background: url($imgurl+'my/invite_bg.png') no-repeat 0 0 / 100% 100%;
}
.rule-btn {
position: absolute;
left: 34rpx;
@ -451,19 +450,7 @@
}
}
.invite-btn {
margin: 30rpx auto 0;
width: 296rpx;
height: 86rpx;
background: url($imgurl+'my/yqbtn.png') no-repeat 0 0 / 100% 100%;
}
.invite-btn2 {
margin: 30rpx auto 0;
width: 296rpx;
height: 86rpx;
background: url($imgurl+'my/promotion_poster.png') no-repeat 0 0 / 100% 100%;
}
.tips {
text-align: center;
@ -471,6 +458,26 @@
}
}
.invite-btn {
width: 304rpx;
height: 76rpx;
background-color: #D8FD24;
border-radius: 16rpx;
color: #333333;
font-size: 24rpx;
// background: url($imgurl+'my/yqbtn.png') no-repeat 0 0 / 100% 100%;
}
.invite-btn2 {
width: 304rpx;
height: 76rpx;
background-color: #333333;
border-radius: 16rpx;
color: #D8FD24;
font-size: 24rpx;
// background: url($imgurl+'my/promotion_poster.png') no-repeat 0 0 / 100% 100%;
}
.invite-log {
width: 100%;
margin: 30rpx auto 0;
@ -479,7 +486,7 @@
background-color: #FFFFFF;
padding: 32rpx 34rpx;
border-radius: 16rpx;
.list-title {
display: flex;