admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bjxz-rain' into bjxz-dev

Browse Source
This commit is contained in:
kun 2024-05-30 21:58:33 +08:00
commit 2e8edd25e5
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/messageCenter/messageCenter.vue
View File

@ -192,6 +192,9 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.centerContent {
padding-bottom: 110rpx;
}
.flex2 { .flex2 {
display: flex; display: flex;
align-items: center; align-items: center;

2
pages/projectEnd/emergencyDisposal/detail.vue
View File

@ -242,7 +242,7 @@
this.id = options.id; this.id = options.id;
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn; this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
console.log(options); // console.log(options);
}, },
onShow() { onShow() {

5
pages/standardScheduleNews/addFrom.vue
View File

@ -349,7 +349,7 @@
.b-bottom { .b-bottom {
border-top: 2rpx solid #f0f0f0; border-top: 2rpx solid #f0f0f0;
display: flex; display: flex;
height: 200rpx; // height: 200rpx;
line-height: 80rpx; line-height: 80rpx;
.inputFrom { .inputFrom {
@ -473,7 +473,8 @@
.imgBox_wrap { .imgBox_wrap {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 10px; margin-top: 20rpx;
margin-bottom: 20rpx;
width: 75%; width: 75%;
} }

9
pages/standardScheduleNews/detail.vue
View File

@ -10,7 +10,7 @@
任务内容 任务内容
</view> </view>
<view class="type"> <view class="type">
<view class="textColor">分部分项工程名称：<span class="textStyle">{{itemFrom.taskName}}</span></view> <view class="textColor"><text class="textFlex">分部分项工程名称：</text> <span class="textStyle">{{itemFrom.taskName}}</span></view>
</view> </view>
<view class="type"> <view class="type">
<view class="textColor">区域：<span class="textStyle">{{itemFrom.qualityRegionName}}</span></view> <view class="textColor">区域：<span class="textStyle">{{itemFrom.qualityRegionName}}</span></view>
@ -220,6 +220,13 @@
</script> </script>
<style lang="less"> <style lang="less">
.textColor {
display: flex;
justify-content: space-between;
.textFlex{
width: 55%;
}
}
.content { .content {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;

8
pages/standardScheduleNews/index.vue
View File

@ -245,12 +245,12 @@ export default {
.item { .item {
box-shadow: 0 4px 24px 0px rgba(212, 220, 236, 0.69); box-shadow: 0 8rpx 48rpx 0px rgba(212, 220, 236, 0.69);
border-radius: 8px; border-radius: 8px;
height: 175px; // height: 175px;
width: 92%; width: 92%;
margin: 15px 10px; margin: 30rpx 30rpx;
padding: 10px 0px 0px 10px; padding: 20rpx 0px 20rpx 20rpx;
// position: relative; // position: relative;
} }