diff --git a/pages/jingxuan/brand-detail.vue b/pages/jingxuan/brand-detail.vue
index 2fc93d5..5907cdc 100644
--- a/pages/jingxuan/brand-detail.vue
+++ b/pages/jingxuan/brand-detail.vue
@@ -19,9 +19,9 @@
-
+
diff --git a/pages/jingxuan/skill-detail.vue b/pages/jingxuan/skill-detail.vue
index 0830755..ea0045c 100644
--- a/pages/jingxuan/skill-detail.vue
+++ b/pages/jingxuan/skill-detail.vue
@@ -8,9 +8,9 @@
borderBottom="none">
-
+
diff --git a/pages/my/my.vue b/pages/my/my.vue
index f501b8d..df01b52 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -20,19 +20,24 @@
-
+
{{
userInfo.name || userInfo.nick_name || ""
}}
-
-
- 资料编辑
-
+
+
+
+ {{ userInfo.credentials_state === 2 ? '认证通过' : userInfo.credentials_state === 1 ?
+ '资质审核中' : '资质待认证' }}
- 美融融小程序欢迎您
+
+
@@ -293,22 +298,21 @@ export default {
{
type: "listcard",
title: "我的服务",
- list: [
- {
- text: "我的收藏",
- url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/83fa7f51-dda3-494b-a50e-f15f8fdcdb9c.png",
- path: "/pages/my/myFavorite",
- },
- {
- text: "设置",
- url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d1173680-386b-4db3-a74c-64108da6cec9.png",
- path: "/pages/settings/index",
- },
- {
- text: "联系客服",
- url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bbac7f8-940a-414a-be0b-e6faf5215f63.png",
- path: "/pages/contact/contact",
- },
+ list: [{
+ text: "我的收藏",
+ url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/83fa7f51-dda3-494b-a50e-f15f8fdcdb9c.png",
+ path: "/pages/my/myFavorite",
+ },
+ {
+ text: "设置",
+ url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d1173680-386b-4db3-a74c-64108da6cec9.png",
+ path: "/pages/settings/index",
+ },
+ {
+ text: "联系客服",
+ url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bbac7f8-940a-414a-be0b-e6faf5215f63.png",
+ path: "/pages/contact/contact",
+ },
],
},
],
@@ -653,17 +657,17 @@ 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 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";
+ 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";
}
}
});
@@ -788,6 +792,21 @@ export default {
url: "/pages/artisan/profile",
});
},
+ toruzhu() {
+ if (this.userInfo.credentials_state === 2) {
+ uni.navigateTo({
+ url: '/pages/shop/qualification_sj_change'
+ });
+ } else if (this.userInfo.credentials_state === 1) {
+ uni.navigateTo({
+ url: '/pages/ruzhu/ruzhu?type=1'
+ });
+ } else {
+ uni.navigateTo({
+ url: '/pages/ruzhu/ruzhu'
+ });
+ }
+ },
goToInviteList() {
// 添加访问检查
if (this.isAccountDisabled) {
@@ -1506,21 +1525,15 @@ button::after {
margin-top: 10rpx;
.user_detail_tip_phone {
- max-width: 230rpx;
- height: 36rpx;
- line-height: 36rpx;
- border-radius: 6rpx;
- font-size: 24rpx;
- color: #666666;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- gap: 7rpx;
-
- image {
- width: 8rpx;
- height: 14rpx;
- }
+ // width: 100rpx;
+ height: 28rpx;
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 20rpx;
+ color: #6A574E;
+ line-height: 28rpx;
+ text-align: left;
+ font-style: normal;
}
.user_detail_tip_invite_name {
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index e72ee37..7150001 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -110,7 +110,7 @@
},
data() {
return {
- currentStep: 1, // 当前步骤索引
+ currentStep: 4, // 当前步骤索引
isAgree: false,
identity: null,
textData: {},
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 3791ae7..63aafa5 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -28,18 +28,23 @@
- 证件号码
-
-
+
+ 证件号码
+ mode="aspectFit" @click="showTipPopup('uscc_num')">
+
- 营业名称
+
+ 企业名称
+
+
@@ -101,7 +106,12 @@
- 法人代表
+
+ 法人代表
+
+
@@ -123,16 +133,14 @@
-
永久有效
-
指定日期有效
@@ -280,6 +288,30 @@
+
+
@@ -328,7 +360,11 @@ export default {
userId: null,
identity: 3,
addressListener: null,
- sjAddressListener: null
+ sjAddressListener: null,
+ showTipPopupFlag: false,
+ tipTitle: '',
+ tipImage: '',
+ currentTipType: ''
}
},
@@ -841,7 +877,33 @@ export default {
}
},
- showTipPopup(field) { },
+ showTipPopup(field) {
+ const tipConfig = {
+ 'uscc_num': {
+ title: '如何查看证件号码',
+ image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c5d8d00b-de1e-414f-b310-0a3f99ed8ddb.png'
+ },
+ 'uscc_name': {
+ title: '如何查看企业名称',
+ image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b8df241d-899f-4f8e-89c5-b61b61a9f1b1.png'
+ },
+ 'legal_name': {
+ title: '如何查看法定代表人',
+ image: 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b8df241d-899f-4f8e-89c5-b61b61a9f1b1.png'
+ }
+ };
+
+ if (tipConfig[field]) {
+ this.currentTipType = field;
+ this.tipTitle = tipConfig[field].title;
+ this.tipImage = tipConfig[field].image;
+ this.showTipPopupFlag = true;
+ }
+ },
+
+ hideTipPopup() {
+ this.showTipPopupFlag = false;
+ },
getFormData() {
return this.formData;
@@ -881,7 +943,7 @@ export default {
}
if (!this.formData.uscc_name) {
uni.showToast({
- title: '请输入营业名称',
+ title: '请输入企业名称',
icon: 'none'
});
return false;
@@ -1426,4 +1488,108 @@ export default {
.picker-item-row text.active {
color: #FF4767;
}
+
+.tip-popup {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ z-index: 1000;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ visibility: hidden;
+ opacity: 0;
+ transition: all 0.3s ease;
+}
+
+.tip-popup.show {
+ visibility: visible;
+ opacity: 1;
+}
+
+.tip-popup-mask {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+
+.tip-popup-content {
+ position: relative;
+ width: 620rpx;
+ height: 810rpx;
+}
+
+.tip-popup-bg {
+ width: 620rpx;
+ height: 810rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+
+.tip-popup-body {
+ position: relative;
+ flex-direction: column;
+ padding: 80rpx 20rpx 40rpx 20rpx;
+ box-sizing: border-box;
+}
+
+.tip-title {
+ font-size: 36rpx;
+ font-weight: bold;
+ color: #333;
+ text-align: center;
+ margin-top: 107rpx;
+ margin-bottom: 37rpx;
+}
+
+.tip-image-container {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 50rpx;
+}
+
+.tip-image {
+ width: 90%;
+ max-height: 400rpx;
+}
+
+.tip-buttons {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 28rpx;
+}
+
+.tip-btn {
+ width: 250rpx;
+ height: 80rpx;
+ border-radius: 40rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 32rpx;
+ font-weight: 500;
+}
+
+.tip-btn.cancel {
+ border: #FF4767 2rpx solid;
+ background-color: transparent;
+ color: #FF4767;
+}
+
+.tip-btn.confirm {
+ background: linear-gradient(180deg, #f52540 0%, #FF4767 100%);
+ color: #FFFFFF;
+}
+
+.tip-btn .btn-text {
+ color: inherit;
+}
\ No newline at end of file
diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue
index 7bef678..f6b6a1d 100644
--- a/pages/shop/qualification_sj_change.vue
+++ b/pages/shop/qualification_sj_change.vue
@@ -267,7 +267,7 @@
- 您的提交已驳回
+ 您的变更申请已被驳回
驳回原因：{{ backText }}