Merge branch 'dev' into 'master'

uniapp【修复】： 首页轮播高度跟随后台设置而定

See merge request jianweie/coreshoppro!80

CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-swiper/home-swiper.scss

@@ -3,6 +3,5 @@
 	overflow: hidden;
 	.swiper-img {
 		width: 100%;
-		height: 300rpx;
 	}
 }

CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-swiper/home-swiper.vue

@@ -1,9 +1,9 @@
 <template>
     <swiper class="swiper m-b-25" v-if="props.data.list.length > 0" :vertical="false" :indicator-dots="props.dotsSelect"
         :autoplay="props.autoplaySelect" :interval="props.data.duration" :circular="props.circularSelect"
-        :indicator-color="props.indicatorColor" :indicator-active-color="props.indicatorColorActive">
+        :indicator-color="props.indicatorColor" :indicator-active-color="props.indicatorColorActive" :style="{'height':`${props.data?.height}px`}">
         <swiper-item v-for="item, index in props.data.list" :key="index" @click="hanldeClickImage(item)">
-            <image class="swiper-img" :src="item.image"></image>
+            <image class="swiper-img" :src="item.image" :style="{'height':`${props.data?.height}px`}"></image>
         </swiper-item>
     </swiper>
 </template>
@@ -15,7 +15,6 @@
         data ?: any,
         dotsSelect ?: boolean,
         autoplaySelect ?: boolean,
-        intervalSelect ?: number,
         circularSelect ?: boolean,
         indicatorColor ?: string,
         indicatorColorActive ?: string,
@@ -23,7 +22,6 @@
         data: {},
         dotsSelect: true,
         autoplaySelect: true,
-        intervalSelect: 3000,
         circularSelect: true,
         indicatorColor: '#EEF2F6',
         indicatorColorActive: '#E74435'