Merge branch 'lj'

# Conflicts:
#	service/request.js

components/InputAndSwiper/InputAndSwiper.vue

@@ -13,7 +13,8 @@
 				</u-input>
 			</view>
 		</view>
-		<u-swiper :list="bannerURL" height="300rpx" />
+		<u-swiper :list="bannerURL" keyName="img" height="300rpx" @change="e => currentNum = e.current"
+			@click="handleSwiperList(currentNum==''?0:currentNum,bannerURL)" />
 	</view>
 </template>
 
@@ -38,19 +39,23 @@
 		},
 		data() {
 			return {
-				position: uni.getStorageSync('city')+uni.getStorageSync('district').slice(0, 2)
+				position: uni.getStorageSync('city') + uni.getStorageSync('district').slice(0, 2),
+				currentNum: ''
 			};
 		},
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离
 		},
 		created() {
-			if (this.type !== '0') {
-				// this.open()
-			}
 		},
 		methods: {
-		
+			//点击轮播图
+			handleSwiperList(currentNum, bannerURL) {
+				const item=bannerURL[currentNum]
+				uni.navigateTo({
+					url: item.link+`?id=${item.param}&type=${item.type}`
+				})
+			},
 		}
 	}
 </script>