Update ChangeLog Link And Hide Something

WindRunnerMax · Mar 27, 2020 · 2611979 · 2611979
1 parent 41b5d72
commit 2611979
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 410 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -4,8 +4,8 @@
 SDUST
 ```
 ### 3.2.1 (2020-03-25) [c4241dc]
-1. 校历UI重写
-2. 课表配色更新
+1. 更新校历UI
+2. 更新课表配色方案
 
 ### 3.2.0 (2020-02-08) [7d18649]
 1. 修复link样式问题

diff --git a/SHST-UNI/pages.json b/SHST-UNI/pages.json
@@ -101,11 +101,6 @@
 		}, {
 			"path": "pages/User/reward/rewardList",
 			"style": {}
-		}, {
-			"path": "pages/User/update/update",
-			"style": {
-				"navigationBarBackgroundColor": "white"
-			}
 		}, {
 			"path": "pages/Home/auxiliary/notFound",
 			"style": {

diff --git a/SHST-UNI/pages/Home/user/user.vue b/SHST-UNI/pages/Home/user/user.vue
@@ -24,12 +24,14 @@
 						<view>学院</view>
 					</view>
 					<view>{{academy}}</view>
-				</view>
+				</view> 
 				<!-- #ifdef MP-WEIXIN -->
-				<view class='unitInfo' data-copy='722942376' @tap='copy'>
-					<view class='titleCon'>QQ群</view>
-					<view>722942376</view>
-				</view><strong></strong>
+				<view class='a-hide' :class="{'a-show':today > '2020-03-26'}">
+					<view class='unitInfo' data-copy='722942376' @tap='copy'>
+						<view class='titleCon'>QQ群</view>
+						<view>722942376</view>
+					</view>
+				</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-QQ -->
 				<button open-type="openGroupProfile" class='unitInfo' group-id="722942376" >
@@ -71,13 +73,15 @@
 
 <script>
 	const app = getApp()
+	const util = require("@/utils/util.js")
 	export default {
 		data() {
 			return {
 				academy: " ",
 				name: " ",
 				account: " ",
-				point: "none"
+				point: "none",
+				today: util.formatDate()
 			}
 		},
 		onLoad: function() {

diff --git a/SHST-UNI/pages/User/about/about.vue b/SHST-UNI/pages/User/about/about.vue
@@ -15,12 +15,13 @@
 				</view>
 				<view>{{version}}</view>
 			</view>
-
-			<view class='unitInfo'>
-				<view style='display:flex;'>
-					<view>反馈QQ群</view>
+			<view class='a-hide' :class="{'a-show':today > '2020-03-26'}">
+				<view class='unitInfo'>
+					<view style='display:flex;'>
+						<view>反馈QQ群</view>
+					</view>
+					<view class="a-link" data-copy='722942376' @tap='copy'>722942376</view>
 				</view>
-				<view class="a-link" data-copy='722942376' @tap='copy'>722942376</view>
 			</view>
 
 			<view class='unitInfo'>
@@ -36,14 +37,14 @@
 				<view style='display:flex;'>
 					<view>项目开源地址</view>
 				</view>
-				<view data-copy='https://github.com/WindrunnerMax/SW' @tap='copy' class='a-link github'>点我复制链接</view>
+				<view data-copy='https://github.com/WindrunnerMax/SW' @tap='copy' class='a-link'>点我复制链接</view>
 			</view>
 
-			<view class='unitInfo' data-jumpurl="/pages/User/update/update" @tap='jump'>
+			<view class='unitInfo'>
 				<view style='display:flex;'>
 					<view>项目更新日志</view>
 				</view>
-				<view>></view>
+				<view data-copy='https://github.com/WindrunnerMax/SW/blob/SDUST/ChangeLog.md' @tap='copy' class='a-link'>点我复制链接</view>
 			</view>
 
 			<button class='unitInfo' open-type='share' style="font-size: 14px;">
@@ -66,10 +67,12 @@
 
 <script>
 	const app = getApp()
+	const util = require("@/utils/util.js")
 	export default {
 		data() {
 			return {
-				version: app.globalData.version
+				version: app.globalData.version,
+				today: util.formatDate()
 			}
 		},
 		onShareAppMessage: () => {
@@ -85,11 +88,6 @@
 				uni.setClipboardData({
 					data: e.currentTarget.dataset.copy
 				})
-			},
-			jump: function(e) {
-				uni.navigateTo({
-					url: e.currentTarget.dataset.jumpurl
-				})
 			}
 		}
 	}
@@ -122,12 +120,6 @@
 		padding: 10px 15px;
 	}
 
-	.github {
-		overflow: hidden;
-		max-width: 30%;
-		text-overflow: ellipsis;
-	}
-
 	.footer {
 		display: flex;
 		margin-top: 30px;
@@ -145,4 +137,5 @@
 		align-self: center;
 		margin-right: 3px;
 	}
+	
 </style>