From 7bf034402828d2b0e20e06d48b0c52448557c766 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 24 May 2026 15:26:07 +0800 Subject: [PATCH] =?UTF-8?q?Feat(=E5=85=A5=E9=A9=BB):=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=A2=9E=E5=8A=A0=E5=AD=90=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/join.js | 33 +++++++++++++++++++++--------- pkg_join/views/experienceStore.vue | 8 +++++--- pkg_join/views/index.vue | 14 +++++++------ pkg_join/views/shop.vue | 10 +++++---- pkg_join/views/supplier.vue | 8 +++++--- pkg_join/views/travelResidence.vue | 8 +++++--- pkg_join/views/wholesaler.vue | 8 ++++++-- 7 files changed, 58 insertions(+), 31 deletions(-) diff --git a/api/join.js b/api/join.js index 10a5bd6..1543180 100644 --- a/api/join.js +++ b/api/join.js @@ -11,10 +11,8 @@ export function getImages() { } // 商户申请页面数据 -export function getShopData(partnerId) { - let param = {}; - if (partnerId) param.partnerId = partnerId; - return request.get("/merchantApply/index", param, {login: true}) +export function getShopData(params) { + return request.get("/merchantApply/index", params, {login: true}) } // 查看商户申请 @@ -29,23 +27,38 @@ export function getWholesaler() { } // 提交店铺入驻申请 -export function saveShop(hotelInfo, captcha, partnerId) { +export function saveShop(hotelInfo, partnerId = '', promoterUid = '') { let param = {hotelInfo, captcha: hotelInfo.captcha}; - if (partnerId && partnerId.length > 0) param.partnerId = partnerId; + if (partnerId && partnerId.length > 0) { + param.partnerId = partnerId; + } + if (promoterUid && promoterUid.length > 0) { + param.promoterUid = promoterUid; + } return request.post("/merchantApply/hotel/submit", param, {login: true}) } // 提交特产供应商入驻申请 -export function saveSupplier(hotelInfo, supplierInfo, partnerId) { +export function saveSupplier(hotelInfo, supplierInfo, partnerId = '', promoterUid = '') { let param = {hotelInfo, supplierInfo, captcha: supplierInfo.captcha}; - if (partnerId && partnerId.length > 0) param.partnerId = partnerId; + if (partnerId && partnerId.length > 0) { + param.partnerId = partnerId; + } + if (promoterUid && promoterUid.length > 0) { + param.promoterUid = promoterUid; + } return request.post("/merchantApply/goodSupplier/submit", param, {login: true}) } // 提交文玩供应商入驻申请 -export function saveWenwanSupplier(hotelInfo, supplierInfo, partnerId) { +export function saveWenwanSupplier(hotelInfo, supplierInfo, partnerId = '', promoterUid = '') { let param = {hotelInfo, supplierInfo, captcha: supplierInfo.captcha}; - if (partnerId && partnerId.length > 0) param.partnerId = partnerId; + if (partnerId && partnerId.length > 0) { + param.partnerId = partnerId; + } + if (promoterUid && promoterUid.length > 0) { + param.promoterUid = promoterUid; + } return request.post("/merchantApply/wenwanSupplier/submit", param, {login: true}) } diff --git a/pkg_join/views/experienceStore.vue b/pkg_join/views/experienceStore.vue index 69ec670..e31a8dc 100644 --- a/pkg_join/views/experienceStore.vue +++ b/pkg_join/views/experienceStore.vue @@ -480,7 +480,8 @@ export default { videos: [], district: [], qualificationImg: [], - partnerId: 0, + partnerId: '', + promoterUid: '', experienceStoreCategoryList: [], experienceStoreCategoryIndex: 0, form: { @@ -518,9 +519,10 @@ export default { } }, onLoad(opts) { - this.partnerId = opts.partnerId + this.partnerId = opts.partnerId || '' + this.promoterUid = opts.promoterUid || '' this.queryCity() - getShopData().then(({ data }) => { + getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({ data }) => { this.notice = data.merchantApplyNotice }) getExperienceStoreCategoryList().then(({ data }) => { diff --git a/pkg_join/views/index.vue b/pkg_join/views/index.vue index cc3e6c0..ce1a9e3 100644 --- a/pkg_join/views/index.vue +++ b/pkg_join/views/index.vue @@ -57,6 +57,7 @@ export default { return { webUrl: this.$VUE_APP_RESOURCES_URL, partnerId: '', + promoterUid: '', partnerType: '', hotelId: null, hasHotel: null, @@ -71,8 +72,9 @@ export default { }, onLoad(options) { this.partnerId = options.partnerId || '' + this.promoterUid = options.promoterUid || '' getImages().then(({data}) => this.images = data) - getShopData(this.partnerId).then(({data}) => { + getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => { this.partnerType = data.partnerType this.hotelId = data.hotelId this.hasHotel = data.hasHotel @@ -91,7 +93,7 @@ export default { if (this.hasTravel === 1) { this.$global.goSupplierMini() } else { - this.$yrouter.push('/pkg_join/views/travelResidence?partnerId=' + this.partnerId) + this.$yrouter.push('/pkg_join/views/travelResidence?partnerId=' + this.partnerId + '&promoterUid=' + this.promoterUid) } }, /** @@ -104,14 +106,14 @@ export default { if (this.hasSupplier === 1) { this.$global.goSupplierMini() } else { - this.$yrouter.push(`/pkg_join/views/supplier?type=goods_supplier&partnerId=${this.partnerId}`) + this.$yrouter.push(`/pkg_join/views/supplier?type=goods_supplier&partnerId=${this.partnerId}&promoterUid=${this.promoterUid}`) } break case 'wenwan_supplier': if (this.hasSupplier === 1) { this.$global.goSupplierMini() } else { - this.$yrouter.push(`/pkg_join/views/supplier?type=wenwan_supplier&partnerId=${this.partnerId}`) + this.$yrouter.push(`/pkg_join/views/supplier?type=wenwan_supplier&partnerId=${this.partnerId}&promoterUid=${this.promoterUid}`) } break case 'shop': @@ -129,13 +131,13 @@ export default { this.$global.goSupplierMini() return } - this.$yrouter.push('/pkg_join/views/experienceStore?partnerId=' + this.partnerId) + this.$yrouter.push('/pkg_join/views/experienceStore?partnerId=' + this.partnerId + '&promoterUid=' + this.promoterUid) break case 'wholesaler': if (this.hasWholesaler === 1) { this.$global.goSupplierMini() } else { - this.$yrouter.push(`/pkg_join/views/wholesaler`) + this.$yrouter.push(`/pkg_join/views/wholesaler?partnerId=${this.partnerId}&promoterUid=${this.promoterUid}`) } break } diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue index e474563..0790e5f 100644 --- a/pkg_join/views/shop.vue +++ b/pkg_join/views/shop.vue @@ -473,7 +473,8 @@ export default { mixins: [pageListenMixins], data() { return { - partnerId: null, + partnerId: '', + promoterUid: '', pics: [], quaPics: [], tips: '获取验证码', @@ -603,7 +604,8 @@ export default { } }, onLoad(options) { - this.partnerId = options.partnerId + this.partnerId = options.partnerId || '' + this.promoterUid = options.promoterUid || '' const local_form = uni.getStorageSync('merchantApplyHotel' + '_form') || {} this.quaPics = uni.getStorageSync('merchantApplyHotel' + '_quaPics') || [] if(!local_form.serviceTime) { @@ -694,7 +696,7 @@ export default { getCity().then(({data}) => { this.district = data }) - getShopData().then(({data}) => { + getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => { this.hotelTypeList = data.hotelTypeList || [] this.columnsType = this.hotelTypeList this.notice = data.merchantApplyNotice @@ -969,7 +971,7 @@ export default { if (postData.coverType === 2) { postData.cover = postData.coverVideo } - saveShop(postData, this.partnerId).then(res => { + saveShop(postData, this.partnerId, this.promoterUid).then(res => { if (res.status === 200) { uni.showToast({ title: '您的入驻申请已提交成功，请耐心等待审核', diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue index 80da33c..be844e9 100644 --- a/pkg_join/views/supplier.vue +++ b/pkg_join/views/supplier.vue @@ -567,6 +567,7 @@ export default { data() { return { partnerId: '', + promoterUid: '', tips: '获取验证码', infoTitle: '', pics: [], @@ -763,6 +764,7 @@ export default { }, onLoad(options) { this.partnerId = options.partnerId || '' + this.promoterUid = options.promoterUid || '' const type = options.type const local = uni.getStorageSync(type) || {} const local_form = uni.getStorageSync(type + '_form') || {} @@ -881,7 +883,7 @@ export default { getCity().then(({data}) => { this.district = data }) - getShopData().then(({data}) => { + getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => { this.columnsType = data.hotelTypeList this.columnsSupplierType = data.supplierTypeList this.notice = data.merchantApplyNotice @@ -1161,7 +1163,7 @@ export default { postData.cover = postData.coverVideo } if (this.infoTitle === '特产') { - saveSupplier(postData, this.formSupplier, this.partnerId).then(res => { + saveSupplier(postData, this.formSupplier, this.partnerId, this.promoterUid).then(res => { if (res.status === 200) { uni.showToast({ title: '您的入驻申请已提交成功，请耐心等待审核', @@ -1182,7 +1184,7 @@ export default { }) }) } else { - saveWenwanSupplier(postData, this.formSupplier, this.partnerId).then(res => { + saveWenwanSupplier(postData, this.formSupplier, this.partnerId, this.promoterUid).then(res => { if (res.status === 200) { uni.showToast({ title: '您的入驻申请已提交成功，请耐心等待审核', diff --git a/pkg_join/views/travelResidence.vue b/pkg_join/views/travelResidence.vue index 12c8311..39784e4 100644 --- a/pkg_join/views/travelResidence.vue +++ b/pkg_join/views/travelResidence.vue @@ -408,7 +408,8 @@ export default { cultureImg: [], // 资质图片 qualificationImg: [], - partnerId: 0, + partnerId: '', + promoterUid: '', captcha: '', form: { /** @@ -466,9 +467,10 @@ export default { } }, onLoad(opts) { - this.partnerId = opts.partnerId + this.partnerId = opts.partnerId || '' + this.promoterUid = opts.promoterUid || '' this.queryCity() - getShopData().then(({data}) => { + getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => { this.notice = data.merchantApplyNotice this.initInfo() }) diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue index f6a67e5..ce8e1ed 100644 --- a/pkg_join/views/wholesaler.vue +++ b/pkg_join/views/wholesaler.vue @@ -322,10 +322,14 @@ export default { stateType: 'primary', // 是否为审核中 reviewing: false, - pageKeyId: Object.freeze('merchantApplyWholesaler') + pageKeyId: Object.freeze('merchantApplyWholesaler'), + partnerId: '', + promoterUid: '' } }, onLoad(options) { + this.partnerId = options.partnerId || '' + this.promoterUid = options.promoterUid || '' this.init() }, onReady() { @@ -373,7 +377,7 @@ export default { getCity().then(({data}) => { this.district = data }) - getShopData().then(({data}) => { + getShopData({partnerId: this.partnerId, promoterUid: this.promoterUid}).then(({data}) => { this.notice = data.merchantApplyNotice this.initInfo() })