Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

pages/index/index.vue

@@ -19,7 +19,7 @@
 				<scroll-view style="width:100%;height:100%" scroll-y="true">
 					<view class="box">
 						<!-- <indexad style="width:690rpx"></indexad> -->
-						<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
+						<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
 						<view class="list">
 							<view>
 								<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
@@ -36,7 +36,7 @@
 			<swiper-item>
 				<scroll-view style="width:100%;height:100%" scroll-y="true">
 					<view class="box">
-						<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
+						<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
 						<view class="list">
 							<view>
 								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
@@ -283,6 +283,28 @@
 			    url: '/pageB/follow/index'
 			});
 			},
+			clickFImage(index) {
+				const item = this.indexImageSwiper[index];
+				console.log(item);
+				this.activityLink({ type: item.url_type, id: item.info_id });
+			},
+			clickSImage(index) {
+				const item = this.zhiboImageSwiper[index];
+				console.log(item);
+				this.activityLink({ type: item.url_type, id: item.info_id });
+			},
+			activityLink({ type, id }) {
+				if(type == 0) return false;
+				// type 1 商品详情页, 2 店铺详情页
+				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
+				let params = { id: id };
+				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+				if(type == 1) Object.assign(params, { type: 1 });
+				this.$u.route({
+					url: url,
+					params: params
+				})
+			},
 		},
 	}
 </script>