mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-03-22 14:27:21 +08:00
Merge branch 'dev' into 'master'
uniapp【修复】:修复首页下拉刷新,首页更新没有更新变化 See merge request jianweie/coreshoppro!92
This commit is contained in:
@@ -46,7 +46,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { reactive, onMounted } from 'vue';
|
import { reactive, watch } from 'vue';
|
||||||
import Point from '../home-goods/point.vue';
|
import Point from '../home-goods/point.vue';
|
||||||
import { handleRouteNavigateTo, splitArrayByStep } from '@/core/utils';
|
import { handleRouteNavigateTo, splitArrayByStep } from '@/core/utils';
|
||||||
|
|
||||||
@@ -64,8 +64,8 @@
|
|||||||
column: 1,
|
column: 1,
|
||||||
})
|
})
|
||||||
|
|
||||||
onMounted(() => {
|
watch(() => props.data.list[0], () => {
|
||||||
hanlderChangeTab(props.data.list[0]);
|
hanlderChangeTab(props.data.list?.[0]);
|
||||||
})
|
})
|
||||||
|
|
||||||
// 组合商品数据传入组件
|
// 组合商品数据传入组件
|
||||||
|
|||||||
@@ -76,7 +76,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { reactive, onMounted } from 'vue';
|
import { reactive, watchEffect } from 'vue';
|
||||||
import Point from './point.vue';
|
import Point from './point.vue';
|
||||||
import { handleRouteNavigateTo, toDimensionArray, splitArrayByStep } from '@/core/utils';
|
import { handleRouteNavigateTo, toDimensionArray, splitArrayByStep } from '@/core/utils';
|
||||||
|
|
||||||
@@ -91,8 +91,7 @@
|
|||||||
}>({
|
}>({
|
||||||
goodsList: [],
|
goodsList: [],
|
||||||
})
|
})
|
||||||
|
watchEffect(() => {
|
||||||
onMounted(() => {
|
|
||||||
if (props.data.display == 'slide') { // 横向滚动数据处理
|
if (props.data.display == 'slide') { // 横向滚动数据处理
|
||||||
goodsState.goodsList = toDimensionArray(props.data.list.slice(0, props.data.limit), props.data.column);
|
goodsState.goodsList = toDimensionArray(props.data.list.slice(0, props.data.limit), props.data.column);
|
||||||
} else { // 列表瀑布流数据处理
|
} else { // 列表瀑布流数据处理
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted } from 'vue';
|
import { ref,ks watch } from 'vue';
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
const props = withDefaults(defineProps<{
|
||||||
data : any,
|
data : any,
|
||||||
@@ -14,11 +14,11 @@
|
|||||||
|
|
||||||
let autoplay = ref(false);
|
let autoplay = ref(false);
|
||||||
|
|
||||||
onMounted(() => {
|
watch(() => props.data.autoplay, (autoplay) => {
|
||||||
if (props.data.autoplay == true || props.data.autoplay == 'true') {
|
if (props.data.autoplay == true || props.data.autoplay == 'true') {
|
||||||
autoplay.value = true;
|
autoplay.value = true;
|
||||||
}
|
}
|
||||||
})
|
}, { immediate: true });
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.video-box {
|
.video-box {
|
||||||
|
|||||||
Reference in New Issue
Block a user