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 8611530..299e5a3 100644 --- a/config.js +++ b/config.js @@ -4,8 +4,13 @@ export default { uploadQiNiuDomain: 'https://upload-z2.qiniup.com', // baseUrl: 'https://vue.ruoyi.vip/prod-api', // 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://localhost:8080', +>>>>>>> 628ee1926942d01758e141fb0b5393a175968240 // 应用信息 appInfo: { // 应用名称 diff --git a/manifest.json b/manifest.json index be71bc2..b6a99a5 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,10 @@ "autoclose" : true, "delay" : 0 }, - "modules" : {}, + "modules" : { + "Barcode" : {}, + "Camera" : {} + }, "distribute" : { "android" : { "permissions" : [ @@ -45,7 +48,24 @@ "UniversalLinks" : "" } }, - "ad" : {} + "ad" : {}, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + }, + "amap" : { + "name" : "", + "__platform__" : [ "ios", "android" ], + "appkey_ios" : "", + "appkey_android" : "" + } + }, + "push" : { + "unipush" : { + "version" : "2", + "offline" : false + } + } } } }, diff --git a/pages.json b/pages.json index c8309b8..bf6601d 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" : "" + } } , { @@ -299,6 +314,12 @@ "navigationBarTextStyle": "white" } } + ,{ + "path": "pages/activity/map", + "style": { + "navigationBarTitleText": "地图" + } + } ], "tabBar": { "color": "#000000", 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/activity/map.vue b/pages/activity/map.vue new file mode 100644 index 0000000..ec3c501 --- /dev/null +++ b/pages/activity/map.vue @@ -0,0 +1,37 @@ + + + \ No newline at end of file diff --git a/pages/activity/publish.vue b/pages/activity/publish.vue index 1743c52..8e48b5b 100644 --- a/pages/activity/publish.vue +++ b/pages/activity/publish.vue @@ -14,7 +14,8 @@ + fontSize="34rpx" color="#333333" clearable + placeholderStyle="color: #c0c0c0;font-size: 34rpx;"> @@ -23,10 +24,8 @@ + placeholderStyle="color: #c0c0c0;font-size: 30rpx; white-space: pre-wrap;" color="#333333" + fontSize="30rpx" @linechange="inputtextInfo"> {{ form.acContent.length }}/500 @@ -77,7 +76,7 @@ border="none"> 添加活动具体位置 - + @@ -88,12 +87,12 @@ format="YYYY-MM-DD HH:mm:ss" @cancel="cancel" mode="datetime"> - + 发布 - - + + 存草稿 - + @@ -142,8 +141,10 @@ const data = reactive({ { required: true, message: '请选择活动结束时间', trigger: 'change' }, { validator: (rule, value, callback) => { - console.log(form.value.startTime, " ", value, " ", value <= form.value.startTime) - if (value <= form.value.startTime) { + if( value == null | form.value.startTime == null ){ + callback(); + } + else if (value <= form.value.startTime) { callback(proxy.$modal.msgError('时间选择错误')); } else { callback(); @@ -155,7 +156,6 @@ const data = reactive({ } }); const { form, rules } = toRefs(data); -const fileList1 = ref([]) const fileTypeInfo1 = ref('image') const bgColor = ref(''); bgColor.value = 'rgba(170, 0, 0, 0)' @@ -172,7 +172,7 @@ const timeFormat = uni.$u.timeFormat; // 表单引用 const uFormRef = ref(null); onLoad((options) => { - console.log("页面参数：", options.id); + }) const leftClick = () => { @@ -198,22 +198,20 @@ const inputtextInfo = (e) => { console.log("测试输入1：", e); } - +const gotomap = () => { + proxy.$tab.navigateTo('/pages/activity/map') +} const submitForm = (type) => { if (uFormRef.value) { uFormRef.value.validate().then(valid => { if (valid) { - console.log('表单验证通过:', form.value); proxy.$modal.loading('正在提交数据，请稍候...'); // 提交表单数据 if (type === 'publish') { - console.log("调用发布接口", form.value); // 调用发布接口 addInfo(form.value).then(response => { - proxy.$modal.closeLoading(); - proxy.$modal.msgSuccess("发布成功"); - proxy.$tab.navigateTo('/pages/common/talkState/publish') + rotation(response.data.id); }); } else { // 调用存草稿接口 @@ -232,13 +230,38 @@ const submitForm = (type) => { console.log('表单引用未定义'); } } +//轮训 +const rotation = (id) => { + setTimeout(() => { + getInfo(id).then(response => { + if (response.data.auditStatus === 3 | response.data.auditStatus === 4) { + proxy.$modal.closeLoading(); + proxy.$modal.msgError("审核失败"); + proxy.$tab.navigateTo('/pages/common/talkState/auditFailure') + }else if(response.data.auditStatus === 2){ + proxy.$modal.closeLoading(); + proxy.$modal.msgSuccess("审核中~"); + proxy.$tab.navigateTo('/pages/common/talkState/audit') + }else if(response.data.auditStatus === 0){ + proxy.$modal.closeLoading(); + proxy.$modal.msgSuccess("发布成功"); + proxy.$tab.navigateTo('/pages/common/talkState/publis') + } + + else { + rotation(id); + } + }); + }, 1000); +} + + const startTime = (e) => { showStartTime.value = !showStartTime.value } const confirm1 = (e) => { - console.log(e); showtext1.value = false; StartTime.value = e.value form.value.startTime = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss'); @@ -246,7 +269,6 @@ const confirm1 = (e) => { } const confirm2 = (e) => { - console.log(e); showtext2.value = false; EndTime.value = e.value form.value.endTime = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss'); @@ -259,9 +281,10 @@ const cancel = (e) => { } 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/mine/myActivity/index.vue b/pages/mine/myActivity/index.vue index f301788..15da2ff 100644 --- a/pages/mine/myActivity/index.vue +++ b/pages/mine/myActivity/index.vue @@ -227,6 +227,7 @@ onPullDownRefresh((options) => { console.log("下拉刷新,", queryParams.value); getList(); }) +//按照条件查询 const tabsClick = (index) => { removePage() if (index.state == 9) { diff --git a/pages/mine/myActivity/info.vue b/pages/mine/myActivity/info.vue index 46d7efc..d825613 100644 --- a/pages/mine/myActivity/info.vue +++ b/pages/mine/myActivity/info.vue @@ -7,7 +7,7 @@ - + @@ -24,52 +24,71 @@ - + + @click="showqr = true"> + 签到二维码 - + - + + + + 发布审核时间：{{ actiInfoList.startTime }} + 审核状态：审核中 + + + + + + 发布审核时间：{{ actiInfoList.startTime }} + 审核状态：未通过 + 未通过原因：{{actiInfoList.auditAdvice}} + + + + - - - - - - 已报名：{{ actiInfoList.elroll }}人 - - - - - - + + + + 已报名：{{ actiInfoList.elroll }}人 - - - - - 已签到：{{ actiInfoList.qrcodeElroll }}人 - + + + + + + 已报名：{{ actiInfoList.elroll }}人 + + + + + + 已签到：{{ actiInfoList.qrcodeElroll }}人 + + + - - + + + style="width: 600rpx; height: 600rpx"> + @@ -77,7 +96,7 @@ @@ -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 @@