diff --git a/App.vue b/App.vue index 24b7205..e336421 100644 --- a/App.vue +++ b/App.vue @@ -3,6 +3,7 @@ import store from '@/store' import { getToken } from '@/utils/auth' + export default { onLaunch: function() { this.initApp() @@ -22,7 +23,7 @@ }, checkLogin() { if (!getToken()) { - this.$tab.reLaunch('pages/loginInfo/login') + this.$tab.reLaunch('pages/login') } } } diff --git a/api/activityInfo/activityTakeInfo.js b/api/activityInfo/activityTakeInfo.js index 2798ad7..2fd20cf 100644 --- a/api/activityInfo/activityTakeInfo.js +++ b/api/activityInfo/activityTakeInfo.js @@ -72,3 +72,12 @@ export function gotoQrcode(data) { data: data }) } + +//查询用户所有活动参与的详细信息 +// 报名 +export function getUserAcInfo() { + return request({ + url: '/activityInfo/activityTakeInfo/getUserAcInfo', + method: 'get' + }) +} \ No newline at end of file diff --git a/api/activityInfo/info.js b/api/activityInfo/info.js index d85494c..38af2de 100644 --- a/api/activityInfo/info.js +++ b/api/activityInfo/info.js @@ -16,7 +16,14 @@ export function getInfo(id) { method: 'get' }) } - +getInfoall +// 查询活动详情详细 所有额外信息 +export function getInfoall(id) { + return request({ + url: '/activityInfo/info/app/all/' + id, + method: 'get' + }) +} // 新增活动详情 export function addInfo(data) { return request({ @@ -42,3 +49,12 @@ export function delInfo(id) { method: 'delete' }) } + +// 查询自己的活动详情列表 +export function getmelistInfo(query) { + return request({ + url: '/activityInfo/info/app/getmelistInfo', + method: 'get', + params: query + }) +} diff --git a/config.js b/config.js index 604d2f4..299e5a3 100644 --- a/config.js +++ b/config.js @@ -1,11 +1,16 @@ // 应用全局配置 export default { - qnDomain: 'http://sdcwwvrwz.hn-bkt.clouddn.com/', + qnDomain: 'http://seueton5q.hn-bkt.clouddn.com/', 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/main.js b/main.js index 08620ce..93f4d78 100644 --- a/main.js +++ b/main.js @@ -4,6 +4,7 @@ import store from './store' // store import { install } from './plugins' // plugins import './permission.js' // permission import iconConfig from './utils/icon/icon.js' +import { getDictLabelByValue } from '@/utils/dict' // main.js import uviewPlus from 'uview-plus' @@ -11,6 +12,7 @@ import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, select export function createApp() { const app = createSSRApp(App) app.config.globalProperties.iconConfig = iconConfig + app.config.globalProperties.getDictLabelByValue = getDictLabelByValue app.config.globalProperties.parseTime = parseTime app.config.globalProperties.resetForm = resetForm app.config.globalProperties.handleTree = handleTree 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 eeee789..bf6601d 100644 --- a/pages.json +++ b/pages.json @@ -297,6 +297,29 @@ "navigationBarTitleText" : "" } } + , + { + "path": "pages/mine/myActivity/index", + "style": { + "navigationBarTitleText": "我的活动", + "enablePullDownRefresh": true, + "onReachBottomDistance": 100 + } + } + ,{ + "path": "pages/mine/myActivity/info", + "style": { + "navigationBarTitleText": "活动详情", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + } + ,{ + "path": "pages/activity/map", + "style": { + "navigationBarTitleText": "地图" + } + } ], "tabBar": { "color": "#000000", diff --git a/pages/activity/index.vue b/pages/activity/index.vue index fb9d55f..3901f28 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -1,10 +1,8 @@ @@ -108,6 +121,9 @@ const data = reactive({ endTime: null, file: null, state: null, + addres: null, + longitude: null, + latitude: null }, rules: { acTitle: [ @@ -123,15 +139,17 @@ const data = reactive({ ], endTime: [ { required: true, message: '请选择活动结束时间', trigger: 'change' }, - { validator: (rule, value, callback) => { - console.log(form.value.startTime," ",value," ",value <= form.value.startTime) - if (value <= form.value.startTime) { - callback( proxy.$modal.msgError('时间选择错误') ); - } else { - callback(); - } - }, trigger: 'change' } - ] + { + validator: (rule, value, callback) => { + if (value <= form.value.startTime) { + callback(proxy.$modal.msgError('时间选择错误')); + } else { + callback(); + } + }, trigger: 'change' + } + ], + addres: [] } }); const { form, rules } = toRefs(data); @@ -141,6 +159,7 @@ const bgColor = ref(''); bgColor.value = 'rgba(170, 0, 0, 0)' const showStartTime = ref(false); const showEndTime = ref(false); +const showaddres = ref(false); const StartTime = ref('请选择活动开始时间'); const showtext1 = ref(true); const showtext2 = ref(true); @@ -149,9 +168,9 @@ const EndTime = ref('请选择活动结束时间'); const newData = ref(new Date().getTime()); const timeFormat = uni.$u.timeFormat; // 表单引用 -const uFormRef = ref(null); +const uFormRef = ref(null); onLoad((options) => { - console.log("页面参数：", options.id); + }) const leftClick = () => { @@ -169,21 +188,28 @@ const publish = () => { submitForm('publish'); console.log("发布"); } +const change1 = (e) => { + showtext3.value = false; + +} +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 { // 调用存草稿接口 @@ -202,24 +228,48 @@ 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'); + form.value.startTime = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss'); showStartTime.value = !showStartTime.value } 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'); + form.value.endTime = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss'); showEndTime.value = !showEndTime.value } @@ -229,6 +279,10 @@ const cancel = (e) => { } diff --git a/pages/common/activityList/index.vue b/pages/common/activityList/index.vue index 7216e40..2ceb6e9 100644 --- a/pages/common/activityList/index.vue +++ b/pages/common/activityList/index.vue @@ -16,17 +16,20 @@ 结束时间：{{ item.endTime }} - + 活动地点：{{ item.addres }} - + + + + {{ getDictLabelByValue2(item.attendState) }} + + + {{ getDictLabelByValue(item.state).dictLabel }} - - + @@ -43,6 +46,7 @@ import { useStore } from 'vuex'; const emit = defineEmits(['scrolltolower']); const { proxy } = getCurrentInstance(); const activityState = ref([])//字典 +const activityState2 = ref([])//字典 take_part_state const iconConfig = proxy.iconConfig; const tu21 = iconConfig.tu21; const tu22 = iconConfig.tu22; @@ -62,13 +66,29 @@ const toInfo = (item) => { } const getDictLabelByValue = (state) => { const dict = activityState.value.find((dict) => dict.dictValue === state); + return dict ? dict : '未知状态'; }; +const getDictLabelByValue2 = (state) => { + if(state == null)return null; + const dict = activityState2.value.find((dict) => dict.dictValue === state); + if( dict== undefined | dict.dictValue == 0){ + return null; + } + if(dict.dictValue == 1 | dict.dictValue == 2){ + dict.dictLabel = "已报名" + return dict ? dict.dictLabel : '未知状态'; + } + return dict ? dict.dictLabel : '未知状态'; +}; onLoad((options) => { getDicts('activity_state').then(e => { activityState.value = e.data console.log(activityState.value); }) + getDicts('take_part_state').then(e => { + activityState2.value = e.data + }) }) @@ -97,7 +117,7 @@ onShow(() => { padding-left: 24rpx; .titile { - font-weight: 400; + font-weight: 600; height: 80rpx; font-size: 32rpx; @@ -130,8 +150,13 @@ onShow(() => { color: #000000 100%; } } +.statsInfo1 { + position: absolute; + right: 130rpx; + bottom: 24rpx; +} -.statsInfo { +.statsInfo2 { position: absolute; right: 24rpx; bottom: 24rpx; diff --git a/pages/common/file/fileUpload/index.vue b/pages/common/file/fileUpload/index.vue index 72a9130..b4c605b 100644 --- a/pages/common/file/fileUpload/index.vue +++ b/pages/common/file/fileUpload/index.vue @@ -10,10 +10,11 @@ name="fileInfowx" multiple :previewFullImage="true" + width="210rpx" + height="210rpx" > - - + + @@ -148,30 +149,7 @@ const uploadFilePromise = async (fileInfo1, name) => { const uploadQN = (file) => { return uploadQN1(file.url); }; -//废弃 -const uploadQN2 = (file) => { - return new Promise((resolve, reject) => { - const observable = qiniu.upload(file, dataToken.key, dataToken.token, putExtra, config); - const subscription = observable.subscribe({ - next(res) { - console.log("next:", res); - }, - error(err) { - console.log("error:", err); - reject(err); - }, - async complete(res) { - console.log("complete:", res); - form.url = res.key; - form.name = res.key; - form.type = res.mimeType; - form.size = res.fsize; - await addFileList(form); - resolve(res.key); - } - }); - }); -}; + //调用uni上传方法 const uploadQN1 = (file) => { return new Promise((resolve, reject) => { diff --git a/pages/common/file/fileUpload/index2.vue b/pages/common/file/fileUpload/index2.vue new file mode 100644 index 0000000..f01d7a9 --- /dev/null +++ b/pages/common/file/fileUpload/index2.vue @@ -0,0 +1,208 @@ + + + + + \ No newline at end of file diff --git a/pages/common/postview/index.vue b/pages/common/postview/index.vue index bf7d06b..6cbc1f7 100644 --- a/pages/common/postview/index.vue +++ b/pages/common/postview/index.vue @@ -39,9 +39,41 @@ :src="mediaItem"> - - - + + + + + + + + + + + + + + + + + +{{ postValue.media.length - 3 }} + + + + + + + + + + + + @@ -214,7 +246,7 @@ line-height: 30rpx; } .no-focus-text { - font-weight: 400; + font-weight: 600; width: 58rpx; // height: 30rpx; font-size: 28rpx; @@ -222,7 +254,7 @@ color: #3477FC; } .focus-text { - font-weight: 400; + font-weight: 600; /* width: 58rpx; */ // height: 30rpx; font-size: 28rpx; @@ -281,7 +313,7 @@ .u-album__row__wrapper {} .data-v-6fcabaad { - border-radius: 20rpx 20rpx 20rpx 20rpx !important; + border-radius: 20rpx !important; /* width: 200rpx !important; height: 200rpx !important; */ } @@ -305,7 +337,7 @@ } .center-content-post-tab-text{ - font-weight: 400; + font-weight: 600; /* width: 139rpx; */ // height: 26rpx; font-size: 24rpx; @@ -381,7 +413,7 @@ width: 686rpx; height: 370rpx; - border-radius: 18rpx 18rpx 18rpx 18rpx; + border-radius: 20rpx; background: #b3d7ff; } @@ -393,9 +425,48 @@ width: 100%; height: 306rpx; - border-radius: 18rpx 18rpx 18rpx 18rpx; + border-radius: 20rpx; } } + + .img-style-3-1{ + + image { + // margin: 6rpx; + width: 222rpx; + height: 222rpx; + border-radius: 20rpx; + } + } + + .img-style-3-2{ + display: flex; + justify-content: space-between; + position: relative; + image { + // margin: 6rpx; + width: 222rpx; + height: 222rpx; + border-radius: 20rpx; + } + } + + .img-cover-style{ + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.3); + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + border-radius: 20rpx; + text{ + color: #fff; + } + } diff --git a/pages/common/talkState/audit.vue b/pages/common/talkState/audit.vue index b064025..f9d1c5b 100644 --- a/pages/common/talkState/audit.vue +++ b/pages/common/talkState/audit.vue @@ -35,15 +35,20 @@ const { proxy } = getCurrentInstance(); const iconConfig = proxy.iconConfig; const sh2x1 = iconConfig.sh2x1; const sh2x = iconConfig.sh2x; -const bgColor = ref(''); -bgColor.value = 'rgba(170, 0, 0, 0)' +const bgColor = ref('rgba(170, 0, 0, 0)'); + const leftClick = () => { proxy.$tab.navigateBack(1) } - diff --git a/pages/mine/myActivity/index.vue b/pages/mine/myActivity/index.vue new file mode 100644 index 0000000..15da2ff --- /dev/null +++ b/pages/mine/myActivity/index.vue @@ -0,0 +1,401 @@ + + + + + \ No newline at end of file diff --git a/pages/mine/myActivity/info.vue b/pages/mine/myActivity/info.vue new file mode 100644 index 0000000..d825613 --- /dev/null +++ b/pages/mine/myActivity/info.vue @@ -0,0 +1,405 @@ + + + + \ No newline at end of file diff --git a/pages/mine/setting/index.vue b/pages/mine/setting/index.vue index 9321d01..ada64c0 100644 --- a/pages/mine/setting/index.vue +++ b/pages/mine/setting/index.vue @@ -50,7 +50,7 @@ handleLogout() { this.$modal.confirm('确定注销并退出系统吗？').then(() => { this.$store.dispatch('LogOut').then(() => { - this.$tab.reLaunch('/pages/loginInfo/login') + this.$tab.reLaunch('/pages/login') }) }) } diff --git a/pages/post/postInfo/postInfo.vue b/pages/post/postInfo/postInfo.vue index d4e6139..6ecfa88 100644 --- a/pages/post/postInfo/postInfo.vue +++ b/pages/post/postInfo/postInfo.vue @@ -34,17 +34,20 @@ - ---展开回复 - + - {{answer.uname}} - -> - {{answer.toUserName}} + + {{answer.uname}} + + + {{answer.toUserName}} + + {{answer.content}} @@ -54,7 +57,21 @@ - ---收起 + + + + 展开{{item.answerCommentAllCount}}条回复 + + + + 展开回复 + + + + 收起 + + + @@ -79,7 +96,7 @@ - + 友好评论~ @@ -93,11 +110,11 @@ {{postValue.likeCount}} - + {{postValue.favoriteCount}} - + {{postValue.favoriteCount}} @@ -112,12 +129,13 @@ diff --git a/pages/register.vue b/pages/register.vue index 293264e..a981a2f 100644 --- a/pages/register.vue +++ b/pages/register.vue @@ -111,6 +111,7 @@ registerSuccess(result) { // 设置用户信息 this.$store.dispatch('GetInfo').then(res => { + this.$store.dispatch('GetUserInfo'); this.$tab.reLaunch('/pages/index') }) } diff --git a/pages/search/index.vue b/pages/search/index.vue index 26688dd..7b72c41 100644 --- a/pages/search/index.vue +++ b/pages/search/index.vue @@ -7,11 +7,11 @@ - + - + 搜索 @@ -22,7 +22,7 @@ 搜索历史 - + @@ -33,7 +33,7 @@ diff --git a/pages/takeaway/index.vue b/pages/takeaway/index.vue index 987f156..19f6415 100644 --- a/pages/takeaway/index.vue +++ b/pages/takeaway/index.vue @@ -1,19 +1,159 @@ -