diff --git a/manifest.json b/manifest.json index f438265..32e4a62 100644 --- a/manifest.json +++ b/manifest.json @@ -41,7 +41,8 @@ "Payment" : {}, "VideoPlayer" : {}, "OAuth" : {}, - "Camera" : {} + "Camera" : {}, + "Barcode" : {} }, /* 应用发布信息 */ "distribute" : { diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue index 99cc2d2..06c95e3 100644 --- a/pages/artisan/profile.vue +++ b/pages/artisan/profile.vue @@ -167,7 +167,7 @@ {{ userInfo.credentials_state === 0 ? '待完善' : userInfo.credentials_state === 1 ? '审核中' : - '已认证' }} + '已认证' }} @@ -191,663 +191,658 @@ \ No newline at end of file diff --git a/pages/home/components/brand-card.vue b/pages/home/components/brand-card.vue index 894311d..c3ab8e5 100644 --- a/pages/home/components/brand-card.vue +++ b/pages/home/components/brand-card.vue @@ -34,8 +34,8 @@ const TAG_LIBRARY = { borderColor: '#D6CAC0 ', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/60816ae2-92ee-4473-9eca-562e1200dbca.png' }, - recruit: { // 学院招募 - text: '学院招募', + recruit: { // 学员招募 + text: '学员招募', color: '#E5505F', borderColor: '#EFCFD2 ', icon: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fd0699b9-9f3c-4b1e-8693-d0c9ec7eabc3.png' diff --git a/pages/my/my.vue b/pages/my/my.vue index df01b52..85ed488 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -28,10 +28,11 @@ - {{ userInfo.credentials_state === 2 ? '认证通过' : userInfo.credentials_state === 1 ? + {{ (userInfo.credentials_state === 2 || (userInfo.id_type > 0 && + userInfo.credentials_state === 0)) ? '认证通过' : userInfo.credentials_state === 1 ? '资质审核中' : '资质待认证' }} 0 && credentialsState === 0) { + // 已认证 + 待完善 uni.navigateTo({ url: '/pages/shop/qualification_sj_change' }); - } else if (this.userInfo.credentials_state === 1) { + } else if (idType > 0 && credentialsState === 1) { + // 已认证 + 申请中 + uni.navigateTo({ + url: '/pages/shop/qualification_sj_change' + }); + } else if (idType < 0 && credentialsState === 1) { + // 未入驻 + 申请中 uni.navigateTo({ url: '/pages/ruzhu/ruzhu?type=1' }); - } else { - uni.navigateTo({ - url: '/pages/ruzhu/ruzhu' - }); } }, goToInviteList() { @@ -867,7 +879,7 @@ page { position: relative; padding-bottom: 50rpx; padding-top: var(--status-bar-height); - background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/825812de-54b3-486a-a3a0-2c4a1fb9fd28.png"); + background-image: url("https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/8c7c4d24-9a21-4d21-b1ed-1aa985d188e6.png"); background-position: 0 0; background-size: 100%; background-repeat: no-repeat;