diff --git a/pages.json b/pages.json index ecff9b5..2b876d1 100644 --- a/pages.json +++ b/pages.json @@ -101,6 +101,13 @@ "style": { "navigationBarTitleText": "关于我们" } + }, { + "path": "pages/company/approve", + "name": "companyApprove", + "auth": true, + "style": { + "navigationBarTitleText": "企业认证" + } }], "globalStyle": { "navigationStyle": "custom", diff --git a/pages/company/approve.vue b/pages/company/approve.vue index 1ecab2f..b01ddc6 100644 --- a/pages/company/approve.vue +++ b/pages/company/approve.vue @@ -97,13 +97,13 @@ }; }, created(){ + + console.log(this.$Route) + // 读取配置信息 appliesCreate().then(res=>{ - console.log(res) - this.industry = res.industries - this.formType = this.$Route.query.formType - this.name = res.info.name - this.industryIndex = res.industries.findIndex(val => val.industry_id === res.info.industry.industry_id) || 0 + this.industry = res + this.formType = this.$Route.query.form_type if(this.formType === 'put'){ appliesInfo().then(formValue => { for(let val of formValue.categories){ @@ -111,12 +111,14 @@ this.categorys.push(val.category_id) } } - this.category = formValue.categories - this.corporate = formValue.certification.name - this.identity = formValue.certification.idcard - this.org = formValue.certification.code - this.logo = formValue.cover - this.license = formValue.certification.license + this.name = formValue.name + this.industryIndex = this.industry.findIndex(val=> val.industry_id === formValue.industry.industry_id) + this.category = formValue.categories + this.corporate = formValue.certification.name + this.identity = formValue.certification.idcard + this.org = formValue.certification.code + this.logo = formValue.cover + this.license = formValue.certification.license }).catch(valueErr => { uni.showToast({ title: valueErr.message, @@ -124,7 +126,7 @@ }) }) }else{ - this.category = res.info.categories + this.getAppliesCategory(res[0].industry_id) } }).catch(err =>{ uni.showToast({ @@ -181,8 +183,13 @@ // 选择器 changePicker(e){ this.industryIndex = e.detail.value + this.getAppliesCategory(this.industry[e.detail.value].industry_id) + }, + + // 获取经营类目 + getAppliesCategory(id){ appliesCategory({ - industry: this.industry[e.detail.value].industry_id, + industry: id, }).then(res => { this.category = res }).catch(err => { @@ -222,8 +229,7 @@ // 内容 .content{ .header{ - height: 15vh; - padding-bottom: $padding * 2; + padding: $padding * 2 0; box-sizing: border-box; @extend .vertical; .title{ @@ -281,7 +287,7 @@ } } .logo{ - min-height: 98rpx; + height: $padding + 98; padding-bottom: $padding; .logo-cover{ position: absolute; @@ -301,13 +307,12 @@ .btns{ padding-top: $padding * 2; button{ - background: $text-price; + background: $mian-color-deep; border-radius: 0; height: 90rpx; line-height: 90rpx; font-size: $title-size; color: white; - font-weight: bold; &::after{ border: none; } @@ -335,20 +340,19 @@ @extend .nowrap; &.show{ color: white; - background-color: $text-price; + background-color: $mian-color-deep; } } } .btns{ padding-top: $padding * 2; button{ - background: $text-price; + background: $mian-color-deep; border-radius: 0; height: 90rpx; line-height: 90rpx; font-size: $title-size; color: white; - font-weight: bold; &::after{ border: none; } diff --git a/pages/user/index.vue b/pages/user/index.vue index 5cc5b36..36b7ce3 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -7,7 +7,8 @@ 店员管理 成交客户 个人认证 - 企业认证 + 企业认证 + 编辑企业认证 设置中心 diff --git a/router/index.js b/router/index.js index 7bfd15d..52ddefd 100644 --- a/router/index.js +++ b/router/index.js @@ -14,6 +14,9 @@ import store from '../store/index' // }) const router = createRouter({ + h5: { + paramsToQuery: true + }, platform: process.env.VUE_APP_PLATFORM, routes: [...ROUTES] })