diff --git a/components/newArchives/breeding.vue b/components/newArchives/breeding.vue index 3deb0c4..6b28d1e 100644 --- a/components/newArchives/breeding.vue +++ b/components/newArchives/breeding.vue @@ -1,17 +1,8 @@ @@ -59,8 +52,8 @@ } }, onLoad(options) { - if(options.id)this.user_id = options.id; - else if(this.$store.state.app.userInfo.admin_id==0){ //如果用户是小队长,将带上自己的id + if (options.id) this.user_id = options.id; + else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id this.user_id = this.$store.state.app.userInfo.id; } }, @@ -71,7 +64,7 @@ computed: { // 是否显示查看和更新按钮 showView() { - return !this.$store.state.app.userInfo.admin_id&&this.$store.state.app.userInfo.is_captain; + return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain; } }, onReachBottom() { @@ -144,101 +137,67 @@ margin-bottom: 21rpx; box-sizing: border-box; padding: 28rpx; + font-size: 24.53rpx; + color: #999999FF; .top { display: flex; - justify-content: space-between; align-items: center; width: 100%; .avatar { - width: 88rpx; - height: 88rpx; - border-radius: 50%; + width: 120rpx; + height: 120rpx; margin-right: 18rpx; } - .u_avatar { - margin-right: 18rpx; - } - - .text { - display: flex; - justify-content: space-around; - flex-direction: column; - height: 100%; - - .name { - font-size: 32rpx; - font-weight: 500; - color: #333333; - } - - .mobile { - color: #999999; - font-size: 28rpx; - } - } - - .right { - height: 100%; - display: flex; - flex-direction: column; - justify-content: center; - - .top, - .bottom { - width: 158rpx; - height: 53rpx; - background: #FFFFFF; - border-radius: 26rpx 26rpx 26rpx 26rpx; - opacity: 1; - border: 2rpx solid #3274F9; - color: #3274F9; + .body{ + flex: 1; + .t_top{ display: flex; - align-items: center; - justify-content: center; + justify-content: space-between; + margin-bottom: 18rpx; + .name{ + font-size: 32rpx; + color: #333; + } + .mobile{ + font-size: 28rpx; + color: #333; + } } - - .bottom { - border: 2rpx solid #F9AA32; - color: #F9AA32; - margin-top: 18rpx; + .t_bottom{ + width: 500rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + .address{ + font-size: 28rpx; + color: #333; + } } } } .bottom { display: flex; - justify-content: left; + justify-content: space-between; align-items: center; margin-top: 20rpx; font-size: 25rpx; - - .circle { - width: 11rpx; - height: 11rpx; - opacity: 1; - border: 2rpx solid #34A853; - margin-right: 10rpx; - border-radius: 50%; + + .right{ + font-size: 28rpx; + display: flex; + .look{ + color: $theme-oa-color; + } + .update{ + color: #34A853; + margin-right: 38rpx; + } } - .green { - font-weight: 400; - color: #34A853; - line-height: 0rpx; - margin-right: 18rpx; - -webkit-background-clip: text; - } - - .tips{ - width: 480rpx; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - } diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index 185a1f0..72af92a 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -1,248 +1,277 @@ - - - - - \ No newline at end of file diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue index b3c92ce..dfd02b8 100644 --- a/subpkg/captain/captain.vue +++ b/subpkg/captain/captain.vue @@ -1,6 +1,6 @@ @@ -164,7 +209,8 @@ margin-right: 18rpx; -webkit-background-clip: text; } - .b_l_text{ + + .b_l_text { width: 360rpx; overflow: hidden; text-overflow: ellipsis; @@ -178,4 +224,197 @@ } } } + + .personnel_list { + display: flex; + flex-direction: column; + align-items: center; + padding-bottom: 130rpx; + + .personnel_item { + width: 694rpx; + // height: 407rpx; + background: #FFFFFF; + border-radius: 14rpx 14rpx 14rpx 14rpx; + margin-bottom: 32rpx; + overflow: hidden; + position: relative; + padding: 28rpx; + + .type { + width: 50rpx; + height: 50rpx; + background-color: #F02828; + border-radius: 50%; + font-size: 25rpx; + font-weight: 400; + color: #FFFFFF; + line-height: 35rpx; + display: flex; + justify-content: center; + align-items: center; + position: absolute; + top: 28rpx; + right: 28rpx; + + image { + width: 18rpx; + height: 18rpx; + margin-right: 1rpx; + } + } + + .type_blue { + background-color: #34A853; + } + + .top { + // background-color: #3274F9; + display: flex; + + .right { + display: flex; + flex-direction: column; + justify-content: space-around; + margin-left: 28rpx; + font-size: 25rpx; + font-weight: 400; + overflow: hidden; + color: #999999; + + .info_top { + display: flex; + align-items: flex-end; + font-size: 25rpx; + font-weight: 400; + color: $theme-oa-color; + margin-bottom: 10rpx; + + .info_name { + font-size: 32rpx; + font-weight: 400; + color: #333333; + margin-right: 18rpx; + } + + .phone { + margin-left: 30rpx; + color: #999999; + } + + .tel { + color: #000; + } + } + + .info_bottom { + display: flex; + margin-bottom: 8rpx; + + .item { + display: flex; + align-items: center; + } + + .phone { + margin-right: 28rpx; + } + + .location { + width: 320rpx; + white-space: nowrap; + /* 不换行 */ + overflow: hidden; + /* 将超出文本隐藏 */ + text-overflow: ellipsis; + /* 使用省略号表示被隐藏的文本 */ + color: #000; + } + } + + .company { + display: flex; + + text { + margin-right: 30rpx; + } + + .itm { + width: 320rpx; + white-space: nowrap; + /* 不换行 */ + overflow: hidden; + /* 将超出文本隐藏 */ + text-overflow: ellipsis; + /* 使用省略号表示被隐藏的文本 */ + color: #000; + } + } + } + } + + .center { + padding: 28rpx 0; + + .top { + font-size: 28rpx; + font-weight: 400; + color: #666666FF; + margin-bottom: 20rpx; + + .green { + color: #34A853FF; + } + + .yellow { + color: #F9AA32FF; + } + } + + .bottom { + display: flex; + justify-content: space-around; + font-size: 25rpx; + font-weight: 400; + color: #999999; + + image { + width: 18rpx; + height: 18rpx; + margin-right: 9rpx; + } + } + } + + .bottom { + display: flex; + justify-content: center; + + .look { + height: 43rpx; + background: #FFFFFF; + border-radius: 26rpx 26rpx 26rpx 26rpx; + opacity: 1; + // border: 2rpx solid $theme-oa-color; + font-size: 28rpx; + font-weight: 400; + margin-left: 28rpx; + color: $theme-oa-color; + display: flex; + justify-content: center; + align-items: center; + } + + .sign { + color: #34A853; + // border: 2rpx solid #34A853; + } + + .red { + color: #F02828; + // border: 2rpx solid #F02828; + } + } + } + } \ No newline at end of file diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index 65ac28a..de322e1 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -4,20 +4,6 @@ - diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue index c62cc00..b9af296 100644 --- a/subpkg/companySign/companySign.vue +++ b/subpkg/companySign/companySign.vue @@ -118,7 +118,6 @@ }); Toast('合同已生成'); this.initCompany(); - this.naviTo('/subpkg/submit/submit'); if (this.userInfo.contract.check_status == 3) { this.timerCount = 60; this.timer = setInterval(() => { @@ -129,6 +128,7 @@ } }, 1000); } + this.naviTo('/subpkg/submit/submit'); }, // 发送短信 async getPostsms() { diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue index 506cc38..13861b0 100644 --- a/subpkg/contract/contract.vue +++ b/subpkg/contract/contract.vue @@ -36,7 +36,8 @@ - + + diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue index e23acd5..89a7bed 100644 --- a/subpkg/newArchives/newArchives.vue +++ b/subpkg/newArchives/newArchives.vue @@ -26,7 +26,8 @@ - + 地区信息 + @@ -56,11 +57,13 @@ + + @@ -156,8 +158,8 @@ justify-content: center; align-items: center; position: absolute; - top: 10rpx; - right: 10rpx; + top: 28rpx; + right: 28rpx; image { width: 18rpx; @@ -190,6 +192,7 @@ font-size: 25rpx; font-weight: 400; color: $theme-oa-color; + margin-bottom: 10rpx; .info_name { font-size: 32rpx; @@ -210,6 +213,7 @@ .info_bottom { display: flex; + margin-bottom: 8rpx; .item { display: flex; @@ -221,7 +225,7 @@ } .location { - width: 250rpx; + width: 350rpx; white-space: nowrap; /* 不换行 */ overflow: hidden; @@ -240,6 +244,13 @@ } .itm { + width: 350rpx; + white-space: nowrap; + /* 不换行 */ + overflow: hidden; + /* 将超出文本隐藏 */ + text-overflow: ellipsis; + /* 使用省略号表示被隐藏的文本 */ color: #000; } } diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue index b932e6e..6675e67 100644 --- a/subpkg/personnelDetails/personnelDetails.vue +++ b/subpkg/personnelDetails/personnelDetails.vue @@ -277,6 +277,7 @@ } }, 1000); } + this.naviTo('/subpkg/submit/submit'); }, // 发送短信 async getPostsms(){ @@ -293,6 +294,7 @@ id: this.userInfo.id }) Toast('短信已发送'); + this.naviTo('/subpkg/submit/submit'); } }, loadUserDetail() { diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue index 0da6d5b..c8eecc3 100644 --- a/subpkg/updateArchives/updateArchives.vue +++ b/subpkg/updateArchives/updateArchives.vue @@ -2,7 +2,7 @@ - + + + - + + @@ -48,11 +50,12 @@ - + - + + @@ -65,6 +68,7 @@ import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器 import residents from "@/components/newArchives/residents.vue" // 常住人口 import breeding from "@/components/newArchives/breeding.vue" // 种养殖 + import plant from "@/components/newArchives/plant.vue" // 种养殖 import store from "@/components/newArchives/store.vue" // 开设店铺 import deepProcessing from "@/components/newArchives/deepProcessing.vue" // 深加工 import thickProcessing from "@/components/newArchives/thickProcessing.vue" // 粗加工 @@ -82,6 +86,7 @@ districtSelector, residents, breeding, + plant, store, deepProcessing, thickProcessing, @@ -131,6 +136,7 @@ }, // 更新档案 addArchives: throttle(async function() { + if(this.showDemandList.length==0)return Toast('请先选择需求!'); let refsDatas = await this.loadRefsDatas(); if (!this.updateFlag) return; uni.showLoading({ @@ -145,9 +151,9 @@ icon: 'none', title: '更新成功', success() { - setTimeout(()=>{ + setTimeout(() => { uni.navigateBack() - },1000) + }, 1000) } }) }, 1000), @@ -157,7 +163,7 @@ let datas = []; let map = new Map(); // 使用map存储当前ref是第几位 for (let demand of this.showDemandList) { - if(map.get(demand.id)>=0) map.set(demand.id, map.get(demand.id)+1); + if (map.get(demand.id) >= 0) map.set(demand.id, map.get(demand.id) + 1); else map.set(demand.id, 0); let now = map.get(demand.id); try { @@ -169,6 +175,7 @@ } catch (e) { console.log('err', e); this.updateFlag = false; + Toast('请完整填写以上数据!') } } return datas; @@ -177,8 +184,9 @@ async initCategoryBusinessList() { let res = await categoryBusinessList(); // this.demandList = res.data; - this.demandList = res.data.filter(item=>item.id==6); - this.demandList[0].children = this.demandList[0].children.filter(item=>item.id==7||item.id==8); + this.demandList = res.data.filter(item => item.id == 6); + this.demandList[0].children = this.demandList[0].children.filter(item => item.id == 7 || item.id == 8 || item + .id == 32); this.demandListChild = this.demandList[0].children; // console.log(this.demandList); }, @@ -215,7 +223,7 @@