From 27924672a24cf634909073f63fbd9276a4bf9ad7 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Thu, 21 May 2026 15:32:14 +0800 Subject: [PATCH 01/23] =?UTF-8?q?Refactor(=E9=A6=96=E9=A1=B5):=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B8=B2=E6=9F=93=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/index.vue | 52 +++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/pages/home/index.vue b/pages/home/index.vue index 4500212..719fd1b 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -517,6 +517,7 @@ export default { } }, onLoad() { + console.clear() console.time() // uni.hideTabBar() const _this = this @@ -553,7 +554,11 @@ export default { this.pageToHideHandle() }, onPageScroll(e) { - this.scrollTop = e.scrollTop + if (this.pageScrollTimer) return + this.pageScrollTimer = setTimeout(() => { + this.pageScrollTimer = null + this.scrollTop = e.scrollTop + }, 50) }, onShareTimeline() { uni.updateShareMenu({ @@ -636,20 +641,24 @@ export default { }, onscroll(e) { this.scrollViewWidth = e.detail.scrollWidth - const imgs = [] - this.getElementData(`#${this.scrollView}`, res=>{ - this.setFunctionGuideData({ - imgs: this.imgs, - btnGroupPosition: '20rpx', - tipsPosition: '', - position: { - top: res.top + 'px', - left: res.left + 'px', - width: `${res.height}px`, - height: `${res.height}px` - } + if (this.scrollTimer) return + this.scrollTimer = setTimeout(() => { + this.scrollTimer = null + this.getElementData(`#${this.scrollView}`, res => { + if (!res) return + this.setFunctionGuideData({ + imgs: this.imgs, + btnGroupPosition: '20rpx', + tipsPosition: '', + position: { + top: res.top + 'px', + left: res.left + 'px', + width: `${res.height}px`, + height: `${res.height}px` + } + }) }) - }) + }, 100) }, toEle(id, imgs) { this.getElementData(`#${id}`, res=>{ @@ -739,6 +748,9 @@ export default { getHomeData({ cityName: this.cityName }).then(res => { const { success, data } = res if (success && data) { + console.timeEnd() + console.log('^^^^^^^^^^^^^^^^接口响应之后开始') + console.time() _this.$set(_this, 'banner', data.banner || []) _this.$set(_this, 'menus', data.menus || []) _this.$set(_this, 'landmarkGoodsImage', data.landmarkGoodsImage || {}) @@ -758,28 +770,32 @@ export default { _this.lotteryCanDraw = data.lotteryCanDraw || false _this.initPosterPopupState(data) if (data.bastList) { + const newBastLeftList = [] + const newBastRightList = [] for (let i = 0; i < data.bastList.length; i++) { if (i % 2 === 0) { // 店铺排名 if (i === 4 && data.hotelList.length > 0) { - _this.bastLeftList.push({ + newBastLeftList.push({ type: 'hotel', list: data.hotelList }) } - _this.bastLeftList.push(data.bastList[i]) + newBastLeftList.push(data.bastList[i]) } if (i % 2 === 1) { // 尖货专题 if (i === 3 && data.contentBest.length > 0) { - _this.bastRightList.push({ + newBastRightList.push({ type: 'swiper', list: data.contentBest }) } - _this.bastRightList.push(data.bastList[i]) + newBastRightList.push(data.bastList[i]) } } + _this.$set(_this, 'bastLeftList', newBastLeftList) + _this.$set(_this, 'bastRightList', newBastRightList) } this.$nextTick(() => { console.timeEnd() From 2cddb59530b835fa0fea4037223831c78e062d68 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Thu, 21 May 2026 15:32:54 +0800 Subject: [PATCH 02/23] =?UTF-8?q?Refactor(=E6=88=91=E7=9A=84):=E6=9C=AA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E4=B8=8D=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=8A=BD=E5=A5=96=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/User/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue index dba947b..40f6449 100644 --- a/pages/user/User/index.vue +++ b/pages/user/User/index.vue @@ -216,7 +216,10 @@ @@ -415,7 +418,6 @@ export default { }, onShow() { uni.$emit('updateUnreadMessageCount') - this.getDrawConfigReq() if (this.$store.getters.token) { this.isNoLogin = false uni.showLoading({ @@ -426,6 +428,7 @@ export default { this.getUserLevelInfoReq() this.isWeixin = isWeixin() // this.getUnreadMsgList() + this.getDrawConfigReq() } else { this.isNoLogin = true /* From 656c27fdb87fa3da9431fafbb86ac6ab0c15b9bf Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Thu, 21 May 2026 16:37:02 +0800 Subject: [PATCH 03/23] =?UTF-8?q?Refactor(=E9=A6=96=E9=A1=B5):=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E5=BD=93=E5=89=8D=E5=AE=9A=E4=BD=8D=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=92=8C=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E5=9F=8E=E5=B8=82=E4=B8=8D=E5=90=8C=EF=BC=8C=E6=89=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=9F=8E=E5=B8=82=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96=E9=A6=96=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/index.vue | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pages/home/index.vue b/pages/home/index.vue index 719fd1b..9bb2c98 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -713,6 +713,9 @@ export default { const { data } = res this.bannerList = data.banner || [] }) + console.timeEnd() + console.log('^^^^^^^^^^^^^^^^获取定位开始') + console.time() this.getLocationData() }, // 定位失败，重新唤起定位授权 @@ -723,16 +726,25 @@ export default { })) }, getLocationData() { + const cityName = uni.getStorageSync('locationCityName') + if (cityName) { + this.cityName = cityName + this.getPageData() + } this.isLocating = true getLocationPromise().then(mapData => { if (mapData.errMsg) { const { latitude, longitude } = mapData getCurAddress(latitude, longitude, address => { console.log(address) - this.cityName = address.city - uni.setStorageSync('locationCityName', this.cityName) + const resCityName = address.city || '' + // 如果当前定位成功和上一次的定位城市不同，才更新城市名称 + if (resCityName !== this.cityName) { + this.cityName = address.city + uni.setStorageSync('locationCityName', this.cityName) + this.getPageData() + } this.isLocating = false - this.getPageData() }) } else { this.isLocating = false @@ -743,6 +755,9 @@ export default { }) }, getPageData() { + console.timeEnd() + console.log('^^^^^^^^^^^^^^^^获取定位成功/失败开始获取首页数据') + console.time() const _this = this uni.showLoading({ title: '加载中' }) getHomeData({ cityName: this.cityName }).then(res => { From e0dd9aa7edffb345efc5e8e3de634c920ffe7fe4 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Thu, 21 May 2026 17:06:31 +0800 Subject: [PATCH 04/23] =?UTF-8?q?Refactor(=E9=A6=96=E9=A1=B5):=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=AE=9A=E4=BD=8D=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E5=8F=AA=E7=94=A8=E4=BA=8E=E5=B7=A6?= =?UTF-8?q?=E4=B8=8A=E8=A7=92=E6=98=BE=E7=A4=BA=E4=B9=8B=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/home/index.vue b/pages/home/index.vue index 9bb2c98..9122bf2 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -716,6 +716,7 @@ export default { console.timeEnd() console.log('^^^^^^^^^^^^^^^^获取定位开始') console.time() + this.getPageData() this.getLocationData() }, // 定位失败，重新唤起定位授权 @@ -729,7 +730,7 @@ export default { const cityName = uni.getStorageSync('locationCityName') if (cityName) { this.cityName = cityName - this.getPageData() + // this.getPageData() } this.isLocating = true getLocationPromise().then(mapData => { @@ -742,16 +743,16 @@ export default { if (resCityName !== this.cityName) { this.cityName = address.city uni.setStorageSync('locationCityName', this.cityName) - this.getPageData() + // this.getPageData() } this.isLocating = false }) } else { this.isLocating = false - this.getPageData() + // this.getPageData() } }).catch(() => { - this.getPageData() + // this.getPageData() }) }, getPageData() { From 1b4db7d4f85b4027ee15ebf897049e8cb08ffd89 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Fri, 22 May 2026 14:36:54 +0800 Subject: [PATCH 05/23] =?UTF-8?q?Fix=EF=BC=9A=E6=8A=BD=E5=A5=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=95=86=E5=93=81=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 1 + pagesOrder/order/OrderDetails/index.vue | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 96b454d..7bd427b 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -493,6 +493,7 @@ ref="attrWindow" :attr="attr" :cartNum="cart_num" + :hideQuantityControls="source === 'countyLottery' && Number(activityId) > 0" @changeFun="changeFun" :isNegotiable="storeInfo.isNegotiable === 1" @gift="gift" diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue index a2fb978..75a6a23 100644 --- a/pagesOrder/order/OrderDetails/index.vue +++ b/pagesOrder/order/OrderDetails/index.vue @@ -848,11 +848,21 @@ export default { goGoodsCon(item, isGiftCardReceiveBlind, isDrawOrder) { if(isGiftCardReceiveBlind) return if(isDrawOrder) return + const activityId = Number( + item.drawActivityId || + (item.productInfo && item.productInfo.drawActivityId) || + 0 + ) + const query = { + id: item.productId + } + if (activityId > 0) { + query.from = 'countyLottery' + query.activityId = activityId + } this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', - query: { - id: item.productId - } + query }) }, handleShowMore() { From 3826e11a3ef66b0f3af0fe391c184e1acb3772fe Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Fri, 22 May 2026 14:57:56 +0800 Subject: [PATCH 06/23] =?UTF-8?q?Fix=EF=BC=9A=E6=8A=BD=E5=A5=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=95=86=E5=93=81=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg-video/views/county-lottery.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg-video/views/county-lottery.vue b/pkg-video/views/county-lottery.vue index 43db79e..57e758e 100644 --- a/pkg-video/views/county-lottery.vue +++ b/pkg-video/views/county-lottery.vue @@ -123,7 +123,7 @@ :cartNum="cart_num" :hideQuantityControls="true" :showOk="true" - :okText="currentGoodsItem && Number(currentGoodsItem.isGiftCard) === 1 ? '送给朋友' : '立即下单'" + :okText="currentGoodsItem && Number(currentGoodsItem.isGiftCard) === 1 ? '立即下单' : '立即下单'" @changeFun="changeFun" @ok="submitFromSku()" /> @@ -369,7 +369,9 @@ export default { ...(productSelect || {}), ...(this.attr.productSelect || {}) } - const isGiftOrder = Number(this.currentGoodsItem && this.currentGoodsItem.isGiftCard) === 1 + // const isGiftOrder = Number(this.currentGoodsItem && this.currentGoodsItem.isGiftCard) === 1 + const isGiftOrder = false + const stock = Number(currentSelect.stock || 0) const hasNo = (this.attr.productAttr.length && !productSelect && this.isOpen) || stock <= 0 if (hasNo) { 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 07/23] =?UTF-8?q?Feat(=E5=85=A5=E9=A9=BB):=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E8=B7=B3=E8=BD=AC=E5=A2=9E=E5=8A=A0=E5=AD=90=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=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() }) From cf1f2791f69e0600f9863472f1c291dbe3576853 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Mon, 25 May 2026 10:29:48 +0800 Subject: [PATCH 08/23] =?UTF-8?q?Fix=EF=BC=9A5296=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=A4=BC=E5=93=81?= =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=96=B0=E6=94=BE?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=87=8F=E6=95=B0=E9=87=8F=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_user/views/gift/gift.vue | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue index 1f10cc7..25e87d8 100644 --- a/pkg_user/views/gift/gift.vue +++ b/pkg_user/views/gift/gift.vue @@ -24,7 +24,7 @@ - x{{ isCountyLotteryGift ? 1 : goodsInfo['cartNum'] }} + x{{ goodsInfo['cartNum'] }} @@ -417,9 +417,6 @@ export default { this.giftNotice = res.data.giftCardGiftNotice this.orderKey = res.data.orderKey this.goodsInfo = goodsInfo - if (this.isCountyLotteryGift) { - this.$set(this.goodsInfo, 'cartNum', 1) - } this.templateId = template.id this.defaultIndex = this.coverList.findIndex(item => item.id === this.templateId) console.log(this.defaultIndex, 'defaultIndex'); @@ -501,9 +498,6 @@ export default { this.giftNotice = res.data.giftCardGiftNotice this.orderKey = res.data.orderKey this.goodsInfo = goodsInfo - if (this.isCountyLotteryGift) { - this.$set(this.goodsInfo, 'cartNum', 1) - } this.templateId = template.id this.selectedCover = template.cover this.giftImage = template.image @@ -512,7 +506,7 @@ export default { // if(!this.couponId) { // this.couponId = res.data.couponList.usable[0] && res.data.couponList.usable[0].id || '' // } - this.computedPrice(this.isCountyLotteryGift ? 1 : this.goodsInfo.cartNum) + this.computedPrice(this.goodsInfo.cartNum) }).finally(() => { this.loading = false }) @@ -577,7 +571,7 @@ export default { from: 'routine', cartId: this.cartId, couponId: this.couponId, - recipientsNum: this.isCountyLotteryGift ? 1 : this.goodsInfo.cartNum, + recipientsNum: this.goodsInfo.cartNum, templateId: this.templateId, message : this.message || '礼笺轻启，礼藏心意', cover: this.selectedCover, From 778702a877d2278a0dc8447a3280ff6633d46cb8 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Mon, 25 May 2026 11:05:06 +0800 Subject: [PATCH 09/23] =?UTF-8?q?Fix=EF=BC=9A5298=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=82=B9=E5=87=BB=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E7=94=9F=E6=88=90=E7=9A=84=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=B5=B7=E6=8A=A5=E8=A2=AB=E5=BA=95=E9=83=A8=E9=81=AE?= =?UTF-8?q?=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 7bd427b..4511564 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -2114,7 +2114,7 @@ export default { .product-con .footer{ height: 140rpx !important; padding-bottom: 20rpx; - z-index: 1002 !important; + // z-index: 1002 !important; } .product-con .product-intro .conter view { width: 100% !important; From fe1cdf4dd5bf6bf9b16d6984abe650db0b4f3e1c Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Mon, 25 May 2026 11:05:23 +0800 Subject: [PATCH 10/23] =?UTF-8?q?Fix=EF=BC=9A5295=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=BA=95=E9=83=A8=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=BA=95=E4=B8=8B=E7=95=99=E7=99=BD=E5=A4=AA=E5=A4=9A=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E6=95=B4=E4=BD=93=E5=BE=80=E4=B8=8B=E7=A7=BB=E4=B8=80?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg-video/views/county-lottery.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg-video/views/county-lottery.vue b/pkg-video/views/county-lottery.vue index 57e758e..e82e62d 100644 --- a/pkg-video/views/county-lottery.vue +++ b/pkg-video/views/county-lottery.vue @@ -125,6 +125,7 @@ :showOk="true" :okText="currentGoodsItem && Number(currentGoodsItem.isGiftCard) === 1 ? '立即下单' : '立即下单'" @changeFun="changeFun" + paddingBottom="80rpx" @ok="submitFromSku()" /> From dba726dc125046efce2aa92ca9e2783099060d36 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 25 May 2026 12:24:46 +0800 Subject: [PATCH 11/23] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E5=95=86=E5=93=81=E8=B4=AD=E4=B9=B0=EF=BC=8C=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/wechat.js | 4 +- pages/order/OrderSubmission/index.vue | 72 ++++++++++----------------- 2 files changed, 29 insertions(+), 47 deletions(-) diff --git a/libs/wechat.js b/libs/wechat.js index b95b507..de04fa9 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -1,4 +1,4 @@ -import { subscribeMessage } from '@/libs/order' +// import { subscribeMessage } from '@/libs/order' import { getProvider } from '@/utils' import WechatJSSDK from 'wechat-jssdk/dist/client.umd' import { getWechatConfig, wechatAuth } from '@/api/public' @@ -65,7 +65,7 @@ export const weappPay = option => { resolve(success) }, 3000) // #ifdef MP-WEIXIN - subscribeMessage() + // subscribeMessage() // #endif }, fail: error => { diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index e211e46..c45c512 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -743,21 +743,7 @@ export default { icon: "none", duration: 2000 }) - this.afterPaySuccess(orderId, (drawTicketResult) => { - if (this.orderGroupInfo.cartInfo && this.orderGroupInfo.cartInfo.length === 1) { - this.$yrouter.replace({ - path: "/pagesOrder/order/OrderDetails/index", - query: this.buildOrderDetailQuery(orderId, drawTicketResult) - }) - } else { - this.$yrouter.replace({ - path: "/pages/order/MyOrder/index", - query: { - type: 2 - } - }) - } - }) + this.paySuccessToMyOrderOrDetail(orderId) break; case "WECHAT_H5_PAY": // H5支付 @@ -771,41 +757,17 @@ export default { case "WECHAT_PAY": // 小程序支付 weappPay(data.result.jsConfig).then(() => { - this.afterPaySuccess(orderId, () => { - this.$yrouter.replace({ - path: "/pages/order/MyOrder/index", - query: { - type: 1 - } - }) - }) + this.paySuccessToMyOrderOrDetail(orderId) }).catch(() => { - this.$yrouter.replace({ - path: "/pages/order/MyOrder/index", - query: { - type: 1 - } - }) + this.paySuccessToMyOrderOrDetail(orderId) }) break; case "WECHAT_APP_PAY": // APP支付 weappPay(data.result.jsConfig).then(() => { - this.afterPaySuccess(orderId, () => { - this.$yrouter.replace({ - path: "/pages/order/MyOrder/index", - query: { - type: 1 - } - }) - }) + this.paySuccessToMyOrderOrDetail(orderId) }).catch(() => { - this.$yrouter.replace({ - path: "/pages/order/MyOrder/index", - query: { - type: 1 - } - }) + this.paySuccessToMyOrderOrDetail(orderId) }) break; } @@ -820,9 +782,29 @@ export default { duration: 2000 }) }).finally(function () { + if (that.$refs.payPwdPop) { + that.$refs.payPwdPop.clear() + that.$refs.payPwdPop.close() + } that.isShowPayPwdPop = false - that.$refs.payPwdPop.clear() - that.$refs.payPwdPop.close() + }) + }, + paySuccessToMyOrderOrDetail(orderId) { + this.afterPaySuccess(orderId, (drawTicketResult) => { + if (this.orderGroupInfo.cartInfo && this.orderGroupInfo.cartInfo.length === 1) { + this.$yrouter.replace({ + path: "/pagesOrder/order/OrderDetails/index", + query: this.buildOrderDetailQuery(orderId, drawTicketResult) + }) + } else { + this.$yrouter.replace({ + path: "/pages/order/MyOrder/index", + query: { + type: 2, + query: this.buildOrderDetailQuery(orderId, drawTicketResult) + } + }) + } }) }, close() { From b72e7db15e68a23c80c4e33904c3e3fe6a505971 Mon Sep 17 00:00:00 2001 From: linxi <957440651@qq.com> Date: Tue, 26 May 2026 10:12:33 +0800 Subject: [PATCH 12/23] =?UTF-8?q?Fix=EF=BC=9A=E6=A0=B7=E5=BC=8F=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ProductWindow.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue index 5895cb4..004747d 100644 --- a/components/ProductWindow.vue +++ b/components/ProductWindow.vue @@ -1,11 +1,8 @@