1

components/my-tabbar.vue

@@ -18,7 +18,7 @@
 						{{item.name}}</view>
 				</view>
 			</view>
-			<view style="height: 100rpx;position: fixed;bottom: 0;width: 100%;background-color: #ffffff;"></view>
+			<view v-if="isOverall==1" style="height: 100rpx;position: fixed;bottom: 0;width: 100%;background-color: #ffffff;"></view>
 			<!-- <span class="badge" v-if="number != 0">
 				<u-badge type="warning " max="99" :value="number"></u-badge>
 			</span> -->

packageA/center/detail.vue

@@ -117,7 +117,12 @@
 				</view>
 			</view>
 
-
+			<view class="footer flex align-items" style="justify-content: space-between;" v-if="detail.status == 4">
+				<view class="btn_1" style="background-color: #E2E2E2;color: #999999;">报名已结束</view>
+			</view>
+			<view class="footer flex align-items" style="justify-content: space-between;" v-if="detail.status == 5">
+				<view class="btn_1" style="background-color: #E2E2E2;color: #999999;">活动已结束</view>
+			</view>
 			<view class="footer flex align-items" style="justify-content: space-between;" v-if="detail.status == 2">
 				<view class="footer-left">
 					<!-- <view @click="callPhone(detail.user.mobile)">

packageA/my/pendinPayDetail.vue

@@ -14,7 +14,7 @@
 							<view class="first-image flex align-items" style="margin-top: 25rpx;">
 								<image :src="detailAny.user.avatar" mode=""
 									style="width: 36rpx;height: 36rpx;border-radius:50%;"></image>
-								<text style="color:#9C9C9C;">{{ detailAny.user.nickname }}</text>
+								<text style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</text>
 								<text style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number
 									}}人玩过</text>
 							</view>
@@ -374,9 +374,9 @@ export default {
 					// 		prevPage.onLoad(prevPage.options)
 					// 	}
 					// });
-					setTimeout(() => {
+					// setTimeout(() => {
-						uni.hideLoading();
+					// 	uni.hideLoading();
-					}, 2000)
+					// }, 2000)
 
 				} else {
 					uni.showToast({
@@ -1002,7 +1002,7 @@ export default {
 	width: 690rpx;
 	background: #FFFFFF;
 	padding: 30rpx;
-	border-radius: 18rpx;
+	border-radius: 44rpx;
 	box-sizing: border-box;
 
 	.head_img {

packageA/my/person-detail.vue

@@ -126,14 +126,14 @@
 </template>
 
 <script>
-import {
+	import {
 		dateFormat,
 		dateFormats
-} from '../../utils/dateFormat'
+	} from '../../utils/dateFormat'
-// import {
+	// import {
-// 	address
+	// 	address
-// } from '../../static/address'
+	// } from '../../static/address'
-export default {
+	export default {
 		data() {
 			return {
 				typeop: '',
@@ -334,7 +334,7 @@ export default {
 							type: 'success',
 							message: '保存成功',
 							duration: '1000',
-						complete: function () {
+							complete: function() {
 								// setTimeout(function() {
 								// 	uni.navigateBack(1)
 								// }, 1000);
@@ -428,13 +428,16 @@ export default {
 			},
 			upload() {
 				// 示例代码
-			uni.chooseImage({
+				uni.chooseMedia({
+					count: 1,
+					mediaType: ['image'],
 					success: (chooseImageRes) => {
-					const tempFilePaths = chooseImageRes.tempFilePaths;
+						console.log(chooseImageRes);
+						const tempFilePaths = chooseImageRes.tempFiles[0].tempFilePath;
 						const that = this
 						uni.uploadFile({
 							url: 'https://naweigetetest2.hschool.com.cn/api/common/upload', //仅为示例，非真实的接口地址
-						filePath: tempFilePaths[0],
+							filePath: tempFilePaths,
 							name: 'file',
 							header: {
 								"token": uni.getStorageSync("token")
@@ -449,8 +452,14 @@ export default {
 								console.log(group.data)
 								console.log(that.avata)
 								that.submit();
+							},
+							fail(red) {
+								console.log(red);
 							}
 						});
+					},
+					fail(res) {
+						console.log(res);
 					}
 				});
 				// this.show5 = true
@@ -572,15 +581,15 @@ export default {
 				}
 			},
 		}
-}
+	}
 </script>
 
 <style lang="scss">
-.left {
+	.left {
 		font-weight: 600;
-}
+	}
 
-.content {
+	.content {
 		.backImg {
 			position: fixed;
 			width: 100%;
@@ -673,5 +682,5 @@ export default {
 				}
 			}
 		}
-}
+	}
 </style>

pages/activity/stationStemys.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="box flex justify-center flex-column">
+	<view class="box flex flex-column">
 		<view class="nav">
 			<u-navbar :is-back="true"  :autoBack="true" leftIconColor="#323232"  bgColor="#FFFFFF"> 
 				<!-- <view
@@ -159,7 +159,7 @@
 			// 重置列表
 			resetLists() {
 				this.page = 1;
-				this.alllist = [];
+				this.list = [];
 				this.loadStatus = 'loading'
 			}
 		}