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