Merge branch 'wjw_dev'

pages/home/components/functionmenu.vue

 <template>
 	<view>
-		<view v-if="style_setting.rank === 1" class="rank rank1" :style="[style_setting.bg_show ? {'background-image':style_setting.bg_url} : {'background-color': style_setting.bg_color},{'border-bottom-left-radius':style_setting.radius_bottom_left*2+'rpx', 'border-bottom-right-radius':style_setting.radius_bottom_right*2+'rpx', 'border-top-left-radius':style_setting.radius_top_left*2+'rpx', 'border-top-right-radius':style_setting.radius_top_right*2+'rpx'}, style_setting.bg_style === 1 ? {'width':'702rpx','margin':'0 auto  20rpx'}: null]">
+		<view v-if="style_setting.rank === 1" class="rank rank1" :style="[{'background-image':style_setting.bg_url}, {'background-color': style_setting.bg_color},{'border-bottom-left-radius':style_setting.radius_bottom_left*2+'rpx', 'border-bottom-right-radius':style_setting.radius_bottom_right*2+'rpx', 'border-top-left-radius':style_setting.radius_top_left*2+'rpx', 'border-top-right-radius':style_setting.radius_top_right*2+'rpx'}, style_setting.bg_style === 1 ? {'width':'702rpx','margin':'0 auto  20rpx'}: null]">
 			<view class="menuItem" v-for="(item, key) in menuArray" :key="key" :style="{'width': width}" @click="$jump(item.img_href)">
 				<image :src="item.img_url" class="icon_img"></image>
 				<text v-if="style_setting.font_show" class="title" :style="{'color': style_setting.font_color}">{{item.title}}</text>
 			</view>
 		</view>
-		<swiper v-else indicator-dots="true" :style="[{'height': style_setting.rank*200+10+'rpx'}, style_setting.bg_style === 1 ? {'padding':'0 24rpx','box-sizing':'border-box'}: null]">
+		<swiper v-else indicator-dots="true" :style="[{'height': style_setting.rank*200+10+'rpx'}, style_setting.bg_style === 1 ? {'width':'702rpx','margin':'0 auto  20rpx'}: null, {'background-image':style_setting.bg_url}, {'background-color': style_setting.bg_color}]" class="swiper_view">
 			<swiper-item v-for="(item, key) in menuArray" :key="key" class="rank rank1">
 				<view class="menuItem" v-for="(val, index) in item" :key="index" :style="{'width': width}" @click="$jump(item.img_href)">
 					<image :src="val.img_url" class="icon_img"></image>
@@ -51,6 +51,10 @@
 </script>
 
 <style lang="less" scoped>
+	.swiper_view {
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+	}
 	.rank {
 		background-size: 100% 100%;
 		background-repeat: no-repeat;