From 66760ee72a5d951ad3a8fbd65ec1ab35fb1049fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 28 May 2026 11:38:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/ruzhu/qualification_sj copy.vue | 1963 +++++++++++++++++++++++++
pages/ruzhu/successruzhu.vue | 94 ++
2 files changed, 2057 insertions(+)
create mode 100644 pages/ruzhu/qualification_sj copy.vue
create mode 100644 pages/ruzhu/successruzhu.vue
diff --git a/pages/ruzhu/qualification_sj copy.vue b/pages/ruzhu/qualification_sj copy.vue
new file mode 100644
index 0000000..921f2f0
--- /dev/null
+++ b/pages/ruzhu/qualification_sj copy.vue
@@ -0,0 +1,1963 @@
+
+
+
+
+
+
+ 营业执照
+
+
+
+
+ 资质照片
+ 请保证图片上的文字清晰、无遮挡、证件边角可见
+
+
+
+
+
+
+
+
+
+ 请上传营业执照原件
+
+
+
+
+
+
+ 商户类型
+
+
+
+
+
+
+
+ 证件号码
+
+
+
+
+
+
+
+ 企业名称
+
+
+
+
+
+
+
+
+
+
+ 法人信息
+
+
+
+
+
+
+ 身份证照片
+ 请保证图片上的文字清晰、无遮挡、证件边角可见
+
+
+
+
+
+
+
+
+
+
+
+
+ 请上传身份证正面（人像面）
+
+
+
+
+
+
+
+
+
+
+
+
+ 请上传身份证反面（国徽面）
+
+
+
+
+
+
+
+
+ 法人代表
+
+
+
+
+
+
+ 法人联系方式
+
+
+
+
+ 法人身份证号
+
+
+
+
+
+ 身份证有效期至
+
+
+
+
+
+ 长久有效
+
+
+
+
+
+ 指定日期有效
+
+
+
+
+
+
+
+
+ 开始日期
+
+
+ {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
+
+
+
+
+
+
+ 结束日期
+
+
+ {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/ruzhu/successruzhu.vue b/pages/ruzhu/successruzhu.vue
new file mode 100644
index 0000000..f817e70
--- /dev/null
+++ b/pages/ruzhu/successruzhu.vue
@@ -0,0 +1,94 @@
+
+
+
+ 恭喜您！
+
+ 成功入驻成为美融融门店
+
+
+
+
+
+
+ 扫码联系专属客服
+
+
+
+
+
+
+
\ No newline at end of file
From 27d41076797316979e6d2233cd3511089fe189aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 28 May 2026 11:38:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A5=E4=BD=8F=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/step-tab/step-tab.vue | 109 +-
pages.json | 6 +
pages/artisan/profile.vue | 1587 ++++++-------
pages/ruzhu/qualification_sj.vue | 2965 +++++++++---------------
pages/ruzhu/ruzhu.vue | 575 ++---
pages/ruzhu/sj-info.vue | 3618 ++++++++++--------------------
6 files changed, 3219 insertions(+), 5641 deletions(-)
diff --git a/components/step-tab/step-tab.vue b/components/step-tab/step-tab.vue
index 1615bfe..228ad96 100644
--- a/components/step-tab/step-tab.vue
+++ b/components/step-tab/step-tab.vue
@@ -1,63 +1,54 @@
-
-
- 1
+ 1
1
- 入驻协议
+ 入驻协议
-
-
+
-
-
+
-
- 2
+ 2
2
-
- {{ identity === 1 ? '个人信息' : '资质信息' }}
-
+ 基本信息
-
-
+
-
-
+
-
- 3
+ 3
3
-
- {{ identity === 1 ? '资质信息' : '门店信息' }}
-
+ 资质认证
@@ -67,32 +58,23 @@
export default {
name: "StepTab",
props: {
- // 当前步骤索引 (0, 1, 2)
- currentStep: {
+ mappedStep: {
type: Number,
default: 0
- },
- // 身份类型：1-手艺人，2-商家
- identity: {
- type: Number,
- default: 2
}
},
data() {
return {
- prevStep: 0, // 记录上一步骤
- line1Active: false, // 第一条线激活状态
- line2Active: false, // 第二条线激活状态
- line1Deactivating: false, // 第一条线正在取消激活
- line2Deactivating: false // 第二条线正在取消激活
+ prevStep: 0,
+ line1Active: false,
+ line2Active: false,
+ line1Deactivating: false,
+ line2Deactivating: false
};
},
watch: {
- // 监听currentStep变化，处理线条动画
- currentStep(newVal, oldVal) {
+ mappedStep(newVal, oldVal) {
this.prevStep = oldVal;
-
- // 处理前进动画
if (newVal > oldVal) {
if (newVal >= 1) {
this.line1Active = true;
@@ -102,38 +84,34 @@ export default {
this.line2Active = true;
this.line2Deactivating = false;
}
- }
- // 处理返回动画
- else if (newVal < oldVal) {
+ } else if (newVal < oldVal) {
if (newVal < 2) {
this.line2Deactivating = true;
setTimeout(() => {
this.line2Active = false;
this.line2Deactivating = false;
- }, 300); // 与动画持续时间匹配
+ }, 300);
}
if (newVal < 1) {
this.line1Deactivating = true;
setTimeout(() => {
this.line1Active = false;
this.line1Deactivating = false;
- }, 300); // 与动画持续时间匹配
+ }, 300);
}
}
}
},
mounted() {
- // 初始化线条状态
- this.line1Active = this.currentStep >= 1;
- this.line2Active = this.currentStep >= 2;
+ this.line1Active = this.mappedStep >= 1;
+ this.line2Active = this.mappedStep >= 2;
},
methods: {
- // 获取步骤的CSS类名
getStepClass(stepIndex) {
- if (stepIndex === this.currentStep) {
+ if (stepIndex === this.mappedStep) {
return 'active';
}
- else if (stepIndex < this.currentStep) {
+ else if (stepIndex < this.mappedStep) {
return 'completed';
}
return '';
@@ -259,35 +237,16 @@ export default {
transform-origin: left center;
}
-/* 激活状态的线条 - 前进动画 */
.line-progress.active {
width: 100%;
background-color: #E8101E;
transition: width 0.3s ease;
}
-/* 取消激活状态的线条 - 返回动画 */
.line-progress.deactivating {
width: 0%;
background-color: #E8101E;
transition: width 0.3s ease;
transform-origin: right center;
}
-
-/* 响应式调整 */
-@media (max-width: 750rpx) {
- .step-container {
- /* padding: 5rpx 40rpx; */
- }
-
- .line-segment {
- /* width: 100rpx; */
- }
-
- /* .line-1,
- .line-2 {
- margin-left: 15rpx;
- margin-right: 15rpx;
- } */
-}
-
\ No newline at end of file
+
diff --git a/pages.json b/pages.json
index 029437b..26b1390 100644
--- a/pages.json
+++ b/pages.json
@@ -1006,6 +1006,12 @@
"style": {
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "pages/ruzhu/successruzhu",
+ "style": {
+ "navigationBarTitleText": "入驻成功"
+ }
}
diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index e73858c..a85a145 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -1,768 +1,821 @@
-
-
-
-
-
-
-
- 我的资料
-
-
-
-
-
-
-
-
-
-
-
-
-
- 店铺信息将影响顾客到店消费体验，请确保信息准确。
-
-
-
-
-
-
-
- {{ identity == '2' ? '营业时间' : '服务时间' }}
-
-
-
-
-
-
-
- 服务技能
-
-
-
-
-
-
-
-
- 门店信息
-
-
-
-
-
-
-
-
- 服务区域
-
-
-
-
-
-
-
-
- 个人信息
-
-
-
-
-
-
-
-
- 相册管理
-
-
-
-
-
-
-
-
- 视频管理
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 资质信息
-
-
-
-
-
-
-
-
- 所属门店
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/ruzhu/qualification_sj.vue b/pages/ruzhu/qualification_sj.vue
index 921f2f0..dcc1be6 100644
--- a/pages/ruzhu/qualification_sj.vue
+++ b/pages/ruzhu/qualification_sj.vue
@@ -1,1963 +1,1002 @@
-
-
-
-
-
-
- 营业执照
-
-
-
-
- 资质照片
- 请保证图片上的文字清晰、无遮挡、证件边角可见
-
-
-
-
-
-
-
-
-
- 请上传营业执照原件
-
-
-
-
-
-
- 商户类型
-
-
-
-
-
-
-
- 证件号码
-
-
-
-
-
-
-
- 企业名称
-
-
-
-
-
-
-
-
-
-
- 法人信息
-
-
-
-
-
-
- 身份证照片
- 请保证图片上的文字清晰、无遮挡、证件边角可见
-
-
-
-
-
-
-
-
-
-
-
-
- 请上传身份证正面（人像面）
-
-
-
-
-
-
-
-
-
-
-
-
- 请上传身份证反面（国徽面）
-
-
-
-
-
-
-
-
- 法人代表
-
-
-
-
-
-
- 法人联系方式
-
-
-
-
- 法人身份证号
-
-
-
-
-
- 身份证有效期至
-
-
-
-
-
- 长久有效
-
-
-
-
-
- 指定日期有效
-
-
-
-
-
-
-
-
- 开始日期
-
-
- {{formatDateForDisplay(formData.idcard_start_date) || '请选择日期'}}
-
-
-
-
-
-
- 结束日期
-
-
- {{formatDateForDisplay(formData.idcard_end_date) || '请选择日期'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+ 门店信息
+
+
+
+
+ 店铺名称
+
+
+
+
+ 门店所在地
+
+
+ {{ formData.dependency || '请选择' }}
+
+
+
+
+
+ 门店详细地址
+
+
+ {{ formData.address || '请选择' }}
+
+
+
+
+
+
+
+
+
+ 联系人信息
+
+
+
+ 您的身份
+
+
+
+
+
+ 法人
+
+
+
+
+
+ 其他
+
+
+
+
+
+ 联系人
+
+
+
+
+ 联系人电话
+
+
+
+
+ 备用联系人电话
+
+
+
+
+
+
+
+ 其他信息
+
+
+
+ 邀请码
+
+
+
+ 请填写邀请人的邀请码，若没有邀请人请填写13131313
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/ruzhu/ruzhu.vue b/pages/ruzhu/ruzhu.vue
index 86104a5..92ee357 100644
--- a/pages/ruzhu/ruzhu.vue
+++ b/pages/ruzhu/ruzhu.vue
@@ -4,23 +4,23 @@
-
+
-
-
-
-
+
-
+
+
+
+
@@ -28,7 +28,7 @@
-
+
我已阅读并同意以上协议
- 下一步，填写资质信息
+ 下一步，填写基本信息
-
+
上一步
- 下一步，填写门店信息
+ 提交入驻
-
+
+
+
+ 进入平台
+
+
+ 去完成资质认证
+
+
+
+
+
+
上一步
@@ -74,16 +86,18 @@
import StepTab from '@/components/step-tab/step-tab.vue';
import QualificationInfo from './qualification_sj.vue';
import StoreInfo from './sj-info.vue';
+ import successruzhu from './successruzhu.vue';
export default {
components: {
StepTab,
QualificationInfo,
StoreInfo,
+ successruzhu
},
data() {
return {
- currentStep: 0, // 当前步骤索引
+ currentStep:3, // 当前步骤索引
isAgree: false,
identity: null,
textData: {},
@@ -92,6 +106,7 @@
navTitle: '商家入驻', // 默认标题
qualificationData: null, // 新增：保存资质信息
storeInfoData: null, // 新增：保存门店信息
+ successData:{},//入驻提示
// 新增：缓存手艺人数据
artisanDataCache: {
personalInfo: null,
@@ -99,6 +114,14 @@
}
}
},
+ computed: {
+ mappedStep() {
+ if (this.currentStep === 0) return 0;
+ if (this.currentStep === 1) return 1;
+ if (this.currentStep === 3) return 2;
+ return 0;
+ }
+ },
async onLoad(options) {
this.identity = 2;
await this.getUserInfoSync()
@@ -113,6 +136,11 @@
},
methods: {
+ topt(){
+ uni.switchTab({
+ url:'/pages/home/home'
+ })
+ },
// 获取用户信息（复用不可服务时间页面的方法）
async getUserInfoSync() {
await request.post('/sj/userSjAuth/details', {
@@ -122,59 +150,36 @@
let data = result.data
if (getApp().globalData.artisanType == 2) {
- //储存已有的商家入驻信息
let qualification_form_data = {
- "uscc_num": data.uscc_num,
- "uscc_name": data.uscc_name,
- "legal_name": data.legal_name,
- "legal_phone": data.legal_phone,
- "legal_idcard_num": data.legal_idcard_num,
- "uscc_photo": data.uscc_photo,
- "legal_idcard_positive": data.legal_idcard_positive,
- "legal_idcard_negative": data.legal_idcard_negative,
- "uscc_type": data.uscc_type,
- "license_valid_type": data.uscc_expiry_type,
- }
- if (data.uscc_expiry) {
- let expirys = data.uscc_expiry.split(' —— ')
- qualification_form_data.license_start_date = expirys[0]
- qualification_form_data.license_end_date = expirys[1]
- }
- if (data.legal_idcard_expiry) {
- let expirys = data.legal_idcard_expiry.split(' —— ')
- qualification_form_data.idcard_start_date = expirys[0]
- if (expirys[1]) {
- qualification_form_data.legal_idcard_expiry_type = "date"
- qualification_form_data.idcard_end_date = expirys[1]
- } else {
- qualification_form_data.legal_idcard_expiry_type = "permanent"
- qualification_form_data.idcard_end_date = ""
- }
-
- }
- uni.setStorageSync('qualification_form_data', qualification_form_data);
- let store_invite_state = {
- "currentValidatingCode": data.invite_code_other
- }
- uni.setStorageSync('store_invite_state', store_invite_state);
- let store_info_form_data = {
- "head_photo": data.head_photo,
- "name": data.name,
- "business_time": data.business_time,
- "servers_kill": data.servers_kill,
- "dependency": data.dependency,
- "address": data.address,
- "apply_state": data.apply_state,
- "invite_code_other": data.invite_code_other,
- "major": data.major,
- "dependency_code": data.dependency_code,
- "dependency_province": data.dependency_province,
- "dependency_city": data.dependency_city,
- "longitude": data.longitude,
- "latitude": data.latitude
- }
- console.log(111111111, store_info_form_data)
- uni.setStorageSync('store_info_form_data', store_info_form_data);
+ "uscc_type": data.uscc_type || '',
+ // "contact_identity": 'legal',
+ // "contact_name": data.legal_name || data.contact_name || '',
+ "contact_phone": data.legal_phone || data.contact_phone || '',
+ "backup_phone": data.backup_phone || '',
+ "invite_code": data.invite_code_other || '',
+ "dependency": data.dependency || '',
+ "address": data.address || '',
+ "dependency_code": data.dependency_code || '',
+ "dependency_province": data.dependency_province || '',
+ "dependency_city": data.dependency_city || '',
+ "longitude": data.longitude || '',
+ "latitude": data.latitude || '',
+ "name": data.name || '',
+ "contact_type": data.contact_type || ''
+
+ }
+ uni.setStorageSync('qualification_form_data', qualification_form_data);
+ let store_info_form_data = {
+ "head_photo": data.head_photo,
+ "name": data.name,
+ "business_time": data.business_time,
+ // "servers_kill": data.servers_kill,
+ "apply_state": data.apply_state,
+ "invite_code_other": data.invite_code_other,
+ "major": data.major
+ }
+ console.log(111111111, store_info_form_data)
+ uni.setStorageSync('store_info_form_data', store_info_form_data);
}
}
@@ -182,65 +187,6 @@
console.error('获取用户信息接口错误:', error);
});
},
- /**
- * 解析身份证有效期字符串，转换为中文日期格式（兼容低版本iOS，支持结束日期为空/长期）
- * @param {string} expiryStr 原有效期字符串，格式如："2016-01-29 —— 2026-01-29" | "2016-01-29 —— " | "2016-01-29 —— 长期"
- * @returns {Object} 包含开始和结束日期的对象
- */
- parseIdCardExpiry(expiryStr) {
- // 初始化默认值
- let id_card_start_date = '';
- let id_card_end_date = '';
-
- try {
- // 1. 分割字符串：兼容多种分隔符（——、--、—、-），并去除前后空格
- const dateParts = expiryStr.split(/\s*[-—]{1,2}\s*/).map(str => str.trim());
- // 提取开始和结束日期部分（处理分割后长度不足的情况）
- const startStr = dateParts[0] || '';
- const endStr = dateParts[1] || '';
-
- // 2. 日期解析函数（核心：兼容低版本iOS）
- const formatDateToChinese = (dateStr) => {
- // 若为空，直接返回空
- if (!dateStr) return '';
- // 若为“长期”，直接返回“长期”
- if (dateStr === '长期') return '长期';
-
- // 关键：低版本iOS不支持“yyyy-mm-dd”，替换为“yyyy/mm/dd”
- const compatibleStr = dateStr.replace(/-/g, '/');
- const date = new Date(compatibleStr);
-
- // 检查日期是否有效
- if (isNaN(date.getTime())) {
- return ''; // 解析失败则返回空
- }
-
- // 获取年、月、日（去掉前导零）
- const year = date.getFullYear();
- const month = date.getMonth() + 1;
- const day = date.getDate();
-
- return `${year}年${month}月${day}日`;
- };
-
- // 3. 解析开始日期（必须有值，否则置空）
- if (startStr) {
- id_card_start_date = formatDateToChinese(startStr);
- }
-
- // 4. 解析结束日期（支持空、长期、正常日期）
- id_card_end_date = formatDateToChinese(endStr);
-
- } catch (err) {
- console.error('解析身份证有效期失败：', err);
- }
-
- // 5. 返回结果
- return {
- id_card_start_date,
- id_card_end_date
- };
- },
// 检查并传递地址给商家组件
checkAndPassAddressToSj() {
try {
@@ -248,38 +194,15 @@
if (sjAddress) {
console.log('找到商家地址数据，准备传递:', sjAddress);
- // 延迟执行，确保组件已渲染
setTimeout(() => {
- if (this.identity === 2 && this.$refs.storeInfo) {
- console.log('传递地址给商家组件');
-
- // 传递给商家组件
- if (typeof this.$refs.storeInfo.handleAddressSelected === 'function') {
- this.$refs.storeInfo.handleAddressSelected(sjAddress);
- } else if (this.$refs.storeInfo.formData) {
- // 直接设置数据
- this.$refs.storeInfo.formData.address = sjAddress.address || sjAddress
- .name;
- this.$refs.storeInfo.formData.longitude = sjAddress.longitude;
- this.$refs.storeInfo.formData.latitude = sjAddress.latitude;
-
- // 设置省市区信息
- if (sjAddress.pname || sjAddress.cityname || sjAddress.adname) {
- const locationParts = [];
- if (sjAddress.pname) locationParts.push(sjAddress.pname);
- if (sjAddress.cityname) locationParts.push(sjAddress.cityname);
- if (sjAddress.adname) locationParts.push(sjAddress.adname);
- this.$refs.storeInfo.formData.dependency = locationParts.join('-');
- }
-
- this.$refs.storeInfo.saveFormDataToLocal();
- this.$refs.storeInfo.$forceUpdate();
- }
-
- // 清理存储
- uni.removeStorageSync('sj_selected_address');
+ if (this.identity === 2 && this.$refs.qualificationInfo) {
+ console.log('传递地址给资质组件');
+ if (typeof this.$refs.qualificationInfo.handleAddressSelected === 'function') {
+ this.$refs.qualificationInfo.handleAddressSelected(sjAddress);
}
- }, 300);
+ }
+ uni.removeStorageSync('sj_selected_address');
+ }, 300);
}
} catch (e) {
console.error('处理商家地址失败:', e);
@@ -400,82 +323,32 @@
// 审核提交方法
async submitForReview() {
- // 提交前确保有用户信息
const userInfo = await this.checkAndGetUserInfo();
if (!userInfo) {
return;
}
- uni.showLoading({
- title: '提交中...'
- });
+ uni.showLoading({ title: '提交中...' });
try {
- console.log('=== 提交审核调试信息 ===');
- console.log('身份类型:', this.identity);
- console.log('门店信息数据:', this.storeInfoData);
- console.log('资质信息数据:', this.qualificationData);
- console.log('个人信息数据:', this.personalInfoData);
-
-
- let apiUrl = '';
- let formData = {};
-
-
-
- if (this.identity === 2) {
- // 商家入驻
- apiUrl = '/sj/userSjAuth/apply';
-
- // 确保重新获取最新数据
- if (this.$refs.storeInfo) {
- if (!this.$refs.storeInfo.saveFormData()) {
- uni.hideLoading();
- return;
- }
- this.storeInfoData = this.$refs.storeInfo.getFormData();
- console.log('重新获取的门店信息:', this.storeInfoData);
- }
-
- // 验证服务技能是否存在
- if (!this.storeInfoData || !this.storeInfoData.servers_kill || this.storeInfoData
- .servers_kill.length === 0) {
- uni.hideLoading();
- uni.showToast({
- title: '请选择服务技能',
- icon: 'none'
- });
- return;
- }
-
- formData = this.buildBusinessData(this.qualificationData, this.storeInfoData);
- }
-
- console.log('提交的数据:', formData);
- console.log('API URL:', apiUrl);
-
- formData.type = 1
- formData.id_type = 1
-
- const res = await request.post(apiUrl, formData);
+ let formData = this.buildBusinessData(this.qualificationData, {});
+ formData.type = 1;
+ formData.id_type = 1;
+ const res = await request.post('/sj/userSjAuth/applyOne', formData);
uni.hideLoading();
- if (res.state == 1 || res.code == 200) {
- // 提交成功后清除缓存数据
-
+ if (res.state == 1 || res.code == 200) {
+ this.successData=res.data.customer_service
+ console.log(this.successData,'this.successDatathis.successDatathis.successDatathis.successData=======');
uni.showToast({
title: '提交成功',
icon: 'none',
- duration: 1500,
- success: () => {
- setTimeout(() => {
- uni.redirectTo({
- url: `./submitres?identity=${this.identity}&applyState=1`
- });
- }, 1500);
- }
+ duration: 1500
});
+ setTimeout(() => {
+ this.currentStep = 2;
+ }, 1500);
} else {
uni.showToast({
title: res.msg || '提交失败',
@@ -484,7 +357,6 @@
}
} catch (error) {
uni.hideLoading();
- console.error('提交审核失败:', error);
uni.showToast({
title: '提交失败，请重试',
icon: 'none'
@@ -492,106 +364,63 @@
}
},
- // 优化日期格式化方法
- formatDateForBackend(dateStr) {
- if (!dateStr) return '';
- if (dateStr === '长久有效' || dateStr === '长久有效') return '';
-
- // 将 年月日 格式转换为 YYYY-MM-DD
- const match = dateStr.match(/(\d+)年(\d+)月(\d+)日/);
- if (match) {
- const year = match[1];
- const month = match[2].padStart(2, '0');
- const day = match[3].padStart(2, '0');
- return `${year}-${month}-${day}`;
- }
-
- // 如果已经是 YYYY-MM-DD 格式，直接返回
- return dateStr;
- },
-
// 构建商家数据
buildBusinessData(qualificationData, storeData) {
- // 根据接口文档构建数据
+ console.log(qualificationData,'storeDatastoreDatastoreData');
const formData = {};
- // 服务技能处理 - 添加更严格的验证
- if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
- // 确保 servers_kill 是数组
- formData.servers_kill = Array.isArray(storeData.servers_kill) ?
- storeData.servers_kill : [storeData.servers_kill];
-
- console.log('服务技能数组:', formData.servers_kill);
- } else {
- console.warn('警告：没有服务技能数据');
- formData.servers_kill = [];
- }
-
- // 营业执照信息
if (qualificationData.uscc_type) {
- formData.uscc_type = qualificationData.uscc_type === 'individual' ? 1 : 2;
+ formData.uscc_type = qualificationData.uscc_type;
}
- if (qualificationData.uscc_photo) {
- formData.uscc_photo = qualificationData.uscc_photo;
+ // if (qualificationData.contact_identity) {
+ // formData.contact_identity = qualificationData.contact_identity;
+ // }
+ // if (qualificationData.contact_name) {
+ // formData.contact_name = qualificationData.contact_name;
+ // }
+ if (qualificationData.contact_phone) {
+ formData.contact_phone = qualificationData.contact_phone;
}
- if (qualificationData.uscc_num) {
- formData.uscc_num = qualificationData.uscc_num;
+ if (qualificationData.backup_phone) {
+ formData.backup_phone = qualificationData.backup_phone;
}
- if (qualificationData.uscc_name) {
- formData.uscc_name = qualificationData.uscc_name;
+ if (qualificationData.contact_type) {
+ formData.contact_type = qualificationData.contact_type;
}
- if (qualificationData.license_valid_type) {
- formData.uscc_expiry_type = qualificationData.license_valid_type === 'permanent' ? 1 : 2;
+ if (qualificationData.invite_code) {
+ formData.invite_code_other = qualificationData.invite_code;
+ }
+ if (qualificationData.contact_name) {
+ formData.contact_name = qualificationData.contact_name;
}
- // 格式化有效期
- if (qualificationData.license_start_date) {
- const startDate = this.formatDateForBackend(qualificationData.license_start_date);
+ if (qualificationData.dependency) {
+ formData.dependency = qualificationData.dependency;
+ }
+ if (qualificationData.dependency_code) {
+ formData.dependency_code = qualificationData.dependency_code;
+ }
+ if (qualificationData.dependency_province) {
+ formData.dependency_province = qualificationData.dependency_province;
+ }
+ if (qualificationData.dependency_city) {
+ formData.dependency_city = qualificationData.dependency_city;
+ }
+ if (qualificationData.name) {
+ formData.name = qualificationData.name;
+ }
+ if (qualificationData.address) {
+ formData.address = qualificationData.address;
+ }
+ if (qualificationData.longitude) formData.longitude = qualificationData.longitude;
+ if (qualificationData.latitude) formData.latitude = qualificationData.latitude;
- if (qualificationData.license_valid_type === 'permanent') {
- // 长久有效格式：开始日期 + " —— "
- formData.uscc_expiry = `${startDate} —— `;
- } else if (qualificationData.license_end_date) {
- // 指定日期格式：开始日期 + " —— " + 结束日期
- const endDate = this.formatDateForBackend(qualificationData.license_end_date);
- formData.uscc_expiry = `${startDate} —— ${endDate}`;
- }
- }
-
- // 法人信息
- if (qualificationData.legal_name) {
- formData.legal_name = qualificationData.legal_name;
- }
- if (qualificationData.legal_phone) {
- formData.legal_phone = qualificationData.legal_phone;
- }
- if (qualificationData.legal_idcard_num) {
- formData.legal_idcard_num = qualificationData.legal_idcard_num;
- }
- if (qualificationData.legal_idcard_expiry_type) {
- formData.legal_idcard_expiry_type = qualificationData.legal_idcard_expiry_type === 'permanent' ? 1 : 2;
- }
-
- // 格式化有效期
- if (qualificationData.idcard_start_date) {
- const idcardStartDate = this.formatDateForBackend(qualificationData.idcard_start_date);
-
- if (qualificationData.legal_idcard_expiry_type === 'permanent') {
- formData.legal_idcard_expiry = `${idcardStartDate} —— `;
- } else if (qualificationData.idcard_end_date) {
- const idcardEndDate = this.formatDateForBackend(qualificationData.idcard_end_date);
- formData.legal_idcard_expiry = `${idcardStartDate} —— ${idcardEndDate}`;
- }
- }
-
- if (qualificationData.legal_idcard_positive) {
- formData.legal_idcard_positive = qualificationData.legal_idcard_positive;
- }
- if (qualificationData.legal_idcard_negative) {
- formData.legal_idcard_negative = qualificationData.legal_idcard_negative;
- }
-
- // 门店信息
+ // if (storeData && storeData.servers_kill && storeData.servers_kill.length > 0) {
+ // // formData.servers_kill = Array.isArray(storeData.servers_kill) ?
+ // // storeData.servers_kill : [storeData.servers_kill];
+ // } else {
+ // formData.servers_kill = [];
+ // }
if (storeData.head_photo) {
formData.head_photo = storeData.head_photo;
}
@@ -601,86 +430,38 @@
if (storeData.business_time) {
formData.business_time = storeData.business_time;
}
- if (storeData.servers_kill && storeData.servers_kill.length > 0) {
- // 直接传递数组
- formData.servers_kill = storeData.servers_kill;
- console.log('服务技能数组:', formData.servers_kill);
- } else {
- formData.servers_kill = [];
- console.warn('警告：没有服务技能数据');
- }
-
- console.log('最终 formData 中的 servers_kill:', formData.servers_kill);
- console.log('=== 调试结束 ===');
-
- if (storeData.dependency) {
- formData.dependency = storeData.dependency;
-
- // 地址编码
- if (storeData.dependency_code) {
- formData.dependency_code = storeData.dependency_code;
- }
- if (storeData.dependency_province) {
- formData.dependency_province = storeData.dependency_province;
- }
- if (storeData.dependency_city) {
- formData.dependency_city = storeData.dependency_city;
- }
- }
- if (storeData.address) {
- formData.address = storeData.address;
- }
- // 经纬度
- if (storeData.longitude) formData.longitude = storeData.longitude;
- if (storeData.latitude) formData.latitude = storeData.latitude;
-
- // 其他信息
if (storeData.apply_state) {
formData.get_msg_method = storeData.apply_state;
}
- if (storeData.invite_code_other) {
- formData.invite_code_other = storeData.invite_code_other;
- }
if (storeData.major) {
formData.major = storeData.major;
}
+
- // 账号信息 - 直接从登录时输入的手机号获取
- // 注意：这里使用 qualificationData 或 storeData 中的手机号，或者从全局获取
const userInfo = uni.getStorageSync('userInfo');
-
if (userInfo && userInfo.account) {
formData.account = userInfo.account;
} else {
- // 如果全局没有，尝试从本地存储的登录信息获取
const loginAccount = uni.getStorageSync('loginAccount');
if (loginAccount) {
formData.account = loginAccount;
+ } else if (qualificationData.contact_phone) {
+ formData.contact_name = qualificationData.contact_name;
} else {
- // 最后尝试：从资质信息或门店信息中获取手机号
- if (qualificationData.legal_phone) {
- formData.account = qualificationData.legal_phone;
- } else {
- console.error('无法获取账号信息');
- uni.showToast({
- title: '无法获取用户账号',
- icon: 'none'
- });
- return null;
- }
+ console.error('无法获取账号信息');
+ uni.showToast({
+ title: '无法获取用户账号',
+ icon: 'none'
+ });
+ return null;
}
}
- console.log('使用的账号:', formData.account);
return formData;
},
async goNext() {
- console.log('当前步骤:', this.currentStep);
- console.log('身份类型:', this.identity);
-
- // 步骤0需要同意协议
if (this.currentStep === 0 && !this.isAgree) {
uni.showToast({
title: '请阅读并同意以上协议',
@@ -689,68 +470,55 @@
return;
}
- // 步骤1需要验证信息
if (this.currentStep === 1) {
- console.log('商家验证资质信息');
- // 商家验证资质信息
if (this.$refs.qualificationInfo) {
const isValid = await this.$refs.qualificationInfo.saveFormData();
if (!isValid) {
- console.log('商家资质信息验证失败');
return;
}
this.qualificationData = this.$refs.qualificationInfo.getFormData();
- console.log(' 商家资质信息验证通过 ');
}
+ await this.submitForReview();
+ return;
}
- // 步骤2需要验证信息
- if (this.currentStep === 2) {
- // 商家验证门店信息
- if (this.$refs.storeInfo) {
- const isValid = await this.$refs.storeInfo.saveFormData();
- if (!isValid) {
- console.log('商家门店信息验证失败');
- return;
- }
- this.storeInfoData = this.$refs.storeInfo.getFormData();
- console.log('商家门店信息验证通过');
- }
- }
-
- if (this.currentStep < 2) {
+ if (this.currentStep < 3) {
this.currentStep++;
- console.log('切换到步骤:', this.currentStep);
-
- // 步骤切换后滚动到顶部
setTimeout(() => {
this.scrollToTop();
}, 100);
-
- } else {
- this.completeRegistration();
}
},
- submitApplication() {
- // 商家验证门店信息
+ async submitApplication() {
if (this.$refs.storeInfo) {
if (!this.$refs.storeInfo.saveFormData()) {
return;
}
this.storeInfoData = this.$refs.storeInfo.getFormData();
- console.log('商家门店信息数据:', this.storeInfoData);
}
- // 提交前确认邀请码
- if (this.$refs.storeInfo && this.$refs.storeInfo.confirmInviteCodeBeforeSubmit) {
- this.$refs.storeInfo.confirmInviteCodeBeforeSubmit(() => {
- // 确认后执行提交逻辑
- this.completeRegistration();
- });
- } else {
- // 不支持邀请码确认，直接提交
- this.completeRegistration();
+ uni.showLoading({ title: '提交中...' });
+ try {
+ let formData = {};
+ if (this.qualificationData) {
+ Object.assign(formData, this.qualificationData);
+ }
+ if (this.storeInfoData) {
+ Object.assign(formData, this.storeInfoData);
+ }
+ formData.type = 1;
+ formData.id_type = 1;
+ const res = await request.post('/sj/userSjAuth/apply', formData);
+ uni.hideLoading();
+ if (res.state == 1 || res.code == 200) {
+ uni.showToast({ title: '提交成功', icon: 'none' });
+ } else {
+ uni.showToast({ title: res.msg || '提交失败', icon: 'none' });
+ }
+ } catch (error) {
+ uni.hideLoading();
+ uni.showToast({ title: '提交失败，请重试', icon: 'none' });
}
},
@@ -759,11 +527,6 @@
this.currentStep--;
}
},
- completeRegistration() {
- // 提交审核的逻辑
- this.submitForReview();
- },
- // 添加滚动到顶部的方法
scrollToTop() {
uni.pageScrollTo({
scrollTop: 0,
@@ -850,7 +613,7 @@
display: flex;
justify-content: center;
align-items: center;
- background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+ background: #FF4767;
border-radius: 49rpx;
}
@@ -875,7 +638,7 @@
display: flex;
justify-content: center;
align-items: center;
- background: linear-gradient(180deg, #f52540 0%, #e8101e 100%);
+ background: #FF4767;
border-radius: 49rpx;
}
diff --git a/pages/ruzhu/sj-info.vue b/pages/ruzhu/sj-info.vue
index 6e4a47a..ae76b31 100644
--- a/pages/ruzhu/sj-info.vue
+++ b/pages/ruzhu/sj-info.vue
@@ -1,2433 +1,1191 @@
-
-
-
-
-
- 门店信息
-
-
-
-
-
- 店铺logo
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 营业执照
+
+
+
+ 资质照片
+ 请保证照片上的文字清晰、无遮挡、证件边角可见
+
+
+
+
+
+
+ 请上传营业执照原件
+
+
+
+ 商户类型
+
+
+
+
+ 证件号码
+
+
+
+
+
+
+
+ 营业名称
+
+
+
+
+ 注册地区
+
+
+ {{ formData.register_region || '请选择' }}
+
+
+
+
+
+
+ 注册详细地址
+
+
+
-
-
-
-
-
- 店铺名称
-
+
+ 营业执照有效期至：
+
+
+
+
+
+ 永久有效
+
+
+
+
+
+ 指定日期有效
+
+
+
+
+
+ 开始日期
+
+
+ {{ formData.idcard_start_date || '选择日期' }}
+
+
+
+
+
+ 结束日期
+
+
+ {{ formData.idcard_end_date || '选择日期' }}
+
+
+
+
+
+
+
+
+
+
+ 法人信息
+
+
+
+ 身份证照片
+ 请保证照片上的文字清晰、无遮挡、证件边角可见
+
+
+
+
+
+
+ 请上传身份证正面(人像面)
+
+
+
+
+
+
+
+ 请上传身份证反面(国徽面)
+
+
+
+
+ 法人代表
+
+
+
+
+ 法人联系方式
+
+
+
+
+ 法人身份证号
+
+
+
+
+ 营业执照有效期至：
+
+
+
+
+
+ 永久有效
+
+
+
+
+
+ 指定日期有效
+
+
+
+
+
+ 开始日期
+
+
+ {{ formData.idcard_start_date || '选择日期' }}
+
+
+
+
+
+ 结束日期
+
+
+ {{ formData.idcard_end_date || '选择日期' }}
+
+
+
+
+
+
+
+
+
+
+
+ 其他信息
+
+
+
+ 行业资质
+
+
+
+ ×
+
+
+
+ 添加照片
+
-
-
-
-
-
- 营业时间
-
-
- {{formData.business_time || '请输入营业时间'}}
-
-
-
-
-
-
-
- 服务技能（多选）
-
-
- {{selectedServicesText || '请选择'}}
-
-
-
-
-
-
-
- 门店所在地：
-
-
- {{formData.dependency || '请选择'}}
-
-
-
-
-
-
-
- 门店详细地址：
-
-
- {{formData.address || '请选择'}}
-
-
-
-
-
-
-
-
- 其他信息
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
-
-
-
-
-
- 请填写邀请人的邀请码，若没有邀请人请填写13131313
-
-
-
-
- 验证中...
-
-
-
-
- 邀请码无效
-
-
-
-
- 请填写邀请人的邀请码，若没有邀请人请填写13131313
-
-
-
-
- 邀请人：
- {{ inviterInfo.name || inviterInfo.nick_name }}
- /
- {{ inviterInfo.account }}
-
-
-
-
- 邀请码无效
-
-
-
-
-
-
- 专业经验：
-
-
- {{experienceText || '请选择'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file