From e76da8151724cc0df5fe936c4fbf3201fa9660bf Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Tue, 3 Sep 2024 17:43:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96OSS=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=9A=84=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bundle_b/pages/local_settled/index.vue | 5 +++++ bundle_b/pages/local_shop/local_pay.vue | 10 ++++++---- components/after-sales-list/after-sales-list.vue | 2 +- components/cate-home/cate-home.vue | 2 +- components/cate-two/cate-two.vue | 2 +- .../community-comment-list/community-comment-list.vue | 2 +- .../community-comment-popup.vue | 2 +- components/community-list/community-list.vue | 4 ++-- components/coupon-order/coupon-order.vue | 2 +- components/float-tab/float-tab.vue | 8 ++++---- components/goods-list/goods-list.vue | 6 +++--- components/j-video/j-video.vue | 2 +- components/live-item/live-item.vue | 2 +- components/share-popup/share-popup.vue | 8 ++++---- components/sort-nav/sort-nav.vue | 2 +- 15 files changed, 33 insertions(+), 26 deletions(-) diff --git a/bundle_b/pages/local_settled/index.vue b/bundle_b/pages/local_settled/index.vue index d14300e..856c223 100644 --- a/bundle_b/pages/local_settled/index.vue +++ b/bundle_b/pages/local_settled/index.vue @@ -716,6 +716,10 @@ // #ifdef MP-WEIXIN // await this.getAuthMsg(); //#endif + uni.showLoading({ + title: '正在提交...', + mask:true + }) const { data, code, @@ -730,6 +734,7 @@ this.bgColor = '#ffffff'; }, 500) } + uni.hideLoading() }, getAuthMsg() { diff --git a/bundle_b/pages/local_shop/local_pay.vue b/bundle_b/pages/local_shop/local_pay.vue index 3214c37..4d1156d 100644 --- a/bundle_b/pages/local_shop/local_pay.vue +++ b/bundle_b/pages/local_shop/local_pay.vue @@ -118,14 +118,13 @@ } else { this.lstore_id = strToParams(decodeURIComponent(this.$Router.currentRoute.query.scene)).lid } - + if (query?.type && query?.goods_id) { this.goods_id = query.goods_id this.getLocalGoodsDetailsFun() } this.login() - this.getLocalShopByIdFunc() }, methods: { @@ -141,6 +140,7 @@ const {code, data} = await localShopLogin({code: res.code, invite_code: 'L74Y93'}) if (code == 1) { this.user_id = data.user_id + this.getLocalShopByIdFunc() } } }, @@ -227,7 +227,8 @@ if (this.payway == 3) { localBalance({ money: this.money, - lid: this.lstore_id + lid: this.lstore_id, + user_id: this.user_id }).then((result) => { let status = 'fail' if (result.code == 1) { @@ -242,7 +243,8 @@ if (this.payway == 1) { localShopPayWeixin({ money: this.money, - lid: this.lstore_id + lid: this.lstore_id, + user_id: this.user_id }).then((result) => { if (result.code == 1) { const pay = { diff --git a/components/after-sales-list/after-sales-list.vue b/components/after-sales-list/after-sales-list.vue index 1db89ff..ec3ad85 100644 --- a/components/after-sales-list/after-sales-list.vue +++ b/components/after-sales-list/after-sales-list.vue @@ -130,7 +130,7 @@ - + 是否要撤销申请? diff --git a/components/cate-home/cate-home.vue b/components/cate-home/cate-home.vue index ba92101..04ed4f6 100644 --- a/components/cate-home/cate-home.vue +++ b/components/cate-home/cate-home.vue @@ -13,7 +13,7 @@ - + diff --git a/components/cate-two/cate-two.vue b/components/cate-two/cate-two.vue index 3e64275..b32e4d5 100644 --- a/components/cate-two/cate-two.vue +++ b/components/cate-two/cate-two.vue @@ -117,7 +117,7 @@ + :src="aliOSSDomain + 'uniapp/goods_null.png'"> 暂无商品 diff --git a/components/community-comment-list/community-comment-list.vue b/components/community-comment-list/community-comment-list.vue index 2ee2363..f7e8bba 100644 --- a/components/community-comment-list/community-comment-list.vue +++ b/components/community-comment-list/community-comment-list.vue @@ -22,7 +22,7 @@ + :src="commentInfo.is_like ? aliOSSDomain + 'uniapp/icon_good_s.png' : aliOSSDomain + 'uniapp/icon_good.png'"> {{ commentInfo.like }} diff --git a/components/community-comment-popup/community-comment-popup.vue b/components/community-comment-popup/community-comment-popup.vue index 31b9b30..cbf6ee7 100644 --- a/components/community-comment-popup/community-comment-popup.vue +++ b/components/community-comment-popup/community-comment-popup.vue @@ -18,7 +18,7 @@ diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index f05e92a..9aefa0e 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -65,7 +65,7 @@ + :src="aliOSSDomain + 'uniapp/No.' + index + '.png'"> @@ -140,7 +140,7 @@ --> + :src="aliOSSDomain + 'uniapp/No.' + index + '.png'"> @@ -231,7 +231,7 @@ + :src="aliOSSDomain + 'uniapp/No.' + index + '.png'"> diff --git a/components/j-video/j-video.vue b/components/j-video/j-video.vue index be5dc63..bbb6c47 100644 --- a/components/j-video/j-video.vue +++ b/components/j-video/j-video.vue @@ -2,7 +2,7 @@ - + diff --git a/components/live-item/live-item.vue b/components/live-item/live-item.vue index 5934702..b6272c8 100644 --- a/components/live-item/live-item.vue +++ b/components/live-item/live-item.vue @@ -9,7 +9,7 @@ 'live-item__status--expired': data.live_status == 107 }">