wk450097098
/
mrr.sj.front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mrr_sj_develop_hjy_20260520_商家改版' of https://gitee.com/qtvbidt/mrr.sj.front into mrr_sj_develop_hjy_20260520_商家改版

This commit is contained in:
BAKEYi 2026-06-03 16:54:20 +08:00
parent 12826becd5 7549907688
commit 3779b9f753
4 changed files with 619 additions and 611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifest.json
View File

@ -41,7 +41,8 @@
"Payment" : {},
"VideoPlayer" : {},
"OAuth" : {},
"Camera" : {}
"Camera" : {},
"Barcode" : {}
},
/* 应用发布信息 */
"distribute" : {

151
pages/artisan/profile.vue
View File

@ -191,12 +191,12 @@
</template>
<script>
import {
import {
handleImgSizeUni
} from '@/utils/service.js'
import request from "../../utils/request";
} from '@/utils/service.js'
import request from "../../utils/request";
export default {
export default {
data() {
return {
identity: '',
@ -631,34 +631,29 @@
},
navigateToQualification() {
const state = this.userInfo.credentials_state;
const idType = this.userInfo.id_type;
const credentialsState = this.userInfo.credentials_state;
if (state === 1) {
// === 1. 审核中 ===
// 跳转到最新确认的专属进度/客服二维码页面
uni.navigateTo({
url: '/pages/ruzhu/ruzhu?type=1'
});
} else if (state === 0) {
// === 2. 待完善 / 被驳回 ===
// 同步首页逻辑：判断是老手还是纯新手
if (this.userInfo.id_type !== 0) {
// 已经开启过入驻，直接空降到最后一步（门店信息）
uni.navigateTo({
url: '/pages/ruzhu/ruzhu?step=3'
});
} else {
// 完全没入驻过的纯新手，老老实实从第一步开始
if (idType === 0 && credentialsState === 0) {
// 从未入驻
uni.navigateTo({
url: '/pages/ruzhu/ruzhu'
});
}
} else {
// === 3. 已认证 ===
// 跳转到资质信息的查看/修改页面
} else if (idType > 0 && credentialsState === 0) {
// 已认证 + 待完善
uni.navigateTo({
url: '/pages/shop/qualification_sj_change'
});
} 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'
});
}
},
@ -668,17 +663,17 @@
})
}
}
}
}
</script>
<style>
.profile-page {
.profile-page {
min-height: 100vh;
background-color: #f5f5f5;
}
}
/* 自定义导航栏样式 */
.custom-navbar {
/* 自定义导航栏样式 */
.custom-navbar {
position: fixed;
top: 0;
left: 0;
@ -695,21 +690,21 @@
/* 适配不同机型的顶部安全区域 */
padding-top: var(--status-bar-height);
height: calc(128rpx + var(--status-bar-height));
}
}
/* 导航栏左侧 */
.navbar-left {
/* 导航栏左侧 */
.navbar-left {
display: flex;
align-items: center;
}
}
.back-icon {
.back-icon {
width: 16rpx;
height: 32rpx;
margin-right: 23rpx;
}
}
.navbar-title {
.navbar-title {
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 32rpx;
@ -717,29 +712,29 @@
line-height: 45rpx;
text-align: left;
font-style: normal;
}
}
/* 导航栏右侧状态栏 */
.navbar-right {
/* 导航栏右侧状态栏 */
.navbar-right {
display: flex;
align-items: center;
}
}
.nav-status-item {
.nav-status-item {
display: flex;
flex-direction: column;
align-items: center;
margin-left: 11rpx;
padding: 16rpx;
}
}
.nav-status-icon {
.nav-status-icon {
width: 44rpx;
height: 44rpx;
margin-bottom: 7rpx;
}
}
.nav-status-text {
.nav-status-text {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 20rpx;
@ -747,29 +742,29 @@
line-height: 28rpx;
text-align: left;
font-style: normal;
}
}
.content {
.content {
padding: 20rpx;
/* 动态计算内容区域的上边距 */
padding-top: calc(128rpx + var(--status-bar-height) + 20rpx);
}
}
/* 部分卡片 */
.section-card {
/* 部分卡片 */
.section-card {
background: white;
border-radius: 20rpx;
padding: 20rpx 20rpx 0 20rpx;
margin-bottom: 20rpx;
}
}
.section-header {
.section-header {
display: flex;
align-items: center;
margin-bottom: 8rpx;
}
}
.section-title {
.section-title {
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 32rpx;
@ -777,17 +772,17 @@
line-height: 48rpx;
text-align: left;
font-style: normal;
}
}
.title-bar {
.title-bar {
width: 6rpx;
height: 30rpx;
background-color: #FF4767;
margin-right: 10rpx;
border-radius: 5rpx;
}
}
.section-desc {
.section-desc {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
@ -797,45 +792,45 @@
font-style: normal;
margin-left: 20rpx;
letter-spacing: 0.5rpx;
}
}
/* 子部分 */
.subsection {
/* 子部分 */
.subsection {
/* margin-top: 10rpx; */
/* margin-left: 17rpx; */
}
}
.subsection-content {
.subsection-content {
border-radius: 12rpx;
overflow: hidden;
margin-left: 17rpx;
}
}
/* 信息项 */
.info-item {
/* 信息项 */
.info-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 32rpx 0;
border-bottom: 1rpx solid #f0f0f0;
}
}
.info-item:last-child {
.info-item:last-child {
border-bottom: none;
}
}
.info-left {
.info-left {
display: flex;
align-items: center;
}
}
.item-icon {
.item-icon {
width: 48rpx;
height: 48rpx;
margin-right: 24rpx;
}
}
.item-label {
.item-label {
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 28rpx;
@ -843,11 +838,11 @@
line-height: 40rpx;
text-align: left;
font-style: normal;
}
}
.arrow-right {
.arrow-right {
margin-right: 19rpx;
width: 11rpx;
height: 22rpx;
}
}
</style>

4
pages/home/components/brand-card.vue
View File

@ -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'

30
pages/my/my.vue
View File

@ -28,10 +28,11 @@
</view>
<view class="user_detail_tip" @click="toruzhu">
<image
:src="userInfo.credentials_state === 2 ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
:src="(userInfo.credentials_state === 2 || (userInfo.id_type > 0 && userInfo.credentials_state === 0)) ? 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/13cd25db-5b52-4d36-bad2-ee8680eed65f.png' : 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/711e35a8-a7a1-4eb2-8a76-52ac9795fa7e.png'"
mode="widthFix" style="width:26rpx ;"></image>
<view class="user_detail_tip_phone" style="margin-left: -10rpx;">
{{ userInfo.credentials_state === 2 ? '认证通过' : userInfo.credentials_state === 1 ?
{{ (userInfo.credentials_state === 2 || (userInfo.id_type > 0 &&
userInfo.credentials_state === 0)) ? '认证通过' : userInfo.credentials_state === 1 ?
'资质审核中' : '资质待认证' }}
</view>
<image mode="widthFix"
@ -793,18 +794,29 @@ export default {
});
},
toruzhu() {
if (this.userInfo.credentials_state === 2) {
const idType = this.userInfo.id_type;
const credentialsState = this.userInfo.credentials_state;
if (idType === 0 && credentialsState === 0) {
// 从未入驻
uni.navigateTo({
url: '/pages/ruzhu/ruzhu'
});
} else if (idType > 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;