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-01 17:21:54 +08:00
parent d6bae3034b fa17e04f30
commit 6d6c279731
5 changed files with 2732 additions and 2153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/artisan/profile.vue
View File

@ -73,7 +73,7 @@
v-if="!userInfo.servers_kill_arr || userInfo.servers_kill_arr.length === 0">
</image>
<text style="margin-right: 16rpx;"
:style="{ color: (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '#333333' : '#ec5d57' }">
:style="{ color: (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '#c9c9c9' : '#ec5d57' }">
{{ (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '已设置' :
'待完善' }}
</text>
@ -630,14 +630,12 @@
})
},
navigateToQualification() { // 商家手艺人：资质信息
navigateToQualification() {
if (this.userInfo.credentials_state == '1') {
// 商家跳转到资质信息页面
uni.navigateTo({
url: '/pages/ruzhu/ruzhu?type=1'
})
} else {
// 手艺人跳转到资质信息页面
uni.navigateTo({
url: '/pages/shop/qualification_sj_change'
})

16
pages/my/my.vue
View File

@ -176,8 +176,7 @@ export default {
{
title: "店铺装修",
url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
// https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png
path: "/pages/shop/qualification_sj_change",
path: "/pages/artisan/profile",
go_id_type: 1,
},
{
@ -654,6 +653,19 @@ export default {
request.post("/sj/user/getUser").then((result) => {
this.userInfo = result.data;
uni.setStorageSync("syrId", result.data.id);
const allReady = result.data.business_time
&& result.data.servers_kill_arr
&& result.data.servers_kill_arr.length > 0
&& result.data.credentials_state === 2;
const mgmtCard = this.cardList.find(c => c.title === "管理中心");
if (mgmtCard) {
const shopItem = mgmtCard.list.find(i => i.title === "店铺装修");
if (shopItem) {
shopItem.url = allReady
? "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png"
: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png";
}
}
});
this.getInviteList();
},

2935
pages/ruzhu/qualification_sj copy.vue
View File

File diff suppressed because it is too large Load Diff

1924
pages/ruzhu/qualification_sj.vue
View File

File diff suppressed because it is too large Load Diff

4
pages/ruzhu/ruzhu.vue
View File

@ -416,8 +416,8 @@
if (qualificationData.contact_type) {
formData.contact_type = qualificationData.contact_type;
}
if (qualificationData.invite_code) {
formData.invite_code_other = qualificationData.invite_code;
if (qualificationData.invite_code_other) {
formData.invite_code_other = qualificationData.invite_code_other;
}
if (qualificationData.contact_name) {
formData.contact_name = qualificationData.contact_name;