111

pages/detail/detail.vue

@@ -101,24 +101,26 @@
         />
       </view>
     <view class="desc">
-      <view class="videobox" v-if="type == 'video'">
-        <!-- #ifdef MP-WEIXIN -->
- 
-        <polyv-player
-          :id="'playerContext'+info.video_no"
-          :playerId="'playerId'+info.video_no"
-          :vid="info.video_no"
-          height="500rpx"
-          autoplay="{{false}}"
-        >
-        </polyv-player>
-       <!-- #endif -->
-        <!-- #ifdef h5 -->
-         <view class="videobox" v-if="type == 'video'">
-           <baoliVideo :vid="info.video_no" ></baoliVideo>
-         </view>
-        <!-- #endif -->
+		
+      <view class="videobox" v-if="type == 'video' && !isH5 ">
+		  <!-- #ifdef MP-WEIXIN -->
+			<polyv-player
+			  :id="'playerContext'+info.video_no"
+			  :playerId="'playerId'+info.video_no"
+			  :vid="info.video_no"
+			  height="500rpx"
+			  autoplay="{{false}}"
+			>
+			</polyv-player>
+          <!-- #endif -->
       </view>
+	 
+	  <view class="videobox" v-if="type == 'video' && isH5">
+		    <!-- #ifdef H5 -->
+	    <baoliVideo :vid="info.video_no" ></baoliVideo>
+		    <!-- #endif -->
+	  </view>
+	  
       <view class="videobox" v-else-if="type == 'article'" style="min-height:350rpx">
         <view class="content">
 			<up-parse :content="fromatImg(info.article_content)"></up-parse>
@@ -555,8 +557,10 @@ import list from "@/uni_modules/z-paging/components/z-paging/z-paging";
 import api from "@/api/api";
 import { onLoad } from "@dcloudio/uni-app";
 import dayjs from "dayjs";
+// #ifdef H5
 import baoliVideo from "@/components/baoliVideo/baoliVideo.vue";
-
+// #endif
+const isH5=ref(process.env.UNI_PLATFORM =="h5");
 const user_id=ref('');
 const paging = ref(null);
 const dataList = ref([]);

pages/index/index.vue

@@ -151,10 +151,14 @@ const recommend_hospital=ref([]);
 const numInfo=reactive({})
 const goDetail = (id,isLink,src) => {
  if(isLink==1){
-	navTo({
-	  url: `/pages/web/web?src=${src}`,
-	});  
-	 
+	 // #ifdef MP-WEIXIN
+	 navTo({
+	   url: `/pages/web/web?src=${src}`,
+	 });  
+	 // #endif 
+	// #ifdef H5
+	 window.location.href=`${src}`
+	// #endif 
  }else{
 	navTo({
 	  url: `/pages/detail/detail?id=${id}&type=article`,
@@ -305,7 +309,7 @@ onShow(() => {
 }
 .page {
   background: #f9fafb;
-  height: calc(100vh - 400rpx);
+  height: calc(100vh - 425rpx);
   overflow-y: scroll;
 }
 .kubox {

pages/search/search.vue

@@ -328,9 +328,14 @@ const formatdate=(date)=>{
 const goDetail=(id,isLink,src)=>{
   console.log(isLink)
   if(isLink==1){
+	 // #ifdef MP-WEIXIN
 	  navTo({
 	    url: `/pages/web/web?src=${src}`,
 	  });  
+	  // #endif 
+	 // #ifdef H5
+	  window.location.href=`${src}`
+	 // #endif 
   }else{
 	 let type=isArticle.value?'article':'video'
 	 navTo({