From b676a1acd9b3efcc4822320813a6b053a6362560 Mon Sep 17 00:00:00 2001 From: Waiting Date: Sun, 14 Apr 2024 01:05:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/common/groupbuy/detail.vue | 7 ++-- src/pages/common/groupbuy/index.vue | 8 ++-- src/pages/common/login/index.vue | 17 +++++++-- src/pages/home/index.vue | 19 +++++++++ src/pages/home/subs/group/join.vue | 12 ++++-- src/pages/mall/index.vue | 12 ++++-- .../mall/subs/components/coupon-dialog.vue | 5 ++- src/pages/mall/subs/goods/detail.vue | 4 +- src/pages/mall/subs/order/order-confirm.vue | 34 +++++++++++++---- src/pages/mine/subs/address/index.vue | 2 +- src/pages/mine/subs/order/detail.vue | 36 +++++++++--------- src/pages/mine/subs/order/index.vue | 4 +- src/pages/mine/subs/recharge/index.vue | 2 +- src/static/images/bg_coupon.png | Bin 16214 -> 0 bytes src/static/images/bg_coupon_expired.png | Bin 16061 -> 0 bytes src/static/images/bg_coupon_used.png | Bin 16061 -> 0 bytes src/static/images/bg_groupbuy_countdown.png | Bin 158360 -> 0 bytes src/static/images/bg_groupbuy_price.png | Bin 16814 -> 0 bytes .../images/bg_groupbuy_price_disabled.png | Bin 16436 -> 0 bytes src/static/images/bg_mall_close.png | Bin 29636 -> 0 bytes src/static/images/bg_member_recharge.png | Bin 20832 -> 0 bytes src/static/images/bg_member_recharge_item.png | Bin 100022 -> 0 bytes src/static/images/bg_register.png | Bin 2187155 -> 0 bytes src/static/images/ic_add_goods.png | Bin 3732 -> 0 bytes src/static/images/ic_address_dashed_line.png | Bin 15963 -> 0 bytes src/static/images/ic_arrow_down_gray.png | Bin 641 -> 0 bytes src/static/images/ic_arrow_right.png | Bin 886 -> 0 bytes src/static/images/ic_arrow_right_gray.png | Bin 1708 -> 0 bytes src/static/images/ic_arrow_right_yellow.png | Bin 1011 -> 0 bytes src/static/images/ic_back.png | Bin 492 -> 0 bytes src/static/images/ic_balance.png | Bin 5535 -> 0 bytes src/static/images/ic_card.png | Bin 3181 -> 0 bytes src/static/images/ic_checkbox_active.png | Bin 4520 -> 0 bytes src/static/images/ic_checkbox_active_red.png | Bin 4171 -> 0 bytes src/static/images/ic_checkbox_normal.png | Bin 4652 -> 0 bytes src/static/images/ic_close.png | Bin 1561 -> 0 bytes src/static/images/ic_coupon.png | Bin 16159 -> 0 bytes src/static/images/ic_crown.png | Bin 3777 -> 0 bytes src/static/images/ic_decline.png | Bin 4181 -> 0 bytes src/static/images/ic_goods_order.png | Bin 3036 -> 0 bytes src/static/images/ic_goods_shoppingcart.png | Bin 3752 -> 0 bytes src/static/images/ic_goods_store.png | Bin 3298 -> 0 bytes src/static/images/ic_group_gift.png | Bin 12681 -> 0 bytes src/static/images/ic_groupbuy.png | Bin 12974 -> 0 bytes src/static/images/ic_location.png | Bin 5483 -> 0 bytes src/static/images/ic_logo.jpeg | Bin 6176 -> 0 bytes src/static/images/ic_member_card.png | Bin 11321 -> 0 bytes .../images/ic_member_service_address.png | Bin 7165 -> 0 bytes .../images/ic_member_service_contact.png | Bin 7844 -> 0 bytes .../images/ic_member_service_follow.png | Bin 8059 -> 0 bytes src/static/images/ic_member_service_info.png | Bin 5603 -> 0 bytes .../images/ic_member_service_promotion.png | Bin 4744 -> 0 bytes .../images/ic_member_service_record.png | Bin 3909 -> 0 bytes src/static/images/ic_order.png | Bin 3646 -> 0 bytes src/static/images/ic_order_all.png | Bin 4524 -> 0 bytes src/static/images/ic_order_dd.png | Bin 5824 -> 0 bytes src/static/images/ic_order_finish.png | Bin 7257 -> 0 bytes src/static/images/ic_order_progressing.png | Bin 6665 -> 0 bytes src/static/images/ic_order_yj.png | Bin 4893 -> 0 bytes src/static/images/ic_plus.png | Bin 450 -> 0 bytes src/static/images/ic_qrcode_white.png | Bin 1778 -> 0 bytes src/static/images/ic_reduce.png | Bin 139 -> 0 bytes src/static/images/ic_register_captcha.png | Bin 1344 -> 0 bytes src/static/images/ic_register_gift.png | Bin 11282 -> 0 bytes src/static/images/ic_register_mobile.png | Bin 3282 -> 0 bytes src/static/images/ic_search.png | Bin 1348 -> 0 bytes src/static/images/ic_share.png | Bin 2863 -> 0 bytes src/static/images/ic_shopping_cart.png | Bin 1454 -> 0 bytes src/static/images/ic_switch_company.png | Bin 13397 -> 0 bytes src/static/images/ic_time.png | Bin 4166 -> 0 bytes src/static/images/ic_tips.png | Bin 4288 -> 0 bytes src/static/images/ic_triangle_down.png | Bin 1023 -> 0 bytes src/static/images/ic_wechat.png | Bin 5391 -> 0 bytes src/static/images/official_account_qrcode.png | Bin 2459 -> 0 bytes src/static/images/test_bg.png | Bin 674368 -> 0 bytes src/static/images/test_qrcode.png | Bin 46799 -> 0 bytes src/store/modules/shoppingcart/index.ts | 3 +- src/store/modules/user/index.ts | 1 - src/utils/assets.ts | 2 +- src/utils/order/index.ts | 2 +- 80 files changed, 118 insertions(+), 52 deletions(-) delete mode 100644 src/static/images/bg_coupon.png delete mode 100644 src/static/images/bg_coupon_expired.png delete mode 100644 src/static/images/bg_coupon_used.png delete mode 100644 src/static/images/bg_groupbuy_countdown.png delete mode 100644 src/static/images/bg_groupbuy_price.png delete mode 100644 src/static/images/bg_groupbuy_price_disabled.png delete mode 100644 src/static/images/bg_mall_close.png delete mode 100644 src/static/images/bg_member_recharge.png delete mode 100644 src/static/images/bg_member_recharge_item.png delete mode 100644 src/static/images/bg_register.png delete mode 100644 src/static/images/ic_add_goods.png delete mode 100644 src/static/images/ic_address_dashed_line.png delete mode 100644 src/static/images/ic_arrow_down_gray.png delete mode 100644 src/static/images/ic_arrow_right.png delete mode 100644 src/static/images/ic_arrow_right_gray.png delete mode 100644 src/static/images/ic_arrow_right_yellow.png delete mode 100644 src/static/images/ic_back.png delete mode 100644 src/static/images/ic_balance.png delete mode 100644 src/static/images/ic_card.png delete mode 100644 src/static/images/ic_checkbox_active.png delete mode 100644 src/static/images/ic_checkbox_active_red.png delete mode 100644 src/static/images/ic_checkbox_normal.png delete mode 100644 src/static/images/ic_close.png delete mode 100644 src/static/images/ic_coupon.png delete mode 100644 src/static/images/ic_crown.png delete mode 100644 src/static/images/ic_decline.png delete mode 100644 src/static/images/ic_goods_order.png delete mode 100644 src/static/images/ic_goods_shoppingcart.png delete mode 100644 src/static/images/ic_goods_store.png delete mode 100644 src/static/images/ic_group_gift.png delete mode 100644 src/static/images/ic_groupbuy.png delete mode 100644 src/static/images/ic_location.png delete mode 100644 src/static/images/ic_logo.jpeg delete mode 100644 src/static/images/ic_member_card.png delete mode 100644 src/static/images/ic_member_service_address.png delete mode 100644 src/static/images/ic_member_service_contact.png delete mode 100644 src/static/images/ic_member_service_follow.png delete mode 100644 src/static/images/ic_member_service_info.png delete mode 100644 src/static/images/ic_member_service_promotion.png delete mode 100644 src/static/images/ic_member_service_record.png delete mode 100644 src/static/images/ic_order.png delete mode 100644 src/static/images/ic_order_all.png delete mode 100644 src/static/images/ic_order_dd.png delete mode 100644 src/static/images/ic_order_finish.png delete mode 100644 src/static/images/ic_order_progressing.png delete mode 100644 src/static/images/ic_order_yj.png delete mode 100644 src/static/images/ic_plus.png delete mode 100644 src/static/images/ic_qrcode_white.png delete mode 100644 src/static/images/ic_reduce.png delete mode 100644 src/static/images/ic_register_captcha.png delete mode 100644 src/static/images/ic_register_gift.png delete mode 100644 src/static/images/ic_register_mobile.png delete mode 100644 src/static/images/ic_search.png delete mode 100644 src/static/images/ic_share.png delete mode 100644 src/static/images/ic_shopping_cart.png delete mode 100644 src/static/images/ic_switch_company.png delete mode 100644 src/static/images/ic_time.png delete mode 100644 src/static/images/ic_tips.png delete mode 100644 src/static/images/ic_triangle_down.png delete mode 100644 src/static/images/ic_wechat.png delete mode 100644 src/static/images/official_account_qrcode.png delete mode 100644 src/static/images/test_bg.png delete mode 100644 src/static/images/test_qrcode.png diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue index 14bff7b..b48592d 100644 --- a/src/pages/common/groupbuy/detail.vue +++ b/src/pages/common/groupbuy/detail.vue @@ -55,7 +55,7 @@ - + 浏览此商品的客户还浏览了 { if(isLogin()) { + await uni.showLoading(); groupBuyBean.value = await getGroupBuyDetail(e.id); groupBuyBean.value.goods.price = groupBuyBean.value.price; bannerList.value = JSON.parse(groupBuyBean.value.content).filter((item: any) => item.type === 2).map((item: any) => item.images); countdown(); await fetchRecommendList(); await fetchBuyRecordList(); + uni.hideLoading(); } }); @@ -306,8 +308,7 @@ const placeOrder = async () => { height: 130rpx; position: relative; padding: 15rpx 30rpx; - background: #F32B2B; - //background-image: url('../../../static/images/bg_groupbuy_countdown.png'); + background-image: url('https://img.lakeapp.cn/wx/images/bg_groupbuy_countdown.png'); background-size: 100% 100%; .super-second-kill { diff --git a/src/pages/common/groupbuy/index.vue b/src/pages/common/groupbuy/index.vue index c9544e9..737aad8 100644 --- a/src/pages/common/groupbuy/index.vue +++ b/src/pages/common/groupbuy/index.vue @@ -42,7 +42,7 @@ import { getGroupBuyList } from '@/api/groupbuy'; import { goPath } from '@/utils'; const tabIndex = ref(0); -const groupbuyList = ref([]); +const groupbuyList = ref([]); const currentPageNum = ref(1); onLoad((e) => { @@ -54,6 +54,7 @@ watch(() => tabIndex.value, () => { }); const fetchData = async (refresh: boolean = true) => { + await uni.showLoading(); if(!refresh) { currentPageNum.value += 1; } @@ -65,6 +66,7 @@ const fetchData = async (refresh: boolean = true) => { } }); groupbuyList.value = list; + uni.hideLoading(); }; const loadMore = () => { @@ -168,7 +170,7 @@ const loadMore = () => { height: 83rpx; margin-top: 20rpx; align-self: flex-end; - background-image: url("../../../static/images/bg_groupbuy_price.png"); + background-image: url("https://img.lakeapp.cn/wx/images/bg_groupbuy_price.png"); background-size: 100% 100%; color: #FFFFFF; justify-content: space-between; @@ -196,7 +198,7 @@ const loadMore = () => { } .bottom-price-disabled { - background-image: url("../../../static/images/bg_groupbuy_price_disabled.png"); + background-image: url("https://img.lakeapp.cn/wx/images/bg_groupbuy_price_disabled.png"); } } } diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue index 102fb15..4d951d9 100644 --- a/src/pages/common/login/index.vue +++ b/src/pages/common/login/index.vue @@ -11,8 +11,8 @@ 登录代表同意 - - 用户协议、隐私政策， + + 《小程序隐私保护协议》 并授权使用您的账号信息（如昵称、头像、收获地址）以便您统一管理 @@ -32,6 +32,17 @@ function wechatLogin() { uni.reLaunch({ url: '/pages/home/index' }); }); } + +const openPrivacy = () => { + wx.openPrivacyContract({ + success: () => { + }, // 打开成功 + fail: () => { + }, // 打开失败 + complete: () => { + } + }); +};