xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gx

This commit is contained in:
lnn19986213 2022-10-31 17:31:09 +08:00
parent b736e4d160
commit b0e1082a89
6 changed files with 124 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/pages/ActivitiesDetail/ActivitiesDetail.vue
View File

@ -81,21 +81,32 @@
</view>
</view>
</view>
<view class="operation" v-if="userType == 'fws'">
<button type="default" class="apply" v-if="serveList.isGm && serveList.gmState == 0">已申请，审核中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 1" @click="toGm(1)">上传物资照片</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 2">验收中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 3">已验收</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == null" @click="toGm(0)">申请冠名</button>
<button type="default" class="apply" v-else-if="serveList.isGm == false">此活动不接受冠名</button>
<view v-if="hdStatus == '0'" >
<view class="operation" v-if="userType == 'fws'">
<button type="default" class="apply" v-if="serveList.isGm && serveList.gmState == 0">已申请，审核中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 1" @click="toGm(1)">上传物资照片</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 2">验收中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 3">已验收</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == null" @click="toGm(0)">申请冠名</button>
<button type="default" class="apply" v-else-if="serveList.isGm == false">此活动不接受冠名</button>
</view>
<view class="operation" v-else>
<button type="default" class="apply" @click="baoMingQX(0)" v-if="serveList.hdbm && serveList.hdqxbm == false">取消活动报名</button>
<button type="default" class="apply" @click="baoMing(0)" v-else-if="serveList.hdbm == false && serveList.hdqxbm == false">活动报名</button>
<button type="default" class="apply" v-else-if="serveList.hdbm == false && serveList.hdqxbm">活动已无法报名</button>
<button type="default" class="collection" @click="baoMingQX(1)" v-if="serveList.zyzbm && serveList.zyzqxbm == false">取消志愿者报名</button>
<button type="default" class="collection" @click="baoMing(1)" v-else-if="serveList.zyzbm == false && serveList.zyzqxbm == false">志愿者报名</button>
<button type="default" class="collection" v-else-if="serveList.zyzbm == false && serveList.zyzqxbm">已无法报名志愿者</button>
</view>
</view>
<view class="operation" v-else>
<button type="default" class="apply" @click="baoMingQX(0)" v-if="serveList.hdbm && serveList.hdqxbm == false">取消活动报名</button>
<button type="default" class="apply" @click="baoMing(0)" v-else-if="serveList.hdbm == false && serveList.hdqxbm == false">活动报名</button>
<button type="default" class="apply" v-else-if="serveList.hdbm == false && serveList.hdqxbm">活动已无法报名</button>
<button type="default" class="collection" @click="baoMingQX(1)" v-if="serveList.zyzbm && serveList.zyzqxbm == false">取消志愿者报名</button>
<button type="default" class="collection" @click="baoMing(1)" v-else-if="serveList.zyzbm == false && serveList.zyzqxbm == false">志愿者报名</button>
<button type="default" class="collection" v-else-if="serveList.zyzbm == false && serveList.zyzqxbm">已无法报名志愿者</button>
<view v-else>
<view class="operation" v-if="userType == 'fws'">
<button type="default" class="apply-A">活动冠名</button>
</view>
<view class="operation" v-else>
<button type="default" class="apply-A" >活动报名</button>
<button type="default" class="collection-A">报名志愿者</button>
</view>
</view>
<!-- 取消报名-原因 -->
<u-popup :show="showB" mode="center" :round="10" @close="closeZ">
@ -174,6 +185,7 @@
bm: 0,
userType: '',
gmId: '',
hdStatus: '',
}
},
@ -195,6 +207,7 @@
this.img = res.data.images.split(',')
this.activityId = res.data.id
this.gmId = res.data.gmId
this.hdStatus = res.data.hdStatus
}).catch(e => {
uni.showToast({
title: e.data.message,
@ -399,6 +412,13 @@
font-size: 32rpx;
font-weight: 600;
}
.collection-A {
flex: 1;
margin-left: 24rpx;
font-size: 32rpx;
font-weight: 600;
}
.apply {
@ -409,6 +429,12 @@
font-weight: 600;
border: none;
}
.apply-A {
flex: 1;
font-size: 32rpx;
font-weight: 600;
border: none;
}
button {
&::after {

20
src/pages/ArtActivities/ArtActivities.vue
View File

@ -8,7 +8,12 @@
<view class="art_act_itm" v-for="(v,i) in list2" :key="i" @click="goActDeat(v.id)">
<image :src="v.image" mode=""></image>
<view class="title">
{{v.title}}
<view class="textT">
{{v.title}}
</view>
<u-tag text="报名中" type="warning" v-if="v.hdStatus == '0'"></u-tag>
<u-tag text="进行中" type="success" v-else-if="v.hdStatus == '1'"></u-tag>
<u-tag text="已结束" type="error" v-else-if="v.hdStatus == '2'"></u-tag>
</view>
</view>
<view class="addIcon" @click="toAddOrder" v-if="isAdmin">
@ -121,8 +126,17 @@
color: #FFFFFF;
line-height: 88rpx;
font-size: 28rpx;
padding-left: 24rpx;
width: calc(100% - 24rpx);
padding: 0 24rpx;
width: calc(100% - 48rpx);
display: flex;
justify-content: space-between;
align-items: center;
.textT{
width: 500rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
.addIcon{

2
src/pages/my/My.vue
View File

@ -1,5 +1,5 @@
<template>
<view style="padding-bottom:55px;">
<view style="padding-bottom:5px;">
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>

12
src/pages/orderHall/addOrder.vue
View File

@ -172,7 +172,19 @@
this.getTypeList()
this.getUserList()
},
onLoad() {
this.getCurrentTime()
},
methods: {
getCurrentTime() {
//获取当前时间并打印
let yy = new Date().getFullYear();
let mm = new Date().getMonth() + 1;
let dd = new Date().getDate();
let gettime = yy + '-' + mm + '-' + dd;
this.eTime = gettime
this.wTime = gettime
},
// 订单类型
getTypeList() {
this.http.request('/hallType/list', {}, "GET").then(res => {

2
src/pages/shop/Shop.vue
View File

@ -1,5 +1,5 @@
<template>
<view style="padding-bottom:55px;">
<view style="padding-bottom:5px;">
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>

85
src/pagesA/addArtActivity/addArtActivity.vue
View File

@ -15,7 +15,7 @@
活动开始时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="startTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="startTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_line">
@ -23,7 +23,7 @@
活动结束时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="endTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="endTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_line">
@ -50,7 +50,8 @@
<u-radio-group @change="selectForm1" v-model="hdType" :borderBottom="true" placement="column"
iconPlacement="right">
<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist1" :key="index"
:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label" activeColor="#99241B ">
:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
activeColor="#99241B ">
</u-radio>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showType=false">确认</u-button>
@ -61,7 +62,7 @@
活动报名开始时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="bmTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="bmTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_line">
@ -69,7 +70,7 @@
活动报名结束时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="ebmTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="ebmTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_line">
@ -87,7 +88,7 @@
志愿者报名开始时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="zyzTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="zyzTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_line">
@ -95,7 +96,7 @@
志愿者报名结束时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="ezyzTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="ezyzTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_line">
@ -121,7 +122,7 @@
冠名申请开始时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="gmTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="gmTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_line">
@ -129,7 +130,7 @@
冠名申请结束时间
</view>
<view class="form_right">
<uni-datetime-picker type="datetime" v-model="gmeTime" :border="false" :clearIcon="false"/>
<uni-datetime-picker type="datetime" v-model="gmeTime" :border="false" :clearIcon="false" />
</view>
</view>
<view class="form_box">
@ -143,8 +144,8 @@
<view class="gap">
图片上传
</view>
<u-upload class="upload" width="172rpx" height="172rpx" :fileList="fileList3"
@afterRead="afterRead" @delete="deletePic" name="3" multiple>
<u-upload class="upload" width="172rpx" height="172rpx" :fileList="fileList3" @afterRead="afterRead"
@delete="deletePic" name="3" multiple>
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
@ -177,7 +178,7 @@
typeId: '',
showType: false,
radiolist1: [],
timeValue: Number(new Date()),
timeValue: '',
perNumber: 1,
fileList3: [],
ok: true,
@ -186,7 +187,25 @@
onShow() {
this.getTypeList()
},
onLoad() {
this.getCurrentTime()
},
methods: {
getCurrentTime() {
//获取当前时间并打印
let yy = new Date().getFullYear();
let mm = new Date().getMonth() + 1;
let dd = new Date().getDate();
let gettime = yy + '-' + mm + '-' + dd;
this.startTime = gettime
this.endTime = gettime
this.bmTime = gettime
this.ebmTime = gettime
this.zyzTime = gettime
this.ezyzTime = gettime
this.gmTime = gettime
this.gmeTime = gettime
},
// 订单类型
getTypeList() {
this.http.request('/activity/activityType', {}, "GET").then(res => {
@ -270,7 +289,7 @@
},
next() {
this.ok = true
if(this.title == ''){
if (this.title == '') {
uni.showToast({
title: '请输入名称',
icon: "none",
@ -278,7 +297,7 @@
this.ok = false
return
}
if(this.endTime == ''){
if (this.endTime == '') {
uni.showToast({
title: '请选择活动开始时间',
icon: "none",
@ -286,7 +305,7 @@
this.ok = false
return
}
if(this.startTime == ''){
if (this.startTime == '') {
uni.showToast({
title: '请选择活动结束时间',
icon: "none",
@ -294,7 +313,7 @@
this.ok = false
return
}
if(this.address == ''){
if (this.address == '') {
uni.showToast({
title: '请输入地点',
icon: "none",
@ -302,7 +321,7 @@
this.ok = false
return
}
if(this.hdType == ''){
if (this.hdType == '') {
uni.showToast({
title: '请选择类型',
icon: "none",
@ -310,7 +329,7 @@
this.ok = false
return
}
if(this.bmTime == ''){
if (this.bmTime == '') {
uni.showToast({
title: '请选择活动报名开始时间',
icon: "none",
@ -318,7 +337,7 @@
this.ok = false
return
}
if(this.ebmTime == ''){
if (this.ebmTime == '') {
uni.showToast({
title: '请选择活动报名结束时间',
icon: "none",
@ -326,7 +345,7 @@
this.ok = false
return
}
if(this.hdCount == ''){
if (this.hdCount == '') {
uni.showToast({
title: '请输入活动人数',
icon: "none",
@ -334,7 +353,7 @@
this.ok = false
return
}
if(this.zyzTime == ''){
if (this.zyzTime == '') {
uni.showToast({
title: '请选择志愿者报名开始时间',
icon: "none",
@ -342,7 +361,7 @@
this.ok = false
return
}
if(this.ezyzTime == ''){
if (this.ezyzTime == '') {
uni.showToast({
title: '请选择志愿者报名结束时间',
icon: "none",
@ -350,7 +369,7 @@
this.ok = false
return
}
if(this.zyzCount == ''){
if (this.zyzCount == '') {
uni.showToast({
title: '请输入志愿者人数',
icon: "none",
@ -358,8 +377,8 @@
this.ok = false
return
}
if(this.isGm){
if(this.gmTime == ''){
if (this.isGm) {
if (this.gmTime == '') {
uni.showToast({
title: '请选择冠名申请开始时间',
icon: "none",
@ -367,7 +386,7 @@
this.ok = false
return
}
if(this.gmeTime == ''){
if (this.gmeTime == '') {
uni.showToast({
title: '请选择冠名申请结束时间',
icon: "none",
@ -376,7 +395,7 @@
return
}
}
if(this.activityText == ''){
if (this.activityText == '') {
uni.showToast({
title: '请输入活动内容',
icon: "none",
@ -384,7 +403,7 @@
this.ok = false
return
}
if(this.fileList3.length == 0){
if (this.fileList3.length == 0) {
uni.showToast({
title: '请上传图片',
icon: "none",
@ -392,7 +411,7 @@
this.ok = false
return
}
if(this.ok){
if (this.ok) {
let image = []
this.fileList3.forEach(function(item) {
image.push(item.url)
@ -433,17 +452,19 @@
</script>
<style>
</style>
<style lang="scss" scoped>
/deep/ .uni-icons{
/deep/ .uni-icons {
display: none;
}
/deep/ .uni-date-x{
/deep/ .uni-date-x {
text-align: right;
padding: 0;
}
.form_line {
width: 702rpx;
padding: 0 24rpx;