diff --git a/api/index.js b/api/index.js index 955acee..07f04b2 100644 --- a/api/index.js +++ b/api/index.js @@ -2,8 +2,8 @@ import {post, upload, uploads} from "../utils/request"; import {setSecurityMeasures} from "@/utils/submitHomeworkProcess"; export const submitLogin = (params) => post("/app/admin/check", params) // 登录 -export const getIDCardDeduplication = (params) => post("/app/user/hasCardIdForApp", params) // 身份证去重 -export const getUserDeduplication = (params) => post("/app/user/hasUserNameForApp", params) // 用户名去重 +export const getIDCardDeduplication = (params) => post("/app/user/goCheck", params) // 身份证去重 +export const getUserDeduplication = (params) => post("/app/user/goCheck", params) // 用户名去重 export const getPhoneNumberDeduplication = (params) => post("/app/user/hasPhoneForApp", params) // 手机号去重 export const setRegister = (params) => post("/app/admin/register", params) // 注册 export const setForgotPassword = (params) => post("/app/admin/forgetPassword", params) // 忘记密码 @@ -28,8 +28,8 @@ export const getUserInfo = (params) => post("/app/user/getDetailByUserIdAndCorpI export const setUserInfo = (params) => post("/app/user/edit", params) //修改用户信息 export const getCertificateInformationList = (params) => post("/app/specialUser/list", params) //证书信息列表 export const getCertificateInformationView = (params) => post("/app/specialUser/goEdit", params) //证书信息查看 -export const setCertificateInformationAdd = (params) => upload("/app/specialUser/add", params) //证书信息添加 -export const setCertificateInformationEdit = (params) => upload("/app/specialUser/edit", params) //证书信息修改 +export const setCertificateInformationAdd = (params) => uploads("/app/specialUser/add", params) //证书信息添加 +export const setCertificateInformationEdit = (params) => uploads("/app/specialUser/edit", params) //证书信息修改 export const setCertificateInformationEditPost = (params) => post("/app/specialUser/edit", params) //证书信息修改 export const getDeptTree = (params) => post("/api/department/listzTree", params) //用户信息 export const getEMPLOYMENTAPPLYMANAGEMENTID = (params) => post("/app/user/getEMPLOYMENTAPPLYMANAGEMENTID", diff --git a/components/empty/empty.vue b/components/empty/empty.vue index 11949cd..4ca3280 100644 --- a/components/empty/empty.vue +++ b/components/empty/empty.vue @@ -1,6 +1,6 @@ @@ -24,10 +24,10 @@ export default { align-items: center; position: relative; .empty-text{ - font-size: 30upx; + font-size: 30rpx; color: $uni-text-color-placeholder; position: absolute; - top: 400upx; + top: 400rpx; } } diff --git a/components/fab_button/index.vue b/components/fab_button/index.vue new file mode 100644 index 0000000..10ccdcc --- /dev/null +++ b/components/fab_button/index.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/components/sign/sign.vue b/components/sign/sign.vue index 8a64cba..0f8ca94 100644 --- a/components/sign/sign.vue +++ b/components/sign/sign.vue @@ -53,7 +53,7 @@ export default { diff --git a/pages/login/login.vue b/pages/login/login.vue index 3b27015..a7c821a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,22 +1,24 @@ @@ -121,16 +123,16 @@ export default { }, async fnRegister() { this.$refs.form.validate().then(async () => { - if(await this.fnIDCardDeduplication()) return - if(await this.fnUserDeduplication()) return + if (await this.fnIDCardDeduplication()) return + if (await this.fnUserDeduplication()) return await setRegister({...this.form}) uni.$u.toast('注册成功') - setTimeout(()=>{ + setTimeout(() => { uni.$u.route({ url: '/pages/login/login', - type:'reLaunch' + type: 'reLaunch' }) - },2000) + }, 2000) }).catch(() => { uni.$u.toast('请补全必填项') }) @@ -140,9 +142,9 @@ export default { diff --git a/pages/mine/about_us/about_us.vue b/pages/mine/about_us/about_us.vue index 9ee1199..bdb14ff 100644 --- a/pages/mine/about_us/about_us.vue +++ b/pages/mine/about_us/about_us.vue @@ -1,31 +1,31 @@ diff --git a/pages/mine/agreement/agreement.vue b/pages/mine/agreement/agreement.vue index 7e4c36e..c6d9eef 100644 --- a/pages/mine/agreement/agreement.vue +++ b/pages/mine/agreement/agreement.vue @@ -7,9 +7,7 @@ diff --git a/pages/mine/feedback/feedback.vue b/pages/mine/feedback/feedback.vue index d599e74..c640bdb 100644 --- a/pages/mine/feedback/feedback.vue +++ b/pages/mine/feedback/feedback.vue @@ -1,188 +1,189 @@ diff --git a/pages/mine/index/index.vue b/pages/mine/index/index.vue index 7f64f49..e6b32ba 100644 --- a/pages/mine/index/index.vue +++ b/pages/mine/index/index.vue @@ -1,84 +1,88 @@ diff --git a/pages/mine/information/index.vue b/pages/mine/information/index.vue index 3a085fc..80aaf8e 100644 --- a/pages/mine/information/index.vue +++ b/pages/mine/information/index.vue @@ -1,162 +1,234 @@ diff --git a/pages/mine/privacy/privacy.vue b/pages/mine/privacy/privacy.vue index fde32e3..0a6e86c 100644 --- a/pages/mine/privacy/privacy.vue +++ b/pages/mine/privacy/privacy.vue @@ -1,15 +1,13 @@ diff --git a/pages/related_party_units/edit.vue b/pages/related_party_units/edit.vue index e2024a9..87e3873 100644 --- a/pages/related_party_units/edit.vue +++ b/pages/related_party_units/edit.vue @@ -1,816 +1,832 @@ diff --git a/pages/service_unit_management/index.vue b/pages/service_unit_management/index.vue index 662c9c3..3b4d315 100644 --- a/pages/service_unit_management/index.vue +++ b/pages/service_unit_management/index.vue @@ -16,7 +16,8 @@ - + @@ -41,29 +42,29 @@ export default { onLoad() { this.resetList() }, - methods:{ - async getData(){ + methods: { + async getData() { let resData = await getServiceUnitList({ showCount: this.pageSize, currentPage: this.currentPage, }); - this.list = [...this.list,...resData.varList]; + this.list = [...this.list, ...resData.varList]; this.totalPage = resData.page.totalPage; }, resetList() { - this.pageSize= 10 - this.currentPage= 1 + this.pageSize = 10 + this.currentPage = 1 this.list = [] this.getData() }, scrolltolower() { this.currentPage++; - if(this.totalPage >= this.currentPage) this.getData(); + if (this.totalPage >= this.currentPage) this.getData(); }, - fnView(SERVICE_COMPANY_USER_MAP_ID){ + fnView(SERVICE_COMPANY_USER_MAP_ID) { uni.$u.route({ url: '/pages/service_unit_management/view', - params:{ + params: { SERVICE_COMPANY_USER_MAP_ID } }) diff --git a/pages/service_unit_management/view.vue b/pages/service_unit_management/view.vue index 8400bde..2be0e68 100644 --- a/pages/service_unit_management/view.vue +++ b/pages/service_unit_management/view.vue @@ -20,7 +20,7 @@ export default { data() { return { SERVICE_COMPANY_USER_MAP_ID: '', - info:{} + info: {} } }, onLoad(query) { @@ -30,7 +30,7 @@ export default { methods: { async fnGetData() { let resData = await getServiceUnitView({ - SERVICE_COMPANY_USER_MAP_ID:this.SERVICE_COMPANY_USER_MAP_ID + SERVICE_COMPANY_USER_MAP_ID: this.SERVICE_COMPANY_USER_MAP_ID }) this.info = resData.pd } diff --git a/static/icon-apps/app_icons6.png b/static/icon-apps/app_icons6.png index 14d581e..dcdf896 100644 Binary files a/static/icon-apps/app_icons6.png and b/static/icon-apps/app_icons6.png differ diff --git a/styles/home_style.scss b/styles/home_style.scss index 3b74dc1..fa36a4d 100644 --- a/styles/home_style.scss +++ b/styles/home_style.scss @@ -12,53 +12,9 @@ } } .wui_banner{ - height: 507upx; + height: 507rpx; position: relative; overflow: hidden; - .wui-bar{ - display: flex; - align-items: center; - min-height: 100upx; - justify-content: flex-end; - z-index: 9999; - position: absolute; - width: 100%; - .search-form{ - background: rgba(255,255,255,0.2); - border-radius: 100upx; - flex: 1; - height: 60upx; - line-height: 60upx; - font-size: 24upx; - color: #333333; - display: flex; - align-items: center; - margin: 0 30upx; - padding: 0 30upx; - .cuIcon-search{ - color: rgba(255,255,255,0.5); - margin-right: 16upx; - font-size: 28upx; - } - input{ - color: rgba(255,255,255,0.5); - flex: 1; - padding-right: 30upx; - height: 64upx; - line-height: 64upx; - font-size: 26upx; - background-color: transparent; - .phcolor{ - color: rgba(255,255,255,0.5); - } - } - } - .icon-ui { - color: #fff; - font-size: 42upx; - margin-right: 22upx; - } - } .banner_img{ z-index: 1; width: 100%; @@ -74,11 +30,11 @@ .home-apps { position: relative; - top: -180upx; + top: -180rpx; background-color: #fff; - padding: 30upx 20upx; - border-radius: 40upx; - margin: 0 30upx; + padding: 30rpx 20rpx; + border-radius: 40rpx; + margin: 0 30rpx; display: flex; flex-wrap:wrap; .home-apps-item { @@ -88,14 +44,14 @@ flex-grow: 0; width: 25%; .text { - margin: 10upx 0; - font-size: 28upx; + margin: 10rpx 0; + font-size: 28rpx; text-align: center; - width: 140upx; + width: 140rpx; } .home-apps-item-img { - width: 136upx; - height: 136upx; + width: 136rpx; + height: 136rpx; image { width: 100%; height: 100%; @@ -105,39 +61,39 @@ } .home-message{ position: relative; - top: -160upx; - height: 120upx; + top: -160rpx; + height: 120rpx; background-color: #fff; - border-radius: 40upx; - margin: 0 30upx; - padding: 0 30upx; + border-radius: 40rpx; + margin: 0 30rpx; + padding: 0 30rpx; display: flex; align-items: center; .home-title{ width: 54px; height: 54px; - margin-right: 10upx; + margin-right: 10rpx; image{ width: 100%; height: 100%; } } .home-content{ - font-size: 28upx; + font-size: 28rpx; flex: 1; } .home-more{ color: #ccc; - font-size: 26upx; + font-size: 26rpx; } } .home-letters{ position: relative; - top: -140upx; + top: -140rpx; background-color: #fff; - border-radius: 40upx; - margin: 0 30upx; - padding: 30upx; + border-radius: 40rpx; + margin: 0 30rpx; + padding: 30rpx; .letters-title{ width: 80px; @@ -149,17 +105,17 @@ } .letters-content{ .letters-item{ - border-bottom: 1upx solid #e5e5e5; - padding: 20upx 0; + border-bottom: 1rpx solid #e5e5e5; + padding: 20rpx 0; &:last-child{ border: none; } .lable{ - font-size: 30upx; + font-size: 30rpx; white-space: nowrap; } .font{ - font-size: 28upx; + font-size: 28rpx; color: #666; } .letters-title{ @@ -185,14 +141,14 @@ align-items: flex-start; justify-content: space-between; width: 100%; - font-size: 30upx; - margin: 10upx 0; + font-size: 30rpx; + margin: 10rpx 0; } .letters-date{ display: flex; align-items: center; width: 100%; - font-size: 30upx; + font-size: 30rpx; } } @@ -200,7 +156,7 @@ } .home-line{ position: relative; - top: -70upx; + top: -70rpx; text-align: center; color: #ccc; } @@ -213,19 +169,19 @@ z-index: 999; } .grid_item{ - width: calc(47% - 4upx); + width: calc(47% - 4rpx); display: block; - padding: 30upx 0; + padding: 30rpx 0; color: #fff; margin-left: 2%; margin-top: 2%; text-align: center; background-image: linear-gradient(to bottom right, rgba(0,138,255,1), rgba(91,74,255,1)); - border: 1upx solid #2084d9; + border: 1rpx solid #2084d9; position: relative; .grid_text{ display: flex; - padding-left: 30upx; + padding-left: 30rpx; .grid_tut{ width: 85%; } @@ -235,28 +191,28 @@ .message_list{ - padding: 30upx; + padding: 30rpx; .message_item{ position: relative; .message_flex{ - width: calc(100% - 30upx); + width: calc(100% - 30rpx); display: flex; flex-direction: row; justify-content: space-between; align-items: center; .fontstyle{ - font-size: 32upx; - line-height: 60upx; + font-size: 32rpx; + line-height: 60rpx; } .font0{ - font-size: 30upx; + font-size: 30rpx; color: #666; - flex-basis: 72upx; + flex-basis: 72rpx; } .message_time{ - font-size: 26upx; + font-size: 26rpx; color: #666; - line-height: 60upx; + line-height: 60rpx; } } } @@ -269,12 +225,12 @@ bottom: 0; display: block; margin: auto; - width: 30upx; - height: 30upx; + width: 30rpx; + height: 30rpx; color: #b4b4b4; content: "\e6a3"; text-align: center; - font-size: 34upx; + font-size: 34rpx; font-family: cuIcon; - line-height: 30upx + line-height: 30rpx } diff --git a/styles/theme.scss b/styles/theme.scss index 1600d34..0c44630 100644 --- a/styles/theme.scss +++ b/styles/theme.scss @@ -1,154 +1,130 @@ -.ml-10{ - margin-left: 20upx !important; +.ml-10 { + margin-left: 20rpx !important; } -.mt-10{ - margin-top: 20upx !important; + +.mt-10 { + margin-top: 20rpx !important; } -.mb-10{ - margin-bottom: 20upx !important; + +.mb-10 { + margin-bottom: 20rpx !important; } -.mr-10{ - margin-right: 20upx !important; + +.mr-10 { + margin-right: 20rpx !important; } -.m-10{ - margin: 20upx !important; + +.m-10 { + margin: 20rpx !important; } -.p-10{ - padding: 20upx !important; + +.p-10 { + padding: 20rpx !important; } -.pl-10{ - padding-left: 20upx !important; + +.pl-10 { + padding-left: 20rpx !important; } -.pr-10{ - padding-right: 20upx !important; + +.pr-10 { + padding-right: 20rpx !important; } -.pt-10{ - padding-top: 20upx !important; + +.pt-10 { + padding-top: 20rpx !important; } -.pb-10{ - padding-bottom: 20upx !important; + +.pb-10 { + padding-bottom: 20rpx !important; } -.w100{ + +.w100 { width: 100%; } -.flex1{ + +.flex1 { flex: 1; } -.pr{ + +.pr { position: relative; } -.border{ - border: 1px solid #e5e5e5; + +.border { + border: 1px solid #e5e5e5; } + .content { position: relative; min-height: 100vh; background-color: $uni-bg-color-grey; } -.card{ - padding: 20upx; + +.card { + padding: 20rpx; background-color: #FFFFFF; } -.search{ + +.search { border-bottom: 1px solid #ccc; display: flex; flex-direction: row; - .u-text{ - width: 100upx !important; + + .u-text { + width: 100rpx !important; flex: none !important; } + .u-button { - height: 68upx !important; + height: 68rpx !important; } - .u-input__content__field-wrapper__field{ - height: 42upx !important; + + .u-input__content__field-wrapper__field { + height: 42rpx !important; } } -.bth-mini{ - width: auto !important; - border-radius: 15upx !important; - margin-left: unset; - margin-right: unset; -} -.bth{ - flex: 1; - border-radius: 15upx !important; - margin-left: unset; - margin-right: unset; -} -.flex-between{ + +.flex-between { display: flex; flex-direction: row; justify-content: space-between; } -.flex-end{ + +.flex-end { display: flex; flex-direction: row; justify-content: flex-end; } -.flex-warp{ + +.flex-warp { display: flex; flex-direction: row; flex-wrap: wrap; } -.main-title{ + +.main-title { color: #333333; - font-size: 30upx; + font-size: 30rpx; } -.subtitle{ + +.subtitle { color: #888888; - font-size: 26upx; + font-size: 26rpx; } -.view-title{ - border-left: 8upx solid #1d82fe; - .u-text{ - padding-left: 10upx; - color: #353535 !important; - } -} -.title{ + +.title { font-weight: bold; color: #000000; - font-size: 28upx; + font-size: 28rpx; } -.title-none{ - .u-cell__body__content,.u-cell__title{ - display: none !important; - } -} -.title-show{ - .u-cell__body__content,.u-cell__title{ - display: flex !important; - } -} -.flex-none{ - display: block; - .u-cell__body{ - display: block !important; - } -} -.required{ - &:before{ + +.required { + &:before { content: '*'; position: absolute; left: 0; color: #f56c6c; - font-size: 40upx; + font-size: 40rpx; font-weight: normal; } } -.form-item-block{ -.u-form-item__body{ - display: block !important; - .u-form-item__body__left{ - width: 100% !important; - } - .u-form-item__body__right{ - .u-form-item__body__right__content__slot{ - justify-content: flex-start; - position: relative; - margin-left: 20upx; - } - } -} -} diff --git a/styles/uview.scss b/styles/uview.scss index 7723fdf..85089b3 100644 --- a/styles/uview.scss +++ b/styles/uview.scss @@ -1,17 +1,17 @@ .u-list { .u-list-item { - padding: 20upx; + padding: 20rpx; background-color: #fff; border-bottom: 1px solid rgb(214, 215, 217); } } .u-textarea{ - padding: 18upx; + padding: 18rpx; } .u-form-item__body__left__content__required{ position: relative !important; left: 0 !important; - margin-right: 10upx; + margin-right: 10rpx; } .u-form-item__body__left{ //flex: 1 !important; @@ -20,7 +20,7 @@ .u-form-item__body__right__content__slot{ justify-content: flex-end; position: relative; - padding-right: 20upx; + padding-right: 20rpx; } .u-text{ justify-content: flex-end !important; @@ -30,19 +30,19 @@ } } .u-text__value{ - font-size: 28upx !important; + font-size: 28rpx !important; } .u-form-item__body__left__content__label{ - font-size: 28upx !important; + font-size: 28rpx !important; } .u-tabs__wrapper__nav__item{ flex: 1 !important; } .u-upload__deletable{ - height: 40upx !important; - width: 40upx !important; + height: 40rpx !important; + width: 40rpx !important; .u-icon__icon{ - font-size: 30upx !important; - line-height: 30upx !important; + font-size: 30rpx !important; + line-height: 30rpx !important; } }