Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	pages.json
main
26947 2024-06-04 22:01:49 +08:00
commit 70f21ec904
13 changed files with 836 additions and 5 deletions

View File

@ -8,6 +8,38 @@
}
},
"pages": [
{
"path" : "pages/signln/signid",
"style" :
{
"navigationBarTitleText" : "签到任务",
"navigationStyle": "custom"
}
},
{
"path": "pages/signln/signiddetails",
"style": {
"navigationBarTitleText": "签到明细",
"navigationStyle": "custom"
}
},
{
"path" : "pages/signln/exchangemall",
"style" :
{
"navigationBarTitleText" : "兑换商城",
"navigationStyle": "custom"
}
},
{
"path" : "pages/signln/exdetail",
"style" :
{
"navigationBarTitleText" : "兑换商城详情",
"navigationStyle": "custom"
}
},
{
"path": "pages/index",

View File

@ -0,0 +1,14 @@
<!-- 添加好友 -->
<template>
<view>
</view>
</template>
<script setup>
</script>
<style>
</style>

View File

@ -0,0 +1,14 @@
<!-- 消息通知 -->
<template>
<view>
</view>
</template>
<script setup>
</script>
<style>
</style>

View File

@ -0,0 +1,13 @@
:deep(.uni-nav-bar-text.data-v-26544265) {
font-size: 36rpx;
font-weight: 600;
}
:deep(.uni-icons) {
font-family: uniicons;
text-decoration: none;
text-align: center;
width: 31rpx;
height: 44rpx;
line-height: 44rpx;
}

View File

@ -0,0 +1,43 @@
<template>
<view class="uninavbars">
<image :src="leftImage" @click="left_return"></image>
</view>
<view class="uninavbar">
<uni-nav-bar statusBar="false" :fixed="true" :border="false" :background-color=background_color :title="title" />
</view>
</template>
<script setup>
import {
ref,
toRefs,
defineProps,
defineEmits
} from "vue";
const props = defineProps({
title: String,
background_color:String
})
const {
title,
background_color
} = toRefs(props)
let leftImage = ref("../../../static/images/sign/return.png")
</script>
<style>
.uninavbars {
position: fixed;
z-index: 9999;
top: 110rpx;
left: 32rpx;
}
.uninavbars>image {
width: 31rpx;
height: 44rpx;
color: #000000;
}
</style>

View File

@ -0,0 +1,214 @@
<!-- 兑换商城 -->
<template class="content">
<navbar_neadVue title="兑换商城"></navbar_neadVue>
<view class="view-top">
<view class="view-top-rigth-text">
<text>我的校园币:{{count}}</text>
</view>
</view>
<view class="cp">
<view class="view-content" v-for="(item,index) in arr" :key="index">
<view class="content-main">
<view class="content-image">
<image :src="item.src"></image>
</view>
<view class="content-text">
<view class="text1">
{{item.content}}
</view>
<view class="text-flex">
<view class="text2">
兑换所需
</view>
<view class="text3">
<image src="../../static/images/sign/1.png"></image>
<text>{{item.count}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script setup>
import {
ref,
reactive
} from "vue";
import navbar_neadVue from "../common/navbar/navbar_nead.vue";
const count = ref("750");
let arr = reactive([{
id: 1,
src: "https://cbu01.alicdn.com/img/ibank/2019/524/629/11890926425_297889188.jpg",
content: "[端午礼盒] 西凤酒52度头曲礼盒 陕西凤香型白酒礼11111111111",
count: 700
},
{
id: 2,
src: "https://cbu01.alicdn.com/img/ibank/2016/442/823/3216328244_1451018438.jpg",
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
count: 200
},
{
id: 3,
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
count: 500
},
{
id: 3,
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
count: 500
},
{
id: 3,
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
count: 500
},
{
id: 3,
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
count: 500
},
{
id: 3,
src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111 ",
count: 500
},
]);
function return_left(){
console.log("返回事件")
}
</script>
<style>
.content {
background: #faf9fa;
}
.view-top {
/* height: 100rpx; */
}
.view-top-rigth-text {
margin-top: 24rpx;
margin-left: 479rpx;
margin-right: 32rpx;
}
.view-top-rigth-text>text {
font-weight: Regular;
width: 239rpx;
height: 31rpx;
font-size: 30rpx;
text-align: left;
color: #000000;
}
.cp {
display: grid;
grid-template-columns: auto auto;
margin-left: 32rpx;
margin-right: 32rpx;
margin-top: 23rpx;
grid-column-gap: 26rpx;
grid-row-gap: 24rpx;
}
.view-content {
width: 330rpx;
height: 482rpx;
box-sizing: border-box;
}
.content-main {
width: 330rpx;
height: 482rpx;
border-radius: 24rpx 24rpx 24rpx 24rpx;
background: #ffffff;
}
.content-image>image {
width: 330rpx;
height: 330rpx;
border-radius: 24rpx 24rpx 0 0;
display: block;
}
.content-text {
margin-left: 24rpx;
margin-top: 24rpx;
}
.text1 {
font-weight: Regular;
width: 266rpx;
height: 54rpx;
line-height: 27rpx;
font-size: 22rpx;
text-align: left;
color: #000000;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.text-flex {
margin-top: 28rpx;
width: 330rpx;
height: 20rpx;
}
.text2 {
font-weight: Regular;
width: 100rpx;
height: 20rpx;
font-size: 20rpx;
text-align: left;
color: #999999;
line-height: 20rpx;
align-items: center;
float: left;
}
.text3 {
float: right;
margin-right: 24rpx;
line-height: 19rpx;
}
.text3>image {
width: 21rpx;
height: 21rpx;
}
.text3>text {
font-weight: Regular;
width: 41rpx;
height: 19rpx;
font-size: 24rpx;
text-align: left;
color: #f99b46;
padding: 1rpx;
margin-left: 8rpx;
}
</style>

36
pages/signln/exdetail.vue Normal file
View File

@ -0,0 +1,36 @@
<!-- 兑换商城详情 -->
<template>
<view class="uninavbar">
<image src="../../static/images/sign/return.png"></image>
</view>
<view>
<image :src="images"></image>
</view>
</template>
<script setup>
import {
ref
}
from "vue"
const images = ref("https://cbu01.alicdn.com/img/ibank/2016/442/823/3216328244_1451018438.jpg")
</script>
<style>
.uninavbar {
position: absolute;
z-index:9999;
top: 110rpx;
left: 32rpx;
}
.uninavbar > image{
width: 31rpx;
height: 44rpx;
color: #000000;
}
view > image {
width: 750rpx;
height: 500rpx;
}
</style>

451
pages/signln/signid.vue Normal file
View File

@ -0,0 +1,451 @@
<!-- 签到任务 -->
<template>
<navbar_neadVue title="签到任务" background_color="#CAF6F5"></navbar_neadVue>
<view class="content-top">
<view class="top">
<view class="top-right-text">
<text @click="GoTo()"></text>
</view>
<view>
<view class="top-left-text">
<text>{{count}}</text>
<text>校园币</text>
</view>
<view class="top-left">
<text>我的校园币</text>
</view>
</view>
<view class="right-image">
<image src="../../static/images/sign/金币.png"></image>
</view>
<view class="content-bottom">
<view class="c-bottom">
<text>
已连续签到<text class="text-1">1</text>
</text>
</view>
</view>
<view class="content-bottom-bot">
<view class="bot-text">
<text>记得去商城兑换礼物奥</text>
</view>
<view>
<ul style="display: flex; margin-left: 24rpx;padding-left: 2rpx;margin-top: 48rpx;">
<li>
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
</image>
<text style="display: block; font-weight: Regular;
width: 60rpx;
height: 22rpx;
font-size: 24rpx;
text-align: center;
color: #7E7E7E;">12</text>
</li>
<li style="margin-left: 58rpx;">
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
</image>
<text style="display: block; font-weight: Regular;
width: 60rpx;
height: 22rpx;
font-size: 24rpx;
text-align: left;
padding-right: 4rpx;
color: #7E7E7E;">12</text>
</li>
<li style="margin-left: 58rpx;">
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
</image>
<text style="display: block; font-weight: Regular;
width: 60rpx;
height: 22rpx;
font-size: 24rpx;
text-align: left;
padding-right: 4rpx;
color: #7E7E7E;">12</text>
</li>
<li style="margin-left: 58rpx;">
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
</image>
<text style="display: block; font-weight: Regular;
width: 60rpx;
height: 22rpx;
font-size: 24rpx;
text-align: left;
padding-right: 4rpx;
color: #7E7E7E;">12</text>
</li>
<li style="margin-left: 58rpx;">
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
</image>
<text style="display: block; font-weight: Regular;
width: 60rpx;
height: 22rpx;
font-size: 24rpx;
text-align: left;
padding-right: 4rpx;
color: #7E7E7E;">12</text>
</li>
<li style="margin-left: 58rpx;">
<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
</image>
<text style="display: block; font-weight: Regular;
width: 60rpx;
height: 22rpx;
font-size: 24rpx;
text-align: left;
padding-right: 4rpx;
color: #7E7E7E;">12</text>
</li>
</ul>
</view>
</view>
</view>
</view>
<!-- 签到任务 -->
<view class="task">
<view style="height: 60rpx;">
<text class="tasktext">签到任务</text>
</view>
<view class="task-content" v-for="(item,index) in arr" :key="index">
<view class="task-right">
<text>{{item.type}}</text>
</view>
<view>
<text class="c-text">{{item.title}}</text>
<image style="width: 21rpx;height: 21rpx;margin-left: 36rpx;" src="../../static/images/sign/1.png">
</image>
<text class="count-text">{{item.count}}</text>
</view>
<view class="task-left">
<text class="left-text">{{item.content.title}} <text class="left-0text">
{{item.content.count}}
</text>{{item.content.cuent}}</text>
</view>
</view>
<view style="height: 24rpx;"></view>
</view>
<view>
</view>
</template>
<script setup>
import navbar_neadVue from "../common/navbar/navbar_nead.vue";
import exchangemall from "./exchangemall.vue"
//
function GoTo() {
}
import {
ref,
reactive
} from "vue";
const count = ref("750");
const arr = reactive([{
id: 1,
type: "立即签到",
title: "每日签到",
count: "+1",
content: {
title: "点击签到获得每日奖励 ",
count: "(" + "0",
cuent: "/" + "1" + ")"
},
},
{
id: 2,
type: "去关注",
title: "关注",
count: "+2",
content: {
title: "关注优秀用户得奖励 ",
count: "(" + "0",
cuent: "/" + "1" + ")"
},
},
{
id: 3,
type: "去点赞",
title: "点赞",
count: "+2",
content: {
title: "点赞话题获取奖励 ",
count: "(" + "0",
cuent: "/" + "3" + ")"
},
},
{
id: 4,
type: "去发布",
title: "发布话题",
count: "+3",
content: {
title: "点赞话题获取奖励 ",
count: "(" + "0",
cuent: "/" + "1" + ")"
},
},
{
id: 5,
type: "立即邀请",
title: "邀请新用户",
count: "+5",
content: {
title: "邀请新用户得奖励 ",
count: "",
cuent: ""
},
}
])
</script>
<style scoped>
@import '../../pages/common/navbar/navbar.css';
.content-top {
/* height: 424rpx; */
height: 502rpx;
background: linear-gradient(-180deg, #c9f6f5, #ffffff);
}
.top {
margin-left: 32rpx;
margin-right: 32rpx;
}
.top-right-text>text {
font-weight: Regular;
/* width: 95rpx; */
height: 24rpx;
font-size: 24rpx;
text-align: left;
color: #000000;
float: right;
margin-top: 24rpx;
}
.top-left-text {
padding-top: 99rpx;
padding-left: 1rpx;
}
.top-left-text>text:first-child {
color: #000000;
font-weight: Regular;
font-face: Microsoft YaHei;
font-size: 48rpx;
text-align: left;
line-height: 46.29rpx;
}
.top-left-text>text:last-child {
color: #000000;
font-weight: Regular;
font-face: Microsoft YaHei;
font-size: 28rpx;
text-align: left;
line-height: 46.29rpx;
}
.top-left>text {
display: block;
font-weight: Regular;
/* width: 119rpx; */
font-size: 24rpx;
text-align: left;
color: #6F6F6F;
padding-left: 1rpx;
line-height: 24rpx;
}
.right-image>image {
width: 248rpx;
height: 289rpx;
position: absolute;
top: 279rpx;
right: 32rpx;
z-index: 7;
}
.content-bottom {
width: 319rpx;
height: 60rpx;
border-radius: 20rpx 20rpx 0 0;
background: #ffffff;
margin-top: 48rpx;
}
.c-bottom {
padding-left: 26rpx;
padding-top: 8rpx;
}
.c-bottom>text:first-child {
color: #000000;
font-weight: Regular;
font-face: Microsoft YaHei;
font-size: 28rpx;
text-align: left;
line-height: 46.29rpx;
}
.text-1 {
color: #fa3939;
font-weight: Regular;
font-face: Microsoft YaHei;
font-size: 28rpx;
text-align: left;
line-height: 46.29rpx;
}
.content-bottom-bot {
position: relative;
/* width: 686rpx; */
height: 214rpx;
border-radius: 0 32rpx 32rpx 32rpx;
background: #ffffff;
z-index: 9;
}
.bot-text {
padding-left: 24rpx;
display: block;
/* padding-top: 12rpx; */
}
.bot-text>text {
font-weight: Regular;
width: 248rpx;
height: 24rpx;
font-size: 24rpx;
text-align: left;
color: #6F6F6F;
}
.task {
width: 686rpx;
/* height: 484rpx; */
border-radius: 32rpx 32rpx 32rpx 32rpx;
background: #ffffff;
/* background: #fa3939; */
margin-left: 32rpx;
margin-right: 32rpx;
margin-top: 24rpx;
}
.tasktext {
display: block;
font-weight: Regular;
width: 144rpx;
height: 36rpx;
font-size: 36rpx;
text-align: left;
color: #000000;
padding-top: 24rpx;
margin-left: 24rpx;
}
.task-content {
margin-left: 24rpx;
margin-top: 24rpx;
}
.task-right {
margin-top: 16rpx;
width: 120rpx;
height: 48rpx;
border-radius: 24rpx 24rpx 24rpx 24rpx;
background: #f99b46;
float: right;
margin-right: 24rpx;
}
.c-text {
font-weight: Regular;
width: 95rpx;
height: 24rpx;
font-size: 24rpx;
text-align: left;
color: #000000;
}
.count-text {
font-weight: Regular;
width: 20rpx;
height: 16rpx;
font-size: 20rpx;
text-align: left;
color: #F99B46;
padding-left: 3rpx;
line-height: 16rpx;
vertical-align: middle;
}
.task-right>text {
font-weight: Regular;
width: 95rpx;
height: 25rpx;
font-size: 24rpx;
text-align: left;
color: #FFFFFF;
display: block;
margin: auto;
text-align: center;
line-height: 48rpx;
}
.task-left {
/* display: block; */
height: 20rpx;
}
.left-text {
display: block;
color: #999999;
font-weight: Regular;
font-face: Microsoft YaHei;
font-size: 20rpx;
text-align: left;
/* margin-top: 12rpx; */
}
.left-0text {
color: #fb5c5c;
font-weight: Regular;
font-face: Microsoft YaHei;
font-size: 20rpx;
text-align: left;
}
</style>

View File

@ -1,6 +1,7 @@
<!-- 签到明细 -->
<template>
<view class="uninavbar">
<uni-nav-bar statusBar="false" :border="false" left-icon="left" title="签到明细" />
<uni-nav-bar statusBar="false" :border="false" left-icon="leftIcon" title="签到明细" />
</view>
<view style="height: 24rpx;"></view>
<view class="content" v-for="(item,index) in arr" :key="index">
@ -20,6 +21,7 @@
reactive,
ref
} from "vue"
let leftIcon = ref("../../static/images/sign/return.png")
let arr = reactive([{
id: 1,
text: "每日签到",
@ -80,6 +82,9 @@
line-height: 44rpx;
}
*{
background-color: #ffffff;;
}
.content {
margin-left: 32rpx;

9
pages/signln/to.js Normal file
View File

@ -0,0 +1,9 @@
// 跳转
// 打印
export function Log(t1){
console.log(t1);
}

BIN
static/images/sign/1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B