diff --git a/api/signln/SignDetail/Sign.js b/api/signln/SignDetail/Sign.js new file mode 100644 index 0000000..74b484c --- /dev/null +++ b/api/signln/SignDetail/Sign.js @@ -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' + }) +} diff --git a/api/signln/SignTa/SignTa.js b/api/signln/SignTa/SignTa.js new file mode 100644 index 0000000..2c8ba30 --- /dev/null +++ b/api/signln/SignTa/SignTa.js @@ -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' + }) +} diff --git a/api/signln/checktask/task.js b/api/signln/checktask/task.js new file mode 100644 index 0000000..c0b349b --- /dev/null +++ b/api/signln/checktask/task.js @@ -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' + }) +} diff --git a/config.js b/config.js index c724aeb..604d2f4 100644 --- a/config.js +++ b/config.js @@ -4,8 +4,8 @@ export default { uploadQiNiuDomain: 'https://upload-z2.qiniup.com', // baseUrl: 'https://vue.ruoyi.vip/prod-api', // baseUrl: 'http://47.93.242.168:8080', - baseUrl: 'http://47.93.242.168:8080', - // baseUrl: 'http://localhost:8080', + // baseUrl: 'http://47.93.242.168:8080', + baseUrl: 'http://localhost:8080', // 应用信息 appInfo: { // 应用名称 diff --git a/pages.json b/pages.json index 1a58432..eeee789 100644 --- a/pages.json +++ b/pages.json @@ -281,6 +281,21 @@ "style": { "navigationBarTitleText": "兼职" } + }, + { + "path" : "pages/Friend/addressbook", + "style" : + { + "navigationBarTitleText" : "通讯录", + "navigationStyle": "custom" + } + }, + { + "path" : "pages/Friend/messagechat", + "style" : + { + "navigationBarTitleText" : "" + } } ], "tabBar": { diff --git a/pages/Friend/Interactivemessage.vue b/pages/Friend/Interactivemessage.vue index 75b883a..b1d16af 100644 --- a/pages/Friend/Interactivemessage.vue +++ b/pages/Friend/Interactivemessage.vue @@ -2,10 +2,91 @@ \ No newline at end of file diff --git a/pages/Friend/addfruebd.vue b/pages/Friend/addfruebd.vue index 50bf831..047e43f 100644 --- a/pages/Friend/addfruebd.vue +++ b/pages/Friend/addfruebd.vue @@ -4,26 +4,56 @@ - + - 爱吃饭的小张 - 女 - LV 2 - ID: - 19993849611 + margin-top: 50rpx; +height: 154rpx;"> + + + 爱吃饭的小张 + + 女 + LV 2 + ID: + 19993849611 + - - 9999 获赞 + + 9999 获赞 @@ -34,7 +64,7 @@ background: #ffffff; "> height: 80rpx; border-radius: 40rpx 40rpx 40rpx 40rpx; background: #f7f8fa;"> - + 发消息 @@ -84,4 +114,13 @@ background: linear-gradient(-90deg, #c9f6f5, #f7f8e3);"> width: 750rpx; height: 500rpx; } + + .textrig { + font-weight: Regular; + width: 24rpx; + height: 24rpx; + font-size: 24rpx; + text-align: left; + color: #FFFFFF; + } \ No newline at end of file diff --git a/pages/Friend/addressbook.vue b/pages/Friend/addressbook.vue new file mode 100644 index 0000000..e90023a --- /dev/null +++ b/pages/Friend/addressbook.vue @@ -0,0 +1,82 @@ + + + + + + \ No newline at end of file diff --git a/pages/Friend/messagechat.vue b/pages/Friend/messagechat.vue new file mode 100644 index 0000000..669c36d --- /dev/null +++ b/pages/Friend/messagechat.vue @@ -0,0 +1,19 @@ + + + + + + diff --git a/pages/Friend/messagenotification.vue b/pages/Friend/messagenotification.vue index 2c70a35..9294336 100644 --- a/pages/Friend/messagenotification.vue +++ b/pages/Friend/messagenotification.vue @@ -1,14 +1,217 @@ - + \ No newline at end of file diff --git a/pages/Friend/systemnotification.vue b/pages/Friend/systemnotification.vue index 07a4032..4b10ce8 100644 --- a/pages/Friend/systemnotification.vue +++ b/pages/Friend/systemnotification.vue @@ -9,8 +9,8 @@ - - + + {{item.title}} @@ -23,7 +23,10 @@ {{item.typecontent}} + + + @@ -158,7 +161,7 @@ font-size: 24rpx; text-align: left; color: #3477FC; - margin-top: 11rpx; + /* margin-top: 11rpx; */ display: block; margin-left: 24rpx; } @@ -170,7 +173,7 @@ font-size: 24rpx; text-align: left; color: #FA3939; - margin-top: 12rpx; + /* margin-top: 12rpx; */ display: block; margin-left: 24rpx; } diff --git a/pages/Friend/violationreporting.vue b/pages/Friend/violationreporting.vue index b31d318..6bc8d5a 100644 --- a/pages/Friend/violationreporting.vue +++ b/pages/Friend/violationreporting.vue @@ -21,8 +21,8 @@ {{item.title}} - - + + @@ -53,7 +53,7 @@ - + (0/3) diff --git a/pages/common/navbar/navbar.css b/pages/common/navbar/navbar.css index 21fa668..e66c25b 100644 --- a/pages/common/navbar/navbar.css +++ b/pages/common/navbar/navbar.css @@ -3,6 +3,14 @@ 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]) { font-size: 36rpx !important; font-weight: 600 !important; diff --git a/pages/common/navbar/navbar_nead.vue b/pages/common/navbar/navbar_nead.vue index c6d6e00..d2b0693 100644 --- a/pages/common/navbar/navbar_nead.vue +++ b/pages/common/navbar/navbar_nead.vue @@ -1,10 +1,10 @@ @@ -43,6 +43,7 @@ top: 110rpx; left: 32rpx; } + /* #ifdef APP-PLUS */ .uninavbars { position: fixed; diff --git a/pages/signln/signid.vue b/pages/signln/signid.vue index b52fa05..0345037 100644 --- a/pages/signln/signid.vue +++ b/pages/signln/signid.vue @@ -38,8 +38,9 @@ - - + + {{item.data}}日 @@ -65,14 +66,18 @@ {{item.title}} - + - {{item.count}} + +{{item.rewards}} - {{item.content.title}} - {{item.content.count}} - {{item.content.cuent}} + {{item.content}} + {{leftParenthesis}} + {{acquiesce}} + {{slash}}{{item.conditons}}{{rightParenthesis}} @@ -102,6 +107,62 @@ @@ -266,6 +370,7 @@ .top-left-text>text:last-child { color: #000000; font-weight: Regular; + font-weight: 600; font-face: Microsoft YaHei; font-size: 28rpx; text-align: left; @@ -392,6 +497,7 @@ font-size: 24rpx; text-align: left; color: #000000; + vertical-align: middle; } .count-text { @@ -408,7 +514,7 @@ .task-right>text { font-weight: Regular; - width: 95rpx; + /* width: 95rpx; */ height: 25rpx; font-size: 24rpx; text-align: left; @@ -425,7 +531,7 @@ } .left-text { - display: block; + display: inline; color: #999999; font-weight: Regular; font-face: Microsoft YaHei; @@ -489,6 +595,7 @@ margin-left: 24rpx; padding-left: 2rpx; margin-top: 48rpx; + border-radius: 0 32rpx 32rpx 32rpx; } .data-view { diff --git a/pages/signln/signiddetails.vue b/pages/signln/signiddetails.vue index 25db92b..ecd61f2 100644 --- a/pages/signln/signiddetails.vue +++ b/pages/signln/signiddetails.vue @@ -1,8 +1,6 @@