Compare commits

..

No commits in common. "4a983641a4a0a410378f816a2349df2166239530" and "8f4c93eee74b054fc06164d2e4caf5feb9cc4ac7" have entirely different histories.

5 changed files with 525 additions and 539 deletions

View File

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

View File

@ -117,12 +117,7 @@
</view> </view>
</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 flex align-items" style="justify-content: space-between;" v-if="detail.status == 2">
<view class="footer-left"> <view class="footer-left">
<!-- <view @click="callPhone(detail.user.mobile)"> <!-- <view @click="callPhone(detail.user.mobile)">

View File

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

View File

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

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="box flex flex-column"> <view class="box flex justify-center flex-column">
<view class="nav"> <view class="nav">
<u-navbar :is-back="true" :autoBack="true" leftIconColor="#323232" bgColor="#FFFFFF"> <u-navbar :is-back="true" :autoBack="true" leftIconColor="#323232" bgColor="#FFFFFF">
<!-- <view <!-- <view