Merge branch 'master' of http://git.liuniu946.com/hwq/xpl

pages/market/details.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="center">
-		<view class="top"><image :src="list.logo" mode=""></image></view>
+		<!-- <view class="top"><image :src="list.logo" mode=""></image></view> -->
+		<swiper :autoplay="true" :interval="3000" :duration="1000" class="top" indicator-color="rgba(0, 0, 0, .2)" indicator-dots indicator-active-color="#fff">
+			<swiper-item v-for="item in list.imgs.split(',')">
+				<image :src="item" mode="">
+			</swiper-item>
+		</swiper>
 		<view class="name-box">
 			<view class="price-box">
 				兑换价：

pages/product/pingDetails.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="center">
-		<view class="top"><image :src="list.data.background_image" mode=""></image></view>
+		<!-- <view class="top"><image :src="list.data.background_image" mode=""></image></view> -->
+		<swiper  :autoplay="true" :interval="3000" :duration="1000" class="top" indicator-color="rgba(0, 0, 0, .2)" indicator-dots indicator-active-color="#fff">
+			<swiper-item v-for="item in list.data.background_image.split(',')">
+				<image :src="item" mode="">
+			</swiper-item>
+		</swiper>
 		<view class="name-box">
 			<view class="price-box">
 				<text class="price">

pages/user/extension.vue

@@ -16,7 +16,7 @@
 				</view>
 			</view>
 		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
+		<swiper :current="tabCurrentIndex" :style="{ 'height': maxheight }" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
@@ -532,5 +532,8 @@ page {
 		width: 15rpx;
 		height: 27rpx;
 	}
+}
+.swiper-box {
+	background-color: red;
 }
 </style>