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 @@
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 @@
@@ -203,7 +203,7 @@
@@ -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 0000000..345bbf9
Binary files /dev/null and b/static/img/public/dustbin.png differ
diff --git a/static/img/public/modi.png b/static/img/public/modi.png
new file mode 100644
index 0000000..6aae880
Binary files /dev/null and b/static/img/public/modi.png differ
diff --git a/static/img/public/organization.png b/static/img/public/organization.png
new file mode 100644
index 0000000..2f040e6
Binary files /dev/null and b/static/img/public/organization.png differ