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 ? {'padding':'0 24rpx','box-sizing':'border-box'}: null]">
+		<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 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>

pages/home/components/goodslist.vue

@@ -16,8 +16,8 @@
 			</view>
 			<view v-if="spaceArray.length" v-for="(item, key) in spaceArray" :key="key+65535" :style="width ? {'width':width} : ''"></view>
 		</view>
-		<uni-swiper-dot v-else :info="dataList" :dotsStyles="{'width': 4,'height':4, 'bottom':5,'border':'none','selectedBorder':'none'}" mode="dot" :current="current">
-			<swiper class="swiper_content" @change="change" :autoplay="true" :style="style_setting.listType === 2 ? {'height': '536rpx'} : {'height': '346rpx'}">
+		<uni-swiper-dot v-else :info="dataList" :dotsStyles="{'width': 4,'height':4, 'bottom':15,'border':'none','selectedBorder':'none'}" mode="dot" :current="current">
+			<swiper class="swiper_content" @change="change" :autoplay="true" :style="[style_setting.listType === 2 ? {'height': '536rpx'} : {'height': '346rpx'}, {'background-color': style_setting.bg_color}]">
 				<swiper-item v-for="(val, index) in dataList" :key="index" class="goods_box2">
 					<view v-for="(item, key) in val" :key="key" class="goods_item" :style="width ? {'width':width} : ''">
 						<view :class="style_setting.listType === 2 ? 'image_box2' : 'image_box'">
@@ -110,7 +110,6 @@
 		margin: 0 auto;
 		box-sizing: border-box;
 		background: #fff;
-		padding: 0 24rpx;
 	}
 	.goods_content, .swiper_content {
 		border-radius: 0 0 16rpx 16rpx;