From 4daf63fb9e0a82d7b10fdfe387cc05244707d281 Mon Sep 17 00:00:00 2001 From: liupopo Date: Wed, 7 Feb 2024 10:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=BA=90=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/find/ActivityDetail.vue | 44 ++------- pages/find/ActivityList.vue | 69 +++++++------ pages/me/BaseInfo.vue | 8 +- pages/me/RealInfo.vue | 2 +- pages/publish/CreateActivity.vue | 154 ++++++++++++++++++++--------- pages/publish/EnrollCondition.vue | 39 +++++--- pages/publish/Publish.vue | 14 ++- static/columns.css | 47 ++++++--- static/img/public/dustbin.png | Bin 0 -> 3933 bytes static/img/public/modi.png | Bin 0 -> 367 bytes static/img/public/organization.png | Bin 0 -> 6017 bytes 11 files changed, 220 insertions(+), 157 deletions(-) create mode 100644 static/img/public/dustbin.png create mode 100644 static/img/public/modi.png create mode 100644 static/img/public/organization.png diff --git a/pages/find/ActivityDetail.vue b/pages/find/ActivityDetail.vue index 7b8bd6d..1415275 100644 --- a/pages/find/ActivityDetail.vue +++ b/pages/find/ActivityDetail.vue @@ -5,8 +5,8 @@ - - + + @@ -21,7 +21,7 @@ 报名截止： {{page.activityDetails.enrollEndTime}} - 还有1天 + @@ -52,10 +52,10 @@ - + 报名数 {{item.enrollNumbers==0?"暂无":item.enrollNumbers+'人'}}/{{item.enrollNumbersLimit==0?"不限":item.enrollNumbersLimit+'人'}} - + @@ -75,13 +75,13 @@ {{page.activityDetails.introduction}} - + 奖品奖项 {{page.activityDetails.notes}} - + 特别鸣谢 @@ -151,11 +151,11 @@ activityDetails:{}, manageList: [{ 'name': '修改活动', - 'src': '../../static/game-icon/renyuanguanli.png', + 'src': '../../static/img/public/modi.png', 'id': 0 }, { 'name': '删除活动', - 'src': '../../static/game-icon/shanchu.png', + 'src': '/static/img/public/dustbin.png', 'id': 1 }], enrollRequiredName:"" @@ -393,32 +393,6 @@ // 活动项目为个人 if (enrollMold == 0){ // 校验报名条件 - let passCondition = true - let sex = _this.page.activityDetails.listActivityItem[id].activityItemCondition.sex - let minAge = _this.page.activityDetails.listActivityItem[id].activityItemCondition.minAge - let maxAge = _this.page.activityDetails.listActivityItem[id].activityItemCondition.maxAge - if (sex > 0 || minAge > 0 || maxAge > 0){ - _this.HTTP({ - url: 'aos/v1/activityItem/verifyPersonalEnrollCondition', - method: 'GET', - paramsType: "FORM", - data: { - 'activityItemSid': activitySid, - 'sysUserSid': sysUserSid - }, - loading: true - }).then((res) => { - if ( res.code != "200") { - return - uni.showToast({ - title: '报名条件不符', - content:res.msg, - duration:3000 - }) - - } - }) - } this.HTTP({ url: 'aos/v1/activityItem/personalEnroll', method: 'POST', diff --git a/pages/find/ActivityList.vue b/pages/find/ActivityList.vue index 39a829f..64a1bdd 100644 --- a/pages/find/ActivityList.vue +++ b/pages/find/ActivityList.vue @@ -10,7 +10,6 @@ 报名截止：{{item.enrollEndTime}} - @@ -26,7 +25,7 @@ {{info.enrollMoldName}}/{{info.enrollMoney==0?"免费":info.enrollMoney}} - 报名数：{{info.enrollNumbers==0?"暂无":info.enrollNumbersLimit+'人'}}{{info.enrollNumbersLimit==0?"不限":info.enrollNumbersLimit+'人'}} + 报名数：{{info.enrollNumbers==0?"暂无":info.enrollNumbers+'人'}}/{{info.enrollNumbersLimit==0?"不限":info.enrollNumbersLimit+'人'}} {{info.startTime}} @@ -84,15 +83,15 @@ 'reflexTitle': true, 'defaultSelectedIndex': 0, 'detailList': [{ - 'title': '按发布时间排序', + 'title': '按发布', 'value': 0 }, { - 'title': '按报名时间排序', + 'title': '按报名', 'value': 1 }, { - 'title': '按人气从高到低', + 'title': '按人气', 'value': 2 } ] @@ -218,38 +217,38 @@ diff --git a/pages/me/BaseInfo.vue b/pages/me/BaseInfo.vue index c8b7224..8e07028 100644 --- a/pages/me/BaseInfo.vue +++ b/pages/me/BaseInfo.vue @@ -27,7 +27,7 @@ data() { return { page: { - sid:"", + sysUserInfoSid:"", headImage: "http://www.ourpyw.com/upload//touxiang/default_tx.jpg", userNickName: "", loginName: "", @@ -52,8 +52,8 @@ paramsType: "FORM", loading: true }).then((res) => { - console.log('========================================================', res.data.headImage) _this.page = res.data + console.log('========================================================', _this.page) }); }, methods: { @@ -69,7 +69,7 @@ method: 'PUT', paramsType: "FORM", data: { - sysUserInfoSid: _this.page.sid, + sysUserInfoSid: _this.page.sysUserInfoSid, headImageUrl: url, }, loading: true @@ -83,7 +83,7 @@ let _this = this if (getApp().globalData.isLogin ) { uni.navigateTo({ - url: 'ModiNickName?userNickName=' + _this.page.userNickName + "&sysUserInfoSid=" + _this.page.sid + url: 'ModiNickName?userNickName=' + _this.page.userNickName + "&sysUserInfoSid=" + _this.page.sysUserInfoSid }) } }, diff --git a/pages/me/RealInfo.vue b/pages/me/RealInfo.vue index a106b72..a6a7d80 100644 --- a/pages/me/RealInfo.vue +++ b/pages/me/RealInfo.vue @@ -9,7 +9,7 @@ 性别 - {{page.sex}} + {{page.sexView}} diff --git a/pages/publish/CreateActivity.vue b/pages/publish/CreateActivity.vue index 25557ed..4dd1b5c 100644 --- a/pages/publish/CreateActivity.vue +++ b/pages/publish/CreateActivity.vue @@ -54,10 +54,10 @@ - - + @click="deleteItem(item)"> @@ -173,7 +173,7 @@ 人数费用 - {{item.enrollNumbersLimit}} / {{item.enrollMoney}} + {{item.enrollNumbersLimit==0?"不限人数":item.enrollNumbersLimit + "人"}} / {{item.enrollMoney==0?"免费":item.enrollMoney+'元'}} @@ -203,7 +203,7 @@ 报名条件 - {{convertSexText(item.activityItemCondition.sex)}} {{convertAgeRangeText(item.activityItemCondition.minAge,item.activityItemCondition.maxAge)}} + {{convertConditionText(item.listEnrollConditionRelationSexAge)}} @@ -248,7 +248,7 @@ style="display: flex; width: 100%; padding-top: 10rpx;padding-bottom: 15rpx;justify-content: center;"> {{item}} + mode="aspectFit" @click="deleteSponsor(index)"> @@ -299,7 +299,9 @@ isShowActivityItem: false, isShowNotesOther: false, activityItemIndex:0 ,//活动项目索引 - + listIsDelActivityImageSid:[], + listIsDelActivityItemSid:[], + listIsSponsorSid:[] }, data: { sid: "", @@ -321,6 +323,7 @@ sysUserSid:"", listSponsor:[], listCoverImageUrl:[], + listActivityImage:[], listActivityItem:[ { sid:"", @@ -332,12 +335,14 @@ startTime:this.TimeFormat(this.CurrentMillions(), "yyyy-MM-dd HH:mm"), endTime: this.TimeFormat(this.CurrentMillions(), "yyyy-MM-dd"), address:"", - activityItemCondition:{ - sid: "", + listEnrollConditionRelationSexAge:[{ + enrollConditionRelationsid: "", + conditionSid: "", sex: 0, minAge: 0, maxAge: 0 - } + } + ] } ], enrollRequired:{ @@ -377,7 +382,7 @@ paramsType: "FORM", loading: true }).then((res) => { - _this.WriteGameCahce(res.data) + // _this.WriteGameCahce(res.data) _this.data = res.data // 页面参数赋值 _this.page.cancelEnrollRefundDesc = _this.control.listCancelEnrollRefund[_this.data.cancelEnrollRefund] @@ -385,6 +390,8 @@ _this.page.nameAndMobile = _this.data.linkerName + "\u3000" + _this.data.linkerPhone console.log("活动详情：",_this.data) this.setEnrollRequiredName() + this.onEditorIntroduction() + this.onEditorDisclaimer() // _this.switchCheckedInviteType = res.data.activityBasedata.cancelEnrollRefund == 1 ? // true : false @@ -397,13 +404,24 @@ // 如果用户已经登陆 console.log('options.sportCategoryName', options.sportCategoryName) console.log('options.sportCategorySid', options.sportCategorySid) - this.data.sportCategoryName = options.sportCategoryName - this.data.sportCategorySid = options.sportCategorySid + this.data.sportCategoryName = options.sportCategoryName // 活动类型名称 + this.data.sportCategorySid = options.sportCategorySid // 活动类型sid // 控件赋值 this.page.cancelEnrollRefundDesc = this.control.listCancelEnrollRefund[1] this.page.inviteTypeDesc = this.control.listInviteType[0] this.setEnrollRequiredName() + // this.data.disclaimer = options.disclaimer // 默认免责声明 + _this.HTTP({ + url: 'aos/v1/sportCategory/getSportCategory/' + this.data.sportCategorySid, + method: 'GET', + paramsType: "FORM", + loading: true + }).then((res) => { + this.data.disclaimer = res.data.disclaimerTemplate + // console.log('=============================================================',_this.disclaimerTemplate) + }) + } }, @@ -443,19 +461,19 @@ this.setEnrollRequiredName() // 报名条件 - // console.log("1111111111111111111111111111111111111-",JSON.stringify(this.data.listActivityItem[this.parameter.activityItemIndex].activityItemCondition.sex)) - if (!this.IsEmpty(backResult.activityItemCondition)) { - let activityItemCondition = JSON.parse(backResult.activityItemCondition) - if (!this.IsEmpty(activityItemCondition.sex)) { - this.data.listActivityItem[this.parameter.activityItemIndex].activityItemCondition.sex = activityItemCondition.sex - } - if (!this.IsEmpty(activityItemCondition.minAge)) { - this.data.listActivityItem[this.parameter.activityItemIndex].activityItemCondition.minAge = activityItemCondition.minAge - } - if (!this.IsEmpty(activityItemCondition.maxAge)) { - this.data.listActivityItem[this.parameter.activityItemIndex].activityItemCondition.maxAge = activityItemCondition.maxAge + + if (!this.IsEmpty(backResult.listEnrollConditionRelationSexAge)) { + + let listEnrollConditionRelationSexAge = [] + for (let enrollConditionRelationSexAge of backResult.listEnrollConditionRelationSexAge){ + listEnrollConditionRelationSexAge.push(JSON.parse(enrollConditionRelationSexAge)) } - this.convertAgeRangeText(this.data.listActivityItem[this.parameter.activityItemIndex].activityItemCondition.minAge,this.data.listActivityItem[this.parameter.activityItemIndex].activityItemCondition.maxAge) + console.log("111111111111111111111111111111111",listEnrollConditionRelationSexAge) + + this.data.listActivityItem[this.parameter.activityItemIndex].listEnrollConditionRelationSexAge = listEnrollConditionRelationSexAge + console.log("222222222222222222222222222222222",this.data.listActivityItem[this.parameter.activityItemIndex].listEnrollConditionRelationSexAge) + this.convertConditionText(this.data.listActivityItem[this.parameter.activityItemIndex].listEnrollConditionRelationSexAge) + } // 球馆 if (!this.IsEmpty(backResult.sid)) { @@ -498,15 +516,40 @@ return minAge + "岁 至 " + maxAge +"岁" } }, - convertSexText(sex){ - if (sex == 0){ - return "不限性别" - } - if (sex == 1){ - return "男子" + convertConditionText(listEnrollConditionRelationSexAge){ + if (listEnrollConditionRelationSexAge != null && listEnrollConditionRelationSexAge.length > 0){ + let conditionText = "" + for (let conditionRelationSexAge of listEnrollConditionRelationSexAge){ + let sex = conditionRelationSexAge.sex + if (sex == 0){ + conditionText += "不限性别" + } + if (sex == 1){ + conditionText += "男子" + } + if (sex == 2){ + conditionText += "女子" + } + let minAge = conditionRelationSexAge.minAge + let maxAge = conditionRelationSexAge.maxAge + if(minAge == 0 && maxAge == 0 ){ + conditionText += "不限年龄" + } + if(minAge == 0 && maxAge > 0 ){ + conditionText += maxAge + "岁以下" + } + if(minAge > 0 && maxAge == 0 ){ + conditionText += minAge + "岁以上" + } + if(minAge > 0 && maxAge > 0 ){ + conditionText += minAge + "岁 至 " + maxAge +"岁" + } + } + return conditionText } - if (sex == 2){ - return "女子" + else + { + return "无报名条件限制" } }, setEnrollRequiredName(){ @@ -614,9 +657,9 @@ toEnrollCondition(index){ let _this = this _this.parameter.activityItemIndex = index - console.log("-----------------------------------------------", JSON.stringify(_this.data.listActivityItem[index].activityItemCondition)) + console.log("-----------------------------------------------", JSON.stringify(_this.data.listActivityItem[index].listEnrollConditionRelationSexAge)) uni.navigateTo({ - url: "EnrollCondition?activityItemCondition=" + JSON.stringify(_this.data.listActivityItem[index].activityItemCondition) + url: "EnrollCondition?listEnrollConditionRelationSexAge=" + JSON.stringify(_this.data.listActivityItem[index].listEnrollConditionRelationSexAge) }) }, toEditIntroduction(){ @@ -692,9 +735,17 @@ case "宣传海报": this.chooseUpload(9) .then((res) => { - console.log("url>>>>", res); - let a = _this.data.listCoverImageUrl.concat(res.urls) - _this.data.listCoverImageUrl = a + for (var j = 0; j < res.urls.length; j++) { + _this.data.listActivityImage.push({ + sid:"", + activitySid:_this.data.sid, + imageUrl:res.urls[j], + sort:0 + }) + } + console.log("url>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", _this.data.listActivityImage); + // let a = _this.data.listActivityImage.concat(res.urls) + // _this.data.listCoverImageUrl = a }) break; case "赞助商": @@ -750,8 +801,11 @@ content: '确定要删除宣传图片吗？', success(res) { if (res.confirm) { - _this.data.activityBasedata.listImageFile.splice(_this.data.activityBaseInfo - .listImageFile.indexOf(item), 1) + // let listIsDelActivityImageSid = [] + // _this.$set(_this.data,"listIsDelActivityImageSid",listIsDelActivityImageSid) + _this.parameter.listIsDelActivityImageSid.push(item.sid) + console.log("==============================================",JSON.stringify(_this.parameter.listIsDelActivityImageSid)) + _this.data.listActivityImage.splice(_this.data.listActivityImage.indexOf(item), 1) } } }); @@ -759,8 +813,8 @@ showImage(index) { // 预览图片 let imgsArray = []; - for (var j = 0; j < this.data.listCoverImageUrl.length; j++) { - let url = this.data.listCoverImageUrl[j] + for (var j = 0; j < this.data.listActivityImage.length; j++) { + let url = this.data.listActivityImage[j].imageUrl imgsArray[j] = url } uni.previewImage({ @@ -816,13 +870,14 @@ dateChange2(e, index) { this.data.listActivityItem[index].endTime = e.detail.value }, - deleteItems(item) { + deleteItem(item) { let _this = this uni.showModal({ title: '温馨提示', content: '确定要删除这条活动项目吗？', success(res) { if (res.confirm) { + _this.parameter.listIsDelActivityItemSid.push(item.sid) _this.data.listActivityItem.splice(_this.data.listActivityItem.indexOf(item), 1); } @@ -861,7 +916,7 @@ organizerText(e) { this.data.organizer = e }, - deleteItem(item) { + deleteSponsor(item) { let _this = this console.log("====>" + _this.data.listSponsorSid.length); @@ -870,6 +925,7 @@ content: '确定要删除此赞助商吗？', success(res) { if (res.confirm) { + _this.parameter.listIsSponsorSid.push(item.sid) _this.data.listSponsorSid.splice(_this.data .listSponsorSid.indexOf(item), 1); @@ -893,7 +949,7 @@ this.Toast("活动介绍不能为空"); return false; } - if (this.data.listCoverImageUrl.length == 0) { + if (this.data.listActivityImage.length == 0) { this.Toast("宣传图片不能为空") return false } @@ -947,7 +1003,11 @@ } // 保存活动 _this.data.sysUserSid = getApp().globalData.sysUserSid - // console.log('createSid', res) + // 更新时所用 + _this.$set(_this.data,"listIsDelActivityImageSid",_this.parameter.listIsDelActivityImageSid) + _this.$set(_this.data,"listIsDelActivityItemSid",_this.parameter.listIsDelActivityItemSid) + _this.$set(_this.data,"listIsSponsorSid",_this.parameter.listIsSponsorSid) + _this.HTTP({ url: 'aos/v1/activity/saveActivity', method: 'POST', @@ -956,7 +1016,7 @@ loading: true }) .then((res) => { - console.log('======================================================', res) + if (res.code == "200"){ _this.ClearGameCache(_this.data) this.Toast("活动创建成功") diff --git a/pages/publish/EnrollCondition.vue b/pages/publish/EnrollCondition.vue index 2b69fcf..68c0eae 100644 --- a/pages/publish/EnrollCondition.vue +++ b/pages/publish/EnrollCondition.vue @@ -3,9 +3,9 @@ 性别限制 - 不限 - 男 - 女 + 不限 + 男 + 女 @@ -24,11 +24,14 @@ data() { return { data:{ - activityItemCondition:{ + listEnrollConditionRelationSexAge:[{ + enrollConditionRelationsid: "", + conditionSid: "", sex:0, minAge:0, maxAge:0 - } + } + ] }, page:{ age:[ @@ -40,12 +43,15 @@ } }, onLoad(options){ - let activityItemCondition = JSON.parse(options.activityItemCondition) + let listEnrollConditionRelationSexAge = JSON.parse(options.listEnrollConditionRelationSexAge) + console.log("==================================",listEnrollConditionRelationSexAge) let _this = this - if (activityItemCondition != undefined){ - _this.data.activityItemCondition.sex = activityItemCondition.sex == undefined ?0 :activityItemCondition.sex; - _this.data.activityItemCondition.minAge = activityItemCondition.minAge == undefined ?0:activityItemCondition.minAge; - _this.data.activityItemCondition.maxAge = activityItemCondition.maxAge == undefined ?0:activityItemCondition.maxAge; + if (listEnrollConditionRelationSexAge != undefined){ + _this.data.listEnrollConditionRelationSexAge[0].enrollConditionRelationsid = listEnrollConditionRelationSexAge[0].enrollConditionRelationsid; + _this.data.listEnrollConditionRelationSexAge[0].conditionSid = listEnrollConditionRelationSexAge[0].conditionSid; + _this.data.listEnrollConditionRelationSexAge[0].sex = listEnrollConditionRelationSexAge[0].sex == undefined ?0 :listEnrollConditionRelationSexAge[0].sex; + _this.data.listEnrollConditionRelationSexAge[0].minAge = listEnrollConditionRelationSexAge[0].minAge == undefined ?0:listEnrollConditionRelationSexAge[0].minAge; + _this.data.listEnrollConditionRelationSexAge[0].maxAge = listEnrollConditionRelationSexAge[0].maxAge == undefined ?0:listEnrollConditionRelationSexAge[0].maxAge; } // 设置10岁到100岁的数组 _this.page.age[0].push("不限") @@ -55,22 +61,23 @@ _this.page.age[1].push(i + "岁"); } // 年龄段范围文字赋值 - this.page.ageRangeText = this.convertAgeRangeText(this.data.activityItemCondition.minAge,this.data.activityItemCondition.maxAge) + this.page.ageRangeText = this.convertAgeRangeText(this.data.listEnrollConditionRelationSexAge[0].minAge,this.data.listEnrollConditionRelationSexAge[0].maxAge) }, methods:{ radioSexChange(e) { let _this = this - _this.data.activityItemCondition.sex = e.detail.value + _this.data.listEnrollConditionRelationSexAge[0].sex = parseInt( e.detail.value) }, bindAgeChange(e,index){ console.log("--------------------------",JSON.stringify(e.detail.value[0])) - if (e.detail.value[0] == 0){this.data.activityItemCondition.minAge = 0}else{this.data.activityItemCondition.minAge = e.detail.value[0] + 9} - if (e.detail.value[1] == 0){this.data.activityItemCondition.maxAge = 0}else{this.data.activityItemCondition.maxAge = e.detail.value[1] + 9} + if (e.detail.value[0] == 0){this.data.listEnrollConditionRelationSexAge[0].minAge = 0}else{this.data.listEnrollConditionRelationSexAge[0].minAge = e.detail.value[0] + 9} + if (e.detail.value[1] == 0){this.data.listEnrollConditionRelationSexAge[0].maxAge = 0}else{this.data.listEnrollConditionRelationSexAge[0].maxAge = e.detail.value[1] + 9} // this.page.ageRange = this.page.age[0][e.detail.value[0]] + " 到 " + this.page.age[1][e.detail.value[1]] - this.page.ageRangeText = this.convertAgeRangeText(this.data.activityItemCondition.minAge,this.data.activityItemCondition.maxAge) + this.page.ageRangeText = this.convertAgeRangeText(this.data.listEnrollConditionRelationSexAge[0].minAge,this.data.listEnrollConditionRelationSexAge[0].maxAge) }, setup(){ - this.data.activityItemCondition = JSON.stringify(this.data.activityItemCondition) + this.data.listEnrollConditionRelationSexAge[0] = JSON.stringify(this.data.listEnrollConditionRelationSexAge[0]) + console.log("=======================================>>>>>>>>>>>>>>>>asdfasdf",this.data) this.SetResult(this.data) }, convertAgeRangeText(minAge,maxAge){ diff --git a/pages/publish/Publish.vue b/pages/publish/Publish.vue index 2299065..d4f8949 100644 --- a/pages/publish/Publish.vue +++ b/pages/publish/Publish.vue @@ -61,7 +61,8 @@ code: "" }, visits: "...", - activityAmount: "..." + activityAmount: "...", + disclaimerTemplate:"" } }, onLoad(options) { @@ -205,10 +206,15 @@ }); }, onClick(index) { - this.WxSilentLogin() + let _this = this + _this.WxSilentLogin() + let sportCategoryName = _this.SportCategoryList[index].sportCategoryName + let sportCategorySid = _this.SportCategoryList[index].sid + uni.navigateTo({ - url: "../publish/CreateActivity?sportCategoryName=" + this.SportCategoryList[index].sportCategoryName + - "&sportCategorySid=" + this.SportCategoryList[index].sid + url: "../publish/CreateActivity?sportCategoryName=" + sportCategoryName + + "&sportCategorySid=" + sportCategorySid + + "&disclaimer=" + this.disclaimerTemplate }) }, jump() { diff --git a/static/columns.css b/static/columns.css index 1f49108..4034137 100644 --- a/static/columns.css +++ b/static/columns.css @@ -112,8 +112,8 @@ .activity-area{ display: flex; flex-direction: column; - margin-bottom: 30rpx; - padding: 30rpx; + margin-bottom: 10rpx; + padding: 36rpx; background: #FFFFFF; } .activity-area .summary{ @@ -135,22 +135,24 @@ flex: 1; } .activity-area .summary .name-category .category{ + height:32rpx; + float:right; color: #fff; - font-size: 24rpx; + font-size: 20rpx; background-color: #F2BF5C; padding: 5rpx 10rpx; } .activity-area .summary .enroll{ color: #898989 ; - font-size: 28rpx; - margin-top: 10rpx; + font-size: 24rpx; + margin-top: 20rpx; } .activity-area .image-area{ width: 100%; height: 300rpx; margin-top: 20rpx; - margin-bottom: 20rpx; + /* margin-bottom: 20rpx; */ } .activity-area .image-area .image{ width: 100%; @@ -178,27 +180,42 @@ .activity-area .item-area{ display: flex; flex-direction: column; - margin-top:10rpx; - margin-bottom: 10rpx; + margin-top:20rpx; + /* margin-bottom: 10rpx; */ } .activity-area .item-area .item-name-mold-money{ - display: flex;flex-direction: row; align-items: center; margin-top: 10rpx; + display: flex; + flex-direction: row; + align-items: center; + /* margin-top: 10rpx; */ } .activity-area .item-area .item-name-mold-money .item-name{ - color: #101010; font-size: 28rpx; flex: 1; + color: #101010; + font-size: 28rpx; + flex: 1; } .activity-area .item-area .item-name-mold-money .mold-money{ - color: #ff0000 ; font-size: 24rpx; + color: #ff0000 ; + font-size: 24rpx; } .activity-area .item-area .enroll-amount-date{ - display: flex;flex-direction: row;margin-top: 5rpx;margin-bottom:5rpx + display: flex; + flex-direction: row; + align-items: center; + margin-top: 20rpx; + /* margin-bottom:5rpx */ } .activity-area .item-area .enroll-amount-date text{ - color: #919191; font-size: 24rpx; + color: #919191; + font-size: 24rpx; + } + .activity-area .item-area .enroll-amount-date .amount{ + flex: 1; } .activity-area .item-area .enroll-amount-date .date{ - display: flex;text-align: center; - margin-right:30rpx; + float: right; + display: flex; + text-align: center; } /* 队伍创建及加入块 */ diff --git a/static/img/public/dustbin.png b/static/img/public/dustbin.png new file mode 100644 index 0000000000000000000000000000000000000000..345bbf9b26162e34c9ffe7b6ee1bd7f211bf16a0 GIT binary patch literal 3933 zcmV-j52EmiP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91IiLdo1ONa40RR91I{*Lx0L@X^zyJUa$4Nv%RA>d&n`v)bRT{^yV>^3d zXJ6W+NjF-$2)dUkZE4}flo1s(0xA}%uizEZd<4D&NJt2TghbH*6$3);&{hQmsO@y$ z8@jh{k|uWSIEk}3w&(Y^dLk#@ZkAS>Bi-EVd!PH9=l^Wyx#yfXtjE+6iG=gu!Go^B z!NG#Du`zdfdAWyH^VCyMH5L~a*Ic@EsqWONQ_bDo-L3uo{jJbdI-Sn&^5x4fzwyQ! zhuYiQPa@iVhrhq0H6uLEj*jw)6-K4aPOTvcbXnNcu)(7A}s6V zC>S3fcb1ft6rhX*0OMG+azs&pT)64Vl`HkQ`q~W}HmupceR~IebsB+Za-KFw02a_u^Q~LAwtn~B zcRP<9IkFnCZ2+l~g@%WREi7aaUlta!5I%<64Xs|idZ?zRCIY}zWQo0{A(^;xUiU3^Ta{YVHHCC<--p@-23gf-)`vY z>Z-sx1ppYuDuW0*2DoTJLBR-M`dV9CyA~{1(6eI2iU7~UD8q*Wd>c1z?7^CY@C$zO z$tPo*Hf^$+nwr+0KYxA!@!W>xOX1yu!m6cMTsDp?7uMC)72+-KKmPc`eeBq=V#1+d z$BrE%TeohFz#|O5v^FhE(wXR+4|3{Pou3#D zK79DlfA{X)2V~M-1RKDb!&r3;OAbmI031W`gpugI_ujMcg8Rg%586S5_xSz(7D8YF zG}rd;-|r?2T2NdA$*PL$dd|%#qYTB}z|}86cfjyVJx>cHpxjuo`S|hUi%2e&2$R^e zXU}Cc_!G(E90GQ4+qSK*zP?@-3UP!15>4$e)Ab|exs{}NK8_Mb`uh63_wL_IX#xXGYi1Smr=2iA*j-n{wD?%lih z{qoB%9l!qi>-fhXe;ohdgAd|U!HE9!>C-M0q3r5HQH2aECCipA^8ltED^`(k7ND$! zJTKJy*REZw`RudLcH{bg16UFCg(Ns9E-d$TiUt`*6)q$-w|-}8)3PK2#?kVa+>W?P zAdH1}BQWlL;e{6_rFntkz65dOPQ{;p{&^MSWG%_25us}kwia(_z#{X=qz$-TISMSt z&8tX8vZysOGExB0YW2fA7X4dTEP)J>#>U10Vt)Xy>B5svz*ogX#x^aGq;p1vh_9og zqZhY{A-t0$Pz&c4Kq=^*xR>X|i4#@deDjTW<;s;+Sg0IV^I)YWjeS%)jR34>%&cbY zti?KB;>*Q73m%rs<+4a(79gTZOaK#@h=5Twg#g>jvtB?2ux1Dg_mCGl=qu|mGaZmg z%Mkc+N;7pDM?m-W>(>|KhA)vB+lbjB;%7eY*LLR2nU;O~_B8;koTO0BxfG?iv5pJZ zl7*dQVoTW=mkYyp6f2FAq(%VKj|*z-?4-!(0#LA}r6mZD9&*A%uKgrC#r+sz5+w^q zQAApZ@I2YFf=qF@VknCdzT(e6|E#0q6@Y0bOA54g^5n@S#OT`y6$Z2mms0^y$>AaU z6#*(~A&r~RSk$j_xk0Saj|Jpzfuf?K2i)^9Ci+oeA65;}m!HHEMEJoaOO}ja-7%~j z0o*Va%nB%pYRaFapsDx1|Ni?5+@u}hs&Gj!jBC(TB^_21e@(bnEAF?HB&5Px0iOgx z#}j80J6LD{rS!uujD>~)I0~R1?mfU7y#NToGejckCR2BMC3itxj@Z3I9OJi(8G z?vdU*SFKw0keCSqFd}y&PP@sf{dmL}3X4%O#ol`Bt?}tv$S&|SOHzsKLWq4NlwvGZ zBt}XIvXpT*+$@Z1^`QL_)*3?iJ~E&W(8_eZ0PRQkK5E*4toi)&&&$nZ8I758w{h`( zQY{T60RGMg!G5J}+-?{kekz&p{Q2`EfEfUI0E=}mT)424IO^kh1iBzux0CqlrAF1~ zk%p5=70r_Zl&POIccr{~h^CJLGDiIQaLXH5$M@{B&-$^XA6ND>gea8{5|85~oj6vH zzyJRG(Z}U(nFOECy);V_e|3OaOZ-`kcOiy@z|NgJL%8QKjOA*x{!*WgfRBy#(eN?B zpWiOrv>FA}bFCpIXQQlhF%(q1^2#d}Q+Z{25&FUxUwqN?&O7fU%f(DI<{tc<9A1Vh zeVBVV^y!zgrMau9vDU=b0bl>+R58ymgsdTpI-Yy(xpOeS2w5MFoX4J9;dmkgn(ubR^P(A z{&VNf{mAfh5Zap@6UyV-`ugjy-6(GbMZ{j>dL>oQZ8E!)QcYhlN??;3z&zxH4PSow z<=d2p3)ik)dzF61H5@^h@mo?1a)QK-3MiNxsCL#c0kwkc8p9$XGIv8r(S~BEsjYb@scvCn72X9MG2HDP>sP!7yeK5)KquL4i^H z+H0?6#gg@bIsiygGcb$6SmS0~*JR&}8silQz#Iq^!?iWf6W76YMtbq2B^ZuGr(B@3 zey1r!gu0Ih#d$BT(oxqO2@Z?tm5hBP-_xI5O^hhnk_-^u2$Z!zMge-36k5uVQW$G9 z((6kGVPg^$0Lg@hLZp;5dK8cZg)DKC@T3s^&Zb0zE2kw5k9)Ke#n5QjZU+J;T65SD$|x}( zt&zphrFw$7H}z}_qNL3xGV4q&l1pImWK5idTk$yOF*&J+EI;xMFIirjNN(Al&*r`@OB&1A(OSOY zC7ZD7!}ODhMj@afWG2lPNE2hZ+{tu4Q;>Rpre0wB&UUs1GTX~@b>CRfD08m(8a|H| zq=cSp!Hq%$z>a4n=?vPrI`c)4WM#nFiR0A1r%RvuZno<=x1?fHhq0m^Z5xH8T4}1l zdZr=7&`y1x>vzuS5A&kw+>Vyb7l?!reXeApX-`8ZWf{@U<-9Ow`zZ6vlzU3j#`}{Gl!I8}GRpXgg;pQai}zSnJJZ(I7M#R5<%ir=ajZOHaz)DHjF+|&kC>|2VajTk zkKI-O#v&JSy%C0#^H@{s`Dt?-%)^ecVWI=tfAL-`po6TQU4&js<+hrg7|rXh%8pY( z=E|5TLd$&@*(dNHV(}>3UVN{={(9CKs=a&nYJb34(G$miV8xzX=nN>yWaP?4uV=O_ zX&B3ry3PesOql~!C2gykhNmp77)-{Yc4lR20>tt_a^Iewn}nnLns?3B@>nIQ98BqfaMm?$1pXlPu`wM>xH zl57%6u);Ks)?%`x7G`jn8d81}TJmzgkF&sLtx$|MXK^;l)ZRMn=4wQagASYp`eXRc`Yg{;+`(Hh7{?_`@v23{UMoY5{yQN-0nyE7-s_C9T7=Eo za)Q)bXtDR@mtQ`CHJ7qJxC56dLZeNrJ~t@|DLy2Ony%-n8J<#{t~rv0y9#;S(_%-; zJ@zCV1K@S~&9qcMAxd75P=={RkFj~zi&edBKw2%JXj&T-wC~giF~M{$FT~&UfqQB{ zdyI`wy>Gtx=8tS3{*k_X`TDb^dVzsa3og2at=Svd{IHC8X-3N~SyP&RTur@ r0trAB0)7%r2Npa>=m0VxVA7;XKm`ysL>$O%XlQ`2=g*%Hkpc=rM1Ula4Fo`OI0$YshNBvGSFmMhj*hy z2T)I)r;B4q#hj@Z!ugsVcvvpXJ*(Ep;$*dV`|tY#hvnDk9;~s8mO7nP?sNQigURDR zYzK66>KVeB_usE_@YDTancXk8{NU3)pQ1kec9dt;ul(O~s7`N(*N2qYP>z3mkH75N z&VTIr{e!tV;cs6{-_|;2ZTK-`!O8<&^Uh!Q>A7RT_|ci=>z3btK_SQB>FVdQ&MBb@ E0J_7blmGw# literal 0 HcmV?d00001 diff --git a/static/img/public/organization.png b/static/img/public/organization.png new file mode 100644 index 0000000000000000000000000000000000000000..2f040e6273e5bc71cfd3e5b30cf9157244020f0a GIT binary patch literal 6017 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 literal 0 HcmV?d00001