Merge branch 'dev' into zhaosm

# Conflicts:
#	pages/activity/components/activity-item.vue
#	pages/activity/components/activity-recommend.vue
#	pages/index/search.vue
#	pages/news/components/news-item.vue

main.js

@@ -118,18 +118,7 @@ Vue.prototype.loadFontFace = function(fontFamily) {
 	const fontUrls = {
 		'Poppins': 'https://oss.starify.cn/test/Poppins-Regular.ttf'
 	}
-	if (fontFamily === 'Poppins') {
-		// 开发者工具没有该字体
-		wx.getSystemInfo({
-		  success(res) {
-		    if (res.platform === 'devtools') {
-					loadCloudFontFace(fontUrls[fontFamily], fontFamily + '.ttf', fontFamily)
-		    }
-		  }
-		})
-	} else {
-		loadCloudFontFace(fontUrls[fontFamily], fontFamily + '.ttf', fontFamily)
-	}
+	loadCloudFontFace(fontUrls[fontFamily], fontFamily + '.ttf', fontFamily)
 }
 
 App.mpType = 'app'

package.json

@@ -17,6 +17,7 @@
 					"ENV_TYPE": "dev",
 					"UNI_PLATFORM": "mp-weixin",
 					"NAME": "dev",
+					"VERSION": "0.01",
 					"TOKEN_KEY": "token",
 					"BASE_API": "https://mp-test-onlinecatelogue.matchexpo.cn",
 					"WEBSITE": "https://mp-website-test-munich.matchexpo.cn",
@@ -32,6 +33,7 @@
 					"ENV_TYPE": "test",
 					"UNI_PLATFORM": "mp-weixin",
 					"NAME": "test",
+					"VERSION": "0.01",
 					"TOKEN_KEY": "token",
 					"BASE_API": "https://mp-test-miniprogapi.matchexpo.cn",
 					"WEBSITE": "https://mp-website-test-munich.matchexpo.cn",
@@ -47,6 +49,7 @@
 					"ENV_TYPE": "prod",
 					"UNI_PLATFORM": "mp-weixin",
 					"NAME": "prod",
+					"VERSION": "0.01",
 					"TOKEN_KEY": "token",
 					"BASE_API": "https://starify-api-dev.matchexpo.cn",
 					"WEBSITE": "https://www.productronicachina.com.cn",

pages/activity/components/activity-item.vue

@@ -27,7 +27,8 @@
 
 <script>
 	import { meetingCollect, meetingCancelCollect, mettingView } from '@/api/exhibitor'
-	
+
+
 	export default {
 		options: {
 			styleIsolation: 'shared'
@@ -35,6 +36,7 @@
 		components: {
 		},
 		props: {
+      type: String,
 			// 数据
 			item: Object,
 			favoritesHidden: Boolean,
@@ -81,18 +83,23 @@
 			  const day = date.getDate();
 			  return `${year}年${month}月${day}日`;
 			},
-			onClickActivity(item){
-				this.saveMeetingView(item)
-				this.navigateTo(this.websiteUrl + '/' + item.urla)
-			},
+      onClickActivity(item){
+        this.saveMeetingView(item)
+        if (this.type === 'exhibitor') {
+          this.webviewTo(this.$store.getters.website_url + '/mini-pro-activity?v=' + this.$store.getters.version)
+        } else {
+          this.webviewTo(this.$store.getters.website_url + '/mini-pro-same-detail?v=' + this.$store.getters.version)
+        }
+        // this.navigateTo('/pages/activity/detail')
+      },
 			saveMeetingView(item) {
 				if (this.platform !== 'metting') return
 				mettingView({ id: item.id }).then(res => {
-					
+
 				})
 			}
 		}
 	}
 </script>
 <style lang="scss">
-</style>
+</style>

pages/activity/components/activity-recommend.vue

@@ -22,7 +22,8 @@
 <script>
 	import { exhibitorsBoothActivityList } from '@/api/exhibitor'
 	import { link } from '@/utils/request'
-	
+
+
 	export default {
 		options: {
 			styleIsolation: 'shared'
@@ -76,8 +77,8 @@
 			  const day = date.getDate();
 			  return `${year}年${month}月${day}日`;
 			},
-			onClickActivity(item) {
-				this.navigateTo(link('/' + item.urla))
+			onClickActivity() {
+				this.navigateTo(this.$store.getters.website_url + '/mini-pro-activity?v=' + this.$store.getters.version)
 			}
 		}
 	}
@@ -126,17 +127,17 @@
 			padding-right: 30rpx;
 			color: #555555;
 			@include text-ellipsis-line;
-			-webkit-line-clamp: 2;  
+			-webkit-line-clamp: 2;
 		}
 		.arrow{
 			margin-left: 12rpx;
 			font-size: $fontSize0;
 		}
 	}
-	
+
 	.activity-tab{
 		van-button{
 			margin-right: 13rpx;
 		}
 	}
-</style>
+</style>

pages/index/search.vue

@@ -53,7 +53,7 @@
 	import ExhibitorItem from '@/pages/exhibitor/components/exhibitor-item.vue'
 	import NewsItem from '@/pages/news/components/news-item.vue'
 	import ActivityItem from '@/pages/activity/components/activity-item.vue'
-	
+
 	import { globalSearch, mettingList, exhibitorsList, exhibitorsProductList, exhibitorsNewsList, exhibitorsBoothActivityList, globalPollShow } from '@/api/exhibitor'
 	import DisclaimerText from '@/components/disclaimer-text/index.vue'
 	export default {
@@ -161,6 +161,7 @@
 
 			},
 			onClickSearch() {
+
 				this.listParams.page = 1
 				this.listParams.keyword = this.searchKeyword
 				this.exhibitorListParams = {...this.listParams}
@@ -214,7 +215,7 @@
 					this.exhibitorListLoading = false
 				})
 			},
-			getExhibitList() { // 展品 
+			getExhibitList() { // 展品
 				this.exhibitListLoading = true
 				exhibitorsProductList(this.exhibitListParams).then(res => {
 					if (res.data.data) {

pages/news/components/news-item.vue

@@ -34,11 +34,12 @@
 			  return `${year}年${month}月${day}日`;
 			},
 			onClickDetail(item) {
-				if (this.type === 'exhibitor')  {
-					this.navigateTo(link('/' + item.urla))
+        this.navigateTo(this.$store.getters.website_url + '/mini-pro-news?v=' + this.$store.getters.version)
+				/*if (this.type === 'exhibitor')  {
+					this.navigateTo('https://mp-test-onlinecatelogue.matchexpo.cn/Selis-responds-to-Guangzhou-s-inquiry-on-M7-accident-identification-the-owner-does-not-recognize-the-analysis-conclusion-that-the-case-has-entered-the-judicial-procedure')
 				} else {
-					this.navigateTo(this.websiteUrl + '/' + item.urla)
-				}
+					this.navigateTo('https://www.productronicachina.com.cn/2025%E6%85%95%E5%B0%BC%E9%BB%91%E4%B8%8A%E6%B5%B7%E7%94%B5%E5%AD%90%E7%94%9F%E4%BA%A7%E8%AE%BE%E5%A4%87%E5%B1%953%E6%9C%88%E5%A5%8F%E5%93%8D%E6%96%B0%E7%AF%87%E7%AB%A0-%E6%8E%A2%E7%B4%A2%E7%94%B5%E5%AD%90%E5%88%B6%E9%80%A0%E7%9A%84%E6%97%A0%E9%99%90%E5%8F%AF%E8%83%BD')
+				}*/
 			}
 		}
 	}
@@ -75,7 +76,7 @@
 			padding-right: 30rpx;
 			color: #555555;
 			@include text-ellipsis-line;
-			-webkit-line-clamp: 2;  
+			-webkit-line-clamp: 2;
 		}
 		.to-detail{
 			display: flex;
@@ -91,4 +92,4 @@
 			font-size: $fontSize0;
 		}
 	}
-</style>
+</style>

store/getters.js

@@ -5,6 +5,8 @@ const getters = {
   baseApi: state => process.env.BASE_API,
   loading: state => state.app.loading,
   ossDomain: state => state.app.ossDomain,
-  locale: state => state.app.locale
+  locale: state => state.app.locale,
+  version: state => process.env.VERSION ?? '0.01',
+  website_url: state => 'https://mp-test-onlinecatelogue.matchexpo.cn'
 }
 export default getters