Merge pull request 'gdpaoup' (#99) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/99
This commit is contained in:
		
						commit
						0266a556d9
					
				@ -34,22 +34,23 @@
 | 
			
		||||
								</view>
 | 
			
		||||
							</view>
 | 
			
		||||
						</view>
 | 
			
		||||
					</view>
 | 
			
		||||
				</scroll-view>
 | 
			
		||||
			</swiper-item>
 | 
			
		||||
			<swiper-item>
 | 
			
		||||
				<scroll-view style="width:100%;height:100%" scroll-y="true">
 | 
			
		||||
					<view class="box">
 | 
			
		||||
						<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" :rid="item.chatroom_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 | 
			
		||||
							</view>
 | 
			
		||||
							<view style="margin-left:20rpx">
 | 
			
		||||
								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 | 
			
		||||
					</scroll-view>
 | 
			
		||||
				</swiper-item>
 | 
			
		||||
				<swiper-item>
 | 
			
		||||
					<scroll-view style="width:100%;height:100%" scroll-y="true">
 | 
			
		||||
						<view class="box">
 | 
			
		||||
							<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" :rid="item.chatroom_id"
 | 
			
		||||
									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 | 
			
		||||
								</view>
 | 
			
		||||
								<view style="margin-left:20rpx">
 | 
			
		||||
									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id"
 | 
			
		||||
									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 | 
			
		||||
								</view>
 | 
			
		||||
							</view>
 | 
			
		||||
						</view>
 | 
			
		||||
 | 
			
		||||
					</scroll-view>
 | 
			
		||||
				</swiper-item>
 | 
			
		||||
				<swiper-item>
 | 
			
		||||
@ -293,20 +294,33 @@
 | 
			
		||||
			clickFImage(index) {
 | 
			
		||||
				const item = this.indexImageSwiper[index];
 | 
			
		||||
				console.log(item);
 | 
			
		||||
				this.activityLink({ type: item.url_type, id: item.info_id });
 | 
			
		||||
				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 });
 | 
			
		||||
				this.activityLink({
 | 
			
		||||
					type: item.url_type,
 | 
			
		||||
					id: item.info_id
 | 
			
		||||
				});
 | 
			
		||||
			},
 | 
			
		||||
			activityLink({ type, id }) {
 | 
			
		||||
				if(type == 0) return false;
 | 
			
		||||
			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 };
 | 
			
		||||
				let params = {
 | 
			
		||||
					id: id
 | 
			
		||||
				};
 | 
			
		||||
				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
 | 
			
		||||
				if(type == 1) Object.assign(params, { type: 1 });
 | 
			
		||||
				if (type == 1) Object.assign(params, {
 | 
			
		||||
					type: 1
 | 
			
		||||
				});
 | 
			
		||||
				this.$u.route({
 | 
			
		||||
					url: url,
 | 
			
		||||
					params: params
 | 
			
		||||
@ -314,4 +328,4 @@
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
</script>
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user