feat:完善首页会员优选、我的社员ui重构
This commit is contained in:
@@ -61,6 +61,12 @@
|
||||
if (mescrollItems.length > n) mescrollItems.splice(n);
|
||||
};
|
||||
|
||||
const { tabIndex } = useMescrollMore(
|
||||
mescrollItems,
|
||||
onPageScroll,
|
||||
onReachBottom,
|
||||
);
|
||||
|
||||
const refreshDisplay = () => {
|
||||
const next = computeDisplayList();
|
||||
displayList.value = next;
|
||||
@@ -90,12 +96,6 @@
|
||||
},
|
||||
{ immediate: true, deep: true },
|
||||
);
|
||||
|
||||
const { tabIndex } = useMescrollMore(
|
||||
mescrollItems,
|
||||
onPageScroll,
|
||||
onReachBottom,
|
||||
);
|
||||
// let tabIndex = ref(0);
|
||||
const navChange = (i) => {
|
||||
// scrollToLastY()
|
||||
|
||||
@@ -67,11 +67,11 @@
|
||||
</view>
|
||||
<!-- -->
|
||||
<uni-badge :text="props.data.cartCount" v-if="props.type == 2 && props.data.cartCount" absolute="rightTop" :customStyle="{background: '#FF0000'}">
|
||||
<view class="shopIcon" :class="{ 'shopIcon1': props.type == 2 }" @click.stop="changeSelectSku">
|
||||
<view class="shopIcon" :class="{ 'shopIcon1': props.type == 2 }" @click.stop="onShopIconClick">
|
||||
<image src="/static/index/shop.png" mode="scaleToFill" />
|
||||
</view>
|
||||
</uni-badge>
|
||||
<view class="shopIcon" :class="{ 'shopIcon1': props.type == 2 }" @click.stop="changeSelectSku" v-else>
|
||||
<view class="shopIcon" :class="{ 'shopIcon1': props.type == 2 }" @click.stop="onShopIconClick" v-else>
|
||||
<image src="/static/index/shop.png" mode="scaleToFill" />
|
||||
</view>
|
||||
</view>
|
||||
@@ -101,6 +101,10 @@
|
||||
return {};
|
||||
},
|
||||
},
|
||||
memberPreferred: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
type: {
|
||||
//1:首页 2:分类 3:搜索
|
||||
type: Number,
|
||||
@@ -120,6 +124,18 @@
|
||||
},
|
||||
);
|
||||
let showSelectSku = ref(false);
|
||||
const buyMemberGoods = () => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/AI/giftOrder?id=${props.data.id}`,
|
||||
});
|
||||
};
|
||||
const onShopIconClick = () => {
|
||||
if (props.memberPreferred) {
|
||||
buyMemberGoods();
|
||||
return;
|
||||
}
|
||||
changeSelectSku();
|
||||
};
|
||||
const changeSelectSku = async () => {
|
||||
let res = await getData();
|
||||
showSelectSku.value = true;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
>
|
||||
<view class="flex-row wrap w100">
|
||||
<view class="cardItem" v-for="(v, i) in goods" :key="i">
|
||||
<card_goods :data="v"></card_goods>
|
||||
<card_goods :data="v" :memberPreferred="isMemberPreferred"></card_goods>
|
||||
</view>
|
||||
</view>
|
||||
</mescroll-body>
|
||||
@@ -20,7 +20,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, watch } from 'vue';
|
||||
import { ref, watch, computed } from 'vue';
|
||||
import useMescroll from '@/uni_modules/mescroll-uni/hooks/useMescroll.js';
|
||||
import SpuApi from '@/sheep/api/product/spu';
|
||||
import { getAiProduct } from '@/sheep/api/ai';
|
||||
@@ -89,6 +89,8 @@
|
||||
};
|
||||
|
||||
const isInit = ref(isAutoInit); // 当前tab是否已初始化
|
||||
const tabName = computed(() => String(props.tabs?.[props.i]?.name || '').trim());
|
||||
const isMemberPreferred = computed(() => tabName.value === '会员优选');
|
||||
// 监听下标的变化
|
||||
watch(
|
||||
() => props.index,
|
||||
@@ -110,11 +112,7 @@
|
||||
}
|
||||
};
|
||||
const upCallback = (mescroll) => {
|
||||
const tab = props.tabs?.[props.i] || {};
|
||||
const tabName = String(tab?.name || '').trim();
|
||||
const isMemberPreferred = tabName === '会员优选';
|
||||
|
||||
if (isMemberPreferred) {
|
||||
if (isMemberPreferred.value) {
|
||||
getAiProduct({
|
||||
pageNo: mescroll.num,
|
||||
pageSize: mescroll.size,
|
||||
@@ -135,7 +133,7 @@
|
||||
SpuApi.getSpuPage({
|
||||
pageNo: mescroll.num,
|
||||
pageSize: mescroll.size,
|
||||
tagTypeId: tab.id,
|
||||
tagTypeId: props.tabs?.[props.i]?.id,
|
||||
})
|
||||
.then((res) => {
|
||||
const list = res.data.list || []; // 当前页数据
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<view class="m-b-12 size24 h_52" v-for="(item, i) in v.items" :key="i">
|
||||
<view class="flex1 flex-center ju-between h_52 bg18 radius8 p-l-8 p-r-16">
|
||||
<view class="lineOne c19">
|
||||
{{item?.properties.length > 1? item?.properties.reduce((items2, items) => items2.valueName + ' ' + items.valueName,): item?.properties[0].valueName}}
|
||||
{{ formatSkuProperties(item?.properties) }}
|
||||
</view>
|
||||
<view class="flex-center">
|
||||
<view class="c19">x{{ item.count }}</view>
|
||||
@@ -41,9 +41,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-row ju-between" :class="{ 'm-t-8': props.type == 3 }" v-else>
|
||||
<view class="valueName size28" :class="{ c19: props.theme == 2 }">{{
|
||||
v.properties.map((property) => property.valueName).join(' ')
|
||||
}}</view>
|
||||
<view class="valueName size28" :class="{ c19: props.theme == 2 }">{{ formatSkuProperties(v.properties) }}</view>
|
||||
<view class="shrink size28 c_333" :class="{ c0: props.theme == 2 }">{{
|
||||
`x${v.count}`
|
||||
}}</view>
|
||||
@@ -75,6 +73,13 @@
|
||||
import sheep from '@/sheep';
|
||||
const { proxy } = getCurrentInstance() as any;
|
||||
let emit = defineEmits(['getOrderDetail']);
|
||||
const formatSkuProperties = (properties: any) => {
|
||||
const list = Array.isArray(properties) ? properties : [];
|
||||
return list
|
||||
.map((property) => property?.valueName)
|
||||
.filter(Boolean)
|
||||
.join(' ');
|
||||
};
|
||||
const props = defineProps({
|
||||
data: {
|
||||
type: Object,
|
||||
@@ -160,4 +165,4 @@
|
||||
.btnItem1 {
|
||||
background: #F2F2F2;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user