Skip to content

Great Teamwork
Great Teamwork

_milo / Great Teamwork

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

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

上级 ec56d4d7 54b3d950
隐藏空白更改
内联 并排
Showing with 509 addition and 143 deletion
teamwork/.hbuilderx/launch.json
浏览文件 @ db12f001
......@@ -16,7 +16,7 @@
"type" : "uniCloud"
},
{
"playground" : "custom",
"playground" : "standard",
"type" : "uni-app:app-android"
}
]
......
teamwork/pages.json
浏览文件 @ db12f001
......@@ -165,6 +165,7 @@
"style": {
"navigationStyle": "custom"
}
<<<<<<< HEAD
} ,{
"path" : "pages/sport/countdown",
"style" :
......@@ -175,6 +176,15 @@
}
],
=======
},
{
"path": "pages/post/message",
"style": {
"navigationStyle": "custom"
}
}],
>>>>>>> 54b3d95054c07a616682f4703d5579c57e9ad77c
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
......
teamwork/pages/login/find.vue
浏览文件 @ db12f001
......@@ -14,7 +14,8 @@
<uni-easyinput type="number" :inputBorder="true" v-model="formData.captcha"
placeholder="请输入六位验证码"></uni-easyinput>
</uni-forms-item>
<button class="captchaButton" @click="sendCaptcha()">发送验证码</button>
<!-- <button class="captchaButton" @click="sendCaptcha()">发送验证码</button> -->
<button size="mini" class="captchaButton" :disabled="btnDis" @tap="sendCaptcha">{{btnText}}</button>
</view>
<uni-forms-item name="newPassword" required label="新密码">
<uni-easyinput type="password" :inputBorder="true" v-model="formData.newPassword"
......@@ -53,6 +54,8 @@
components: {},
data() {
return {
btnDis: false,// 发送验证码按钮不禁用
btnText: "发送验证码",// 提示
loading: false,
graphicVerifyCode: "",
formData: {
......@@ -134,6 +137,30 @@
await this.$refs['popupDialog'].open()
await this.fcaptcha.refresh()
},
countDown() {
// 初始化定时器
let t = null;
// 倒计时1分钟
let timer = 300;
// 按钮禁用
this.btnDis = true;
// 计时器清零
clearInterval(t);
// 按钮显示时间
this.btnText = `${timer}s`;
t = setInterval(() => {
// 当倒计时完时，显示重新发送,按钮开启
if (timer == 0) {
clearInterval(t);
this.btnText = "重新发送";
this.btnDis = false;
return;
}
// 实现倒计时效果
timer--;
this.btnText = `${timer}s`;
}, 1000)
},
confirm(validateForm) {
this.$refs[validateForm].validate(valid => {
if (!valid) {
......@@ -223,6 +250,7 @@
this.code = res.result.code
console.log(this.userId)
})
this.countDown();
}
}
},
......
teamwork/pages/my/my-resetpassword.vue
浏览文件 @ db12f001
......@@ -6,25 +6,46 @@
<span class="empty"></span>
</view>
<view class="content">
<view class="password">
<span>原&ensp;密&ensp;码：</span>
<input placeholder="请输入原密码" @input="bindPassword" type="text" :password="showPassword"
name="input"></input>
<view class="text-area">
<uni-forms :modelValue="formData" label-position="left" :labelWidth='90' :rules="confirmRules"
ref="form" validate-trigger="bind" err-show-type="undertext">
<uni-forms-item name="phone" required label="手机号">
<uni-easyinput type="text" :inputBorder="true" v-model="formData.phone"
placeholder="请输入注册使用的手机号"></uni-easyinput>
</uni-forms-item>
<view style="display: flex;flex-flow: row nowrap;">
<uni-forms-item name="captcha" required label="验证码">
<uni-easyinput type="number" :inputBorder="true" v-model="formData.captcha"
placeholder="请输入六位验证码"></uni-easyinput>
</uni-forms-item>
<button size="mini" class="captchaButton" :disabled="btnDis" @tap="sendCaptcha">{{btnText}}</button>
<!-- <button class="captchaButton" @click="sendCaptcha()">发送验证码</button> -->
</view>
<uni-forms-item name="newPassword" required label="新密码">
<uni-easyinput type="password" :inputBorder="true" v-model="formData.newPassword"
placeholder="请输入密码"></uni-easyinput>
</uni-forms-item>
<uni-forms-item name="confirmPassword" required label="确认密码">
<uni-easyinput type="password" :inputBorder="true" v-model="formData.confirmPassword"
placeholder="请确认新密码"></uni-easyinput>
</uni-forms-item>
<uni-forms-item>
<button class="confirmButton" @click="confirm('form')">确认</button>
</uni-forms-item>
</uni-forms>
</view>
<view class="password">
<span>新&ensp;密&ensp;码：</span>
<input placeholder="请输入新密码" type="text" @input="bindNewPassword" :password="showPassword"
name="input"></input>
</view>
<view class="password">
<span>确认密码：</span>
<input placeholder="请确认密码" type="text" @input="bindConfirmPassword" :password="showPassword"
name="input"></input>
</view>
</view>
<view class="confirm">
<button class="confirm-btn" @click="confirmModification()">确认修改</button>
</view>
<uni-popup ref="popupDialog" type="center">
<view class="mcaptcha">
<view style="padding: 30px 20px;text-align: center;">
<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>
<uni-popup ref="alertDialog" type="dialog">
<uni-popup-dialog cancelText="取消" confirmText="确定" title="提示" content="确定修改你的密码吗？"
@confirm="dialogConfirm"></uni-popup-dialog>
......@@ -33,115 +54,252 @@
</template>
<script>
let code = 200;
import {
Fcaptcha
} from "@/common/fcaptcha.js"
export default {
name: 'login',
components: {},
data() {
return {
showPassword: true,
password: '',
newPassword: '',
confirmPassword: '',
btnDis: false,// 发送验证码按钮不禁用
btnText: "发送验证码",// 提示
loading: false,
graphicVerifyCode: "",
formData: {
phone: '',
password: '',
captcha: '',
newPassword: ''
},
confirmRules: {
phone: {
rules: [{
required: true,
errorMessage: '请输入手机号'
}, {
validateFunction: function(rule, value, data, callback) {
if (value === '') {
callback(new Error('手机号不能为空'))
} else {
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('请输入正确的手机号')
}
}
}
}]
},
captcha: {
rules: [{
required: true,
errorMessage: '请输入六位验证码'
}, {
validateFunction: function(rule, value, data, callback) {
if (value.length != 6) {
callback('验证码为六位！')
} else {
callback();
}
}
}]
},
newPassword: {
rules: [{
required: true,
errorMessage: '请输入密码'
}, {
validateFunction: function(rule, value, data, callback) {
if (value.length > 20 || value.length < 8) {
callback('密码长度在8-20位！')
} else {
callback();
}
}
}]
},
confirmPassword: {
rules: [{
required: true,
errorMessage: '请确认密码'
}, {
validateFunction: function(rule, value, data, callback) {
if (value.length > 20 || value.length < 8) {
callback('密码长度在8-20位！')
} else if (value != data.newPassword) {
callback('密码不一致')
} else {
callback();
}
}
}]
}
}
}
},
methods: {
bindPassword(e) {
this.password = e.detail.value;
async sendCaptcha() {
await this.$refs['popupDialog'].open()
await this.fcaptcha.refresh()
},
bindNewPassword(e) {
this.newPassword = e.detail.value;
countDown() {
// 初始化定时器
let t = null;
// 倒计时1分钟
let timer = 300;
// 按钮禁用
this.btnDis = true;
// 计时器清零
clearInterval(t);
// 按钮显示时间
this.btnText = `${timer}s`;
t = setInterval(() => {
// 当倒计时完时，显示重新发送,按钮开启
if (timer == 0) {
clearInterval(t);
this.btnText = "重新发送";
this.btnDis = false;
return;
}
// 实现倒计时效果
timer--;
this.btnText = `${timer}s`;
}, 1000)
},
bindConfirmPassword(e) {
this.confirmPassword = e.detail.value;
confirm(validateForm) {
this.$refs.alertDialog.open();
},
dialogConfirm() {
let that = this;
let password = that.password;
let newPassword = that.newPassword;
let confirmPassword = that.confirmPassword;
let updata = {};
if (!that.isPasswordAvailable(newPassword)) {
this.$refs[validateForm].validate(valid => {
if (!valid) {
this.calluniCloud()
}
})
},
async calluniCloud() {
await uniCloud.callFunction({
name: 'fe-retrievePassword',
data: {
phone: this.formData.phone,
password: this.formData.newPassword,
code: this.formData.captcha
}
})
.then(res => {
this.code = res.result.code
console.log(res)
})
await this.showTorM()
},
showTorM() {
if (this.code == 200) {
console.log(this.code, 'this.code1')
uni.showToast({
title: '密码长度在8-20位！',
icon: 'none',
title: '修改成功',
duration: 2000
});
return;
} else if (!that.isConfirmPasswordAvailable(newPassword, confirmPassword)) {
} else if (this.code == 400) {
uni.showToast({
title: '两次密码不一致',
icon: 'none',
title: '验证码错误或超时',
icon: "error",
duration: 2000
});
return;
} else if (that.password == newPassword) {
} else {
uni.showToast({
title: '与原密码一致',
icon: 'none',
title: '错误',
icon: "error",
duration: 2000
});
} else {
updata.password = password;
updata.newPassword = newPassword;
this.Upload(updata);
}
this.$refs.alertDialog.close();
},
goBack() {
uni.navigateBack({
delta: 1, //返回层数，2则上上页
})
},
dialogClose() {
this.$refsalertDialog.close();
},
confirmModification() {
this.$refs.alertDialog.open();
// 刷新验证码
updateImageCode() {
this.fcaptcha.refresh()
},
isPasswordAvailable(newPassword) {
if (newPassword.length > 20 || newPassword.length < 8) {
return false;
} else {
return true;
// 提交前校验图形验证码
submitFcha() {
if (!this.graphicVerifyCode) {
return uni.showToast({
title: '请输入图形验证码',
icon: 'error'
})
}
},
isConfirmPasswordAvailable(newPassword, confirmPassword) {
if (newPassword == confirmPassword) {
return true;
let validate = this.fcaptcha.validate(this.graphicVerifyCode)
if (!validate) {
this.updateImageCode();
this.graphicVerifyCode = ''
uni.showToast({
title: '图形验证码错误',
icon: 'error'
})
this.fcaptcha.refresh()
} else {
return false;
}
},
goBack() {
uni.navigateBack({
delta: 1, //返回层数，2则上上页
})
},
Upload(updata) {
uniCloud.callFunction({
name: 'fe-my-resetpassword',
data: {
userId: getApp().globalData.userId,
password: updata.password,
newPassword: updata.newPassword
},
uni.showToast({
title: '图形验证码通过'
})
.then(res => {
uni.showToast({
title: res.result.message,
icon: 'none',
duration: 2000
});
console.log(res);
});
},
onload() {
plus.navigator.setStatusBarBackground('#EDEEF0');
this.$refs['popupDialog'].close();
uniCloud.callFunction({
name: 'fe-auth-code',
data: {
phone: this.formData.phone
}
})
.then(res => {
this.code = res.result.code
console.log(this.userId)
})
this.countDown();
}
}
}
},
onReady() {
this.fcaptcha = new Fcaptcha({
el: 'canvas',
width: 80,
height: 35,
createCodeImg: ""
});
},
}
</script>
<style>
.bg {
background-color: #edeef0;
}
.main {
position: absolute;
width: 100%;
height: 100%;
}
.content {
/* background-color: #edeef0; */
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
position: absolute;
width: 100%;
height: 100%;
}
.top {
width: 100%;
......@@ -149,7 +307,7 @@
background-color: #EDEEF0;
text-align: center;
}
.back {
width: 40px;
height: 30px;
......@@ -158,7 +316,7 @@
float: left;
margin-left: 10px;
}
.empty {
width: 40px;
height: 30px;
......@@ -167,7 +325,7 @@
float: right;
margin-right: 10px;
}
.title {
font-size: 20px;
margin-top: 15px;
......@@ -176,46 +334,65 @@
display: inline-block;
}
.content {
width: 80%;
margin-top: 50%;
margin-left: auto;
.returnBack {
height: 55rpx;
width: 55rpx;
margin-top: 60rpx;
margin-left: 20rpx;
margin-right: auto;
}
.password {
.confirmButton {
background-color: #f1992d;
color: #fff;
border: 0;
border-radius: 20px;
}
margin-top: 50rpx;
height: 20%;
display: flex;
align-items: center;
.confirmButton::after {
border: 0;
}
/* border-bottom: 1px solid #ccc; */
.captchaButton {
background-color: #f1992d;
color: #fff;
width: 90px;
height: 35px;
font-size: 0.7em;
border: 0;
border-radius: 18px;
}
.password span {
font-size: 35rpx;
.captchaButton::after {
border: 0;
}
.password input {
border-bottom: 1px solid #ccc;
.mcaptcha {
display: flex;
flex-direction: column;
background-color: #fff;
width: 270px;
height: 200px;
border-radius: 10px;
}
.confirm {
height: 20%;
margin-top: 20%;
.canvas {
margin: auto;
width: 200rpx;
height: 100rpx;
}
.confirm-btn {
background-color: #F1992D;
color: #FFFFFF;
width: 70%;
height: 85rpx;
line-height: 85rpx;
margin-top: 100rpx;
margin-left: auto;
margin-right: auto;
border-radius: 20rpx;
.btn-big {
background-color: #f1992d;
color: #fff;
border: 0;
border-radius: 20px;
}
.text{
margin-top: 12px;
font-size: 10px;
color: #f1992d;
}
</style>
\ No newline at end of file
teamwork/pages/post/message.vue 0 → 100644
浏览文件 @ db12f001
<template>
<view>
<!-- 页头 -->
<view class="top">
<image @click="back" class="back" src="/static/discover/back.png"></image>
<view class="title">消息列表</view>
<span class="empty"></span>
</view>
<view class="one-post" >
<view class="icon-with-name">
<image :src="'https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/f692aaa2-45bc-42c3-af38-e0dff12d2eac.jpg'"
class="icon" />
<text class="name">用户姓名</text></br>
<text class="message">太6啦</text>
</view>
<image :src="'https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/f692aaa2-45bc-42c3-af38-e0dff12d2eac.jpg'"
class="post-img" />
<text class="text-content">2023年2月15日 5月20日 12:54</text>
</view>
</view>
</template>
<script>
</script>
<style>
.top {
width: 100%;
height: 50px;
background-color: #EDEEF0;
text-align: center;
}
.back {
width: 40px;
height: 30px;
margin-top: 10px;
margin-bottom: 10px;
float: left;
margin-left: 10px;
}
.empty {
width: 40px;
height: 30px;
margin-top: 10px;
margin-bottom: 10px;
float: right;
margin-right: 10px;
}
.title {
font-size: 20px;
margin-top: 15px;
font-weight: bold;
color: #f1992d;
display: inline-block;
}
.one-post {
width: 90%;
background-color: rgb(245 154 35 / 30%);
margin-left: auto;
margin-right: auto;
margin-top: 20px;
border-radius: 15px;
overflow: auto;
}
.icon-with-name {
width: 70%;
margin-left: 10px;
margin-top: 15px;
float: left;
overflow: auto;
}
.icon {
width: 40px;
height: 40px;
border-radius: 50%;
float: left;
}
.post-img{
width: 60px;
height: 60px;
border-radius: 15%;
float: right;
margin-top: 10px;
margin-right: 10px;
}
.name {
float: left;
margin-bottom: auto;
margin-left: 10px;
margin-top: 5px;
font-size: 12px;
font-weight: bold;
width: 60%;
color:#02A7F0;
}
.message {
float: left;
font-size: 12px;
margin-left: 10px;
width: 70%;
word-wrap: break-word;
}
.text-content {
float: left;
margin-top: 5px;
margin-left: 5%;
overflow: auto;
font-size: 12px;
transform: scale(0.7);
}
</style>
\ No newline at end of file
teamwork/pages/post/post-detail.vue
浏览文件 @ db12f001
......@@ -17,8 +17,8 @@
<text class="text-content">{{postDetail.content}}</text>
<view class="img-conetent">
<!-- 多张图片 -->
<view class="one-img" v-for="img in postDetail.pictureList">
<view class="post-pic" @click.stop="showPic(img)"
<view class="one-img" v-for="(img,imgIndex) in item.pictureList">
<view class="post-pic" @click.stop="showPic(imgIndex,item.pictureList)"
:style="'background: url('+img+') no-repeat center/cover #eeeeee;'"></view>
</view>
......@@ -209,13 +209,11 @@
})
},
// 图片放大
showPic(imgUrl) {
let arr = [];
arr.push(imgUrl)
console.log(arr, '图片的地址')
showPic(index,list) {
uni.previewImage({
current: 0,
urls: arr
current: index,
urls: list
});
},
//点赞状态改变
......
teamwork/pages/post/post.vue
浏览文件 @ db12f001
......@@ -26,13 +26,14 @@
<text class="text-content">{{item.content}}</text>
<view class="img-conetent">
<!-- 多张图片 -->
<view v-if="item.pictureList.length!=1" class="one-img" v-for="img in item.pictureList">
<view class="post-pic" @click.stop="showPic(img)"
<view v-if="item.pictureList.length!=1" class="one-img"
v-for="(img,imgIndex) in item.pictureList">
<view class="post-pic" @click.stop="showPic(imgIndex,item.pictureList)"
:style="'background: url('+img+') no-repeat center/cover #eeeeee;'"></view>
</view>
<!-- 单张图片 -->
<view v-if="item.pictureList.length == 1" class="single-pic"
@click.stop="showPic(item.pictureList[0])"
@click.stop="showPic(0,item.pictureList)"
:style="'background: url('+item.pictureList[0]+') no-repeat center/cover #eeeeee;'">
</view>
</view>
......@@ -55,6 +56,11 @@
</view>
<!-- 我的帖子 -->
<view v-if="current == 0">
<view class="message">
您一共收到{{messageNum}}条消息~
</view>
<!-- 单个帖子 -->
<view v-for="(item,index) in myPost" :key="index">
<!-- 单个帖子 -->
......@@ -68,13 +74,14 @@
<text class="text-content">{{item.content}}</text>
<view class="img-conetent">
<!-- 多张图片 -->
<view v-if="item.pictureList.length!=1" class="one-img" v-for="img in item.pictureList">
<view class="post-pic" @click.stop="showPic(img)"
<view v-if="item.pictureList.length!=1" class="one-img"
v-for="(img,imgIndex) in item.pictureList">
<view class="post-pic" @click.stop="showPic(imgIndex,item.pictureList)"
:style="'background: url('+img+') no-repeat center/cover #eeeeee;'"></view>
</view>
<!-- 单张图片 -->
<view v-if="item.pictureList.length == 1" class="single-pic"
@click.stop="showPic(item.pictureList[0])"
@click.stop="showPic(0,item.pictureList)"
:style="'background: url('+item.pictureList[0]+') no-repeat center/cover #eeeeee;'">
</view>
</view>
......@@ -101,6 +108,7 @@
<script>
export default {
//下拉刷新
onPullDownRefresh() {
this.getAllPost();
this.getMyPost();
......@@ -134,6 +142,7 @@
like: 200,
isLike: 1,
comment: 120,
messageNum:6,
pictureList: [{
picture: "https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/becea65c-89d7-4fe0-9c3f-2e08cdf911e8.jpg"
}, ],
......@@ -182,15 +191,14 @@
});
},
// 图片放大
showPic(imgUrl) {
let arr = [];
arr.push(imgUrl)
console.log(arr, '图片的地址')
showPic(index, list) {
uni.previewImage({
current: 0,
urls: arr
current: index,
urls: list
});
},
//点赞状态改变
changeAllPostLike(index) {
if (this.btnDisabled) {
......@@ -233,7 +241,7 @@
});
}
},
//点赞状态改变
//点赞状态改变（我的帖子部分）
changeMyPostLike(index) {
if (this.btnDisabled) {
return
......@@ -280,6 +288,21 @@
</script>
<style>
.message {
/* border: 2px solid #000; */
width: 60%;
height: 40px;
border-radius: 15px;
margin-top: 15px;
margin-left: auto;
margin-right: auto;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
background-color: rgb(245 154 35 / 30%);
}
.one-post {
width: 90%;
background-color: rgb(245 154 35 / 30%);
......
teamwork/pages/sport/start.vue
浏览文件 @ db12f001
......@@ -72,7 +72,7 @@
dottedLine: true
}]
},
load:true,
timer: null, //定时器
is: true,
start: '/static/sport/start.png',
......@@ -122,6 +122,7 @@
}
})
.then(res => {
console.log(this.info)
this.info.id = res.result.data.id
if (res.result.code === 200) {
uni.showToast({
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或