Skip to content

Great Teamwork
Great Teamwork

_milo / Great Teamwork

通知 13
Star 0
Fork 0
Great Teamwork
Great Teamwork
提交 12ef4e64 编写于 作者: Y yyt
浏览文件
操作

真的真的最终版+apk上传

上级 239bbc6c
隐藏空白更改
内联 并排
Showing with 100 addition and 78 deletion
android_debug.apk 0 → 100644
浏览文件 @ 12ef4e64
文件已添加
teamwork/manifest.json
浏览文件 @ 12ef4e64
......@@ -72,6 +72,41 @@
}
},
"ad" : {}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
},
"splashscreen" : {
"androidStyle" : "common"
}
},
"uniStatistics" : {
......
teamwork/pages/discover/discover-detail.vue
浏览文件 @ 12ef4e64
......@@ -242,8 +242,6 @@
/* 文字换行处理 */
word-wrap: break-word;
word-break: break-all;
padding-left: 7px;
padding-right: 7px;
padding-top: 5px;
padding: 10px;
}
</style>
\ No newline at end of file
teamwork/pages/discover/main.vue
浏览文件 @ 12ef4e64
......@@ -170,7 +170,10 @@
}
.school-activity-title {
color: #5e5e5e;
display: block;
margin-top: 10px;
margin-bottom: 8px;
text-align: center;
font-size: 20px;
font-weight: bold;
......
teamwork/pages/login/find.vue
浏览文件 @ 12ef4e64
......@@ -75,7 +75,7 @@
this.yzmshow = true
callback()
} else {
callback(new Error('请输入正确的手机号'))
callback('请输入正确的手机号')
}
}
}
......@@ -260,11 +260,6 @@
margin-right: auto;
}
/* .text-area {
display: flex;
justify-content: center;
} */
.confirmButton {
background-color: #f1992d;
color: #fff;
......@@ -283,7 +278,7 @@
height: 35px;
font-size: 0.7em;
border: 0;
border-radius: 20px;
border-radius: 18px;
}
.captchaButton::after {
......@@ -295,7 +290,7 @@
flex-direction: column;
background-color: #fff;
width: 270px;
height: 300px;
height: 200px;
border-radius: 10px;
}
......
teamwork/pages/my/finish.vue
浏览文件 @ 12ef4e64
......@@ -70,8 +70,14 @@
},
methods: {
goBack() {
var url
if (this.type === '跑步') {
url = '/pages/my/my-running-record'
} else {
url = '/pages/my/my-walking-record'
}
uni.reLaunch({
url: '/pages/my/my-running-record',
url: url,
animationType: 'pop-in',
animationDuration: 300
})
......
teamwork/pages/my/main.vue
浏览文件 @ 12ef4e64
......@@ -13,11 +13,17 @@
<view class="info2">
<view class="school">
<view class="school-icon"></view>
<view class="school-name">学&emsp;&emsp;校：{{schoolName}}</view>
<view class="school-name">
<view class="text">学&emsp;&emsp;校：</view>
<view class="text1">{{schoolName}}</view>
</view>
</view>
<view class="team">
<view class="team-icon"></view>
<view class="team-name">运动小队：{{teamName}}</view>
<view class="team-name">
<view class="text">运动小队：</view>
<view class="text1">{{teamName}}</view>
</view>
</view>
</view>
</view>
......@@ -51,9 +57,7 @@
headPortraitIcon: '',
nickname: '',
schoolName: '',
teamName: '',
// moblie:'',
// gender:'',
teamName: '新野生动物营',
userId: '',
}
},
......@@ -129,12 +133,10 @@
}
.modify {
height: 10%;
}
.modify-icon {
margin-top: 50rpx;
margin-left: 85%;
width: 70rpx;
......@@ -142,41 +144,35 @@
}
.info {
height: 60%;
}
.info1 {
height: 30%;
}
.head-portrait {
margin-top: 50rpx;
margin-left: 15%;
width: 200rpx;
height: 200rpx;
width: 180rpx;
height: 180rpx;
border-radius: 50%;
background-size: 100% 100%;
/* background-image:url("/static/my/main/head-portrait.png") ;
background-repeat:no-repeat; */
float: left;
}
.nickname {
width: 250rpx;
height: 50rpx;
font-size: 60rpx;
font-size: 50rpx;
text-align: left;
float: right;
margin-top: 100rpx;
margin-right: 100rpx;
font-weight: bold;
margin-top: 110rpx;
margin-right: 150rpx;
}
.info2 {
border-radius: 20rpx;
background-color: #FFFFFF;
width: 75%;
......@@ -187,16 +183,13 @@
}
.school {
height: 50%;
}
.school-icon {
width: 100rpx;
height: 100rpx;
margin-top: 30rpx;
margin-top: 45rpx;
margin-left: 50rpx;
background-size: 100% 100%;
background-image: url("/static/my/main/school-icon.png");
......@@ -205,26 +198,23 @@
}
.school-name {
width: 340rpx;
height: 30rpx;
margin-top: 60rpx;
margin-top: 80rpx;
margin-right: 45rpx;
font-size: 35rpx;
font-size: 36rpx;
text-align: left;
float: right;
}
.team {
height: 50%;
}
.team-icon {
width: 100rpx;
height: 100rpx;
margin-top: 40rpx;
margin-top: 35rpx;
margin-left: 50rpx;
background-size: 100% 100%;
background-image: url("/static/my/main/team-icon.png");
......@@ -233,20 +223,26 @@
}
.team-name {
width: 340rpx;
height: 30rpx;
margin-top: 60rpx;
margin-top: 55rpx;
margin-right: 45rpx;
font-size: 35rpx;
font-size: 36rpx;
text-align: left;
float: right;
}
.text{
float:left;
}
.text1{
float:right;
width: 75px;
}
.func {
width: 75%;
/* margin-top: 10rpx; */
margin-left: auto;
margin-right: auto;
display: flex;
......@@ -262,7 +258,6 @@
}
.my-walking-record-icon {
width: 100rpx;
height: 100rpx;
margin-top: 50rpx;
......@@ -274,13 +269,11 @@
}
.running-record {
width: 200rpx;
height: 250rpx;
}
.running-record-icon {
width: 100rpx;
height: 100rpx;
margin-top: 50rpx;
......@@ -292,13 +285,11 @@
}
.setting {
width: 200rpx;
height: 250rpx;
}
.setting-icon {
width: 100rpx;
height: 100rpx;
margin-top: 50rpx;
......@@ -310,13 +301,11 @@
}
.reset-password {
width: 200rpx;
height: 250rpx;
}
.reset-password-icon {
width: 100rpx;
height: 100rpx;
margin-top: 50rpx;
......
teamwork/pages/post/post-detail.vue
浏览文件 @ 12ef4e64
......@@ -410,12 +410,10 @@
margin-left: 10px;
}
.name {
float: left;
margin-bottom: auto;
margin-left: 10px;
margin-left: 15px;
margin-top: 5px;
font-size: 12px;
font-weight: bold;
......
teamwork/pages/sport/finish.vue
浏览文件 @ 12ef4e64
......@@ -13,7 +13,6 @@
//传从运动界面传数据过来
var data = uni.getStorageSync('data-to-finish')
var res = JSON.parse(data)
this.id = res.id;
this.polyline = res.polyline;
this.markers[0].latitude = this.polyline[0].points[0].latitude;
this.markers[0].longitude = this.polyline[0].points[0].longitude;
......@@ -26,25 +25,25 @@
startTime: res.startTime,
distance: res.distance,
duration: res.duration,
pace: res.duration / res.distance
pace: res.duration / res.distance,
id: res.id
});
const subNVue = uni.getSubNVueById('popup'); // 通过 id 获取 nvue 子窗体
subNVue.show('slide-in-top', 250); // 打开 nvue 子窗体
},
data() {
return {
id: '',
icon: '/static/sport/icon.jpg',
longitude: 121.44820869,
latitude: 37.48330837,
scale: 16,
polyline: [{
points: [],
color: "#00aa00", //线的颜色
arrowLine: true,
width: 20,
dottedLine: true
}],
points: [],
color: "#00aa00", //线的颜色
arrowLine: true,
width: 20,
dottedLine: true
}],
markers: [{
id: 0,
longitude: 121.44577861,
......
teamwork/pages/sport/ranking.vue
浏览文件 @ 12ef4e64
......@@ -28,7 +28,7 @@
export default {
data() {
return {
userId: '644a643a0c801ca878983559',
userId: '',
rank: 1,
distance: 99.99,
type: '',
......
teamwork/pages/sport/subNVue/finish.nvue
浏览文件 @ 12ef4e64
......@@ -89,6 +89,9 @@
this.feeling = 'bad'
this.bad = '/static/sport/bad1.png'
}
console.log(this.id)
console.log(this.type)
console.log(this.feeling)
this.choose = true
uniCloud.callFunction({
name: 'fe-sport-feelings',
......@@ -99,14 +102,15 @@
}
})
.then(res => {
if (res.code === 200) {
console.log(res);
if (res.result.code === 200) {
uni.showToast({
title: '运动感受保存成功',
title: '保存成功',
icon: 'success'
})
} else {
uni.showToast({
title: '运动感受保存失败',
title: '保存失败',
icon: 'error'
})
}
......
teamwork/pages/team/main.vue
浏览文件 @ 12ef4e64
......@@ -314,6 +314,7 @@
height: 45px;
border-radius: 50%;
float: left;
margin-left: 8px;
}
.search-team {
......@@ -337,7 +338,7 @@
float: left;
margin-bottom: auto;
margin-left: 10px;
margin-top: 9px;
margin-top: 12px;
font-size: 18px;
font-weight: bold;
width: 60%;
......
teamwork/pages/team/member-list.vue
浏览文件 @ 12ef4e64
......@@ -16,14 +16,8 @@
export default {
data() {
return {
userId: '644a643a0c801ca878983559',
memList: [{
memberIcon: '/static/icon/1.png',
memberName: "不会取名字",
}, {
memberIcon: '/static/sport/icon.jpg',
memberName: "不会取名字",
}]
userId: '',
memList: []
}
},
methods: {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或