|
|
@@ -14,6 +14,14 @@
|
|
|
<view class="actit">
|
|
|
{{actItemList.acName}}
|
|
|
</view>
|
|
|
+ <view class="footer">
|
|
|
+ <view class="">
|
|
|
+ {{actItemList.create_at}}
|
|
|
+ </view>
|
|
|
+ <view class="">
|
|
|
+ 阅读量：{{actItemList.views}}
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view class="avaList">
|
|
|
<view class="ava" @click="gotoMorePer">
|
|
|
<u-avatar-group :urls="applyUserlist" maxCount='6' showMore size="35"
|
|
|
@@ -21,22 +29,31 @@
|
|
|
<text
|
|
|
style="font-size: 24rpx;font-weight: 400;color:rgba(0, 0, 0, 0.6);margin-left: 20rpx;">{{!applyUserlist.length?'暂无报名':'已报名'}}</text>
|
|
|
</view>
|
|
|
- <view class="cost" v-if="false">
|
|
|
+ <view class="cost">
|
|
|
￥<text style="font-size: 48rpx;">{{actItemList.cost}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="acinfo">
|
|
|
- <view class="">
|
|
|
- 时间：<text class="inf">{{actItemList.begin_at}}</text>
|
|
|
- </view>
|
|
|
<view class="acinfoAddress">
|
|
|
- 地点：<text class="inf">{{actItemList.address}}</text>
|
|
|
+ <view class="acinfoTit">
|
|
|
+ <text>时</text>
|
|
|
+ <text>间</text>
|
|
|
+ </view>：
|
|
|
+ <text class="inf">{{actItemList.begin_at}}</text>
|
|
|
</view>
|
|
|
+ <!-- <view class="acinfoAddress">
|
|
|
+ 地点：<text class="inf">{{actItemList.address}}</text>
|
|
|
+ </view> -->
|
|
|
<!-- <view class="">
|
|
|
主办单位：<text class="inf">暂无字段</text>
|
|
|
</view> -->
|
|
|
- <view class="">
|
|
|
- 活动形式：<text style="color:rgba(0, 86, 168, 1) ;">{{actItemList.acshape}}</text>
|
|
|
+ <view class="acinfoAddress">
|
|
|
+ <view class="acinfoTit">
|
|
|
+ <text>活</text>
|
|
|
+ <text>动</text>
|
|
|
+ <text>形</text>
|
|
|
+ <text>式</text>
|
|
|
+ </view>： <text style="color:rgba(0, 86, 168, 1) ;">{{actItemList.acshape}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="acbrief">
|
|
|
@@ -48,14 +65,7 @@
|
|
|
</view>
|
|
|
<image class="briImg" :src="actItemList.pic" mode="widthFix"></image>
|
|
|
</view>
|
|
|
- <view class="footer">
|
|
|
- <view class="">
|
|
|
- {{actItemList.create_at}}
|
|
|
- </view>
|
|
|
- <view class="">
|
|
|
- 阅读量：{{actItemList.views}}
|
|
|
- </view>
|
|
|
- </view>
|
|
|
+
|
|
|
</view>
|
|
|
|
|
|
<view class="btnBlock">
|
|
|
@@ -81,12 +91,28 @@
|
|
|
<view class="btnt" v-else-if="!isSign" @click="applyAdd">立即报名</view>
|
|
|
<view class="btnt1" v-else-if="isSign">已报名</view>
|
|
|
<view class="btnt1" v-else-if="actItemList.bnum>=actItemList.pers">人数已满</view>
|
|
|
-
|
|
|
+
|
|
|
<!-- <view class="btnt1" v-else-if="isSign && actItemList.openid!=oid">已报名</view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
|
|
|
+ <!-- 弹窗 -->
|
|
|
+ <view>
|
|
|
+ <view class="mask" v-show="showPopup" @click="showPopup = false"></view>
|
|
|
+ <view class="popup-container" v-show="showPopup">
|
|
|
+ <view class="popup">
|
|
|
+ <view class="header">
|
|
|
+ <text>确认报名</text>
|
|
|
+ </view>
|
|
|
+ <view class="footer">
|
|
|
+ <view class="cancel-btn" @click="showPopup=false">取消</view>
|
|
|
+ <view class="confirm-btn" @click="conf">确认</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
<view class="" style="height: 170rpx;width: 750rpx;">
|
|
|
<!-- 占位的 -->
|
|
|
</view>
|
|
|
@@ -115,6 +141,8 @@
|
|
|
// 用户订阅列表
|
|
|
// subArr: [],
|
|
|
|
|
|
+ //控制弹窗
|
|
|
+ showPopup: false,
|
|
|
// 是否已加入
|
|
|
isSign: 0,
|
|
|
|
|
|
@@ -133,7 +161,7 @@
|
|
|
acId: this.acId,
|
|
|
}
|
|
|
this.$request('/selectActivityID', "POST", data).then(res => {
|
|
|
- console.log('页面数据', res[0][0]);
|
|
|
+ // console.log('页面数据', res[0][0]);
|
|
|
this.actItemList = res[0][0]
|
|
|
})
|
|
|
|
|
|
@@ -141,8 +169,59 @@
|
|
|
|
|
|
// 申请加入
|
|
|
applyAdd() {
|
|
|
- uni.navigateTo({
|
|
|
- url: `/pages/jys/jys?acId=${this.acId}&tit=${'活动报名'}`
|
|
|
+ // console.log('报名');
|
|
|
+ this.showPopup = true
|
|
|
+ },
|
|
|
+ // 确认操作
|
|
|
+ conf() {
|
|
|
+ // this.showPopup = false;
|
|
|
+ // this.showPopupConfirm = true
|
|
|
+ // 做最后判断防止同一时间进入报名页面都报名成功
|
|
|
+ this.$request('/selectIntercept', "POST", {
|
|
|
+ oid: this.$store.state.user.openid,
|
|
|
+ acid: this.acId
|
|
|
+ }).then(res => {
|
|
|
+ let c = res[0][0]
|
|
|
+ console.log('报名人数',res[0][0]);
|
|
|
+ console.log(c.bnum >= c.pers * 1);
|
|
|
+ if (c.bnum >= c.pers * 1) {
|
|
|
+ return uni.showToast({
|
|
|
+ title: '已有人先您一步报名，名额已满',
|
|
|
+ icon: "none"
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ let data = {
|
|
|
+ oid: this.$store.state.user.openid, //用户id
|
|
|
+ acid: this.acId,
|
|
|
+ ty: 2,
|
|
|
+ }
|
|
|
+ this.$request('/insertSignup', "POST", data).then(res => {
|
|
|
+
|
|
|
+ console.log('报名返回',res);
|
|
|
+
|
|
|
+ // 添加消息页面系统通知提示报名成功
|
|
|
+ this.addMessage()
|
|
|
+
|
|
|
+
|
|
|
+ // 弹窗关闭
|
|
|
+ this.showPopup = false
|
|
|
+ uni.reLaunch({
|
|
|
+ url: '/pages/Sign/Sign',
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ },
|
|
|
+ // 添加消息页面系统通知提示报名成功
|
|
|
+ addMessage() {
|
|
|
+ let data = {
|
|
|
+ oid: this.$store.state.user.openid,
|
|
|
+ acid: this.acId,
|
|
|
+ type: 0,
|
|
|
+ }
|
|
|
+ this.$request('/insertMessage', "POST", data).then(res => {
|
|
|
+ console.log('添加消息页面系统通知提示报名成功',res);
|
|
|
})
|
|
|
},
|
|
|
// 查看更多报名同学
|
|
|
@@ -153,8 +232,8 @@
|
|
|
},
|
|
|
share() {
|
|
|
uni.showToast({
|
|
|
- title:'暂未开发，还不能分享哦',
|
|
|
- icon:'none'
|
|
|
+ title: '暂未开发，还不能分享哦',
|
|
|
+ icon: 'none'
|
|
|
})
|
|
|
},
|
|
|
|
|
|
@@ -240,7 +319,8 @@
|
|
|
// console.log('接收参数',e);
|
|
|
this.acId = e.acId
|
|
|
this.oid = this.$store.state.user.openid
|
|
|
-
|
|
|
+ // 获取是否报名
|
|
|
+ this.btnEnroll()
|
|
|
|
|
|
// this.getActivity()
|
|
|
// 获取页面数据
|
|
|
@@ -249,8 +329,7 @@
|
|
|
this.getColl()
|
|
|
// 获取是否订阅
|
|
|
// this.getSub()
|
|
|
- // 获取是否报名
|
|
|
- this.btnEnroll()
|
|
|
+
|
|
|
// 获取报名人名单
|
|
|
this.getUsers()
|
|
|
}
|
|
|
@@ -305,6 +384,18 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
+ .footer {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ color: rgba(0, 0, 0, 0.4);
|
|
|
+ font-size: 24rpx;
|
|
|
+ // height: 32rpx;
|
|
|
+ // line-height: 32rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ padding: 20rpx 0;
|
|
|
+ padding-bottom: 0;
|
|
|
+ }
|
|
|
+
|
|
|
.avaList {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
@@ -312,7 +403,7 @@
|
|
|
align-items: center;
|
|
|
padding: 30rpx 0;
|
|
|
border-bottom: 1rpx rgba(231, 231, 231, 1) solid;
|
|
|
- margin-bottom: 30rpx;
|
|
|
+ margin-bottom: 20rpx;
|
|
|
|
|
|
.ava {
|
|
|
width: 353rpx;
|
|
|
@@ -338,10 +429,24 @@
|
|
|
font-weight: 400;
|
|
|
color: rgba(0, 0, 0, 0.6);
|
|
|
border-bottom: 1rpx rgba(231, 231, 231, 1) solid;
|
|
|
- padding-bottom: 30rpx;
|
|
|
- .acinfoAddress{
|
|
|
- padding: 30rpx 0;
|
|
|
+
|
|
|
+ // padding-bottom: 30rpx;
|
|
|
+ .acinfoAddress {
|
|
|
+ // padding: 20rpx 0;
|
|
|
+ display: flex;
|
|
|
+ padding-bottom: 20rpx;
|
|
|
+ .acinfoTit{
|
|
|
+ width: 150rpx;
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ // text-align: justify;
|
|
|
+ .justified-text{
|
|
|
+ text-align: justify;
|
|
|
+ text-justify: inter-word; /* 兼容性写法，用于处理中英文混排时的对齐效果 */
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
.inf {
|
|
|
color: rgba(0, 0, 0, 0.8);
|
|
|
}
|
|
|
@@ -374,16 +479,7 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- .footer {
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- color: rgba(0, 0, 0, 0.4);
|
|
|
- font-size: 24rpx;
|
|
|
- height: 32rpx;
|
|
|
- line-height: 32rpx;
|
|
|
- font-weight: 400;
|
|
|
- margin: 30rpx 0;
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
.btnBlock {
|
|
|
@@ -455,6 +551,7 @@
|
|
|
align-items: center;
|
|
|
border-radius: 10rpx;
|
|
|
}
|
|
|
+
|
|
|
.btnt1 {
|
|
|
width: 454rpx;
|
|
|
color: #fff;
|
yuanyiming