9-30-1

src/assets/css/base.css

@@ -55,4 +55,13 @@ html {
 }
 h1 {
 	font-weight: bold;
+}
+
+video{
+width: 100%;
+height: 100%;
+object-fit: contain;
+}
+video:focus {
+outline:none;
 }

src/views/cause/cells/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/cells/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/cells/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,12 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
+				
 			},
 			currentChange(e) {
 				this.page = e;

src/views/cause/emergency/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/emergency/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/emergency/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e;

src/views/cause/free/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/free/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/free/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e;

src/views/cause/humanity/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/humanity/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/humanity/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e;

src/views/cause/remains/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/remains/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/remains/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e;

src/views/cause/rescue/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/rescue/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/rescue/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e;

src/views/cause/service/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/service/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/service/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e;

src/views/cause/teenagers/List.vue

@@ -8,7 +8,7 @@
 		</div>
 		<div class="empty" v-if="newList.length == 0">暂无数据</div>
 		<div class="new-item hand" v-for="item in newList" :key="item.id"
-			@click="navTo('/cause/teenagers/detail?id=' + item.id)">
+			@click="navTo(item.url?item.url:('/cause/teenagers/detail?id=' + item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -50,7 +50,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e;

src/views/directories/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/directories/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/directories/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -78,7 +78,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/help/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/help/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/help/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -79,7 +79,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/knowledge/bloodDonation/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/knowledge/bloodDonation/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/knowledge/bloodDonation/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/knowledge/cells/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/knowledge/cells/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/knowledge/cells/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -69,7 +69,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+	  if(url.indexOf('http') != -1) {
+	  	window.open(url)
+	  }else {
+	  	this.$router.push(url);
+	  }
     },
     currentChange(e) {
       this.page = e;

src/views/knowledge/development/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/knowledge/development/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/knowledge/development/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -69,7 +69,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/knowledge/rescue/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/knowledge/rescue/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/knowledge/rescue/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -69,7 +69,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/newContent/hhs/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/newContent/hhs/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/newContent/hhs/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+     if(url.indexOf('http') != -1) {
+     	window.open(url)
+     }else {
+     	this.$router.push(url);
+     }
     },
     currentChange(e) {
       this.page = e;

src/views/newContent/jls/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/newContent/jls/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/newContent/jls/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/newContent/jlx/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/newContent/jlx/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/newContent/jlx/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/newContent/jzq/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/newContent/jzq/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/newContent/jzq/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/newContent/ssq/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/newContent/ssq/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/newContent/ssq/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/newContent/sss/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/newContent/sss/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/newContent/sss/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/newContent/szs/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/newContent/szs/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/newContent/szs/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -67,7 +67,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/news/Detail.vue

@@ -29,46 +29,8 @@ export default {
       let obj = this;
       details({}, this.idd).then((res) => {
         obj.content = res.data.content;
-        console.log(res);
-        let mess = {
-          title: "荆州市红十字会",
-          link: window.location.href, // 分享链接
-          imgUrl: "http://jzswx.jzrc.org.cn/index/static/img/002.png", // 分享图标
-          desc: res.data.title,
-          success: function () {
-            console.log(" 成功调用分享");
-          },
-          fail: function (e) {
-            console.log(e);
-          },
-        };
-        wx.checkJsApi({
-          jsApiList: ["updateAppMessageShareData"],
-          success: function (res) {
-			  console.log(res,'校驗結果')
-		  },
-        });
-		wechatConfig({
-			// url: 'pages/applic/location',			
-			url: 'http://jzsred.jzrc.org.cn',
-		}).then(res => {
-			console.log(res)
-		})
-		wx.config({
-				debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-				appId: data.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
-				timestamp: data.timestamp, // 必填，生成签名的时间戳
-				nonceStr: data.nonceStr, // 必填，生成签名的随机串
-				signature: data.signature, // 必填，签名，见附录1
-				jsApiList: data.jsApiList // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-			});
-        console.log(mess);
-        // wx.updateAppMessageShareData(mess);
-        wx.onMenuShareAppMessage(mess); // 即将废弃
-        // 分享朋友圈
-        // wx.updateTimelineShareData(mess);
-        wx.onMenuShareTimeline(mess); // 即将废弃
-      });
+})
+       
     },
   },
 };

src/views/news/List.vue

@@ -9,7 +9,7 @@
 		<div class="empty" v-if="newList.length == 0">
 			暂无数据
 		</div>
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/news/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo(item.url?item.url:('/news/detail?id='+ item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -54,7 +54,11 @@
 		},
 		methods: {
 			navTo(url) {
-				this.$router.push(url);
+				if(url.indexOf('http') != -1) {
+					window.open(url)
+				}else {
+					this.$router.push(url);
+				}
 			},
 			currentChange(e) {
 				this.page = e

src/views/organs/List.vue

@@ -21,7 +21,7 @@
       class="new-item hand"
       v-for="item in newList"
       :key="item.id"
-      @click="navTo('/organs/detail?id=' + item.id)"
+      @click="navTo(item.url?item.url:('/organs/detail?id=' + item.id))"
     >
       <div class="title clamp">
         <span class="title-icon"></span>
@@ -76,7 +76,11 @@ export default {
   },
   methods: {
     navTo(url) {
-      this.$router.push(url);
+      if(url.indexOf('http') != -1) {
+      	window.open(url)
+      }else {
+      	this.$router.push(url);
+      }
     },
     currentChange(e) {
       this.page = e;

src/views/popularScience/List.vue

@@ -22,7 +22,7 @@
         class="tip"
         v-for="item in tipList"
         :key="item.id"
-        @click="tipClick(item.id)"
+        @click="tipClick(item.url?item.url:('/popularScience/detail?id=' + item.id))"
       >
         <img :src="item.image" />
         <div class="info hand">
@@ -62,8 +62,13 @@ export default {
     this.getAllList();
   },
   methods: {
-    tipClick(id) {
-      this.$router.push("/popularScience/detail?id=" + id);
+    tipClick(url) {
+		if(url.indexOf('http') != -1) {
+			window.open(url)
+		}else {
+			this.$router.push(url);
+		}
+      // this.$router.push("/popularScience/detail?id=" + id);
     },
     //分页页码改变触发事件
     currentChange(e) {

src/views/publicity/List.vue

@@ -9,7 +9,7 @@
 		<div class="empty" v-if="newList.length == 0">
 			暂无数据
 		</div>
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/publicity/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo(item.url?item.url:('/publicity/detail?id='+ item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -45,7 +45,11 @@ export default {
 	},
 	methods:{
 		navTo(url) {
-			this.$router.push(url);
+			if(url.indexOf('http') != -1) {
+				window.open(url)
+			}else {
+				this.$router.push(url);
+			}
 		},
 		currentChange(e) {
 			this.page = e

src/views/regulations/List.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="new-list">
-		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo('/regulations/detail?id='+ item.id)">
+		<div class="new-item  hand" v-for="item in newList" :key="item.id" @click="navTo(item.url?item.url:('/regulations/detail?id='+ item.id))">
 			<div class="title clamp">
 				<span class="title-icon"></span>
 				{{ item.title }}
@@ -35,7 +35,11 @@ export default {
 	},
 	methods:{
 		navTo(url) {
-			this.$router.push(url);
+			if(url.indexOf('http') != -1) {
+				window.open(url)
+			}else {
+				this.$router.push(url);
+			}
 		},
 		currentChange(e) {
 			this.page = e