From 9d5b4d650e5b01081d3537c750e7469db4d161e3 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 29 Apr 2025 08:53:20 +0800
Subject: [PATCH] 提交
---
pages/tabBar/count/count.vue | 435 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 306 insertions(+), 129 deletions(-)
diff --git a/pages/tabBar/count/count.vue b/pages/tabBar/count/count.vue
index 366f6d9..a246841 100644
--- a/pages/tabBar/count/count.vue
+++ b/pages/tabBar/count/count.vue
@@ -8,45 +8,94 @@
<view style="display: flex; flex-direction: column;">
<view class="navBar">
<!-- <u-icon style=" margin-left: -25px;" name="arrow-left" color="black" size="17" @click="goBack" />-->
- <view class="barText">我的成绩</view>
+ <view class="barText">我的</view>
</view>
</view>
</view>
<view class="m-p-15">
- <view class="card-list">
- <scroll-view scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
- @scrolltolower="lower" lower-threshold="150" @scroll="scrollView" style="height:350px">
- <view class="paper-card" v-for="(item,index) in examList" :key="index" @click="toDetail(item,2)">
- <view class="paper-card-l">
- <view class="paper-card-t">{{item.examPaper.name}}</view>
- <view style="color: #999;margin-bottom: 15px;font-size: 12px">{{item.examPaper.code}}</view>
- <view style="display: flex;align-items: center">
- <u-tag style="margin-right: 20rpx" :text="item.examPaper.categoryName" size="mini"></u-tag>
- <u-tag :text="item.createName" plain plainFill size="mini"></u-tag>
- </view>
- </view>
- <view class="paper-card-r">
- <view :class="item.passed == 0?'red':'green'">
- <view>{{item.score}}</view>
- <view class="divide"></view>
- <view>{{item.passed == 0?'不合格':'合格'}}</view>
- </view>
- </view>
- </view>
- </scroll-view>
+ <view class="userInfo">
+ <view class="info-l">
+ <image :src="avator" mode="aspectFill"></image>
+<!-- <view class="info-icons">-->
+<!-- <u-icon v-if="user.sex==0" name="man" color="#0f7ff9" bold size="24"></u-icon>-->
+<!-- <u-icon v-else-if="user.sex==1" name="woman" color="#ff69bf" bold size="24"></u-icon>-->
+<!-- <u-icon v-else name="question" color="#ff69bf" bold size="24"></u-icon>-->
+<!-- </view>-->
+ </view>
+
+ <view class="info-r">
+ <view class="info-n">
+<!-- 用户：-->
+ <span>{{username}}</span>
+
+ </view>
+ <view class="info-id" @click="resetPwd()">
+ <u-icon name="edit-pen" color="#e6e6e6" size="16"></u-icon><span>修改密码</span>
+ </view>
+ </view>
</view>
- <view>
+ <view class="card-list">
+ <view class="paper-card">
+ <view :class="user.useProd == 1?'menu-i':'menu-i-l'" @click="toHazmat">
+ <view class="menu-l">
+ <u-icon name="warning" color="#0f7ff9" size="32"></u-icon>
+ <view><span style="color: #ed6464">危化品</span>操作记录</view>
+ </view>
+ <u-icon name="arrow-right" color="#ccc" size="20"></u-icon>
+ </view>
+ <view class="menu-i" @click="toProduct" v-if="user.useProd == 1">
+ <view class="menu-l">
+ <u-icon name="bag" color="#0f7ff9" size="32"></u-icon>
+ <view><span style="color: #5fb734">成品</span>操作记录</view>
+ </view>
+ <u-icon name="arrow-right" color="#ccc" size="20"></u-icon>
+ </view>
+ </view>
+<!-- <u-empty v-else text="暂无已完成的考试记录" mode="list"></u-empty>-->
+ </view>
+ <view class="loginBtn">
<u-button @click="loginOut" type="primary" text="退出登录" style="width: 80%" shape="circle"></u-button>
</view>
</view>
+ <u-modal :show="showModal" title="修改密码" :showConfirmButton="false" :closeOnClickOverlay="true" ref="uModal" :asyncClose="true" @close="closeModal()">
+ <view>
+ <u-form labelPosition="top" labelWidth="120" :model="pwdForm" :rules="rules" ref="uForm">
+ <u-form-item
+ prop="password"
+ ref="password"
+ label="新密码"
+ >
+ <u-input v-model="pwdForm.password" placeholder="请输入新密码" :password="isPwd1">
+ <template slot="suffix">
+ <u-icon :name="isPwd1?'eye':'eye-off'" color="#999" size="20" @click="isPwd1 = !isPwd1"></u-icon>
+ </template>
+ </u-input>
+ </u-form-item>
+ <u-form-item
+ prop="rePassword"
+ ref="rePassword"
+ label="确认密码"
+ >
+ <u-input v-model="pwdForm.rePassword" placeholder="请输入新密码" :password="isPwd2">
+ <template slot="suffix">
+ <u-icon :name="isPwd2?'eye':'eye-off'" color="#999" size="20" @click="isPwd2 = !isPwd2"></u-icon>
+ </template>
+ </u-input>
+ </u-form-item>
+ </u-form>
+ <u-button type="primary" style="margin-top: 20px" text="确认" @click="confirmPwd()"></u-button>
+ </view>
+ </u-modal>
+ <u-toast ref="uToast"></u-toast>
<tabBar :currentPagePath="page"></tabBar>
</view>
</template>
<script>
import tabBar from '../tabBarIndex.vue'
- import {getExamList, loginOut} from "../../../api";
- import {getCleanRecord} from "../../../api/wearhouse";
+ import {loginOut, postHazmatReturn, resetPwd} from "../../../api";
+ import VUE_APP_BASE_URL from 'common/constant.js'
+ import avatorPic from '../../../static/avator.png'
export default {
components:{
tabBar
@@ -55,47 +104,91 @@
return {
page: 'pages/tabBar/count/count',
statusBarHeight: '',
+ username: '',
examParams: {
pageNum: 1,
pageSize: 10,
completed: 1
},
examList: [],
- totalPage: 0
+ totalPage: 0,
+ user: {},
+ avator: avatorPic,
+ showModal: false,
+ pwdForm:{
+ id: null,
+ password: '',
+ rePassword: ''
+ },
+ rules: {
+ password: [
+ {
+ type: 'string',
+ required: true,
+ message: '新密码不可为空',
+ trigger: ['blur', 'change']
+ },
+ {
+ validator: (rule, value, callback) => {
+ return /^(?![a-zA-Z]+$)(?!\d+$)(?![!@#$%^&\.*]+$)(?![a-zA-Z\d]+$)(?![a-zA-Z!@#$%^&\.*]+$)(?![\d!@#$%^&\.*]+$)[a-zA-Z\d!@#$%^&\.*\-_]{6,16}$/.test(value)
+ },
+ message: '密码须同时包含字母、数字和特殊字符，长度在6-16之间',
+ trigger: ['change','blur'],
+ }
+ ],
+ rePassword: [
+ {
+ type: 'string',
+ required: true,
+ message: '请再次确认密码',
+ trigger: ['blur', 'change'],
+ },
+ {
+ validator: (rule, value, callback) => {
+ return value == this.pwdForm.password;
+ },
+ message: '两次输入密码不一致',
+ trigger: ['change','blur'],
+ }
+ ]
+ },
+ isPwd1: true,
+ isPwd2: true
}
},
+ created(){
+ uni.hideTabBar()
+ },
onLoad() {
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
+ this.username = uni.getStorageSync('name')
// uni.hideTabBar();
- this.getExamList()
+ // this.getUserInfo()
+ this.user = uni.getStorageSync('userSet')
+ // if(this.user.logoPath && this.user.logoPath !== ''){
+ // this.avator = VUE_APP_BASE_URL + '/api/' + this.user.logoPath
+ // }else{
+ // this.avator = avatorPic
+ // }
},
+
methods: {
- goBack() {
- uni.switchTab({
- url:'/pages/tabBar/firstPage/firstPage'
- });
- },
- getExamList(){
- getExamList(this.examParams).then(res => {
- if(res.code == 200) {
- let list = res.data.list?res.data.list: [];
- if (res.pageNum != 1) {
- this.examList = this.examList.concat(list)
- } else {
- this.examList = res.data.list
- }
- this.totalPage = res.data.totalPage
- }else{
- uni.$u.toast(res.message)
- }
+ base64Encode(str) {
+ return btoa(unescape(encodeURIComponent(str)));
+ },
+
+ toHazmat(){
+ uni.setStorageSync("prevPage", '/pages/tabBar/count/count');
+ uni.navigateTo({
+ url: '/pages/tabBar/count/countDetail'
})
},
- toDetail(item,type){
+ toProduct(){
uni.setStorageSync("prevPage", '/pages/tabBar/count/count');
uni.navigateTo({
- url: `/pages/tabBar/firstPage/exam?bank=` + encodeURIComponent(JSON.stringify(item)) + `&type=` + encodeURIComponent(JSON.stringify(type))
+ url: '/pages/tabBar/count/productDetail'
})
},
@@ -109,7 +202,7 @@
if(res.code == 200){
uni.showToast({
title: '账户已退出',
- duration: 1000
+ duration: 800
})
setTimeout(()=>{
uni.clearStorageSync();
@@ -117,7 +210,7 @@
uni.navigateTo({
url: '/pages/index/index'
})
- },1000)
+ },800)
}
})
} else if (res.cancel) {
@@ -127,22 +220,63 @@
})
},
- upper(e) {
- // console.log(e)
+ resetPwd(){
+ const t = this
+ t.showModal = true
},
- lower(e) {
- //并且让页码+1,调用获取数据的方法获取第二页数据
- this.examParams.pageNum++
- //此处调用自己获取数据列表的方法
- if (this.examParams.pageNum > this.totalPage){
- uni.$u.toast('已加载全部数据')
- return
+
+ confirmPwd(){
+ const t = this
+ t.$refs.uForm.validate().then(res => {
+ let data = {}
+ data.id = uni.getStorageSync("uid");
+ data.password = t.base64Encode(t.pwdForm.password)
+ resetPwd(data).then((r)=>{
+ if(r.code == 200){
+ t.$refs.uToast.show({
+ type: 'default',
+ message: '密码已修改，请重新登录',
+ duration: 1000
+ })
+ loginOut().then(res=>{
+ if(res.code == 200){
+ setTimeout(()=>{
+ uni.clearStorageSync();
+ uni.clearStorage();
+ uni.navigateTo({
+ url: '/pages/index/index'
+ })
+ },1000)
+ }
+ })
+ }else{
+ t.$refs.uToast.show({
+ type: 'default',
+ message: r.message
+ })
+ }
+ }).catch((err) => {
+ uni.showToast({
+ title: err,
+ duration: 2000
+ })
+ })
+ t.closeModal()
+ }).catch(errors => {
+ uni.$u.toast('请按要求完善信息')
+ })
+ },
+
+ closeModal(){
+ this.showModal = false
+ this.pwdForm = {
+ id: null,
+ password: '',
+ rePassword: ''
}
- this.getExamList()
- },
- scrollView(e) {
- // console.log(e)
- },
+ this.isPwd1 = true
+ this.isPwd2 = true
+ }
}
}
@@ -154,6 +288,9 @@
flex-direction: column;
width: 100%;
height: 100%;
+}
+.u-icon{
+ margin: 0 !important;
}
.fix{
position: sticky;
@@ -182,88 +319,128 @@
.statusBar{
background-color:lightgrey;
}
+
+/deep/ .u-modal__title{
+ padding-top: 20px !important;
+}
+
+/deep/ .u-modal__content{
+ display: flex;
+ flex-direction: column !important;
+ align-items: center;
+ text-align: left;
+ padding-top: 0 !important;
+
+ &>view{
+ width: 100%;
+ }
+}
+
.m-p-15{
width: 100%;
+ padding-top: 50rpx;
+ background: url("../../../static/my-bg.jpg") no-repeat top;
+ background-size: 100% auto;
- .card-list{
- width: 100%;
- height: calc(100vh - 220px);
- margin: 20px 0;
+ .userInfo{
+ display: flex;
+ align-items: center;
+ width: calc(100% - 60px);
+ margin: 20rpx auto;
- .paper-card{
- width: calc(100% - 30px);
- background: #fff;
- border-radius: 16px;
- padding: 15px;
- margin: 0 auto 15px;
- //position: relative;
- box-sizing: border-box;
- box-shadow: 0 3px 8px rgba(150,150,150,.1);
+ .info-l{
+ width: 150rpx;
+ height: 150rpx;
+ border-radius: 75rpx;
display: flex;
+ justify-content: center;
align-items: center;
- justify-content: space-between;
-
- &:last-of-type{
- margin-bottom: 0;
+ overflow: hidden;
+ margin-right: 20px;
+ border: 2px solid #fff;
+ box-sizing: border-box;
+ image{
+ width: calc(100% + 4px) !important;
+ height: calc(100% + 4px) !important;
}
+ }
- //.isPassed{
- // position: absolute;
- // right: 15px;
- // top: 15px;
- //}
+ .info-r{
+ color: #fff;
+ .info-n{
+ display: flex;
+ align-items: center;
+ font-size: 36rpx;
+ font-weight: bold;
+ margin-bottom: 10px;
- .paper-card-l{
- width: 75%;
-
- .paper-card-t{
- font-size: 32rpx;
- margin-bottom: 10rpx;
- font-family: "PingFang SC";
- font-weight: 800;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
+ span{
+ margin-right: 10px;
}
}
- .paper-card-r{
- width: 25%;
- &>view{
- width: 140rpx;
- height: 140rpx;
- border-radius: 50%;
- color: #fff;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- font-size: 20rpx;
- line-height: 1;
+ .info-id{
+ display: flex;
+ align-items: center;
- view:first-of-type{
- font-size: 44rpx;
- font-weight: 600;
- }
-
- .divide{
- width: 60%;
- height: 1rpx;
- background: #fff;
- margin: 10rpx 0;
- }
- }
-
- .green{
- background: #5fb734;
- }
- .red{
- background: #ed6464
+ span{
+ font-size: 24rpx;
+ color: #e6e6e6;
}
}
}
}
+
+ .card-list{
+ width: 100%;
+ margin: 20px 0;
+
+ .paper-card{
+ width: calc(100% - 40px);
+ margin: 0 auto 15px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .menu-i,.menu-i-l{
+ width: calc(50% - 5px);
+ background: rgba(255,255,255,1);
+ border-radius: 12px;
+ display: flex;
+ align-items: center;
+ box-shadow: 0 3px 8px rgba(150,150,150,.1);
+ justify-content: space-between;
+ padding: 18px 15px;
+ box-sizing: border-box;
+ cursor: pointer;
+
+ .menu-l{
+ display: flex;
+ align-items: center;
+ font-size: 22rpx;
+ color: #999;
+ view{
+ margin-left: 6px;
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ span{
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #333;
+ }
+ }
+ }
+ }
+ .menu-i-l{
+ width: 100%;
+ }
+ }
+ }
+}
+.loginBtn{
+ width: 100%;
+ position: fixed;
+ bottom: 90px;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.2