From 2ecd26d609c2b5c90f7163a9dbdfa5b7513f7675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com> Date: Mon, 1 Jun 2026 16:36:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/artisan/profile.vue | 6 +- pages/my/my.vue | 16 +- pages/ruzhu/qualification_sj copy.vue | 2935 +++++++++++++------------ pages/ruzhu/qualification_sj.vue | 1919 +++++++++------- 4 files changed, 2725 insertions(+), 2151 deletions(-) diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue index 7c9d35d..5d62d4f 100644 --- a/pages/artisan/profile.vue +++ b/pages/artisan/profile.vue @@ -73,7 +73,7 @@ v-if="!userInfo.servers_kill_arr || userInfo.servers_kill_arr.length === 0"> + :style="{ color: (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '#c9c9c9' : '#ec5d57' }"> {{ (userInfo.servers_kill_arr && userInfo.servers_kill_arr.length > 0) ? '已设置' : '待完善' }} @@ -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' }) diff --git a/pages/my/my.vue b/pages/my/my.vue index 67f1fac..71cf155 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -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(); }, diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue index 921f2f0..39037df 100644 --- a/pages/ruzhu/qualification_sj copy.vue +++ b/pages/ruzhu/qualification_sj copy.vue @@ -1,210 +1,275 @@ + +.invite-info-container { + padding: 20rpx 24rpx; + width: 100%; + box-sizing: border-box; + min-height: 60rpx; +} + +.invite-tip { + font-size: 24rpx; + color: #666666; +} + +.invite-validating { + font-size: 20rpx; + color: #999999; +} + +.invite-error { + font-size: 24rpx; + color: #E8101E; +} + +.inviter-info { + display: flex; + align-items: center; + font-size: 20rpx; +} + +.inviter-label { + color: #666666; +} + +.inviter-name { + color: #333333; + font-weight: 500; +} + +.inviter-divider { + color: #666666; + margin: 0 5rpx; +} + +.inviter-phone { + color: #666666; +} + \ No newline at end of file From fa17e04f3090a7d678e525026d10cf67b874c909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com> Date: Mon, 1 Jun 2026 17:21:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ruzhu/qualification_sj.vue | 17 +++++++++++------ pages/ruzhu/ruzhu.vue | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue index 23a90f2..62c54c1 100644 --- a/pages/ruzhu/qualification_sj.vue +++ b/pages/ruzhu/qualification_sj.vue @@ -9,6 +9,9 @@ 店铺名称 + @@ -87,7 +90,7 @@ - 邀请码 + 邀请码 @@ -181,7 +184,7 @@ {{ tipTitle }} - + @@ -229,6 +232,7 @@ export default { indicatorStyle: 'height: 68rpx;', tipTitle: '', tipImage: '', + currentTipType: '', isSubmit: false, identity: 2, @@ -586,7 +590,7 @@ export default { try { // 调用接口验证邀请码 const response = await request.post('/user/user/getInvite', { - invite_code: code + invite_code_other: code }); console.log('邀请码验证响应:', response); @@ -758,7 +762,7 @@ export default { }); return false; } - if (!this.formData.invite_code) { + if (!this.formData.invite_code_other) { uni.showToast({ title: '请输入邀请码', icon: 'none' @@ -777,12 +781,13 @@ export default { showTipPopup(field) { const tipConfig = { 'name': { - title: '如何找到店铺名称', - image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4fb3e0a2-4c1a-4433-a181-b7a1dfefd030' + title: '如何查看店铺名称', + image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4a2dc8c2-98d4-4465-ae31-b2ea2d13aa23' } }; if (tipConfig[field]) { + this.currentTipType = field; this.tipTitle = tipConfig[field].title; this.tipImage = tipConfig[field].image; this.showTipPopupFlag = true; diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue index aa64e95..8caea0d 100644 --- a/pages/ruzhu/ruzhu.vue +++ b/pages/ruzhu/ruzhu.vue @@ -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;