xhj преди 2 години
родител
ревизия
70e42ed2cd

+ 3 - 3
pages/index/index.css

@@ -688,7 +688,7 @@ page{background: #fff;}
 	border-bottom: none;
 }
 .lpgs-item-content-title{
-	height: 72rpx;
+	height: 108rpx;
 	font-size: 28rpx;
 	font-family: PingFang SC-Medium, PingFang SC;
 	font-weight: 500;
@@ -710,8 +710,8 @@ page{background: #fff;}
 	margin-right: 10rpx;
 }
 .lpgs-item-content-pic{
-	width: 163rpx;
-	height: 114rpx;
+	width: 202rpx;
+	height: 141rpx;
 	margin-left: 10rpx;
 	border-radius: 10rpx;
 }

+ 4 - 2
pages/index/index.vue

@@ -158,7 +158,7 @@
 					</view>
 				</view>
 				<view class="map-ac">
-					<scroll-view scroll-x="true" class="map-acs ddflex" style="height: 430rpx;">
+					<scroll-view scroll-x="true" class="map-acs ddflex" style="height: 502rpx;">
 						<view class="lpgs-item" v-for="items,indexs in lpalList ">
 							<image class="lpgs-icon" src="../../static/images/lpgs_icon.png"></image>
 							<view :class="'lpgs-header '+(indexs%2==0?'':'lpgs-header-c')">
@@ -168,7 +168,7 @@
 								<view class="lpgs-item-content ddflex" v-for="item,index in items.contentList" :key="index"
 									@click="jumpUrl('/topic/content/content?id='+item.id)">
 									<view class="flex" style="min-width: 0;">
-										<view class="lpgs-item-content-title tovers">{{item.title}}</view>
+										<view class="lpgs-item-content-title tovers3">{{item.title}}</view>
 										<view class="lpgs-item-content-look ddflex">
 											<image src="/static/images/eyes.png"></image>
 											<view>{{unitFormat(item.browse)}}</view>
@@ -1064,6 +1064,8 @@
 					url = "activity/group/detail/detail?acid=" + acid + "&id=" + id;
 				}else if (dt.type * 1 == 19 && dt.content != "") {
 					url = "topic/content/content?id=" + dt.content;
+				}else if (dt.type * 1 == 27 && dt.content != "") {
+					url = "match/activityDetail/activityDetail?id=" + dt.content;
 				} else {
 					url = "";
 				}

+ 27 - 11
template/banner/banner.vue

@@ -10,9 +10,9 @@
 						circular="true" duration="1000">
 						<block v-for="(item, index) in bannerList" :key="index">
 							<swiper-item autoplay="true">
-								<contact-button :img-url="item.pic + '?x-oss-process=style/w750-auto'" class-name="banner-img" v-if="item.type == 8"></contact-button>
+								<contact-button :img-url="item.pic" class-name="banner-img" v-if="item.type == 8"></contact-button>
 								<block v-else>
-									<image lazy-load="true" :src="item.pic + '?x-oss-process=style/w750-auto'"
+									<image lazy-load="true" :src="item.pic"
 										mode="aspectFill" @tap="getUrl2" :data-type="item.type"
 										:data-content="item.content" :data-merchant="url"></image>
 								</block>
@@ -230,21 +230,37 @@
 					url: url
 				})
 			},
-
 			getUrl2(e) {
+				console.log(e)
 				var dt = e.currentTarget.dataset;
 				var url = "";
 				var id = "";
 				var acid = "";
-
+			
 				if (dt.content != "") {
 					let conunt = dt.content.split("_");
 					id = conunt[1];
 					acid = conunt[0];
 				}
-
+			
 				if (dt.type * 1 == 2 && dt.content != "") {
 					url = "product/detail/detail?id=" + dt.content;
+				} else if (dt.type * 1 == 3) {
+					url = dt.content;
+					console.log('urlgetUrl2===',url)
+					if(!url){
+						req.msg('功能待接入')
+						return false
+					}
+					if(url=='pages/index/index'||url=='pages/matchList/index'||url=='pages/interactive/index'||url=='pages/found/found'||url=='pages/user/user'){
+						app.globalData.switchTab(url)
+						return false
+					}else{
+						if(url.indexOf('http')!=-1){
+							app.globalData.openPage('pages/web/web?url='+url);
+							return false
+						}
+					}
 				} else if (dt.type * 1 == 4) {
 					url = "product/groupDetail/groupDetail?acid=" + acid + "&id=" + id;
 				} else if (dt.type * 1 == 5) {
@@ -254,7 +270,7 @@
 				} else if (dt.type * 1 == 7) {
 					url = "product/groupList/groupList" + dt.merchant;
 				} else if (dt.type * 1 == 9 && dt.content != "") {
-					url = "product/list/list?id=" + dt.content;
+					url = "product/list/list?id=" + dt.content + '&title=' + dt.title + this.web;
 				} else if (dt.type * 1 == 10) {
 					url = "plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=" + dt.content;
 					// console.log(
@@ -276,15 +292,15 @@
 				} else if (dt.type * 1 == 18 && dt.content != "") {
 					url = "activity/group/detail/detail?acid=" + acid + "&id=" + id;
 				} else if (dt.type * 1 == 19 && dt.content != "") {//文章内容
-					url = "activity/content/content?id=" + dt.content + "&type=" + 1;//1为普通文章内容
+					url = "topic/content/content?id=" + dt.content + "&type=" + 1;//1为普通文章内容
 				} else if (dt.type * 1 == 21 && dt.content != "") {//专题类型
 					url = "pages/topic/topic?id=" + dt.content;
-				} else if (dt.type * 1 == 3 && dt.content != "") {//外链类型
-					url = dt.content;//1为普通文章内容
-				} else {
+				} else if (dt.type * 1 == 27 && dt.content != "") {
+					url = "match/activityDetail/activityDetail?id=" + dt.content;
+				} else{
 					url = "";
 				}
-
+			
 				if (dt.type * 1 == 6) app.globalData.switchTab(url);
 				else app.globalData.openPage(url);
 				this.hideAd();

+ 1 - 1
template/bargain/bargain.vue

@@ -10,7 +10,7 @@
 					{{bargainTemplate.titleCon}}
 					<image src="/static/pages/images/more.png" class="more"></image>
 				</view>
-				<image lazy-load="true" v-if="bargainTemplate.titleType==2" :src="bargainTemplate.titleCon + '?x-oss-process=style/w750-auto'" mode="widthFix" class="imgtit"></image>
+				<image lazy-load="true" v-if="bargainTemplate.titleType==2" :src="bargainTemplate.titleCon" mode="widthFix" class="imgtit"></image>
 			</navigator>
 			<goodsList :pageList="bargainList" :about="about" :merchant="web" :type="'5'" :typeName="'砍价'"></goodsList>
 <!-- 			<view class="pintuan pdlr20">

+ 1 - 1
template/coupons/index.vue

@@ -7,7 +7,7 @@
 						<view><text class="quan-tits">领券</text>更优惠</view>
 						<image src="/static/pages/images/more.png" class="more"></image>
 					</view>
-					<!-- <image lazy-load="true" :src="hotTemplate.titleCon + '?x-oss-process=style/w750-auto'" mode="widthFix" class="imgtit"></image> -->
+					<!-- <image lazy-load="true" :src="hotTemplate.titleCon" mode="widthFix" class="imgtit"></image> -->
 				</navigator>
 				<view class="coupons-list ddflex">
 					<scroll-view scroll-x="true" class="coupons-lists">

+ 7 - 1
template/king_kong_district/king_kong_district.vue

@@ -188,7 +188,13 @@
 					url = "activity/bargain/detail/detail?acid=" + acid + "&id=" + id;
 				} else if (dt.type * 1 == 18 && dt.content != "") {
 					url = "activity/group/detail/detail?acid=" + acid + "&id=" + id;
-				} else {
+				} else if (dt.type * 1 == 19 && dt.content != "") {//文章内容
+					url = "topic/content/content?id=" + dt.content + "&type=" + 1;//1为普通文章内容
+				} else if (dt.type * 1 == 21 && dt.content != "") {//专题类型
+					url = "pages/topic/topic?id=" + dt.content;
+				} else if (dt.type * 1 == 27 && dt.content != "") {
+					url = "match/activityDetail/activityDetail?id=" + dt.content;
+				} else{
 					url = "";
 				}
 

+ 24 - 5
template/popAd/popAd.vue

@@ -49,6 +49,7 @@
 
 		methods: {
 			getUrl2(e) {
+				console.log(e)
 				var dt = e.currentTarget.dataset;
 				var url = "";
 				var id = "";
@@ -62,6 +63,22 @@
 			
 				if (dt.type * 1 == 2 && dt.content != "") {
 					url = "product/detail/detail?id=" + dt.content;
+				} else if (dt.type * 1 == 3) {
+					url = dt.content;
+					console.log('urlgetUrl2===',url)
+					if(!url){
+						req.msg('功能待接入')
+						return false
+					}
+					if(url=='pages/index/index'||url=='pages/matchList/index'||url=='pages/interactive/index'||url=='pages/found/found'||url=='pages/user/user'){
+						app.globalData.switchTab(url)
+						return false
+					}else{
+						if(url.indexOf('http')!=-1){
+							app.globalData.openPage('pages/web/web?url='+url);
+							return false
+						}
+					}
 				} else if (dt.type * 1 == 4) {
 					url = "product/groupDetail/groupDetail?acid=" + acid + "&id=" + id;
 				} else if (dt.type * 1 == 5) {
@@ -71,9 +88,11 @@
 				} else if (dt.type * 1 == 7) {
 					url = "product/groupList/groupList" + dt.merchant;
 				} else if (dt.type * 1 == 9 && dt.content != "") {
-					url = "product/list/list?id=" + dt.content;
+					url = "product/list/list?id=" + dt.content + '&title=' + dt.title + this.web;
 				} else if (dt.type * 1 == 10) {
 					url = "plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=" + dt.content;
+					// console.log(
+					// url); // url=`plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${dt.content}`
 				} else if (dt.type * 1 == 11) {
 					url = "activity/group/index/index" + dt.merchant;
 				} else if (dt.type * 1 == 12) {
@@ -91,12 +110,12 @@
 				} else if (dt.type * 1 == 18 && dt.content != "") {
 					url = "activity/group/detail/detail?acid=" + acid + "&id=" + id;
 				} else if (dt.type * 1 == 19 && dt.content != "") {//文章内容
-					url = "activity/content/content?id=" + dt.content + "&type=" + 1;//1为普通文章内容
+					url = "topic/content/content?id=" + dt.content + "&type=" + 1;//1为普通文章内容
 				} else if (dt.type * 1 == 21 && dt.content != "") {//专题类型
 					url = "pages/topic/topic?id=" + dt.content;
-				} else if (dt.type * 1 == 3 && dt.content != "") {//外链类型
-					url = dt.content;//1为普通文章内容
-				} else {
+				} else if (dt.type * 1 == 27 && dt.content != "") {
+					url = "match/activityDetail/activityDetail?id=" + dt.content;
+				} else{
 					url = "";
 				}