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/manifest.json b/manifest.json index 4ea46e4..e88aa8c 100644 --- a/manifest.json +++ b/manifest.json @@ -105,11 +105,18 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "", + "appid" : "wx06c53a01ae0afd2c", "setting" : { - "urlCheck" : false + "urlCheck" : false, + "minified" : true, + "es6" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "展示当前位置信息" + } + } }, "mp-alipay" : { "usingComponents" : true diff --git a/pages.json b/pages.json index 2e43621..287b7e3 100644 --- a/pages.json +++ b/pages.json @@ -72,17 +72,7 @@ { "path": "pages/certificate_information/index", "style": { - "navigationBarTitleText": "证书信息", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "新建", - "fontSize": "15", - "float": "right", - "width": "40px" - }] - } - } + "navigationBarTitleText": "证书信息" } }, { @@ -119,17 +109,7 @@ { "path": "pages/mine/information/index", "style": { - "navigationBarTitleText": "我的信息", - "app-plus": { - "titleNView": { - "buttons": [{ - "text": "修改", - "fontSize": "15", - "float": "right", - "width": "40px" - }] - } - } + "navigationBarTitleText": "我的信息" } }, { diff --git a/pages/certificate_information/add.vue b/pages/certificate_information/add.vue index 94553e5..0ae6497 100644 --- a/pages/certificate_information/add.vue +++ b/pages/certificate_information/add.vue @@ -30,7 +30,8 @@ - + @@ -48,10 +49,12 @@ - + - + - + + + @@ -121,10 +126,10 @@ export default { CARD_ID: '', CER_TYPE: '', CER_TYPE_NAME: '', - CERTIFICATE:'', - JOBS_TYPE:'', - SPECIAL_TYPE:'', - OPERATION_TYPE:'', + CERTIFICATE: '', + JOBS_TYPE: '', + SPECIAL_TYPE: '', + OPERATION_TYPE: '', SPECIAL_NUMBER: '', ISSUING_AUTHORITY: '', VALIDITY_TIME_START: '', @@ -250,20 +255,20 @@ export default { this.form.SEX_NAME = '女' } }, - async fnGetDataDictionary(){ - let resData = await getDataDictionary({DICTIONARIES_ID:'6f87965751b84311b066484ac93c8077'}) + async fnGetDataDictionary() { + let resData = await getDataDictionary({DICTIONARIES_ID: '6f87965751b84311b066484ac93c8077'}) this.certificateTypeColumns = [resData.list] }, - async fnGetDataDictionaryJobs(){ - let resData = await getDataDictionary({DICTIONARIES_ID:'55484e491a5e442d839c4595380713ec'}) + async fnGetDataDictionaryJobs() { + let resData = await getDataDictionary({DICTIONARIES_ID: '55484e491a5e442d839c4595380713ec'}) this.certificateTypeColumnsJobs = [resData.list] }, - async fnGetDataDictionarySpe(){ - let resData = await getDataDictionary({DICTIONARIES_ID:'f4c3890d06d54904b32986cb6428ed4f'}) + async fnGetDataDictionarySpe() { + let resData = await getDataDictionary({DICTIONARIES_ID: 'f4c3890d06d54904b32986cb6428ed4f'}) this.certificateTypeColumnsSpe = [resData.list] }, - async fnGetDataDictionaryOpe(){ - let resData = await getDataDictionary({DICTIONARIES_ID:this.form.SPECIAL_TYPE}) + async fnGetDataDictionaryOpe() { + let resData = await getDataDictionary({DICTIONARIES_ID: this.form.SPECIAL_TYPE}) this.certificateTypeColumnsOpe = [resData.list] }, fnCardIdDisassembly(event) { @@ -296,13 +301,13 @@ export default { this.form.specialName = e.value[0].NAME this.form.SPECIAL_TYPE = e.value[0].DICTIONARIES_ID this.fnShowCertificateTypeSpe() - this.fnGetDataDictionaryOpe(); - this.form.operationName =''; - this.form.OPERATION_TYPE= ''; + this.fnGetDataDictionaryOpe(); + this.form.operationName = ''; + this.form.OPERATION_TYPE = ''; }, fnCertificateTypeConfirmOpe(e) { - this.form.operationName = e.value[0].NAME - this.form.OPERATION_TYPE= e.value[0].DICTIONARIES_ID + this.form.operationName = e.value[0].NAME + this.form.OPERATION_TYPE = e.value[0].DICTIONARIES_ID this.fnShowCertificateTypeOpe() }, fnShowTermOfValidityStart() { @@ -359,7 +364,7 @@ export default { async fnSubmit() { console.info(this.$refs) this.$refs.form.validate().then(async () => { - if(!this.SPECIAL_USER_ID){ + if (!this.SPECIAL_USER_ID) { let files = [] files.push({ name: 'FILEPATH', @@ -373,7 +378,7 @@ export default { uri: this.form.fileListBack[0].url, }) - if (files.length !== 2){ + if (files.length !== 2) { uni.$u.toast('请上传证书正反面') return } @@ -384,11 +389,11 @@ export default { ...this.form } }) - }else { + } else { if (!this.form.fileList[0].FILEPATH || !this.form.fileListBack[0].FILEPATH) { uni.$u.toast('1') let files = [] - if (!this.form.fileList[0].FILEPATH){ + if (!this.form.fileList[0].FILEPATH) { files.push({ name: 'FILEPATH', file: this.form.fileList[0], @@ -396,7 +401,7 @@ export default { }) } - if (!this.form.fileListBack[0].FILEPATH){ + if (!this.form.fileListBack[0].FILEPATH) { files.push({ name: 'FILEPATH_BACK', file: this.form.fileListBack[0], @@ -412,16 +417,16 @@ export default { }) } else { this.form.fileMark = '1', - await setCertificateInformationEditPost({ - ...this.form - }) + await setCertificateInformationEditPost({ + ...this.form + }) } } // uni.$u.toast('保存成功') - setTimeout(()=>{ + setTimeout(() => { uni.navigateBack() - },2000) + }, 2000) }).catch((e) => { console.info(e) // uni.$u.toast('请补全必填项') diff --git a/pages/certificate_information/index.vue b/pages/certificate_information/index.vue index 277be21..553bd30 100644 --- a/pages/certificate_information/index.vue +++ b/pages/certificate_information/index.vue @@ -19,8 +19,12 @@ - - + + + + @@ -28,16 +32,21 @@ + diff --git a/pages/login/register.vue b/pages/login/register.vue index f67d033..d28d551 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -19,7 +19,9 @@ 密码长度8~32位,须包含数字、字母、符号至少2种或以上元素 - + + + @@ -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,7 +142,7 @@ export default { 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 2d5c756..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 eb04df5..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 11cbf6c..6b55625 100644 --- a/pages/mine/information/index.vue +++ b/pages/mine/information/index.vue @@ -1,64 +1,65 @@ 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/qa-prevention-xgf-app.iml b/qa-prevention-xgf-app.iml deleted file mode 100644 index 8021953..0000000 --- a/qa-prevention-xgf-app.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/qa-related-parties-gwj-app.iml b/qa-related-parties-gwj-app.iml deleted file mode 100644 index 8021953..0000000 --- a/qa-related-parties-gwj-app.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/static/icon-apps/app_icons6.png b/static/icon-apps/app_icons6.png new file mode 100644 index 0000000..dcdf896 Binary files /dev/null and b/static/icon-apps/app_icons6.png differ diff --git a/styles/home_style.scss b/styles/home_style.scss index 0eb5260..fa36a4d 100644 --- a/styles/home_style.scss +++ b/styles/home_style.scss @@ -15,50 +15,6 @@ height: 507rpx; position: relative; overflow: hidden; - .wui-bar{ - display: flex; - align-items: center; - min-height: 100rpx; - justify-content: flex-end; - z-index: 9999; - position: absolute; - width: 100%; - .search-form{ - background: rgba(255,255,255,0.2); - border-radius: 100rpx; - flex: 1; - height: 60rpx; - line-height: 60rpx; - font-size: 24rpx; - color: #333333; - display: flex; - align-items: center; - margin: 0 30rpx; - padding: 0 30rpx; - .cuIcon-search{ - color: rgba(255,255,255,0.5); - margin-right: 16rpx; - font-size: 28rpx; - } - input{ - color: rgba(255,255,255,0.5); - flex: 1; - padding-right: 30rpx; - height: 64rpx; - line-height: 64rpx; - font-size: 26rpx; - background-color: transparent; - .phcolor{ - color: rgba(255,255,255,0.5); - } - } - } - .icon-ui { - color: #fff; - font-size: 42rpx; - margin-right: 22rpx; - } - } .banner_img{ z-index: 1; width: 100%; diff --git a/styles/theme.scss b/styles/theme.scss index 17182ad..0c44630 100644 --- a/styles/theme.scss +++ b/styles/theme.scss @@ -1,134 +1,125 @@ -.ml-10{ +.ml-10 { margin-left: 20rpx !important; } -.mt-10{ + +.mt-10 { margin-top: 20rpx !important; } -.mb-10{ + +.mb-10 { margin-bottom: 20rpx !important; } -.mr-10{ + +.mr-10 { margin-right: 20rpx !important; } -.m-10{ + +.m-10 { margin: 20rpx !important; } -.p-10{ + +.p-10 { padding: 20rpx !important; } -.pl-10{ + +.pl-10 { padding-left: 20rpx !important; } -.pr-10{ + +.pr-10 { padding-right: 20rpx !important; } -.pt-10{ + +.pt-10 { padding-top: 20rpx !important; } -.pb-10{ + +.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{ + +.card { padding: 20rpx; background-color: #FFFFFF; } -.search{ + +.search { border-bottom: 1px solid #ccc; display: flex; flex-direction: row; - .u-text{ + + .u-text { width: 100rpx !important; flex: none !important; } + .u-button { height: 68rpx !important; } - .u-input__content__field-wrapper__field{ + + .u-input__content__field-wrapper__field { height: 42rpx !important; } } -.bth-mini{ - width: auto !important; - border-radius: 15rpx !important; - margin-left: unset; - margin-right: unset; -} -.bth{ - flex: 1; - border-radius: 15rpx !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: 30rpx; } -.subtitle{ + +.subtitle { color: #888888; font-size: 26rpx; } -.view-title{ - border-left: 8rpx solid #1d82fe; - .u-text{ - padding-left: 10rpx; - color: #353535 !important; - } -} -.title{ + +.title { font-weight: bold; color: #000000; 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; @@ -137,18 +128,3 @@ 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: 20rpx; - } - } -} -}