Skip to content

E
educationStu
Commit a0cc33d2 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 6a337486
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 72 deletions
src/api/activity.js
View file @ a0cc33d2
......@@ -57,4 +57,16 @@ export function activitySignUp(data) {
method: 'post',
data
})
}
/**
* 获取参加的活动列表
* @param {JSON参数} data
*/
export function activityJoinList(data) {
return request({
url: '/AppletEducation/GetUserJoinActivityPageListJxh',
method: 'post',
data
})
}
\ No newline at end of file
src/components/signUpList.vue
View file @ a0cc33d2
......@@ -32,9 +32,14 @@
<image
:src="x.CoverImg"
mode="aspectFill"
style="width: 110px; height: 67px; border-radius: 8px"
style="
width: 220rpx;
height: 134rpx;
border-radius: 16rpx;
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
"
></image>
<view style="margin-left: 10px; height: 67px">
<view style="margin-left: 20rpx; height: 134rpx">
<view class="box-title">{{ x.ActivityName }}</view>
<view style="font-size: 12px; color: #666666; margin-top: 8px"
>活动类型:{{ x.TypeName }}</view
......@@ -42,41 +47,42 @@
</view>
</view>
<view class="box-top-r-b">
<u-icon
<van-icon
name="contact"
:size="28"
size="28rpx"
color="#999999"
style="margin-right: 5px"
></u-icon>
></van-icon>
<view
style="
max-width: 280rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 24rpx;
"
>{{ x.LinkMan }}</view
>
<u-icon
<van-icon
name="friends-o"
:size="28"
size="28rpx"
color="#999999"
style="margin-right: 5px; margin-left: 10px"
></u-icon>
<view>{{ x.PeopleNum }}</view>
<u-icon
style="margin-right: 10rpx; margin-left: 20rpx"
></van-icon>
<view style="font-size: 24rpx">{{ x.PeopleNum }}</view>
<van-icon
name="phone-o"
:size="28"
size="28rpx"
color="#999999"
style="margin-right: 5px; margin-left: 10px"
></u-icon>
<view>{{ x.LinkTel }}</view>
<u-icon
style="margin-right: 10rpx; margin-left: 20rpx"
></van-icon>
<view style="font-size: 24rpx">{{ x.LinkTel }}</view>
<van-icon
name="star-o"
:size="28"
size="28rpx"
:color="mainColor"
style="margin-right: 5px; margin-left: 10px"
></u-icon>
style="margin-right: 10rpx; margin-left: 20rpx"
></van-icon>
<view
v-if="x.Money > 0 && x.TotalPoint == 0"
:style="{ color: mainColor }"
......@@ -95,7 +101,7 @@
</view>
<view class="box-Remark">
<view class="box-Remark-top">
<view style="width: calc(100vw - 110px)">
<view style="width: calc(100vw - 220rpx)">
备注：{{ x.Remark == "" ? "无" : x.Remark }}
</view>
<view
......@@ -178,6 +184,7 @@
flex-direction: column;
align-items: center;
background: #fff;
width: 650rpx;
"
>
<view
......@@ -186,25 +193,27 @@
align-items: center;
justify-content: center;
height: 140rpx;
font-size: 30rpx;
"
>
<Text>是否取消订单？</Text>
是否取消订单？
</view>
<view
style="
display: flex;
flex-direction: column;
height: 160rpx;
margin-left: 30rpx;
width: 100%;
font-size: 30rpx;
box-sizing: border-box;
padding: 0 30rpx;
"
>
<Text style="margin-left: 20rpx; margin-top: 10rpx">备注</Text>
<input
class="uni-input inputM"
style="margin-left: 20rpx; margin-top: 10rpx"
备注
<textarea
style="margin-top: 10rpx; font-size: 30rpx"
v-model="cancelRemark"
placeholder="输入备注"
placeholder="请输入备注"
placeholder-style="color:#999"
/>
</view>
<view
......@@ -215,6 +224,7 @@
height: 100rpx;
border-top: 1px solid #f5f5f5;
width: 100%;
font-size: 30rpx;
"
>
<view
......@@ -223,22 +233,24 @@
display: flex;
align-items: center;
justify-content: center;
font-size: 30rpx;
"
@click="show = false"
>
<Text>取消</Text>
取消
</view>
<view
style="
width: 50%;
color: #a0cfff;
color: #00acf9;
font-size: 30rpx;
display: flex;
align-items: center;
justify-content: center;
"
@click="queren"
>
<Text>确定</Text>
确定
</view>
</view>
</view>
......@@ -259,7 +271,7 @@ import {
onMounted,
} from "vue";
import Loadmore from "./loadmore.vue";
import { getActivityList, cancelSignUp } from "../api/activity";
import { activityJoinList, cancelSignUp } from "../api/activity";
export default {
components: {
Loadmore,
......@@ -271,7 +283,7 @@ export default {
u: {},
show: false,
current: 0,
mainColor: "",
mainColor: "#00acf9",
contentHeight: 0,
msg: {
......@@ -307,7 +319,7 @@ export default {
that.getList();
},
async getList() {
let res = await getActivityList(data.msg);
let res = await activityJoinList(data.msg);
if (res) {
if (data.msg.pageIndex === 1) {
data.g = res.data.pageData;
......@@ -335,6 +347,7 @@ export default {
index: i,
Id: x.Id,
};
data.show = true;
},
//取消报名
......@@ -413,16 +426,16 @@ export default {
}
.mysignupList .box-top {
width: 100%;
height: 67px;
height: 134rpx;
display: flex;
align-items: center;
}
.mysignupList .box-title {
width: calc(100vw - 30px - 110px - 10px);
font-size: 15px;
width: calc(100vw - 60rpx - 220rpx - 20rpx);
font-size: 30rpx;
color: #000000;
font-weight: 500;
line-height: 22px;
line-height: 44rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -433,18 +446,19 @@ export default {
width: 100%;
display: flex;
align-items: center;
font-size: 13px;
font-size: 26rpx;
color: #666666;
margin-top: 10px;
margin-top: 20rpx;
}
.mysignupList .box-Remark {
width: 100%;
padding: 14px 10px;
font-size: 11px;
box-sizing: border-box;
padding: 28rpx 20rpx;
font-size: 22rpx;
color: #777777;
background: #ededed;
margin-top: 13px;
border-radius: 6px;
margin-top: 26rpx;
border-radius: 12rpx;
}
.mysignupList .box-Remark-top {
width: 100%;
......@@ -453,27 +467,27 @@ export default {
justify-content: space-between;
}
.mysignupList .box-Remark-top-r {
font-size: 11px;
font-size: 22rpx;
}
.mysignupList .box-Remark-b {
width: 100%;
display: flex;
justify-content: flex-end;
margin-top: 5px;
margin-top: 10rpx;
}
.mysignupList .box-Remark-btn {
width: 60px;
height: 25px;
border-radius: 12.5px;
border: 1px solid #333333;
width: 120rpx;
height: 50rpx;
border-radius: 25rpx;
border: 1px solid #333;
display: flex;
align-items: center;
justify-content: center;
font-size: 13px;
color: #333333;
font-size: 26rpx;
color: #333;
}
.mysignupList .scroll-box {
height: calc(100vh - 90px);
height: calc(100vh - 180rpx);
width: calc(100vw);
overflow: hidden;
}
......
src/pages.json
View file @ a0cc33d2
......@@ -72,7 +72,7 @@
],
"tabBar": {
"color": "#7A7E83",
"selectedColor": "#3cc51f",
"selectedColor": "#00ACF9",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [{
......
src/pages/activity/activityDetails.vue
View file @ a0cc33d2
......@@ -124,7 +124,7 @@
.title-pic .line-bottom {
width: 71rpx;
height: 12rpx;
background-color: #40766e;
background-color: #00ACF9;
border-radius: 4rpx;
position: absolute;
left: 0;
......@@ -197,7 +197,7 @@
width: 100%;
min-height: 90rpx;
border-radius: 20rpx;
background-color: #40766e;
background-color: #00ACF9;
color: #fff;
display: flex;
box-sizing: border-box;
......@@ -221,7 +221,7 @@
position: absolute;
width: 4rpx;
height: 100%;
background-color: #40766e;
background-color: #00ACF9;
left: 24rpx;
top: 90rpx;
}
......@@ -343,10 +343,10 @@
</view>
</view>
<view v-if="detial.IsJoinActivity == 1">
<view class="details-box-top-f" style="background: #40766e"></view>
<view class="details-box-top-f" style="background: #00ACF9"></view>
<view
class="details-box-t-positions"
:style="{ background: '#40766E' }"
:style="{ background: '#00ACF9' }"
>
已报名
</view>
......
src/pages/activity/activityList.vue
View file @ a0cc33d2
......@@ -97,11 +97,11 @@
<view v-if="x.IsJoinActivity == 1">
<view
class="details-box-top-f"
style="background: #40766e"
style="background: #00acf9"
></view>
<view
class="details-box-t-positions"
:style="{ background: '#40766E' }"
:style="{ background: '#00ACF9' }"
>
已报名
</view>
......@@ -332,14 +332,14 @@ export default {
}
return att;
},
// getorder() {
// //报名成功处理
// data.current = 2; //让他直接跳入我报名
// if (Object.keys(this.$refs).length > 0 && this.$refs.children) {
// //判断
// this.$refs.children.getfzuj();
// }
// },
getorder() {
//报名成功处理
data.current = 2; //让他直接跳入我报名
if (Object.keys(refs).length > 0 && refs.children) {
//判断
refs.children.$vm.getfzuj();
}
},
lower(e) {
if (data.msg.pageIndex < data.PageCount) {
data.pageState = "loading";
......@@ -361,7 +361,6 @@ export default {
data.msg.SelectIsEnd = 0;
that.getList();
} else {
console.log(253, refs);
refs.children.$vm.getfzuj();
}
},
......@@ -420,7 +419,7 @@ export default {
}
.currentStyle {
color: #fff;
background-color: #40766e;
background-color: #00acf9;
}
.box-top-r {
width: 200rpx;
......@@ -429,7 +428,7 @@ export default {
align-items: center;
justify-content: center;
font-size: 26rpx;
color: #40766e;
color: #00acf9;
background: #edf0f3;
border-radius: 8rpx;
box-sizing: border-box;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment