Merge branch 'dev' of gitee.com:zongzhige/shopxo-uniapp into dev-sws

master
sws 2024-10-19 18:31:16 +08:00
commit b9569dc080
3 changed files with 10 additions and 7 deletions

View File

@ -7,12 +7,12 @@
data: { data: {
// //
// //
// request_url: 'http://shopxo.com/', //request_url: 'http://shopxo.com/',
request_url:'https://new.shopxo.vip/', request_url:'https://new.shopxo.vip/',
// publicpublichttps://d1.shopxo.vip/public/ // publicpublichttps://d1.shopxo.vip/public/
// static_url: 'http://shopxo.com/', //static_url: 'http://shopxo.com/',
static_url:'https://new.shopxo.vip/', static_url:'https://new.shopxo.vip/',
// default // default
system_type: 'default', system_type: 'default',

View File

@ -1,7 +1,7 @@
<template> <template>
<view :style="style_container"> <view :style="style_container">
<view :style="style_img_container"> <view :style="style_img_container">
<swiper circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :style="{ height: newHeight }" @change="slideChange"> <swiper circular="true" :autoplay="new_style.is_roll == '1'" :interval="new_style.interval_time * 1000" :duration="500" :style="{ height: new_height }" @change="slideChange">
<swiper-item v-for="(item, index) in nav_content_list" :key="index" class="flex-row align-c"> <swiper-item v-for="(item, index) in nav_content_list" :key="index" class="flex-row align-c">
<view class="bannerImg flex-row flex-wrap wh-auto" :style="space"> <view class="bannerImg flex-row flex-wrap wh-auto" :style="space">
<view v-for="(item1, index1) in item.split_list" :key="index1" class="flex-col gap-10 align-c" :style="group_width + nav_title_space" :data-value="item1.link.page" @tap="url_open_event"> <view v-for="(item1, index1) in item.split_list" :key="index1" class="flex-col gap-10 align-c" :style="group_width + nav_title_space" :data-value="item1.link.page" @tap="url_open_event">
@ -64,7 +64,7 @@
img_style: '', img_style: '',
text_style: '', text_style: '',
indicator_style: '', indicator_style: '',
newHeight: '300rpx', new_height: '300rpx',
actived_index: 0, actived_index: 0,
group_width: '', group_width: '',
nav_content_list: [], nav_content_list: [],
@ -111,7 +111,7 @@
if ((res || null) != null) { if ((res || null) != null) {
// data // data
this.setData({ this.setData({
newHeight: res.height * 2 + 'rpx', new_height: res.height + 'px',
}); });
} }
}) })

View File

@ -17,6 +17,9 @@
</template> </template>
</componentDiy> </componentDiy>
</block> </block>
<block v-else>
<component-no-data propStatus="0" propPage="home"></component-no-data>
</block>
</block> </block>
<!-- 自动和手动模式 --> <!-- 自动和手动模式 -->
<block v-else> <block v-else>