Hooke / swx_weapp

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
51a24a73 1 parent 8c8f208c

优化细节

Inline Side-by-side
Showing 6 changed files with 19 additions and 13 deletions
...@@ -5,3 +5,5 @@ page { ...@@ -5,3 +5,5 @@ page {
5 margin: 0; 5 margin: 0;
6 height: 100%; 6 height: 100%;
7 } 7 }
8 +
9 +.van-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden;text-overflow:ellipsis}.van-multi-ellipsis--l3{-webkit-line-clamp:3}.van-clearfix:after{clear:both;content:"";display:table}.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{border:0 solid #ebedf0;bottom:-50%;box-sizing:border-box;content:" ";left:-50%;pointer-events:none;position:absolute;right:-50%;top:-50%;transform:scale(.5);transform-origin:center}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
......
1 <!-- 1 <!--
2 * @Date: 2022-09-20 15:39:37 2 * @Date: 2022-09-20 15:39:37
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-26 11:39:21 4 + * @LastEditTime: 2022-10-26 14:20:33
5 * @FilePath: /swx/src/components/activity-card.vue 5 * @FilePath: /swx/src/components/activity-card.vue
6 * @Description: 活动卡片组件 6 * @Description: 活动卡片组件
7 --> 7 -->
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 </van-row> 30 </van-row>
31 <view v-if="status === 'creator'"> 31 <view v-if="status === 'creator'">
32 <view @tap="editActivity(data)" class="edit-button">编辑</view> 32 <view @tap="editActivity(data)" class="edit-button">编辑</view>
33 - <view @tap="finishActivity(data)" v-if="formatStatus(data) === '报名未开始' || formatStatus(data) === '报名中' || formatStatus(data) === '报名结束'" class="finish-button">结束</view> 33 + <view @tap="finishActivity(data)" v-if="formatStatus(data) === '报名未开始' || formatStatus(data) === '报名中' || formatStatus(data) === '报名结束' || formatStatus(data) === '活动进行中'" class="finish-button">结束</view>
34 <view @tap="delActivity(data)" v-if="formatStatus(data) === '未发布' || formatStatus(data) === '已结束'" class="close-button">删除</view> 34 <view @tap="delActivity(data)" v-if="formatStatus(data) === '未发布' || formatStatus(data) === '已结束'" class="close-button">删除</view>
35 </view> 35 </view>
36 </view> 36 </view>
......
1 <!-- 1 <!--
2 * @Date: 2022-09-26 14:36:57 2 * @Date: 2022-09-26 14:36:57
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-26 09:14:00 4 + * @LastEditTime: 2022-10-26 14:02:39
5 * @FilePath: /swx/src/pages/activityDetail/index.vue 5 * @FilePath: /swx/src/pages/activityDetail/index.vue
6 * @Description: 活动详情页 6 * @Description: 活动详情页
7 --> 7 -->
...@@ -513,10 +513,14 @@ export default { ...@@ -513,10 +513,14 @@ export default {
513 } 513 }
514 } 514 }
515 if (this.member_role === 'volunteer') { 515 if (this.member_role === 'volunteer') {
516 - if (this.activity.is_inner) { 516 + if (this.reg_id) {
517 - status = 'volunteer' 517 + status = 'player_join'
518 } else { 518 } else {
519 - status = 'volunteer_only' 519 + if (this.activity.is_inner) {
520 + status = 'volunteer'
521 + } else {
522 + status = 'volunteer_only'
523 + }
520 } 524 }
521 } 525 }
522 return status 526 return status
......
1 <!-- 1 <!--
2 * @Date: 2022-09-19 14:11:06 2 * @Date: 2022-09-19 14:11:06
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-21 17:23:18 4 + * @LastEditTime: 2022-10-26 14:03:25
5 * @FilePath: /swx/src/pages/index/index.vue 5 * @FilePath: /swx/src/pages/index/index.vue
6 * @Description: 首页 6 * @Description: 首页
7 --> 7 -->
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
135 carousel: [], 135 carousel: [],
136 flag: true, 136 flag: true,
137 page: 0, 137 page: 0,
138 - limit: 3, 138 + limit: 10,
139 scrollStyle: { height: '1000rpx' } 139 scrollStyle: { height: '1000rpx' }
140 }; 140 };
141 }, 141 },
......
1 <!-- 1 <!--
2 * @Date: 2022-09-19 14:11:06 2 * @Date: 2022-09-19 14:11:06
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-26 11:39:02 4 + * @LastEditTime: 2022-10-26 15:21:16
5 * @FilePath: /swx/src/pages/myCreateActivity/index.vue 5 * @FilePath: /swx/src/pages/myCreateActivity/index.vue
6 - * @Description: 文件描述 6 + * @Description: 创建的活动页面
7 --> 7 -->
8 <template> 8 <template>
9 <div class="my-create-activity-page"> 9 <div class="my-create-activity-page">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 <view class="box"> 29 <view class="box">
30 <text class="bg-gradient" style="font-size: 1.15rem;">活动统计</text> 30 <text class="bg-gradient" style="font-size: 1.15rem;">活动统计</text>
31 </view> 31 </view>
32 - <view class="partner-box">用户陪伴</view> 32 + <!-- <view @tap="goToPartner" class="partner-box">用户陪伴</view> -->
33 </view> 33 </view>
34 <view class="header-info"> 34 <view class="header-info">
35 <view class="activity"> 35 <view class="activity">
......
1 <!-- 1 <!--
2 * @Date: 2022-09-29 16:32:03 2 * @Date: 2022-09-29 16:32:03
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-24 16:48:30 4 + * @LastEditTime: 2022-10-26 15:52:36
5 * @FilePath: /swx/src/pages/userInfo/index.vue 5 * @FilePath: /swx/src/pages/userInfo/index.vue
6 * @Description: 用户资料 6 * @Description: 用户资料
7 --> 7 -->
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
147 const { code, data } = await infoMemberAPI({ i: getCurrentPageParam().member_id }); 147 const { code, data } = await infoMemberAPI({ i: getCurrentPageParam().member_id });
148 if (code) { 148 if (code) {
149 this.name = data.member.name; 149 this.name = data.member.name;
150 - this.avatar = data.member.avatar ? data.member.avatar : 'https://jdc.jd.com/img/200'; 150 + this.avatar = data.member.avatar ? data.member.avatar : 'http://gyzs.onwall.cn/tou%402x.png';
151 this.reg_count = data.reg_count; 151 this.reg_count = data.reg_count;
152 this.age_group = data.member.age_group; 152 this.age_group = data.member.age_group;
153 this.gender = data.member.gender === 'man' ? '男士' : '女士'; 153 this.gender = data.member.gender === 'man' ? '男士' : '女士';
......