1.新增'学习'tabbar 2.新增过滤文件

filters/index.js

@@ -0,0 +1,90 @@
+/**
+ * 时间戳转换成时间
+ * @param {*} time
+ */
+const formDate = (time, formate = 'yyyy-mm-dd hh:mm:ss') => {
+    var padDate = function (va) {
+        va = va < 10 ? '0' + va : va
+        return va
+    }
+    if (time) {
+        var value = new Date(parseFloat(time))
+        var year = value.getFullYear()
+        var month = padDate(value.getMonth() + 1)
+        var day = padDate(value.getDate())
+        var hour = padDate(value.getHours())
+        var minutes = padDate(value.getMinutes())
+        var seconds = padDate(value.getSeconds())
+        let res = ''
+        switch (formate) {
+            case 'mm-dd': {
+                res =  month + '-' + day
+                break
+            }
+            case 'yyyy-mm-dd': {
+                res = year + '-' + month + '-' + day
+                break
+            }
+            case 'yyyy-mm': {
+                res = year + '-' + month
+                break
+            }
+            case 'mm月dd日': {
+                res = month + '月' + day + '日'
+                break
+            }
+            case 'yyyy年mm月dd日': {
+                res = year + '年' + month + '月' + day + '日'
+                break
+            }
+            case 'yyyy年mm月': {
+                res = year + '年' + month + '月'
+                break
+            }
+            case 'yyyy-mm-dd hh:mm': {
+                res = year + '-' + month + '-' + day + ' ' + hour + ':' + minutes
+                break
+            }
+            case 'yyyy-mm-dd hh:mm:ss':
+            default: {
+                res = year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+                break
+            }
+        }
+        return res
+    }
+    return '--'
+}
+
+const formDateStr = (time) => {
+    var padDate = function (va) {
+        va = va < 10 ? '0' + va : va
+        return va
+    }
+    if (time) {
+        var value = new Date(parseFloat(time))
+        var year = value.getFullYear()
+        var month = padDate(value.getMonth() + 1)
+        var day = value.getDate()
+        var hour = padDate(value.getHours())
+        var minutes = padDate(value.getMinutes())
+        var seconds = padDate(value.getSeconds())
+        let res = ''
+        if(day == new Date().getDate()){
+             res = '今天' + hour + ':' + minutes
+             return res
+        }
+        if(year == new Date().getFullYear() ){
+            res =  month + '-' + padDate(day) + ' ' + hour + ':' + minutes
+            return res
+        }
+        res = year + '-' + month + '-' + padDate(day)
+        return res
+    }
+    return '--'
+}
+
+export default { 
+	formDate,
+	formDateStr
+}

main.js

@@ -14,7 +14,7 @@ Vue.prototype.$navTo = navTo
 // 验证登入有效等...
 import method from '@/common/methodTool'
 Vue.prototype.$method = method
-
+import filters from './filters'
 //import share from '@/js_sdk/share.js'
 //Vue.mixin(share)
 import uView from "uview-ui";
@@ -24,6 +24,11 @@ Vue.config.productionTip = false
 
 App.mpType = 'app'
 
+// 全局过滤器
+Object.keys(filters).forEach((filterName) => {
+    Vue.filter(filterName, filters[filterName])
+})
+
 const app = new Vue({
 	...App
 })

pages.json

@@ -37,6 +37,18 @@
 			}
 
 		},
+        {
+			"path": "pages/learn/index",
+			"style": {
+				"navigationBarTitleText": "学习",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏 
+					"bounce": "none"
+				}
+			}
+		},
 		{
 			"path": "pages/shopping/shoppingCart",
 			"style": {
@@ -1001,6 +1013,12 @@
 				"selectedIconPath": "static/nav2_on.png",
 				"text": "选课"
 			},
+            {
+				"pagePath": "pages/learn/index",
+				"iconPath": "static/nav2.png",
+				"selectedIconPath": "static/nav2_on.png",
+				"text": "学习"
+			},
 			{
 				"pagePath": "pages/shopping/shoppingCart",
 				"iconPath": "static/nav3.png",

pages/learn/index.vue

@@ -0,0 +1,23 @@
+<template>
+    <view>
+			<u-navbar :is-back="false" title="学习中心" :border-bottom="false"  title-color="#333333" back-icon-color="#ffffff">
+				<view class="slot-wrap">
+					<image  src="/static/logo2.png" style="width: 178rpx;height: 31rpx;margin-left: 30rpx;"></image>
+				</view>
+			</u-navbar>
+			<u-line color="#D6D6DB" />
+			<view class="content">
+				<!-- 正文内容 -->
+			</view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+
+        }
+    }
+}
+</script>

pages/wd/index.vue

@@ -38,7 +38,7 @@
 						<view>我的题库通</view>
 					</view>
 				</view> -->
-				<!-- <navigator  hover-class="none" url="/pages5/liveDetail/list" class="menu_box" >
+				<navigator  hover-class="none" url="/pages5/liveDetail/list" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon12.png" class="my_icon"></image>
 						<view>我的直播课</view>
@@ -48,7 +48,7 @@
 						<text>{{ total2 }}</text>
 						个课程直播中
 					</view>
-				</navigator> -->
+				</navigator>
 				<!-- <navigator  hover-class="none" url="/pages2/learn/my_learn" class="menu_box" >
 					<view class="box_left">
 						<image src="/static/icon/my_icon2.png" class="my_icon"></image>

store/index.js

@@ -97,12 +97,12 @@ const store = new Vuex.Store({
 		tabNum(state, nums) {
 			if (nums) {
 				uni.setTabBarBadge({
-					index: 3,
+					index: 4,
 					text: nums + ''
 				})
 			} else {
 				uni.removeTabBarBadge({
-					index: 3
+					index: 4
 				})
 			}
 		},