活动调整

pages/news/activityDetails.vue

@@ -1,6 +1,12 @@
 <template>
 	<view>
-		<u-navbar :title="navbarTitle"></u-navbar>
+		<u-navbar title="">
+			<view class="slot-wrap" @click="back">
+				<view class="slot-title">
+					{{navbarTitle}}
+				</view>
+			</view>
+		</u-navbar>
 		<!-- <view class="img">
 			<img src="../../static/img/activity.png" alt="">
 		</view> -->
@@ -96,6 +102,11 @@
 			}
 		},
 		methods: {
+			back() {
+				uni.navigateBack({
+					
+				})
+			},
 			getActivityDetail() {
 				uni.showLoading({
 					title: "加载中",
@@ -107,9 +118,10 @@
 					this.detail = response.data;
 					this.navbarTitle = this.detail.title;
 					
+					var reg=new RegExp('-','gi');
 					var date = new Date();
-					var oDate1 = new Date(this.detail.startTime);
-					var oDate2 = new Date(this.detail.endTime);
+					var oDate1 = new Date(this.detail.startTime.replace(reg,'/'));
+					var oDate2 = new Date(this.detail.endTime.replace(reg,'/'));
 					if(date.getTime() > oDate1.getTime() && date.getTime() < oDate2.getTime()){
 						this.endShow = false;
 					} else {

pages/news/index.vue

@@ -62,9 +62,10 @@
 			}
 		},
 		onShow() {
-			if(this.carhelp.get("newsTypeCurrent") != null) {
+			if(this.carhelp.get("newsTypeCurrent") || this.carhelp.get("newsTypeCurrent")==0) {
 				this.newsTypeCurrent = this.carhelp.get("newsTypeCurrent");
 				this.current = this.newsTypeCurrent;
+				console.log(this.current)
 			}
 			
 			this.getType()