From 600ba2eeb3d0a94497829c07370b0cc590597161 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 24 Aug 2023 17:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/company/company.vue | 4 +- components/companyFinance/companyFinance.vue | 4 +- .../districtSelector/districtSelector.vue | 2 +- .../districtSelector/districtSelectorTow.vue | 2 +- .../logistiCard/logistiBriefCard.vue | 2 +- .../logistiCard/logistiCard.vue | 2 +- components/newArchives/banquetBirthday.vue | 324 ++++----- components/newArchives/banquetFullMoon.vue | 324 ++++----- components/newArchives/banquetFuneral.vue | 350 +++++----- components/newArchives/banquetMarry.vue | 340 +++++----- components/newArchives/banquetOther.vue | 330 ++++----- components/newArchives/breeding.vue | 2 +- components/newArchives/deepProcessing.vue | 568 ++++++++-------- components/newArchives/houseDecoration.vue | 284 ++++---- components/newArchives/houseRenovate.vue | 264 ++++---- components/newArchives/houseRepair.vue | 334 ++++----- components/newArchives/houseTransaction.vue | 316 ++++----- components/newArchives/plant.vue | 2 +- components/newArchives/residents.vue | 634 +++++++++--------- components/newArchives/store.vue | 2 +- components/newArchives/thickProcessing.vue | 536 +++++++-------- components/tabbar.vue | 4 +- pages/logistics/logisticDetil.vue | 2 +- pages/oaTask/oaTask.vue | 8 +- pages/office_app/application.vue | 2 +- pages/office_app/components/tabbar.vue | 4 +- pages/office_app/oaExamine/oaExamine.vue | 2 +- pages/office_app/oaHome/oaHome.vue | 2 +- pages/office_app/oaMy/oaMy.vue | 2 +- pages/office_app/oaTask/oaTask.vue | 2 +- pages/views/application.vue | 2 +- subpkg/archivesDetail/archivesDetail.vue | 6 +- subpkg/companyInfo/companyInfo.vue | 16 +- subpkg/companySign/companySign.vue | 20 +- subpkg/companyUnsign/companyUnsign.vue | 19 +- subpkg/contract/contract.vue | 16 +- subpkg/finance/finance.vue | 9 +- subpkg/newArchives/newArchives.vue | 2 +- subpkg/newPersonnel/newPersonnel.vue | 2 +- subpkg/personnelDetails/personnelDetails.vue | 6 +- subpkg/property/vehicle.vue | 2 +- subpkg/updateArchives/updateArchives.vue | 2 +- .../uni-calendar/uni-calendar-item.vue | 2 +- .../uni-scss/styles/setting/_variables.scss | 2 +- uni_modules/uni-scss/theme.scss | 2 +- uni_modules/uni-scss/variables.scss | 2 +- .../components/uni-section/uni-section.vue | 2 +- .../uni-segmented-control.vue | 2 +- .../u-checkbox-group/u-checkbox-group.vue | 2 +- .../components/u-checkbox/u-checkbox.vue | 4 +- .../uview-ui/components/u-dropdown/props.js | 2 +- .../uview-ui/components/u-icon/u-icon.vue | 2 +- .../uview-ui/components/u-modal/u-modal.vue | 2 +- .../u-radio-group/u-radio-group.vue | 2 +- .../uview-ui/components/u-radio/u-radio.vue | 4 +- .../components/u-read-more/u-read-more.vue | 2 +- .../uview-ui/components/u-switch/u-switch.vue | 2 +- uni_modules/uview-ui/libs/config/config.js | 2 +- .../libs/config/props/checkboxGroup.js | 2 +- .../uview-ui/libs/config/props/modal.js | 2 +- .../uview-ui/libs/config/props/radioGroup.js | 2 +- .../uview-ui/libs/config/props/readMore.js | 2 +- .../uview-ui/libs/config/props/slider.js | 2 +- .../uview-ui/libs/config/props/switch.js | 2 +- 64 files changed, 2419 insertions(+), 2385 deletions(-) diff --git a/components/company/company.vue b/components/company/company.vue index 50f44bd..ecdb9a5 100644 --- a/components/company/company.vue +++ b/components/company/company.vue @@ -212,7 +212,7 @@ + style="height: 30rpx;width: 6rpx;background-color: #0122c7;border-radius: 8rpx;margin-right: 8rpx;"> 主要联系人 @@ -229,7 +229,7 @@ :key="index"> + style="height: 30rpx;width: 6rpx;background-color: #0122c7;border-radius: 8rpx;margin-right: 8rpx;"> 其他联系人 diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue index 0cc059a..4cf41d5 100644 --- a/components/companyFinance/companyFinance.vue +++ b/components/companyFinance/companyFinance.vue @@ -218,7 +218,7 @@ border-radius: 10rpx; margin-right: 10rpx; display: inline-block; - background-color: #3175F9; + background-color: #0122c7; } } @@ -230,7 +230,7 @@ } .active { - color: #3175F9; + color: #0122c7; } } } diff --git a/components/districtSelector/districtSelector.vue b/components/districtSelector/districtSelector.vue index ed09da7..57c9970 100644 --- a/components/districtSelector/districtSelector.vue +++ b/components/districtSelector/districtSelector.vue @@ -284,7 +284,7 @@ width: 8rpx; height: 26rpx; border-radius: 4rpx; - background-color: #3175f9; + background-color: #0122c7; content: ""; display: inline-block; margin-right: 8rpx; diff --git a/components/districtSelector/districtSelectorTow.vue b/components/districtSelector/districtSelectorTow.vue index 7900d43..8218591 100644 --- a/components/districtSelector/districtSelectorTow.vue +++ b/components/districtSelector/districtSelectorTow.vue @@ -249,7 +249,7 @@ width: 8rpx; height: 26rpx; border-radius: 4rpx; - background-color: #3175f9; + background-color: #0122c7; content: ""; display: inline-block; margin-right: 8rpx; diff --git a/components/logistiComptent/logistiCard/logistiBriefCard.vue b/components/logistiComptent/logistiCard/logistiBriefCard.vue index da66c79..c092b76 100644 --- a/components/logistiComptent/logistiCard/logistiBriefCard.vue +++ b/components/logistiComptent/logistiCard/logistiBriefCard.vue @@ -12,7 +12,7 @@ 店主姓名:  {{goodsInfo.shop_user}} 联系电话:   + color="#0122c7" size="22"> {{goodsInfo.shop_phone}} 取货地址:  {{goodsInfo.shop_address}} diff --git a/components/logistiComptent/logistiCard/logistiCard.vue b/components/logistiComptent/logistiCard/logistiCard.vue index 12000be..8b4a7d0 100644 --- a/components/logistiComptent/logistiCard/logistiCard.vue +++ b/components/logistiComptent/logistiCard/logistiCard.vue @@ -35,7 +35,7 @@ + color="#0122c7" size="22"> {{goodsInfo.shop_phone}} diff --git a/components/newArchives/banquetBirthday.vue b/components/newArchives/banquetBirthday.vue index d65d137..6f40702 100644 --- a/components/newArchives/banquetBirthday.vue +++ b/components/newArchives/banquetBirthday.vue @@ -1,163 +1,163 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/banquetFullMoon.vue b/components/newArchives/banquetFullMoon.vue index 76d71cc..23caefe 100644 --- a/components/newArchives/banquetFullMoon.vue +++ b/components/newArchives/banquetFullMoon.vue @@ -1,163 +1,163 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/banquetFuneral.vue b/components/newArchives/banquetFuneral.vue index 600f25c..384474f 100644 --- a/components/newArchives/banquetFuneral.vue +++ b/components/newArchives/banquetFuneral.vue @@ -1,176 +1,176 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/banquetMarry.vue b/components/newArchives/banquetMarry.vue index 91b245a..784f562 100644 --- a/components/newArchives/banquetMarry.vue +++ b/components/newArchives/banquetMarry.vue @@ -1,171 +1,171 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/banquetOther.vue b/components/newArchives/banquetOther.vue index 20c8fb0..e7caddc 100644 --- a/components/newArchives/banquetOther.vue +++ b/components/newArchives/banquetOther.vue @@ -1,166 +1,166 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/breeding.vue b/components/newArchives/breeding.vue index 8ce53c7..1eae1ed 100644 --- a/components/newArchives/breeding.vue +++ b/components/newArchives/breeding.vue @@ -283,7 +283,7 @@ width: 8rpx; height: 26rpx; border-radius: 4rpx; - background-color: #3175f9; + background-color: #0122c7; content: ""; display: inline-block; margin-right: 8rpx; diff --git a/components/newArchives/deepProcessing.vue b/components/newArchives/deepProcessing.vue index 684de93..aabf1e7 100644 --- a/components/newArchives/deepProcessing.vue +++ b/components/newArchives/deepProcessing.vue @@ -1,285 +1,285 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/houseDecoration.vue b/components/newArchives/houseDecoration.vue index 9ddacc1..7dd9a89 100644 --- a/components/newArchives/houseDecoration.vue +++ b/components/newArchives/houseDecoration.vue @@ -1,143 +1,143 @@ - - - - - \ No newline at end of file diff --git a/components/newArchives/houseRenovate.vue b/components/newArchives/houseRenovate.vue index 9da3e2c..4d74f45 100644 --- a/components/newArchives/houseRenovate.vue +++ b/components/newArchives/houseRenovate.vue @@ -1,133 +1,133 @@ - - - - - \ No newline at end of file diff --git a/components/newArchives/houseRepair.vue b/components/newArchives/houseRepair.vue index 81fdc78..7ed750e 100644 --- a/components/newArchives/houseRepair.vue +++ b/components/newArchives/houseRepair.vue @@ -1,168 +1,168 @@ - - - - - \ No newline at end of file diff --git a/components/newArchives/houseTransaction.vue b/components/newArchives/houseTransaction.vue index faab1ce..789f666 100644 --- a/components/newArchives/houseTransaction.vue +++ b/components/newArchives/houseTransaction.vue @@ -1,159 +1,159 @@ - - - - - \ No newline at end of file diff --git a/components/newArchives/plant.vue b/components/newArchives/plant.vue index 9d715e2..9810db6 100644 --- a/components/newArchives/plant.vue +++ b/components/newArchives/plant.vue @@ -298,7 +298,7 @@ width: 8rpx; height: 26rpx; border-radius: 4rpx; - background-color: #3175f9; + background-color: #0122c7; content: ""; display: inline-block; margin-right: 8rpx; diff --git a/components/newArchives/residents.vue b/components/newArchives/residents.vue index d8ccab9..de8e50f 100644 --- a/components/newArchives/residents.vue +++ b/components/newArchives/residents.vue @@ -1,318 +1,318 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/store.vue b/components/newArchives/store.vue index 91caab0..f220605 100644 --- a/components/newArchives/store.vue +++ b/components/newArchives/store.vue @@ -219,7 +219,7 @@ width: 8rpx; height: 26rpx; border-radius: 4rpx; - background-color: #3175f9; + background-color: #0122c7; content: ""; display: inline-block; margin-right: 8rpx; diff --git a/components/newArchives/thickProcessing.vue b/components/newArchives/thickProcessing.vue index 289df14..874880a 100644 --- a/components/newArchives/thickProcessing.vue +++ b/components/newArchives/thickProcessing.vue @@ -1,269 +1,269 @@ - - - - - - \ No newline at end of file diff --git a/components/tabbar.vue b/components/tabbar.vue index a7e98a8..1447031 100644 --- a/components/tabbar.vue +++ b/components/tabbar.vue @@ -61,7 +61,7 @@ // 选中的颜色--为空显示主题色 activeColor: { type: String, - default: '#3175f9' + default: '#0122c7' }, // 未选中颜色 inactiveColor: { @@ -78,7 +78,7 @@ }, data() { return { - PrimaryColor: '#3175f9', + PrimaryColor: '#0122c7', safeAreaInsetBottom: false, systemInfo: base.systemInfo, tabIndex: 0, diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue index d719d45..d637c6f 100644 --- a/pages/logistics/logisticDetil.vue +++ b/pages/logistics/logisticDetil.vue @@ -173,7 +173,7 @@ 联系方式 - {{goodsDetil.logistics.receiver_phone}} diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue index 836a850..8229668 100644 --- a/pages/oaTask/oaTask.vue +++ b/pages/oaTask/oaTask.vue @@ -35,15 +35,15 @@ list: [] } }, - onLoad() { + onLoad() {}, + onShow() {}, + onReady() { this.loadList(); uni.$on('initOaTask', this.loadList); }, - onShow() { - }, methods: { async loadList(){ - let res = await taskLists(); + let res = await taskLists({limit: 10, page: 1}); this.list = res.data; } }, diff --git a/pages/office_app/application.vue b/pages/office_app/application.vue index 4d86c7b..ebc28a8 100644 --- a/pages/office_app/application.vue +++ b/pages/office_app/application.vue @@ -33,7 +33,7 @@ onReady() { uni.setNavigationBarColor({ frontColor: '#ffffff', - backgroundColor: '#3175f9' + backgroundColor: '#0122c7' }) }, onLoad() {}, diff --git a/pages/office_app/components/tabbar.vue b/pages/office_app/components/tabbar.vue index 1e0dd94..6c043d7 100644 --- a/pages/office_app/components/tabbar.vue +++ b/pages/office_app/components/tabbar.vue @@ -61,7 +61,7 @@ // 选中的颜色--为空显示主题色 activeColor: { type: String, - default: '#3175f9' + default: '#0122c7' }, // 未选中颜色 inactiveColor: { @@ -78,7 +78,7 @@ }, data() { return { - PrimaryColor: '#3175f9', + PrimaryColor: '#0122c7', safeAreaInsetBottom: false, systemInfo: base.systemInfo, tabIndex: 0, diff --git a/pages/office_app/oaExamine/oaExamine.vue b/pages/office_app/oaExamine/oaExamine.vue index 3c0ad90..e1d3d2f 100644 --- a/pages/office_app/oaExamine/oaExamine.vue +++ b/pages/office_app/oaExamine/oaExamine.vue @@ -65,7 +65,7 @@ onReady() { uni.setNavigationBarColor({ frontColor: '#ffffff', - backgroundColor: '#3175f9' + backgroundColor: '#0122c7' }) }, onLoad() { diff --git a/pages/office_app/oaHome/oaHome.vue b/pages/office_app/oaHome/oaHome.vue index 66f27ff..f055681 100644 --- a/pages/office_app/oaHome/oaHome.vue +++ b/pages/office_app/oaHome/oaHome.vue @@ -134,7 +134,7 @@ onReady() { uni.setNavigationBarColor({ frontColor: '#ffffff', - backgroundColor: '#3175f9' + backgroundColor: '#0122c7' }) }, onLoad() {}, diff --git a/pages/office_app/oaMy/oaMy.vue b/pages/office_app/oaMy/oaMy.vue index bb4f263..c78c0eb 100644 --- a/pages/office_app/oaMy/oaMy.vue +++ b/pages/office_app/oaMy/oaMy.vue @@ -78,7 +78,7 @@ onReady() { uni.setNavigationBarColor({ frontColor: '#ffffff', - backgroundColor: '#3175f9' + backgroundColor: '#0122c7' }) }, onLoad() { diff --git a/pages/office_app/oaTask/oaTask.vue b/pages/office_app/oaTask/oaTask.vue index 9b9423c..8bc003c 100644 --- a/pages/office_app/oaTask/oaTask.vue +++ b/pages/office_app/oaTask/oaTask.vue @@ -105,7 +105,7 @@ onReady() { uni.setNavigationBarColor({ frontColor: '#ffffff', - backgroundColor: '#3175f9' + backgroundColor: '#0122c7' }) }, onLoad() { diff --git a/pages/views/application.vue b/pages/views/application.vue index 4d86c7b..ebc28a8 100644 --- a/pages/views/application.vue +++ b/pages/views/application.vue @@ -33,7 +33,7 @@ onReady() { uni.setNavigationBarColor({ frontColor: '#ffffff', - backgroundColor: '#3175f9' + backgroundColor: '#0122c7' }) }, onLoad() {}, diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index 2c49279..84b6af2 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -89,7 +89,7 @@ 性别 : - {{formData.sex}} + {{formData.sex==1?'男':'女'}} 年龄 : @@ -497,7 +497,7 @@ .hr { border-top: 1px dashed $theme-oa-color; // display: block; - width: 85vw; + width: 100%; margin: 30rpx 0 } @@ -542,7 +542,7 @@ width: 8rpx; height: 26rpx; border-radius: 4rpx; - background-color: #3175f9; + background-color: #0122c7; content: ""; display: inline-block; margin-right: 8rpx; diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index d8aa81c..573361c 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -181,10 +181,18 @@ this.companyList = [...this.companyList, ...res.data?.data] }, navTo(url) { - url ? - uni.navigateTo({ - url: url - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, naviBack() { uni.navigateBack() diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue index 9a16c8f..7ba71a0 100644 --- a/subpkg/companySign/companySign.vue +++ b/subpkg/companySign/companySign.vue @@ -175,7 +175,7 @@ // content: '请检查信息无误后再生成合同', // confirmText: '确认无误', // cancelText: '我再看看', - // confirmColor: '#3175f9', + // confirmColor: '#0122c7', // success: async (e) => { // if (e.confirm) { @@ -206,7 +206,7 @@ // content: '请检查合同无误后再发送', // confirmText: '确认无误', // cancelText: '我再看看', - // confirmColor: '#3175f9', + // confirmColor: '#0122c7', // success: async (e) => { // if (e.confirm) { @@ -246,10 +246,18 @@ }, 1000); }, navTo(url) { - url ? - uni.navigateTo({ - url: url - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, }, onPullDownRefresh() { diff --git a/subpkg/companyUnsign/companyUnsign.vue b/subpkg/companyUnsign/companyUnsign.vue index a9880e7..d9c09eb 100644 --- a/subpkg/companyUnsign/companyUnsign.vue +++ b/subpkg/companyUnsign/companyUnsign.vue @@ -129,10 +129,18 @@ this.companyList = [...this.companyList, ...res.data?.data] }, navTo(url) { - url ? - uni.navigateTo({ - url: url - }) : Toast('暂未开放') + if(url){ + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + }else Toast('暂未开放') }, copyPhone(str = "", type = "号码") { if (str) uni.setClipboardData({ @@ -169,6 +177,7 @@