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

main
26947 2024-06-12 16:37:53 +08:00
commit 8bce2621f3
20 changed files with 892 additions and 44 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询签到明细列表
export function listSign(query) {
return request({
url: '/SignDetail/Sign/list',
method: 'get',
params: query
})
}
// 查询签到明细详细
export function getSign(id) {
return request({
url: '/SignDetail/Sign/' + id,
method: 'get'
})
}
// 新增签到明细
export function addSign(data) {
return request({
url: '/SignDetail/Sign',
method: 'post',
data: data
})
}
// 修改签到明细
export function updateSign(data) {
return request({
url: '/SignDetail/Sign',
method: 'put',
data: data
})
}
// 删除签到明细
export function delSign(id) {
return request({
url: '/SignDetail/Sign/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询签到详情列表
export function listSignTa(query) {
return request({
url: '/SignTa/SignTa/list',
method: 'get',
params: query
})
}
// 查询签到详情详细
export function getSignTa(id) {
return request({
url: '/SignTa/SignTa/' + id,
method: 'get'
})
}
// 新增签到详情
export function addSignTa(data) {
return request({
url: '/SignTa/SignTa',
method: 'post',
data: data
})
}
// 修改签到详情
export function updateSignTa(data) {
return request({
url: '/SignTa/SignTa',
method: 'put',
data: data
})
}
// 删除签到详情
export function delSignTa(id) {
return request({
url: '/SignTa/SignTa/' + id,
method: 'delete'
})
}

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询签到任务列表
export function listTask(query) {
return request({
url: '/checktask/task/list',
method: 'get',
params: query
})
}
// 查询签到任务详细
export function getTask(id) {
return request({
url: '/checktask/task/' + id,
method: 'get'
})
}
// 新增签到任务
export function addTask(data) {
return request({
url: '/checktask/task',
method: 'post',
data: data
})
}
// 修改签到任务
export function updateTask(data) {
return request({
url: '/checktask/task',
method: 'put',
data: data
})
}
// 删除签到任务
export function delTask(id) {
return request({
url: '/checktask/task/' + id,
method: 'delete'
})
}

View File

@ -4,8 +4,13 @@ export default {
uploadQiNiuDomain: 'https://upload-z2.qiniup.com', uploadQiNiuDomain: 'https://upload-z2.qiniup.com',
// baseUrl: 'https://vue.ruoyi.vip/prod-api', // baseUrl: 'https://vue.ruoyi.vip/prod-api',
// baseUrl: 'http://47.93.242.168:8080', // baseUrl: 'http://47.93.242.168:8080',
<<<<<<< HEAD
// baseUrl: 'http://47.93.242.168:8080',
baseUrl: 'http://localhost:8080',
=======
// baseUrl: 'http://47.93.242.168:8080', // baseUrl: 'http://47.93.242.168:8080',
baseUrl: 'http://localhost:8080', baseUrl: 'http://localhost:8080',
>>>>>>> 628ee1926942d01758e141fb0b5393a175968240
// 应用信息 // 应用信息
appInfo: { appInfo: {
// 应用名称 // 应用名称

View File

@ -281,6 +281,21 @@
"style": { "style": {
"navigationBarTitleText": "兼职" "navigationBarTitleText": "兼职"
} }
},
{
"path" : "pages/Friend/addressbook",
"style" :
{
"navigationBarTitleText" : "通讯录",
"navigationStyle": "custom"
}
},
{
"path" : "pages/Friend/messagechat",
"style" :
{
"navigationBarTitleText" : ""
}
} }
, ,
{ {

View File

@ -2,10 +2,91 @@
<template> <template>
<navbar_neadVue title="互动消息"></navbar_neadVue> <navbar_neadVue title="互动消息"></navbar_neadVue>
<view> <view style="margin-left: 32rpx; margin-right: 32rpx;">
<u-tabs :list="list1" @change="tabChange"></u-tabs> <u-tabs :lineWidth="25" :lineHeight="2" itemStyle="padding:11px;" lineColor="#3477fc" :list="list1"
@change="tabChange"></u-tabs>
</view> </view>
<view style="width: 750rpx;
height: 2rpx;
background: #f4f5f6;"></view>
<view class="viewcontent">
<view class="viewleft">
<image src="../../static/images/icon/tu4-1.jpg" style="width: 82rpx; height: 82rpx; border-radius: 82rpx;">
</image>
</view>
<view class="viewright">
<view class="rightbutton">
<text>回关</text>
</view>
<view class="viewtoptext">
<text class="viewtoptextfirst">爱吃饭的小张</text>
<text class="viewtoptextlast" style="margin-left: 20rpx;">2024.06.01</text>
</view>
<view class="viewbottomtext">
<text>看你和我那么投缘所以点个关注喽</text>
</view>
</view>
</view>
<view class="viewcontent">
<view class="viewleft">
<image src="../../static/images/icon/tu4-1.jpg" style="width: 82rpx; height: 82rpx; border-radius: 82rpx;">
</image>
<image src="../../static/images/sign/type1.png" class="botimage"></image>
</view>
<view class="viewright" style="padding-top: 23rpx; margin-left: -16rpx;">
<view class="viewtoptext">
<text class="viewtoptextfirst" style="margin-top: 0rpx;">爱吃饭的小张</text>
<view>
<text class="viewtoptexttitle">赞了你的话题</text>
<text class="viewtoptextlast" style="margin-left: 20rpx;">2024.06.01</text>
</view>
</view>
<view class="viewtypebottomtext">
<text>话题下班之后一般喜欢吃什么自己做饭还是吃1111111</text>
</view>
</view>
</view>
<view class="viewcontent">
<view class="viewleft">
<image src="../../static/images/icon/tu4-1.jpg" style="width: 82rpx; height: 82rpx; border-radius: 82rpx;">
</image>
<image src="../../static/images/sign/type2.png" class="botimage"></image>
</view>
<view class="viewright" style="padding-top: 23rpx; margin-left: -16rpx;">
<view class="viewtoptext">
<text class="viewtoptextfirst" style="margin-top: 0rpx;">爱吃饭的小张</text>
<view>
<text class="viewtoptexttitle" style="float: left;width: 370rpx;overflow: hidden;
word-wrap: break-word;
line-height: 21rpx;
padding-top: 7rpx;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;">回复了你的评论你说的对要不是之</text>
<text class="viewtoptextlast" style="margin-left: 20rpx;">2024.06.01</text>
</view>
</view>
<view class="viewtypebottomtext">
<text>话题下班之后一般喜欢吃什么自己做饭还是吃1111111</text>
</view>
</view>
</view>
</template> </template>
<script setup> <script setup>
@ -32,8 +113,139 @@
function tabChange(index) { function tabChange(index) {
console.log('当前选中的选项卡索引:', index); console.log('当前选中的选项卡索引:', index);
} }
const arr = reactive([{
id: 1,
image: "",
name: "",
time: "",
type: "",
content: ""
},
{
id: 2,
image: "",
name: "",
time: "",
type: "",
content: ""
},
])
</script> </script>
<style> <style>
@import '@/pages/common/navbar/navbar.css'; @import '@/pages/common/navbar/navbar.css';
.viewcontent {
width: 750rpx;
height: 130rpx;
background: #d1d1d1;
display: flex;
}
.viewleft {
padding-top: 24rpx;
padding-left: 32rpx;
}
.viewright {
padding-top: 33rpx;
padding-left: 32rpx;
width: 100%;
}
.rightbutton {
width: 72rpx;
height: 40rpx;
border-radius: 20rpx 20rpx 20rpx 20rpx;
background: #3477fc;
float: right;
margin-right: 32rpx;
vertical-align: middle;
text-align: center;
margin-top: 20rpx;
}
.rightbutton>text {
display: block;
font-weight: 500;
font-size: 20rpx;
text-align: left;
color: #FFFFFF;
text-align: center;
line-height: 40rpx;
}
.viewtoptextfirst {
font-weight: 600;
/* width: 173rpx; */
height: 29rpx;
font-size: 28rpx;
text-align: left;
color: #000000;
}
.viewtoptextlast {
font-weight: Regular;
/* width: 89rpx; */
height: 15rpx;
font-size: 18rpx;
text-align: left;
color: #999999;
}
.viewtoptexttitle {
font-weight: Regular;
/* width: 120rpx; */
height: 21rpx;
font-size: 20rpx;
text-align: left;
color: #000000;
}
.viewbottomtext {
font-weight: Regular;
/* width: 327rpx; */
height: 21rpx;
font-size: 20rpx;
text-align: left;
color: #4E4E4E;
/* overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1; */
}
.viewtypebottomtext {
font-weight: Regular;
/* width: 468rpx; */
height: 21rpx;
font-size: 20rpx;
text-align: left;
color: #999999;
line-height: 21rpx;
overflow: hidden;
word-wrap: break-word;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
}
/* / */
.botimage {
width: 32rpx;
height: 32rpx;
position: relative;
bottom: 40rpx;
right: -50rpx;
}
</style> </style>

View File

@ -4,26 +4,56 @@
<image src="../../static/images/sign/return.png"></image> <image src="../../static/images/sign/return.png"></image>
</view> </view>
<view class="back"> <view class="back">
<image src="../../static/images/sign/背景.png" style=" <image src="../../static/images/sign/myBack.png" style="
position: fixed; position:fixed;
top: 0;
left: 0;
width: 750rpx; width: 750rpx;
height: 500rpx; z-index: -1;"></image> height: 500rpx; z-index: -1;"></image>
<view style="width: 154rpx; <view style="width: 154rpx;
height: 154rpx; margin-top: 50rpx;
background: #83c4ff"></view> height: 154rpx;">
<text> 爱吃饭的小张</text> <image src="../../static/images/icon/tu4-1.jpg"
<text></text> style="width: 154rpx; height: 154rpx;border-radius: 154rpx;"></image>
<text>LV 2</text> </view>
<text>ID:</text> <text style="
<text>19993849611</text> font-weight: 600;
width: 272rpx;
height: 45rpx;
font-size: 44rpx;
text-align: left;
color: #FFFFFF;
"> 爱吃饭的小张</text>
<view>
<text class="textrig"></text>
<text class="textrig">LV 2</text>
<text class="textrig">ID:</text>
<text class="textrig">19993849611</text>
</view>
</view> </view>
<view style="position: absolute; top: 424rpx; bottom: 0; left: 0; right: 0; border-radius: 32rpx 32rpx 32rpx 32rpx; <view style="position: absolute; top: 424rpx; bottom: 0; left: 0; right: 0; border-radius: 32rpx 32rpx 32rpx 32rpx;
background: #ffffff; "> background: #ffffff; ">
<view> <view class="viewtop">
<text>9999 获赞</text> <text style="
font-weight:600;
width: 85rpx;
height: 30rpx;
font-size: 36rpx;
text-align: left;
color: #000000;
">9999 <text style="
font-weight: 400;
width: 57rpx;
height: 28rpx;
font-size: 28rpx;
text-align: left;
color: #999999;
vertical-align: middle;
">获赞</text></text>
</view> </view>
<view> <view>
@ -34,7 +64,7 @@ background: #ffffff; ">
height: 80rpx; height: 80rpx;
border-radius: 40rpx 40rpx 40rpx 40rpx; border-radius: 40rpx 40rpx 40rpx 40rpx;
background: #f7f8fa;"> background: #f7f8fa;">
<image style="width: 34rpx; height: 30rpx;" src="../../static/images/sign/发消息.png"></image> <image style="width: 34rpx; height: 30rpx;" src="../../static/images/sign/go.png"></image>
<text>发消息</text> <text>发消息</text>
</view> </view>
@ -84,4 +114,13 @@ background: linear-gradient(-90deg, #c9f6f5, #f7f8e3);"></view>
width: 750rpx; width: 750rpx;
height: 500rpx; height: 500rpx;
} }
.textrig {
font-weight: Regular;
width: 24rpx;
height: 24rpx;
font-size: 24rpx;
text-align: left;
color: #FFFFFF;
}
</style> </style>

View File

@ -0,0 +1,82 @@
<!-- 通讯录 -->
<template>
<view style="position: fixed; top: 0;bottom: 0; left: 0; right: 0; background-color: #ffffff; z-index: -1;"></view>
<up-index-list :index-list="indexList">
<template v-for="(item, index) in itemArr">
<!-- #ifdef APP-NVUE -->
<up-index-anchor :text="indexList[index]"></up-index-anchor>
<!-- #endif -->
<up-index-item>
<!-- #ifndef APP-NVUE -->
<up-index-anchor :text="indexList[index]" bg-color="#ffffff" height="78rpx" style="border-bottom: none;margin-left: 32rpx;padding: 0rpx;" size="30rpx"></up-index-anchor>
<!-- #endif -->
<view class="list-cell" v-for="(cell, index) in item">
<view class="box">
<image src="../../static/images/icon/tu4-1.jpg" />
<view style="margin: auto 0; margin-left: 24rpx;">
<view><text class="boxtexttop">{{cell}}</text></view>
<view><text class="boxtextbottom">[签名]这个人很懒什么都没留下</text></view>
</view>
</view>
</view>
</up-index-item>
</template>
</up-index-list>
</template>
<script setup>
import {
ref
} from 'vue';
//
const indexList = ref(["A", "B", "C", "D"]);
const itemArr = ref([
['列表A1', '列表A2', '列表A3'],
['列表B1', '列表B2', '列表B3'],
['列表C1', '列表C2', '列表C3'],
['列表D1', '列表D2', '列表D3']
]);
</script>
<style scoped>
.list-cell {
padding: 0rpx;
}
.box {
width: 750rpx;
height: 108rpx;
background: #ffffff;
display: flex;
}
.box>image {
width: 60rpx;
height: 60rpx;
border-radius: 60rpx;
display: block;
margin: auto 0;
margin-left: 32rpx;
}
.boxtexttop {
font-weight: 600;
/* width: 81rpx; */
height: 30rpx;
font-size: 30rpx;
text-align: left;
color: #000000;
}
.boxtextbottom {
font-weight: Regular;
/* width: 291rpx; */
height: 21rpx;
font-size: 20rpx;
text-align: left;
color: #939393;
}
</style>

View File

@ -0,0 +1,19 @@
<!-- 消息聊天 -->
<template>
<view>
</view>
<view>
</view>
</template>
<script setup>
</script>
<style>
</style>

View File

@ -1,14 +1,217 @@
<!-- 消息通知 --> <!-- 消息通知 -->
<template> <template>
<view> <view class="box">
<view class="boxview" @click="handerTo('./Interactivemessage')">
<view class="boxmessge"></view>
<image class="boximage" src="../../static/images/sign/message2.png"></image>
<text class="boxtext">互动消息</text>
</view>
<view class="boxview" @click="handerTo('./systemnotification?id=1')">
<view class="boxmessge"></view>
<image class="boximage" src="../../static/images/sign/message.png"></image>
<text class="boxtext">系统通知</text>
</view>
<view class="boxview" @click="handerTo('./systemnotification?id=2')">
<view class="boxmessge"></view>
<image class="boximage" src="../../static/images/sign/message1.png"></image>
<text class="boxtext">审核通知</text>
</view>
</view> </view>
<!-- 内容 -->
<!-- <view class="contentbox, swipe-action__content__text" style="display: flex;">
<view>
<view class="contentboxtop"></view>
<image class="contentboximage" src="../../static/images/icon/tu4-1.jpg"></image>
</view>
<view style="margin-top: 24rpx;">
<text>恋爱60秒</text>
<text>12:00</text>
<text>你有空把上次布置得任务交一下</text>
</view>
</view> -->
<view>
<up-swipe-action style="margin-left: 32rpx; margin-right: 32rpx;margin-top: 48rpx;">
<up-swipe-action-item :options="options1">
<view class="contentbox, swipe-action__content__text" style="display: flex;" @click="gotoAddr()">
<view>
<view class="contentboxtop"></view>
<image class="contentboximage" src="../../static/images/icon/tu4-1.jpg"></image>
</view>
<view style="margin-left: 26rpx;width: 612rpx;">
<text class="contentboxtexttop">恋爱60秒</text>
<text class="contentboxtextmiddle">12:00</text>
<text class="contentboxtextbottom">你有空把上次布置得任务交一下</text>
</view>
</view>
</up-swipe-action-item>
</up-swipe-action>
</view>
</template> </template>
<script setup> <script setup>
import {
reactive
} from 'vue';
// 使 reactive
const options1 = reactive([{
text: '删除',
style: {
backgroundColor: '#3c9cff'
}
},
{
text: '删除',
style: {
backgroundColor: '#f56c6c'
}
}
]);
//
function handerTo(url){
uni.navigateTo({
url: url
});
}
//
function gotoAddr(){
console.log("跳转123")
}
</script> </script>
<style> <style scoped>
.swipe-action__content__text {
padding: 0rpx !important;
margin: 0rpx !important;
height: 82rpx !important;
}
.box {
height: 208rpx;
border-radius: 24rpx 24rpx 0rpx 0rpx;
background-color: aqua;
display: flex;
margin-left: 32rpx;
margin-right: 32rpx;
}
.boxmessge {
width: 24rpx;
height: 24rpx;
background: #fa3939;
border-radius: 24rpx;
position: relative;
left: 96rpx;
top: 24rpx;
}
.boximage {
width: 120rpx;
height: 120rpx;
}
.boxview {
margin: 0 auto;
}
.boxtext {
font-weight: 600;
/* width: 112rpx; */
height: 28rpx;
font-size: 28rpx;
text-align: left;
color: #000000;
display: block;
}
.contentbox {
/* width: 750rpx; */
height: 82rpx;
/* margin-top: -24rpx; */
display: flex;
}
.contentboximage {
width: 82rpx;
height: 82rpx;
border-radius: 82rpx;
}
.contentboxtop {
width: 24rpx;
height: 24rpx;
background: #fa3939;
border-radius: 24rpx;
position: fixed;
left: 56rpx;
/* top: 24rpx; */
z-index: 3;
}
.u-page {
padding: 0;
}
.u-demo-block__title {
padding: 10px 0 2px 15px;
}
.swipe-action {
&__content {
padding: 25rpx 0;
&__text {
font-size: 15px;
color: $u-main-color;
padding-left: 30rpx;
}
}
}
.contentboxtexttop {
font-weight: 600;
/* width: 125rpx; */
height: 30rpx;
font-size: 30rpx;
text-align: left;
color: #000000;
vertical-align: middle;
}
.contentboxtextmiddle {
font-weight: Regular;
/* width: 50rpx; */
height: 17rpx;
font-size: 20rpx;
text-align: right;
color: #999999;
vertical-align: middle;
float: right;
display: block;
/* margin-left: 381rpx; */
margin-right: 24rpx;
}
.contentboxtextbottom {
font-weight: Regular;
/* width: 364rpx; */
height: 26rpx;
font-size: 26rpx;
text-align: left;
color: #999999;
vertical-align: middle;
display: block;
line-height: 26rpx;
margin-top: 12rpx;
}
</style> </style>

View File

@ -9,8 +9,8 @@
<view style="display: flex;margin-left: 32rpx;margin-top: 24rpx;"> <view style="display: flex;margin-left: 32rpx;margin-top: 24rpx;">
<view class="imageview"> <view class="imageview">
<image v-if="item.leng === ''" src="../../static/images/sign/系统通知.png" /> <image v-if="item.leng === ''" src="../../static/images/sign/message.png" />
<image v-if="item.leng === ''" src="../../static/images/sign/审核通知.png" /> <image v-if="item.leng === ''" src="../../static/images/sign/message1.png" />
</view> </view>
<view class="contentview"> <view class="contentview">
<text class="viewtitle">{{item.title}}</text> <text class="viewtitle">{{item.title}}</text>
@ -23,7 +23,10 @@
<text v-if="item.type === 2" class="viewtexttypelose"> <text v-if="item.type === 2" class="viewtexttypelose">
{{item.typecontent}} {{item.typecontent}}
</text> </text>
<view style="margin-top: 24rpx;"></view>
</view> </view>
</view> </view>
</view> </view>
@ -158,7 +161,7 @@
font-size: 24rpx; font-size: 24rpx;
text-align: left; text-align: left;
color: #3477FC; color: #3477FC;
margin-top: 11rpx; /* margin-top: 11rpx; */
display: block; display: block;
margin-left: 24rpx; margin-left: 24rpx;
} }
@ -170,7 +173,7 @@
font-size: 24rpx; font-size: 24rpx;
text-align: left; text-align: left;
color: #FA3939; color: #FA3939;
margin-top: 12rpx; /* margin-top: 12rpx; */
display: block; display: block;
margin-left: 24rpx; margin-left: 24rpx;
} }

View File

@ -21,8 +21,8 @@
<view v-for="(item,index) in arr" :key="index"> <view v-for="(item,index) in arr" :key="index">
<view class="boxc" @click="HaveIsClick(item.id)"> <view class="boxc" @click="HaveIsClick(item.id)">
<text class="box-text">{{item.title}}</text> <text class="box-text">{{item.title}}</text>
<image v-if="item.id == IsClick" class="box-image" src="../../static/images/sign/选中.png"></image> <image v-if="item.id == IsClick" class="box-image" src="../../static/images/sign/isH.png"></image>
<image v-else class="box-image" src="../../static/images/sign/未选中.png"></image> <image v-else class="box-image" src="../../static/images/sign/IsHave.png"></image>
</view> </view>
</view> </view>
<view class="but" @click="goNext()"> <view class="but" @click="goNext()">
@ -53,7 +53,7 @@
</view> </view>
<view class="next-image"> <view class="next-image">
<image src="../../static/images/sign/添加图片.png"></image> <image src="../../static/images/sign/add.png"></image>
<view> <view>
<text class="next-bot-text">(0/3)</text> <text class="next-bot-text">(0/3)</text>
</view> </view>

View File

@ -3,6 +3,14 @@
font-weight: 600; font-weight: 600;
} }
:deep(.uniui-left[data-v-d31e1c47]:before) {
font-weight: 600 !important;
}
:deep(.data-v-2fef5172 .uni-icons) {
font-weight: 600 !important;
}
:deep(.uni-nav-bar-text[data-v-26544265]) { :deep(.uni-nav-bar-text[data-v-26544265]) {
font-size: 36rpx !important; font-size: 36rpx !important;
font-weight: 600 !important; font-weight: 600 !important;

View File

@ -1,10 +1,10 @@
<template> <template>
<view class="uninavbars" @click="ReturnPage()"> <!-- <view class="uninavbars" @click="ReturnPage()">
<image src="../../../static/images/sign/return.png" @click="left_return"></image> <image src="../../../static/images/sign/return.png" @click="left_return"></image>
</view> </view> -->
<view class="uninavbar"> <view class="uninavbar">
<uni-nav-bar statusBar="false" :fixed="true" :border="false" :background-color=background_color <uni-nav-bar statusBar="false" left-icon="left" @clickLeft="ReturnPage" :fixed="true" :border="false"
:title="title" /> :background-color=background_color :title="title" />
</view> </view>
</template> </template>
@ -43,6 +43,7 @@
top: 110rpx; top: 110rpx;
left: 32rpx; left: 32rpx;
} }
/* #ifdef APP-PLUS */ /* #ifdef APP-PLUS */
.uninavbars { .uninavbars {
position: fixed; position: fixed;

View File

@ -38,8 +38,9 @@
<!-- 签到日期 --> <!-- 签到日期 -->
<view> <view>
<view class="data"> <view class="data">
<view class="data-view" v-for="(item,index) in datetime" :key="index"> <view class="data-view" v-for="(item,index) in weekDates" :key="index">
<image v-if="item.isDate == true" class="data-image" src="../../static/images/sign/jin.png"> <image v-if="item.isDate == true" class="data-image"
src="../../static/images/sign/one_l.png">
</image> </image>
<image v-else class="data-image" src="../../static/images/sign/one.png"></image> <image v-else class="data-image" src="../../static/images/sign/one.png"></image>
<text class="data-text">{{item.data}}</text> <text class="data-text">{{item.data}}</text>
@ -65,14 +66,18 @@
</view> </view>
<view> <view>
<text class="c-text">{{item.title}}</text> <text class="c-text">{{item.title}}</text>
<image style="width: 21rpx;height: 21rpx;margin-left: 36rpx;" src="../../static/images/sign/one.png"> <image style="width: 21rpx;height: 21rpx;margin-left: 36rpx;vertical-align: middle;"
src="../../static/images/sign/one.png">
</image> </image>
<text class="count-text">{{item.count}}</text> <text class="count-text">+{{item.rewards}}</text>
</view> </view>
<view class="task-left"> <view class="task-left">
<text class="left-text">{{item.content.title}} <text class="left-0text"> <text class="left-text">{{item.content}}</text>
{{item.content.count}} <text v-show="item.conditons != null" class="left-text"
</text>{{item.content.cuent}}</text> style="margin-left: 20rpx;">{{leftParenthesis}}</text>
<text v-show="item.conditons != null" class="left-0text">{{acquiesce}}</text>
<text v-show="item.conditons != null"
class="left-text">{{slash}}{{item.conditons}}{{rightParenthesis}}</text>
</view> </view>
</view> </view>
@ -102,6 +107,62 @@
<script setup> <script setup>
import navbar_neadVue from "@/pages/common/navbar/navbar_nead.vue"; import navbar_neadVue from "@/pages/common/navbar/navbar_nead.vue";
import ex from "@/pages/common/exchange/index.vue"; import ex from "@/pages/common/exchange/index.vue";
import {
listTask,
getTask,
delTask,
addTask,
updateTask
} from "@/api/signln/checktask/task";
import {
listSignTa,
getSignTa,
delSignTa,
addSignTa,
updateSignTa
} from "@/api/signln/SignTa/SignTa";
// 7
var date = new Date();
console.log("日" + date.getDate() + "年" + date.getFullYear() + "月" + (date.getMonth() + 1))
const datetimes = reactive([{
data: date.getDate(),
}])
const sdate = new Date();
const dayof = date.getDay();
const weekDates = reactive([]);
sdate.setDate(date.getDate() - dayof + (dayof === 0 ? -6 : 1));
console.log(dayof)
for (let i = 0; i < 7; i++) {
const date = new Date(sdate);
date.setDate(sdate.getDate() + i);
const list = {
data: date.getDate(),
isDate: false
}
weekDates.push(list);
}
//
const past = 12;
//
const cot = ref(2);
async function Ipp(ite) {
const indexs = weekDates.indexOf(weekDates.find(item => item.data == past));
for (let j = 0; j < ite; j++) {
weekDates.find(item => item.data == past + j).isDate = true;
}
}
Ipp(cot.value);
// console.log(indexs)
// console.log(weekDates)
const datetime = reactive([{ const datetime = reactive([{
data: "12", data: "12",
@ -148,7 +209,14 @@
} }
function goTaskRight(id) { function goTaskRight(id) {
arr.find(item => item.id == id).type = "成功"; // arr.find(item => item.id == id).type = "";
cot.value++;
Ipp(cot.value);
console.log(weekDates)
console.log(cot.value)
uni.showToast({ uni.showToast({
title: '成功', title: '成功',
// success icon // success icon
@ -163,7 +231,7 @@
reactive reactive
} from "vue"; } from "vue";
const count = ref("750"); const count = ref("750");
const arr = reactive([{ let arr = ref([{
id: 1, id: 1,
type: "立即签到", type: "立即签到",
title: "每日签到", title: "每日签到",
@ -219,6 +287,42 @@
}, },
} }
]) ])
// conditons: (0 /1)
// content: ""
// createBy: null
// createTime: null
// id: 1
// remark: null
// rewards: "1"
// title: ""
// type: ""
// updateBy: null
// updateTime: null
const leftParenthesis = ref("(")
const rightParenthesis = ref(")")
const slash = ref("/");
const acquiesce = ref("0");
/** 查询签到任务列表 */
function getList() {
listTask().then(response => {
arr.value = response.rows;
console.log(arr)
});
}
getList();
/** 查询签到详情列表 */
function getListsign() {
listSignTa().then(response => {
console.log("用户的信息"+response)
// console.log("SecurityUtils.getUserId();"+SecurityUtils.getUserId();)
});
}
getListsign();
</script> </script>
@ -266,6 +370,7 @@
.top-left-text>text:last-child { .top-left-text>text:last-child {
color: #000000; color: #000000;
font-weight: Regular; font-weight: Regular;
font-weight: 600;
font-face: Microsoft YaHei; font-face: Microsoft YaHei;
font-size: 28rpx; font-size: 28rpx;
text-align: left; text-align: left;
@ -392,6 +497,7 @@
font-size: 24rpx; font-size: 24rpx;
text-align: left; text-align: left;
color: #000000; color: #000000;
vertical-align: middle;
} }
.count-text { .count-text {
@ -408,7 +514,7 @@
.task-right>text { .task-right>text {
font-weight: Regular; font-weight: Regular;
width: 95rpx; /* width: 95rpx; */
height: 25rpx; height: 25rpx;
font-size: 24rpx; font-size: 24rpx;
text-align: left; text-align: left;
@ -425,7 +531,7 @@
} }
.left-text { .left-text {
display: block; display: inline;
color: #999999; color: #999999;
font-weight: Regular; font-weight: Regular;
font-face: Microsoft YaHei; font-face: Microsoft YaHei;
@ -489,6 +595,7 @@
margin-left: 24rpx; margin-left: 24rpx;
padding-left: 2rpx; padding-left: 2rpx;
margin-top: 48rpx; margin-top: 48rpx;
border-radius: 0 32rpx 32rpx 32rpx;
} }
.data-view { .data-view {

View File

@ -1,8 +1,6 @@
<!-- 签到明细 --> <!-- 签到明细 -->
<template> <template>
<navbar_neadVue title="签到明细"></navbar_neadVue> <navbar_neadVue title="签到明细"></navbar_neadVue>
<view style="position: fixed; z-index: -1; background-color: #ffffff; top: 0; bottom: 0;left: 0;right: 0;"></view> <view style="position: fixed; z-index: -1; background-color: #ffffff; top: 0; bottom: 0;left: 0;right: 0;"></view>
<view style="background-color: #ffffff;"> <view style="background-color: #ffffff;">
@ -21,6 +19,13 @@
</template> </template>
<script setup> <script setup>
import {
listSign,
getSign,
delSign,
addSign,
updateSign
} from "@/api/signln/SignDetail/Sign";
import { import {
reactive, reactive,
ref ref
@ -71,6 +76,23 @@
type: "-" type: "-"
}, },
]); ]);
const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10
}
});
/** 查询签到明细列表 */
function getList() {
listSign(data.queryParams.value).then(response => {
console.log(response)
});
}
getList();
</script> </script>
<style scoped> <style scoped>

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB