Lee
/
building-sign
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

前端样式完成-1226

master
Lee 2022-12-26 16:52:16 +08:00
parent dc47ddff32
commit ab1441d0c8
29 changed files with 70 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commons/loading.css
View File

@ -4,14 +4,14 @@
width: 100%;
padding-top: 20px;
font-size: 30px;
color: rgba(253, 82, 75, 1);
color: #0788ff;
vertical-align: top;
-webkit-transition: .3s color, .3s border;
transition: .3s color, .3s border;
}
/* .loading-box:hover {
color: #d60b52;
color: #0788ff;
font-size: 0;
padding: 0;
border-width: 3px;

18
commons/style.css
View File

@ -1107,7 +1107,7 @@ page{
display: flex;
align-items: center;
justify-content: space-between;
padding: 15rpx 0;
padding: 10rpx 0;
border-bottom: 2rpx solid #f1f5f9;
}
@ -1116,20 +1116,30 @@ page{
}
.user-info-box .avatar{
width: 100rpx;
display: flex;
justify-content: flex-end;
width: calc(100% - 80rpx);
height: 100rpx;
padding: 0;
border: 0;
margin: 0;
border-radius: 100%;
background: none;
}
.user-info-box .avatar::after{
display: none;
}
.user-info-box .avatar .img{
width: 100rpx;
height: 100rpx;
border-radius: 100%;
overflow: hidden;
}
.user-info-box .avatar image{
width: 100%;
height: 100%;
}
.user-info-box .nick-name{
width: calc(100% - 80rpx);
height: 60rpx;
text-align: right;
}

16
pages/director/expenditure/expenditure.vue
View File

@ -26,23 +26,23 @@
<view class="pay-info font26">
<view class="item font30">
<text>工资总金额</text>
<text>合计：{{payInfo.amount!=='undefined'?payInfo.amount:0}}元</text>
<text>合计：{{payInfo.amount?payInfo.amount:0}}元</text>
</view>
<view class="item">
<text>基本工资</text>
<text>{{payInfo.base_amount!=='undefined'?payInfo.base_amount:0}}元</text>
<text>{{payInfo.base_amount?payInfo.base_amount:0}}元</text>
</view>
<view class="item">
<text>加班工资</text>
<text>{{payInfo.overtime_amount!=='undefined'?payInfo.overtime_amount:0}}元</text>
<text>{{payInfo.overtime_amount?payInfo.overtime_amount:0}}元</text>
</view>
<view class="item">
<text>待发工资</text>
<text>{{payInfo.not_amount!=='undefined'?payInfo.not_amount:0}}元</text>
<text>{{payInfo.not_amount?payInfo.not_amount:0}}元</text>
</view>
<view class="item">
<text>已发工资</text>
<text>{{payInfo.done_amount!=='undefined'?payInfo.done_amount:0}}元</text>
<text>{{payInfo.done_amount?payInfo.done_amount:0}}元</text>
</view>
</view>
<!-- 工资记录 -->
@ -60,7 +60,7 @@
</view>
</view>
<!-- 加载更多 -->
<view class="more-tips font24">{{enterList.length==total?'没有更多数据了':'下滑获取更多'}}</view>
<view class="more-tips font24">{{payList.length==total?'没有更多数据了':'下滑获取更多'}}</view>
</view>
<!-- 尾部 -->
<tabbar :userType="userType" current="1"></tabbar>
@ -163,9 +163,9 @@
if(this.page==1) this.payList = [];
this.$requst.post('/api/v1/manager/pay-list',params).then(res=>{
if(res.code==0){
console.log(res,'录入列表');
console.log(res,'工资列表');
this.total = res.data.total;
this.payInfo = res.data.info
this.payInfo = res.data.info;
this.payList = this.payList.concat(res.data.list);
}
})

4
pages/login/login.vue
View File

@ -10,7 +10,7 @@
<view class="agreement-box color-33 font28">点击授权登录，表示您已阅读<text @tap="toSafeNotice" class="agreement color-blue">《安全告知》</text></view>
</view>
<!-- 获取头像&昵称 -->
<view class="pop-up-bg" v-if="empowerShow">
<view class="pop-up-bg" v-if="empowerShow"> <!-- v-if="empowerShow" -->
<view class="user-info-box bg-white">
<view class="info">
<view class="cover">
@ -26,7 +26,7 @@
<view class="item font26">
<text>头像</text>
<button class="avatar" open-type="chooseAvatar" @chooseavatar="chooseAvatar">
<image :src="userInfo.avatarUrl || logoAvatar" mode="aspectFit"></image>
<view class="img"><image :src="userInfo.avatarUrl || logoAvatar" mode="aspectFit"></image></view>
</button>
</view>
<view class="item font26">

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/nothing/nothing-page.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/sign-calendar/sign-calendar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/status-nav/status-nav.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/sub-nav/sub-nav.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/director/enter/enter.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/director/expenditure/expenditure.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/director/overtime/overtime.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/director/sign/sign.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/worker/my/my.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/worker/sign/sign.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/signRecord/signRecord.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/notick/notick.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/quitApply/quitApply.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/repair/repair.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/worker/worker.js.map vendored
View File

File diff suppressed because one or more lines are too long

22
unpackage/dist/dev/mp-weixin/common/main.wxss vendored
View File

@ -1200,26 +1200,36 @@ page{
display: flex;
align-items: center;
justify-content: space-between;
padding: 15rpx 0;
padding: 10rpx 0;
border-bottom: 2rpx solid #f1f5f9;
}
.user-info-box .item text{
line-height: 1.8;
}
.user-info-box .avatar{
width: 100rpx;
display: flex;
justify-content: flex-end;
width: calc(100% - 80rpx);
height: 100rpx;
padding: 0;
border: 0;
margin: 0;
border-radius: 100%;
background: none;
}
.user-info-box .avatar::after{
display: none;
}
.user-info-box .avatar .img{
width: 100rpx;
height: 100rpx;
border-radius: 100%;
overflow: hidden;
}
.user-info-box .avatar image{
width: 100%;
height: 100%;
}
.user-info-box .nick-name{
width: calc(100% - 80rpx);
height: 60rpx;
text-align: right;
}
@ -1242,12 +1252,12 @@ page{
width: 100%;
padding-top: 20px;
font-size: 30px;
color: rgba(253, 82, 75, 1);
color: #0788ff;
vertical-align: top;
transition: .3s color, .3s border;
}
/* .loading-box:hover {
color: #d60b52;
color: #0788ff;
font-size: 0;
padding: 0;
border-width: 3px;

2
unpackage/dist/dev/mp-weixin/pages/director/expenditure/expenditure.js vendored
View File

@ -284,7 +284,7 @@ var _default = {
if (this.page == 1) this.payList = [];
this.$requst.post('/api/v1/manager/pay-list', params).then(function (res) {
if (res.code == 0) {
console.log(res, '录入列表');
console.log(res, '工资列表');
_this.total = res.data.total;
_this.payInfo = res.data.info;
_this.payList = _this.payList.concat(res.data.list);

2
unpackage/dist/dev/mp-weixin/pages/director/expenditure/expenditure.wxml vendored
View File

@ -1 +1 @@
<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计："+(payInfo.amount!=='undefined'?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount!=='undefined'?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount!=='undefined'?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount!=='undefined'?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount!=='undefined'?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{item.name}}</text><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status_text}}</text></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资："+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资："+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计：<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{enterList.length==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>
<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计："+(payInfo.amount?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{item.name}}</text><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status_text}}</text></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资："+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资："+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计：<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{payList.length==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>

2
unpackage/dist/dev/mp-weixin/pages/login/login.wxml vendored
View File

@ -1 +1 @@
<view class="data-v-b237504c"><view class="login-header data-v-b237504c"><image class="infoImg data-v-b237504c" mode="aspectFill" src="{{imgSrc}}"></image><view class="logo-name font34 color-00 data-v-b237504c">{{appletName}}</view></view><view class="login-footer data-v-b237504c"><block wx:if="{{!isActive}}"><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">微信授权</view></block><block wx:else><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" bindtap="__e">微信授权</view></block><view class="agreement-box color-33 font28 data-v-b237504c">点击授权登录，表示您已阅读<text data-event-opts="{{[['tap',[['toSafeNotice',['$event']]]]]}}" class="agreement color-blue data-v-b237504c" bindtap="__e">《安全告知》</text></view></view><block wx:if="{{empowerShow}}"><view class="pop-up-bg data-v-b237504c"><view class="user-info-box bg-white data-v-b237504c"><view class="info data-v-b237504c"><view class="cover data-v-b237504c"><image src="{{imgSrc}}" mode="aspectFit" class="data-v-b237504c"></image></view><view class="name color-99 font24 data-v-b237504c">{{appletName}}</view><view class="tips data-v-b237504c"><view class="font26 data-v-b237504c">邀请您补全个人信息</view><view class="font24 color-blue data-v-b237504c">(昵称、头像)</view></view></view><view class="msg data-v-b237504c"><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">头像</text><button class="avatar data-v-b237504c" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['chooseAvatar',['$event']]]]]}}" bindchooseavatar="__e"><image src="{{userInfo.avatarUrl||logoAvatar}}" mode="aspectFit" class="data-v-b237504c"></image></button></view><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">昵称</text><input class="nick-name data-v-b237504c" type="nickname" placeholder="请输入昵称" placeholder-style="color:#999" data-event-opts="{{[['blur',[['nickNameInput',['$event']]]],['input',[['__set_model',['$0','nickName','$event',[]],['userInfo']]]]]}}" value="{{userInfo.nickName}}" bindblur="__e" bindinput="__e"/></view></view><view class="empower-btns font30 data-v-b237504c"><view data-event-opts="{{[['tap',[['refuseEv',['$event']]]]]}}" class="btn color-99 data-v-b237504c" bindtap="__e">拒绝</view><view data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" class="btn color-blue data-v-b237504c" bindtap="__e">允许</view></view></view></view></block></view>
<view class="data-v-b237504c"><view class="login-header data-v-b237504c"><image class="infoImg data-v-b237504c" mode="aspectFill" src="{{imgSrc}}"></image><view class="logo-name font34 color-00 data-v-b237504c">{{appletName}}</view></view><view class="login-footer data-v-b237504c"><block wx:if="{{!isActive}}"><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">微信授权</view></block><block wx:else><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" bindtap="__e">微信授权</view></block><view class="agreement-box color-33 font28 data-v-b237504c">点击授权登录，表示您已阅读<text data-event-opts="{{[['tap',[['toSafeNotice',['$event']]]]]}}" class="agreement color-blue data-v-b237504c" bindtap="__e">《安全告知》</text></view></view><block wx:if="{{empowerShow}}"><view class="pop-up-bg data-v-b237504c"><view class="user-info-box bg-white data-v-b237504c"><view class="info data-v-b237504c"><view class="cover data-v-b237504c"><image src="{{imgSrc}}" mode="aspectFit" class="data-v-b237504c"></image></view><view class="name color-99 font24 data-v-b237504c">{{appletName}}</view><view class="tips data-v-b237504c"><view class="font26 data-v-b237504c">邀请您补全个人信息</view><view class="font24 color-blue data-v-b237504c">(昵称、头像)</view></view></view><view class="msg data-v-b237504c"><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">头像</text><button class="avatar data-v-b237504c" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['chooseAvatar',['$event']]]]]}}" bindchooseavatar="__e"><view class="img data-v-b237504c"><image src="{{userInfo.avatarUrl||logoAvatar}}" mode="aspectFit" class="data-v-b237504c"></image></view></button></view><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">昵称</text><input class="nick-name data-v-b237504c" type="nickname" placeholder="请输入昵称" placeholder-style="color:#999" data-event-opts="{{[['blur',[['nickNameInput',['$event']]]],['input',[['__set_model',['$0','nickName','$event',[]],['userInfo']]]]]}}" value="{{userInfo.nickName}}" bindblur="__e" bindinput="__e"/></view></view><view class="empower-btns font30 data-v-b237504c"><view data-event-opts="{{[['tap',[['refuseEv',['$event']]]]]}}" class="btn color-99 data-v-b237504c" bindtap="__e">拒绝</view><view data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" class="btn color-blue data-v-b237504c" bindtap="__e">允许</view></view></view></view></block></view>

BIN
unpackage/dist/dev/mp-weixin/static/icon/icon-start-active.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
unpackage/dist/dev/mp-weixin/static/icon/icon-start.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
unpackage/dist/dev/mp-weixin/static/icon/形状8.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB