diff --git a/src/components/MerList.vue b/src/components/MerList.vue index da58bad..84a67a9 100644 --- a/src/components/MerList.vue +++ b/src/components/MerList.vue @@ -88,17 +88,16 @@ import {calculateDistance, parseQueryString} from '@/utils'; import {bindParent, getBanner} from '@/api/user'; import {getMerList} from '@/api/goods'; -const props = defineProps({ - classId: { - type: Number, - default: 0, - }, -}); +const classId = defineModel({default: 0}); const list1 = ref>([]); const list2 = ref>([]); -Taro.useLoad(async () => { +Taro.useLoad(() => { + init(); +}); + +const init = async () => { Taro.showLoading({ title: '加载中', }); @@ -119,7 +118,7 @@ Taro.useLoad(async () => { } } Taro.hideLoading(); -}); +}; interface MerData { ID: number; @@ -149,11 +148,10 @@ const get_mer_list = async () => { userLocalNum.value.t = res.latitude; }, }); - const res = await getMerList({ PageNum: pageVal.value.page, PageSize: 10, - class_id: props.classId, + class_id: classId.value, }); pageVal.value.total = res.data.total; @@ -209,6 +207,7 @@ Taro.useReachBottom(() => { diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index 75ea85e..56d1f2c 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -43,24 +43,24 @@ - + - 豆子 - {{ + {{ userInfo.data?.pulse || 0 }} + 豆子 - 积分 - {{ + {{ userInfo.data?.integral || 0 }} + 积分 - + 我的订单 - + + size="42" /> 待付款 + size="42" /> 待使用 + size="42" /> 已使用 + size="42" /> 已失效 @@ -115,11 +115,11 @@ v-if="item.type !== 333" class="box-mini" @click="toPage(item.url)"> - + {{ item.label }} @@ -131,44 +131,44 @@ class="user-center" v-if="userInfo.data?.bid && userInfo.store_status === 1"> 商家服务 - - + - - 后结点单 + + - - 订单核销 + + - - 订单统计 + + - - + 收益提现 + + @@ -428,10 +428,10 @@ const scanCode = () => { -nut-grid-item-text-color: #333; .box { - margin-top: 20px; + margin-top: 30px; display: grid; grid-template-columns: repeat(4, 1fr); - grid-gap: 20px; + grid-gap: 20px 100px; box-sizing: border-box; line-height: 1.5; diff --git a/src/static/tabbar/2-02.png b/src/static/tabbar/2-02.png index b47570f..b03d0c4 100644 Binary files a/src/static/tabbar/2-02.png and b/src/static/tabbar/2-02.png differ diff --git a/src/static/tabbar/3-02.png b/src/static/tabbar/3-02.png index c3e6a23..523faa4 100644 Binary files a/src/static/tabbar/3-02.png and b/src/static/tabbar/3-02.png differ diff --git a/src/static/tabbar/4-02.png b/src/static/tabbar/4-02.png index 7867e1d..112ab35 100644 Binary files a/src/static/tabbar/4-02.png and b/src/static/tabbar/4-02.png differ