From 3c61c2d657121482389c0518ac2c81c6df1e704b Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期四, 20 六月 2024 18:59:05 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx
---
pages/hqzc/list.vue | 101 ++++++++++++++++++++++++
pages.json | 8 +-
static/i07.png | 0
static/i08.png | 0
pages/hqzc/details.vue | 47 +++++++++++
pages/registerCompany/registerCompany.vue | 68 ++++++++++++++--
6 files changed, 207 insertions(+), 17 deletions(-)
diff --git a/pages.json b/pages.json
index 9c99d25..9668040 100644
--- a/pages.json
+++ b/pages.json
@@ -41,28 +41,28 @@
"path" : "pages/hqzc/list",
"style" :
{
- "navigationBarTitleText" : ""
+ "navigationBarTitleText" : "鎯犱紒鏀跨瓥"
}
},
{
"path" : "pages/hqzc/details",
"style" :
{
- "navigationBarTitleText" : ""
+ "navigationBarTitleText" : "鎯犱紒鏀跨瓥"
}
},
{
"path" : "pages/message/list",
"style" :
{
- "navigationBarTitleText" : ""
+ "navigationBarTitleText" : "淇℃伅鍏ず"
}
},
{
"path" : "pages/message/details",
"style" :
{
- "navigationBarTitleText" : ""
+ "navigationBarTitleText" : "淇℃伅鍏ず璇︽儏"
}
}
],
diff --git a/pages/hqzc/details.vue b/pages/hqzc/details.vue
index 8183fd0..d80c4c4 100644
--- a/pages/hqzc/details.vue
+++ b/pages/hqzc/details.vue
@@ -1,6 +1,16 @@
<template>
- <view>
-
+ <view class="box">
+ <view class="name">
+ 涓浗绀剧闄㈤兘闃筹細涓浗浜哄彛杞彉鐨勭嫭鐗规�у強鍏跺奖鍝�
+ </view>
+ <view class="font">
+ <view class="left">
+ 鏀跨瓥绫诲瀷
+ </view>
+ <view class="right">
+ 鍙戝竷鏃堕棿锛�2024-04-27
+ </view>
+ </view>
</view>
</template>
@@ -20,3 +30,36 @@
<style>
</style>
+<style scoped lang="scss">
+ .box{
+ padding: 32rpx;
+ }
+ .name{
+ color: #202d44;
+ font-size: 40rpx;
+ font-weight: bold;
+ }
+ .font{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-bottom: 1px solid #f1f1f1;
+ padding-bottom: 26rpx;
+ margin-top: 20rpx;
+ .left{
+ text-align: center;
+ height: 42rpx;
+ line-height: 42rpx;
+ padding: 0 10rpx;
+ border-radius: 4rpx;
+ background: #1171E0;
+ color: #ffffff;
+ font-size: 24rpx;
+
+ }
+ .right{
+ color: #7e8596;
+ font-size: 28rpx;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/hqzc/list.vue b/pages/hqzc/list.vue
index 8183fd0..209dc76 100644
--- a/pages/hqzc/list.vue
+++ b/pages/hqzc/list.vue
@@ -1,6 +1,61 @@
<template>
- <view>
-
+ <view class="box">
+ <view class="item">
+ <view class="name">
+ 娑ㄤ簡锛屾湰鏈堣捣鍙戞斁锛佷竴鍥剧湅鎳傚吇鑰侀噾鎬庝箞璋�
+ </view>
+ <view class="time">
+ 2023.04.05 12:23
+ </view>
+ <view class="bottom">
+ <view class="left">
+ 鏌ョ湅璇︽儏
+ </view>
+ <img src="/static/i08.png" class="img" alt="" />
+ </view>
+ </view>
+ <view class="item">
+ <view class="name">
+ 娑ㄤ簡锛屾湰鏈堣捣鍙戞斁锛佷竴鍥剧湅鎳傚吇鑰侀噾鎬庝箞璋�
+ </view>
+ <view class="time">
+ 2023.04.05 12:23
+ </view>
+ <view class="bottom">
+ <view class="left">
+ 鏌ョ湅璇︽儏
+ </view>
+ <img src="/static/i08.png" class="img" alt="" />
+ </view>
+ </view>
+ <view class="item">
+ <view class="name">
+ 娑ㄤ簡锛屾湰鏈堣捣鍙戞斁锛佷竴鍥剧湅鎳傚吇鑰侀噾鎬庝箞璋�
+ </view>
+ <view class="time">
+ 2023.04.05 12:23
+ </view>
+ <view class="bottom">
+ <view class="left">
+ 鏌ョ湅璇︽儏
+ </view>
+ <img src="/static/i08.png" class="img" alt="" />
+ </view>
+ </view>
+ <view class="item">
+ <view class="name">
+ 娑ㄤ簡锛屾湰鏈堣捣鍙戞斁锛佷竴鍥剧湅鎳傚吇鑰侀噾鎬庝箞璋�
+ </view>
+ <view class="time">
+ 2023.04.05 12:23
+ </view>
+ <view class="bottom">
+ <view class="left">
+ 鏌ョ湅璇︽儏
+ </view>
+ <img src="/static/i08.png" class="img" alt="" />
+ </view>
+ </view>
</view>
</template>
@@ -18,5 +73,47 @@
</script>
<style>
+ page{
+ background-color: #F4F4F4;
+ }
+</style>
+<style scoped lang="scss">
+ .box{
+ .item{
+ background: #fff;
+ border-radius: 5px;
+ padding: 24rpx;
+ box-sizing: border-box;
+ margin: 20rpx 32rpx;
+ .name{
+ color: #202d44;
+ font-size:32rpx;
+ margin-bottom: 16rpx;
+ }
+ .time{
+ color: #7e8596;
+ font-size: 26rpx;
+ margin-bottom: 16rpx;
+
+ }
+ .bottom{
+ padding-top: 14rpx;
+ border-top: 1px solid #f1f1f1;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .left{
+ color: #202d44;
+ font-size: 28rpx;
+ font-weight: 400;
+ }
+ .img{
+ width: 28rpx;
+ height: 28rpx;
+ }
+ }
+ }
+ }
+
</style>
diff --git a/pages/registerCompany/registerCompany.vue b/pages/registerCompany/registerCompany.vue
index 23c6c9b..be5a83f 100644
--- a/pages/registerCompany/registerCompany.vue
+++ b/pages/registerCompany/registerCompany.vue
@@ -17,7 +17,7 @@
</view>
</view>
</view>
- <view class="top-box">
+ <view class="top-box" style="margin-top: 20rpx;">
<view class="form">
<view class="form-item">
<text class="label require">浼佷笟鍚嶇О</text>
@@ -29,8 +29,12 @@
</view>
<view class="form-item">
<text class="label require">钀ヤ笟鎵х収</text>
- <input type="text" placeholder="璇疯緭鍏�"/>
+
</view>
+
+ </view>
+ <view style="text-align: center;">
+ <img src="/static/i07.png" alt="" class="sc"/>
</view>
</view>
<!-- <view class="form">
@@ -63,9 +67,12 @@
<input type="text" placeholder="璇疯緭鍏�" v-model="form.companyAddress"/>
</view>
</view> -->
- <u-button @click="register" class="u-reset-button">
- 娉ㄥ唽
- </u-button>
+ <view class="bottom">
+ <view @click="register" class="button">
+ 娉ㄥ唽
+ </view>
+ </view>
+
</view>
</template>
@@ -126,15 +133,18 @@
}
</style>
<style scoped lang="scss">
- .page-content{
- padding: 30rpx;
- }
+.page-content{
+ padding: 32rpx;
+}
.form{
+ padding: 24rpx;
.form-item{
+ margin-top: 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
- margin-bottom: 20rpx;
+ padding-bottom: 20rpx;
+ border-bottom: 1px solid #F1F1F1;
input{
text-align: right;
font-size: 26rpx;
@@ -144,6 +154,7 @@
}
.require{
+ color: #4A4E60;
position: relative;
&::after{
content: '*';
@@ -153,5 +164,44 @@
}
}
}
+ .form-item:last-child{
+ padding-bottom: 0;
+ border-bottom: none;
+ }
+ .form-item:first-child{
+ margin-top: 0;
+ }
+}
+
+.top-box{
+ background: #fff;
+ border-radius: 5px;
+}
+.bottom{
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ background: #fff;
+ height: 132rpx;
+ left: 0;
+ display: flex;
+ align-items: center;
+ .button{
+ margin: 0 32rpx;
+ height: 88rpx;
+ border-radius: 20rpx;
+ border: 1px solid #1171E0;
+ background: #1171E0;
+ color: #fff;
+ line-height: 88rpx;
+ width: 100%;
+ text-align: center;
+ font-size: 32rpx;
+ }
+}
+.sc{
+ width: 90%;
+ height: 346rpx;
+ margin-bottom: 20rpx;
}
</style>
diff --git a/static/i07.png b/static/i07.png
new file mode 100644
index 0000000..0487fbe
--- /dev/null
+++ b/static/i07.png
Binary files differ
diff --git a/static/i08.png b/static/i08.png
new file mode 100644
index 0000000..9eabcdd
--- /dev/null
+++ b/static/i08.png
Binary files differ
--
Gitblit v1.9.1