Skip to content

Great Teamwork
Great Teamwork

_milo / Great Teamwork

通知 13
Star 0
Fork 0
Great Teamwork
Great Teamwork
提交 14443cb0 编写于 作者: 赵十四's avatar 赵十四
浏览文件
操作

Merge branch 'frontend' of https://gitcode.net/qq_50679803/great-teamwork into frontend

上级 9da97fb6 a8b1ab39
隐藏空白更改
内联 并排
Showing with 192 addition and 135 deletion
android_debug.apk 0 → 100644
浏览文件 @ 14443cb0
文件已添加
teamwork/manifest.json
浏览文件 @ 14443cb0
......@@ -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/add-school-activity.vue
浏览文件 @ 14443cb0
......@@ -198,7 +198,7 @@
position: absolute;
width: 100%;
height: 100%;
background-color: #EDEEF0;
/* background-color: #EDEEF0; */
}
.nav-bar-back {
......@@ -266,6 +266,8 @@
}
.form-input {
border-radius: 5px;
background-color: #EDEEF0;
margin-left: 5px;
width: 70%;
height: 35px;
......@@ -273,11 +275,13 @@
outline: none;
font-size: 14px;
color: #333;
background-color: #fff;
/* background-color: #fff; */
padding: 0 10px;
}
.form-input1 {
border-radius: 5px;
background-color: #EDEEF0;
margin-left: 5px;
width: 70%;
height: 70px;
......@@ -285,7 +289,7 @@
outline: none;
font-size: 14px;
color: #333;
background-color: #fff;
/* background-color: #fff; */
padding: 0 10px;
}
......@@ -301,6 +305,8 @@
}
.form-input2 {
border-radius: 5px;
background-color: #EDEEF0;
margin-top: 5px;
margin-left: 10px;
width: 30%;
......@@ -309,7 +315,7 @@
outline: none;
font-size: 14px;
color: #333;
background-color: #fff;
/* background-color: #fff; */
padding: 0 10px;
}
......@@ -329,7 +335,6 @@
height: 200px;
}
.picker {
margin-top: 10px;
}
......
teamwork/pages/discover/discover-detail.vue
浏览文件 @ 14443cb0
......@@ -16,8 +16,7 @@
</view>
<view class="school-activity-icon-wrapper">
<image class="school-activity-icon"
:style="'background: url('+this.picture+') no-repeat center/cover #eeeeee;'"
@click.stop="showPic(this.picture)"></image>
:style="'background: url('+this.picture+') no-repeat center/cover #eeeeee;'"></image>
</view>
<view class="activity-production">
<image class="activity-production-icon" src="/static/discover/production.png"></image>
......@@ -243,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
浏览文件 @ 14443cb0
......@@ -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
浏览文件 @ 14443cb0
......@@ -36,6 +36,7 @@
<canvas canvas-id="canvas" @click="updateImageCode" class="canvas"></canvas>
<input class="ginput" v-model="graphicVerifyCode" placeholder="请输入验证码" />
<button style="margin-top: 10px;" :loading="loading" @tap="submitFcha" class="btn-big">验证</button>
<view class="text" @click="updateImageCode">获取验证码</view>
</view>
</view>
</uni-popup>
......@@ -70,13 +71,12 @@
if (value === '') {
callback(new Error('手机号不能为空'))
} else {
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
const reg2 = /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/
if ((reg.test(value) || reg2.test(value))) {
const reg = /^(13[0-9]|14[0-9]|15[0-9]|166|17[0-9]|18[0-9]|19[8|9])\d{8}$/
if (reg.test(value)) {
this.yzmshow = true
callback()
} else {
callback(new Error('请输入正确的手机号'))
callback('请输入正确的手机号')
}
}
}
......@@ -114,10 +114,8 @@
rules: [{
required: true,
errorMessage: '请确认密码'
}, {
validateFunction: function(rule, value, data, callback) {
// console.log(data.newPassword);
if (value.length > 20 || value.length < 8) {
callback('密码长度在8-20位！')
} else if (value != data.newPassword) {
......@@ -148,7 +146,7 @@
name: 'fe-retrievePassword',
data: {
phone: this.formData.phone,
password: this.formData.password,
password: this.formData.newPassword,
code: this.formData.captcha
}
})
......@@ -222,8 +220,8 @@
}
})
.then(res => {
this.code = res.result.code,
console.log(this.userId)
this.code = res.result.code
console.log(this.userId)
})
}
}
......@@ -263,11 +261,6 @@
margin-right: auto;
}
/* .text-area {
display: flex;
justify-content: center;
} */
.confirmButton {
background-color: #f1992d;
color: #fff;
......@@ -286,7 +279,7 @@
height: 35px;
font-size: 0.7em;
border: 0;
border-radius: 20px;
border-radius: 18px;
}
.captchaButton::after {
......@@ -298,7 +291,7 @@
flex-direction: column;
background-color: #fff;
width: 270px;
height: 300px;
height: 200px;
border-radius: 10px;
}
......@@ -314,4 +307,10 @@
border: 0;
border-radius: 20px;
}
.text{
margin-top: 12px;
font-size: 10px;
color: #f1992d;
}
</style>
\ No newline at end of file
teamwork/pages/login/login.vue
浏览文件 @ 14443cb0
......@@ -165,8 +165,6 @@
border: 0;
}
.rgst {
color: #f1992d;
display: inline-block;
......
teamwork/pages/my/finish.vue
浏览文件 @ 14443cb0
......@@ -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
浏览文件 @ 14443cb0
......@@ -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/my/my-resetpassword.vue
浏览文件 @ 14443cb0
......@@ -72,11 +72,17 @@
duration: 2000
});
return;
} else if (that.password == newPassword) {
uni.showToast({
title: '与原密码一致',
icon: 'none',
duration: 2000
});
} else {
updata.password = password;
updata.newPassword = newPassword;
this.Upload(updata);
}
this.Upload(updata);
this.$refs.alertDialog.close();
},
dialogClose() {
......
teamwork/pages/post/post-detail.vue
浏览文件 @ 14443cb0
......@@ -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
浏览文件 @ 14443cb0
......@@ -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
浏览文件 @ 14443cb0
......@@ -28,7 +28,7 @@
export default {
data() {
return {
userId: '644a643a0c801ca878983559',
userId: '',
rank: 1,
distance: 99.99,
type: '',
......
teamwork/pages/sport/subNVue/finish.nvue
浏览文件 @ 14443cb0
......@@ -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 => {
console.log(res);
if (res.result.code === 200) {
uni.showToast({
title: '运动感受保存成功',
title: '保存成功',
icon: 'success'
})
} else {
uni.showToast({
title: '运动感受保存失败',
title: '保存失败',
icon: 'error'
})
}
......
teamwork/pages/team/activity-detail.vue
浏览文件 @ 14443cb0
......@@ -81,10 +81,10 @@
}
})
.then(res => {
console.log(res),
this.applyCode = res.result.code,
console.log(res.result.message),
console.log(this.applyCode)
console.log(res)
this.applyCode = res.result.code
console.log(res.result.message)
console.log(this.applyCode)
})
await this.showTT();
......@@ -113,15 +113,15 @@
}
})
.then(res => {
console.log(res),
this.name = res.result.data.username,
this.production = res.result.data.content,
this.startDate = res.result.data.startDate,
this.endDate = res.result.data.endDate,
this.object = res.result.data.participants,
this.place = res.result.data.place,
this.contact = res.result.data.contact,
this.icon = res.result.data.icon
console.log(res)
this.name = res.result.data.username
this.production = res.result.data.content
this.startDate = res.result.data.startDate
this.endDate = res.result.data.endDate
this.object = res.result.data.participants
this.place = res.result.data.place
this.contact = res.result.data.contact
this.icon = res.result.data.icon
})
}
}
......
teamwork/pages/team/add-team-activity.vue
浏览文件 @ 14443cb0
......@@ -116,10 +116,19 @@
})
.then(res => {
console.log(res)
uni.showToast({
title: '提交成功',
icon: 'success'
});
if (res.result.code == 200) {
uni.showToast({
title: '提交成功',
icon: 'success'
});
this.goBack()
} else {
uni.showToast({
title: '提交失败',
icon: 'error'
});
}
})
},
handleDateChange1(event) {
......@@ -210,6 +219,7 @@
}
.form-input {
border-radius: 5px;
margin-left: 5px;
width: 70%;
height: 35px;
......@@ -222,6 +232,7 @@
}
.form-input1 {
border-radius: 5px;
margin-left: 5px;
width: 70%;
height: 70px;
......@@ -245,6 +256,7 @@
}
.form-input2 {
border-radius: 5px;
margin-top: 5px;
margin-left: 10px;
width: 30%;
......
teamwork/pages/team/add-team.vue
浏览文件 @ 14443cb0
......@@ -34,7 +34,7 @@
</view>
</template>
<script>
let code=200;
let code = 200;
export default {
data() {
return {
......@@ -45,7 +45,7 @@
}
},
onLoad() {
this.userId=getApp().globalData.userId
this.userId = getApp().globalData.userId
},
methods: {
goBack() {
......@@ -68,15 +68,16 @@
});
},
async create() {
if(this.name==''||this.content==''){
if (this.name == '' || this.content == '') {
uni.showToast({
title: '信息填写不完整',
icon: 'none'
});
return;
}
if(this.avatar==''){
this.avatar='https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/7d3feb79-8efe-4686-b745-3b7dc5d5df36.png'
if (this.avatar == '') {
this.avatar =
'https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/7d3feb79-8efe-4686-b745-3b7dc5d5df36.png'
}
await uniCloud.callFunction({
name: 'fe-team-createTeam',
......@@ -94,14 +95,14 @@
})
await this.showTorM();
},
showTorM(){
showTorM() {
if (this.code == 200) {
console.log(this.code, 'this.code1')
uni.showToast({
title: '创建成功',
duration: 2000
});
} else{
} else {
uni.showModal({
title: '提示',
content: '您已加入一个小队，若要加入或创建小队，请先退出已加入的小队再进行相应的操作。',
......@@ -115,6 +116,7 @@
}
});
}
this.goBack()
}
}
}
......@@ -201,6 +203,7 @@
}
.form-input {
border-radius: 5px;
margin-left: 5px;
width: 70%;
height: 35px;
......@@ -213,6 +216,7 @@
}
.form-input1 {
border-radius: 5px;
margin-left: 5px;
width: 70%;
height: 170px;
......@@ -286,6 +290,7 @@
}
.avatar {
border-radius: 5px;
margin-left: 5px;
background-color: #edeef0;
width: 70%;
......
teamwork/pages/team/main.vue
浏览文件 @ 14443cb0
......@@ -122,11 +122,11 @@
}
})
.then(res => {
console.log(res),
this.name = res.result.data.teamname,
this.activityList = res.result.data.activityList,
this.join = res.result.join,
this.icon = res.result.data.teamicon
console.log(res)
this.name = res.result.data.teamname
this.activityList = res.result.data.activityList
this.join = res.result.join
this.icon = res.result.data.teamicon
console.log(this.join)
})
},
......@@ -174,7 +174,6 @@
async toggleMessage(index, teamId) {
if (index == 1) {
await this.$refs['popupDialog1'].open()
} else if (index == 2) {
console.log('2222222');
this.tID = teamId
......@@ -192,10 +191,18 @@
}
})
.then(res => {
console.log(res)
this.join = false
// this.code=200
console.log(this.join)
if (res.result.code == 200) {
this.join = false
console.log(this.join)
uni.showToast({
title: '退出成功'
});
} else {
uni.showToast({
title: '退出失败',
icon: 'error'
});
}
})
this.$refs['popupDialog1'].close();
},
......@@ -211,8 +218,8 @@
}
})
.then(res => {
this.code = res.result.code,
console.log(this.userId)
this.code = res.result.code
console.log(this.userId)
})
this.$refs['popupDialog2'].close();
await this.showTorM();
......@@ -223,8 +230,7 @@
showTorM() {
if (this.code == 200) {
uni.showToast({
title: '加入成功',
duration: 2000
title: '加入成功'
});
} else {
uni.showModal({
......@@ -314,6 +320,7 @@
height: 45px;
border-radius: 50%;
float: left;
margin-left: 8px;
}
.search-team {
......@@ -337,7 +344,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
浏览文件 @ 14443cb0
......@@ -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: {
......@@ -44,8 +38,8 @@
}
})
.then(res => {
console.log(res),
this.memList = res.result.data
console.log(res)
this.memList = res.result.data
})
}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或