From 23db8ee6063226480f964ed1de3ece9310e221a2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Wed, 21 Aug 2024 09:37:43 +0800
Subject: [PATCH] 提交
---
pages/tabBar/count/count.vue | 108 ++++++++++++++++++++++++++----------------------------
1 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/pages/tabBar/count/count.vue b/pages/tabBar/count/count.vue
index 731455e..56fb158 100644
--- a/pages/tabBar/count/count.vue
+++ b/pages/tabBar/count/count.vue
@@ -15,18 +15,18 @@
<view class="m-p-15">
<view class="userInfo">
<view class="info-l">
- <image src="../../../static/avator.png" mode="widthFix"></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>
+ <image src="../../../static/companyLogo.png" mode="widthFix"></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>{{user.name}}</span>
+ <span>{{username}}</span>
</view>
<!-- <view class="info-id">-->
@@ -36,20 +36,17 @@
</view>
<view class="card-list">
<view class="paper-card">
- <view class="company-info">
- <view class="company-i">
- <view>电话：</view>
- <span>{{getPhoneNumber(user.phone)}}</span>
- </view>
- <view class="company-i">
- <view>公司：</view>
- <span v-if="user.company && user.company.name">{{user.company.name?user.company.name:'暂无'}}</span>
- </view>
- </view>
- <view class="menu-i" @click="toMyScore">
+ <view class="menu-i" @click="toHazmat">
<view class="menu-l">
- <u-icon name="info-circle-fill" color="#0f7ff9" size="20"></u-icon>
- <view>我的成绩</view>
+ <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">
+ <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>
@@ -76,7 +73,7 @@
return {
page: 'pages/tabBar/count/count',
statusBarHeight: '',
- user: {},
+ username: '',
examParams: {
pageNum: 1,
pageSize: 10,
@@ -92,8 +89,9 @@
},
onLoad() {
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
+ this.username = uni.getStorageSync('name')
// uni.hideTabBar();
- this.getUserInfo()
+ // this.getUserInfo()
},
methods: {
@@ -119,10 +117,17 @@
url: `/pages/tabBar/firstPage/exam?bank=` + encodeURIComponent(JSON.stringify(item)) + `&type=` + encodeURIComponent(JSON.stringify(type))
})
},
- toMyScore(){
+ toHazmat(){
uni.setStorageSync("prevPage", '/pages/tabBar/count/count');
uni.navigateTo({
url: '/pages/tabBar/count/countDetail'
+ })
+ },
+
+ toProduct(){
+ uni.setStorageSync("prevPage", '/pages/tabBar/count/count');
+ uni.navigateTo({
+ url: '/pages/tabBar/count/productDetail'
})
},
@@ -170,8 +175,6 @@
flex-direction: column;
width: 100%;
height: 100%;
- background: url("../../../static/my-bg.png") no-repeat top fixed;
- background-size: 100% auto;
}
.u-icon{
margin: 0 !important;
@@ -211,21 +214,22 @@
.m-p-15{
width: 100%;
- margin-top: 50rpx;
+ padding-top: 50rpx;
+ background: url("../../../static/my-bg.jpg") no-repeat top;
+ background-size: 100% auto;
.userInfo{
display: flex;
align-items: center;
- justify-content: left;
width: calc(100% - 60px);
- margin: 0 auto;
+ margin: 20rpx auto;
.info-l{
width: 150rpx;
height: 150rpx;
border-radius: 50%;
- margin-right: 40rpx;
position: relative;
+ margin-right: 20px;
image{
width: 150rpx;
height: 150rpx;
@@ -267,47 +271,39 @@
margin: 20px 0;
.paper-card{
- width: calc(100% - 60px);
- background: #fff;
- border-radius: 20px;
- padding: 15px 15px 5px;
+ width: calc(100% - 40px);
margin: 0 auto 15px;
- box-sizing: border-box;
- box-shadow: 0 3px 8px rgba(150,150,150,.1);
- .company-info{
- border-bottom: 1px solid #e6e6e6;
- .company-i{
- display: flex;
- align-items: center;
- font-size: 28rpx;
- color: #999;
- margin-bottom: 15px;
- view{
- margin-left: 4px;
- }
- span{
- color: #333;
- }
- &:first-of-type{
- margin-bottom: 5px;
- }
- }
- }
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
.menu-i{
+ 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: 15px 0;
+ padding: 18px 15px;
box-sizing: border-box;
cursor: pointer;
.menu-l{
display: flex;
align-items: center;
- font-size: 28rpx;
+ 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;
+ }
}
}
}
--
Gitblit v1.9.2