diff --git a/components/company/company.vue b/components/company/company.vue
index bc3ab79..bdaf462 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -29,6 +29,7 @@
-->
+
@@ -88,14 +89,17 @@
+
+
-
+
-
-
-
+
+
-
- 电子合同
-
-
-
-
- 甲方 :
- {{contract.party_a_name}}
-
-
- 乙方 :
- {{contract.party_b_name}}
-
-
- 合同类型 :
- {{contract.contract_type_name}}
-
-
- 合同编号 :
- {{contract.contract_no}}
-
-
-
+
+ 电子合同
+
+
+
+
+ 甲方 :
+ {{contract.party_a_name}}
+
+
+ 乙方 :
+ {{contract.party_b_name}}
+
+
+ 合同类型 :
+ {{contract.contract_type_name}}
+
+
+ 合同编号 :
+ {{contract.contract_no}}
+
+
+
-
-
+
+
-
-
-
-
- 合同
-
+
+
+
+
+ 合同
+
- {{contract.create_time}}
-
-
-
-
-
- 查看
-
-
+ {{contract.create_time}}
+
+
+
+
+
+ 查看
+
+
-
-
+
+
-
-
-
-
+
+
-
-
-
+
+
-
- 公司资质信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 公司资质信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/components/newArchives/breeding.vue b/components/newArchives/breeding.vue
index 6b28d1e..f1683b3 100644
--- a/components/newArchives/breeding.vue
+++ b/components/newArchives/breeding.vue
@@ -1,279 +1,329 @@
-
-
- 养殖信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/newArchives/plant.vue b/components/newArchives/plant.vue
index a7ec431..9d715e2 100644
--- a/components/newArchives/plant.vue
+++ b/components/newArchives/plant.vue
@@ -1,296 +1,344 @@
-
-
- 种植信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/newArchives/store.vue b/components/newArchives/store.vue
index 86ecf68..91caab0 100644
--- a/components/newArchives/store.vue
+++ b/components/newArchives/store.vue
@@ -1,234 +1,264 @@
-
- 开设店铺
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 更新时间: {{update_time}}
+ 开设店铺
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index 61ac8e7..927c021 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -5,13 +5,14 @@
商机信息
-->
-
+
-
+
+
-
@@ -80,18 +79,191 @@
+ -->
+
+
+
+ 人员姓名: {{formData.name}}
+
+
+
+
+ 性别 :
+ {{formData.sex}}
+
+
+ 年龄 :
+ {{formData.age}}
+
+
+ 联系方式 :
+ {{formData.phone}}
+
+
+ 身份证号 :
+ {{formData.id_card}}
+
+
+
+
+ 居住地址 :
+ {{nowAddress}}
+
+
+ 详细地址 :
+ {{formData.address}}
+
+
+ 汽车是否到家 :
+
+
+
+
+
+
+ 是否使用智能手机 :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 常住人口
+
+
+
+
+ 姓名 :
+ {{item.name}}
+
+
+ 出生日期 :
+ {{item.birth_time}}
+
+
+ 就业情况 :
+ {{formData.phone}}
+
+
+ 技能特长 :
+ {{item.skills}}
+
+
+ 是否存在学生、婴幼儿 :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 婴幼儿信息
+
+
+
+
+ 年龄 :
+ {{item.age}}
+
+
+ 年级 :
+ {{item.grade}}
+
+
+ 是否补课 :
+
+
+
+
+
+
+ 补课内容 :
+ {{item.lessons || 0}}
+
+
+ 备注 :
+ {{item.notes}}
+
+
+
+
+
+
+
+
+
+
+ 年龄 :
+ {{item.age}}
+
+
+
+ 喂养方式 :
+
+
+
+
+
+
+ 备注 :
+ {{item.notes}}
+
+
+
+
+
+
+
-
+
- 更新时间:{{item.update_time}}
- {{updateTo(item.update_time)}}
+
+
-
-
-
+
+
+
@@ -279,6 +451,68 @@
}
}
+ .cards {
+ margin: 30rpx auto;
+ margin-bottom: 28rpx;
+ width: 694rpx;
+ background: #FFFFFF;
+ border-radius: 30rpx;
+ opacity: 1;
+ overflow: hidden;
+ box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+
+ .card_head {
+ padding: 28rpx;
+ background-color: $theme-oa-color;
+ color: white;
+ height: 100rpx;
+
+ }
+
+ .card_content {
+ padding: 28rpx;
+ display: flex;
+ // justify-content: space-between;
+
+
+ .right {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ view {
+ margin-bottom: 10rpx;
+
+ text:nth-child(2) {
+ margin-left: 20rpx;
+ }
+ }
+
+ .check_view {
+
+ display: flex;
+ line-height: 70rpx;
+
+ // align-items: center;
+
+ }
+ }
+
+ .hr {
+ border-top: 1px dashed $theme-oa-color;
+ // display: block;
+ width: 85vw;
+ margin: 30rpx 0
+ }
+
+
+ }
+
+
+
+ }
+
+
.update_time {
padding: 32rpx 28rpx 0 28rpx;
display: flex;
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index 855db10..8af5d63 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -216,10 +216,11 @@
.left {
text-align: center;
- padding: 15rpx 25rpx;
- padding-top: 20rpx;
- margin-right: 50rpx;
- width: 160rpx;
+ // padding: 15rpx 25rpx;
+ // padding-top: 20rpx;
+ padding: 20rpx 20rpx 10px 0;
+ margin-right: 20rpx;
+ width: 170rpx;
background-color: $theme-oa-color;
color: white;
border-radius: 40rpx;
@@ -227,18 +228,13 @@
.cir {
width: 120rpx;
height: 120rpx;
- background-color: #FFFFFF;
- // margin-left: 25rpx;
- padding: 0 25rpx;
+ background-color: #ffffff;
+ margin-left: 25rpx;
border-radius: 120rpx;
position: relative;
-
-
}
-
}
-
.right {
display: flex;
flex-direction: column;
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 1fa1124..9fcd606 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -9,7 +9,9 @@
-
+
+
+
+
+
+ -->
+
+
+
+ {{item.company_name}}
+ 详情
+
+
+
+
+
+ 法人姓名 :
+ {{item.master_name}}
+
+
+ 已签约
+ 未签约
+
+
+
+
+ 担任职务 :
+ {{item.master_position}}
+
+
+ 联系电话 :
+ {{item.master_phone}}
+
+
+ 负责区域 :
+ {{item.city_name+item.area_name+item.street_name}}
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,6 +211,81 @@