diff --git a/java-mall-app-shop-admin/pages/audit/checkAudit.vue b/java-mall-app-shop-admin/pages/audit/checkAudit.vue index b0e6018..8956c3a 100644 --- a/java-mall-app-shop-admin/pages/audit/checkAudit.vue +++ b/java-mall-app-shop-admin/pages/audit/checkAudit.vue @@ -537,7 +537,7 @@ export default { handler: function (val, oldVal) { if (val) { uni.showLoading({ - title: "数据加载中...", + title: "店铺创建中,请稍等...", mask: true, }); @@ -545,7 +545,7 @@ export default { uni.hideLoading(); this.$store.commit("audit/BACK_PAGE", false); this.getAuditInfo(); - }, 4000); + }, 40000); } }, // immediate: true, @@ -580,6 +580,8 @@ export default { async getAuditInfo() { if (this.isContractSigningaPageTo) return; + + var params = {}; let isContain = this.userInfo.user_mobile.indexOf("86"); @@ -600,6 +602,13 @@ export default { approval_invalid_col: [], }; + if(this.isPassAudit){ + uni.switchTab({ + url: "/pages/order/order", + }); + return + } + if (!res.data || res.data.approval_status == 4) { this.showLoading = false; return; diff --git a/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue b/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue index b6ee0b9..3a83143 100644 --- a/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue +++ b/java-mall-app-shop-admin/pages/my/storeBusinessStatus/oz-timePicker/oz-timePicker.vue @@ -65,6 +65,9 @@ + + + @@ -309,6 +312,7 @@ export default { } .title { + font-weight: 500; font-size: 32rpx; color: #333; } @@ -356,6 +360,7 @@ export default { background: #efefef; margin: 0 16rpx; border-radius: 24rpx; + height: 80rpx; } ::v-deep .uni-picker-view-content { @@ -370,5 +375,12 @@ export default { margin-left: 20rpx; width: 80%; font-size: 36rpx; + height: 80rpx; + line-height: 80rpx; } + +::v-deep .picker-view{ + height: 60%; +} +