Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mt-education-mobile
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王旭
mt-education-mobile
Commits
37da3b4c
Commit
37da3b4c
authored
Sep 09, 2019
by
WangXu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改NavBar
parent
e9aa3c56
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
65 additions
and
52 deletions
+65
-52
.editorconfig
.editorconfig
+6
-1
.eslintrc.js
.eslintrc.js
+1
-1
babel.config.js
babel.config.js
+1
-1
package-lock.json
package-lock.json
+1
-1
back.png
src/assets/images/back.png
+0
-0
close.png
src/assets/images/close.png
+0
-0
NavBar.vue
src/components/NavBar.vue
+7
-5
我发起的-灰.png
src/layouts/images/我发起的-灰.png
+0
-0
我发起的-蓝.png
src/layouts/images/我发起的-蓝.png
+0
-0
我收到的-灰.png
src/layouts/images/我收到的-灰.png
+0
-0
我收到的-蓝.png
src/layouts/images/我收到的-蓝.png
+0
-0
main.js
src/main.js
+2
-2
index.js
src/router/index.js
+2
-2
example.js
src/store/modules/example.js
+1
-1
filters.js
src/utils/filters.js
+14
-14
index.js
src/utils/index.js
+16
-16
mt-utils.js
src/utils/mt-utils.js
+4
-4
index.vue
src/views/Home/index.vue
+10
-4
No files found.
.editorconfig
View file @
37da3b4c
[*.{js,jsx,ts,tsx,vue}]
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
indent_style = space
indent_style = space
indent_size = 2
indent_size = 2
trim_trailing_whitespace = true
trim_trailing_whitespace = true
...
...
.eslintrc.js
View file @
37da3b4c
...
@@ -63,7 +63,7 @@ module.exports = {
...
@@ -63,7 +63,7 @@ module.exports = {
// 在非空文件末尾至少存在一行空行
// 在非空文件末尾至少存在一行空行
'eol-last'
:
2
,
'eol-last'
:
2
,
// 用'===', '!=='代替'==', '!=',null 除外;
// 用'===', '!=='代替'==', '!=',null 除外;
'eqeqeq'
:
[
'error'
,
'always'
,
{
null
:
'ignore'
}],
'eqeqeq'
:
[
'error'
,
'always'
,
{
null
:
'ignore'
}],
// 要求回调函数中有容错处理
// 要求回调函数中有容错处理
'handle-callback-err'
:
[
2
,
'^(err|error)$'
],
'handle-callback-err'
:
[
2
,
'^(err|error)$'
],
// 强制行的最大长度是80
// 强制行的最大长度是80
...
...
babel.config.js
View file @
37da3b4c
...
@@ -5,7 +5,7 @@ module.exports = {
...
@@ -5,7 +5,7 @@ module.exports = {
plugins
:
[
plugins
:
[
[
[
'import'
,
'import'
,
{
libraryName
:
'vant'
,
libraryDirectory
:
'es'
,
style
:
true
},
{
libraryName
:
'vant'
,
libraryDirectory
:
'es'
,
style
:
true
},
'vant'
'vant'
]
]
]
]
...
...
package-lock.json
View file @
37da3b4c
{
{
"name"
:
"mt-
schedule
"
,
"name"
:
"mt-
education
"
,
"version"
:
"0.1.0"
,
"version"
:
"0.1.0"
,
"lockfileVersion"
:
1
,
"lockfileVersion"
:
1
,
"requires"
:
true
,
"requires"
:
true
,
...
...
src/assets/images/back.png
0 → 100644
View file @
37da3b4c
1.13 KB
src/assets/images/close.png
0 → 100644
View file @
37da3b4c
616 Bytes
src/components/NavBar.vue
View file @
37da3b4c
...
@@ -9,14 +9,13 @@
...
@@ -9,14 +9,13 @@
<img
<img
@
click=
"back"
@
click=
"back"
class=
"arrow_back"
class=
"arrow_back"
src=
"../assets/images/
返回白@3x
.png"
src=
"../assets/images/
back
.png"
alt=
""
alt=
""
style=
"height: 19px;width: 19px"
>
>
<img
<img
@
click=
"close"
@
click=
"close"
class=
"arrow_close"
class=
"arrow_close"
src=
"../assets/images/
关闭白@3x
.png"
src=
"../assets/images/
close
.png"
alt=
""
alt=
""
>
>
</
template
>
</
template
>
...
@@ -29,7 +28,7 @@
...
@@ -29,7 +28,7 @@
</slot>
</slot>
</div>
</div>
<div
class=
"right"
>
<div
class=
"right"
>
<slot
name=
"right"
></slot
>
<slot
name=
"right"
/
>
</div>
</div>
</div>
</div>
</template>
</template>
...
@@ -53,10 +52,12 @@ export default {
...
@@ -53,10 +52,12 @@ export default {
default
:
true
default
:
true
}
}
},
},
mounted
()
{
console
.
log
(
this
.
$listeners
)
},
methods
:
{
methods
:
{
// 返回按钮
// 返回按钮
back
()
{
back
()
{
console
.
log
(
this
.
$listeners
)
this
.
$router
.
push
(
'/'
)
this
.
$router
.
push
(
'/'
)
},
},
// 关闭按钮
// 关闭按钮
...
@@ -129,3 +130,4 @@ export default {
...
@@ -129,3 +130,4 @@ export default {
}
}
}
}
</
style
>
</
style
>
src/layouts/images/我发起的-灰.png
deleted
100644 → 0
View file @
e9aa3c56
1.28 KB
src/layouts/images/我发起的-蓝.png
deleted
100644 → 0
View file @
e9aa3c56
1.28 KB
src/layouts/images/我收到的-灰.png
deleted
100644 → 0
View file @
e9aa3c56
1.2 KB
src/layouts/images/我收到的-蓝.png
deleted
100644 → 0
View file @
e9aa3c56
1.2 KB
src/main.js
View file @
37da3b4c
...
@@ -3,10 +3,10 @@ import App from './App.vue'
...
@@ -3,10 +3,10 @@ import App from './App.vue'
import
router
from
'./router'
import
router
from
'./router'
import
store
from
'./store'
import
store
from
'./store'
import
Storage
from
'vue-ls'
import
Storage
from
'vue-ls'
import
{
sessionOptions
,
localOptions
}
from
'./config/vue-ls.config'
import
{
sessionOptions
,
localOptions
}
from
'./config/vue-ls.config'
import
*
as
_
from
'lodash'
import
*
as
_
from
'lodash'
import
'vant/lib/icon/local.css'
import
'vant/lib/icon/local.css'
import
{
Toast
}
from
'vant'
import
{
Toast
}
from
'vant'
import
wnsdk
from
'@tjmt/wnsdk'
import
wnsdk
from
'@tjmt/wnsdk'
// 定义全局过滤器
// 定义全局过滤器
...
...
src/router/index.js
View file @
37da3b4c
import
Vue
from
'vue'
import
Vue
from
'vue'
import
Router
from
'vue-router'
import
Router
from
'vue-router'
import
{
defaultRoutes
}
from
'@/config/router.config'
import
{
defaultRoutes
}
from
'@/config/router.config'
Vue
.
use
(
Router
)
Vue
.
use
(
Router
)
...
@@ -11,7 +11,7 @@ export default new Router({
...
@@ -11,7 +11,7 @@ export default new Router({
if
(
savedPosition
)
{
if
(
savedPosition
)
{
return
savedPosition
return
savedPosition
}
else
{
}
else
{
return
{
x
:
0
,
y
:
0
}
return
{
x
:
0
,
y
:
0
}
}
}
},
},
routes
:
defaultRoutes
routes
:
defaultRoutes
...
...
src/store/modules/example.js
View file @
37da3b4c
...
@@ -16,7 +16,7 @@ export default {
...
@@ -16,7 +16,7 @@ export default {
}
}
},
},
actions
:
{
actions
:
{
setName
({
commit
,
state
},
data
)
{
setName
({
commit
,
state
},
data
)
{
commit
(
'SET_NAME'
,
data
)
commit
(
'SET_NAME'
,
data
)
}
}
}
}
...
...
src/utils/filters.js
View file @
37da3b4c
...
@@ -3,7 +3,7 @@ import moment from 'moment'
...
@@ -3,7 +3,7 @@ import moment from 'moment'
import
'moment/locale/zh-cn'
import
'moment/locale/zh-cn'
moment
.
locale
(
'zh-cn'
)
moment
.
locale
(
'zh-cn'
)
Vue
.
filter
(
'NumberFormat'
,
function
(
value
)
{
Vue
.
filter
(
'NumberFormat'
,
function
(
value
)
{
if
(
!
value
)
{
if
(
!
value
)
{
return
'0'
return
'0'
}
}
...
@@ -11,29 +11,29 @@ Vue.filter('NumberFormat', function(value) {
...
@@ -11,29 +11,29 @@ Vue.filter('NumberFormat', function(value) {
return
intPartFormat
return
intPartFormat
})
})
Vue
.
filter
(
'dayjs'
,
function
(
dataStr
,
pattern
=
'YYYY-MM-DD HH:mm:ss'
)
{
Vue
.
filter
(
'dayjs'
,
function
(
dataStr
,
pattern
=
'YYYY-MM-DD HH:mm:ss'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
Vue
.
filter
(
'moment'
,
function
(
dataStr
,
pattern
=
'YYYY-MM-DD HH:mm:ss'
)
{
Vue
.
filter
(
'moment'
,
function
(
dataStr
,
pattern
=
'YYYY-MM-DD HH:mm:ss'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
Vue
.
filter
(
'date'
,
function
(
dataStr
,
pattern
=
'YYYY-MM-DD'
)
{
Vue
.
filter
(
'date'
,
function
(
dataStr
,
pattern
=
'YYYY-MM-DD'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
/**
/**
* 2018-05-15 09:30:00 => 2018/05/15 09:30
* 2018-05-15 09:30:00 => 2018/05/15 09:30
*/
*/
Vue
.
filter
(
'dateTime'
,
function
(
dataStr
,
pattern
=
'L LT'
)
{
Vue
.
filter
(
'dateTime'
,
function
(
dataStr
,
pattern
=
'L LT'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
/**
/**
* 2018-05-15 09:30:00 => 2018/05/15 周二
* 2018-05-15 09:30:00 => 2018/05/15 周二
*/
*/
Vue
.
filter
(
'YearMonthDayWeek'
,
function
(
dataStr
,
pattern
=
'L ddd'
)
{
Vue
.
filter
(
'YearMonthDayWeek'
,
function
(
dataStr
,
pattern
=
'L ddd'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
...
@@ -41,41 +41,41 @@ Vue.filter('YearMonthDayWeek', function(dataStr, pattern = 'L ddd') {
...
@@ -41,41 +41,41 @@ Vue.filter('YearMonthDayWeek', function(dataStr, pattern = 'L ddd') {
* 2018-05-15 09:30:00 => 2019年8月28日星期三上午10点24分
* 2018-05-15 09:30:00 => 2019年8月28日星期三上午10点24分
*/
*/
Vue
.
filter
(
'YearMonthDayWeekTime'
,
function
(
dataStr
,
pattern
=
'LLLL'
)
{
Vue
.
filter
(
'YearMonthDayWeekTime'
,
function
(
dataStr
,
pattern
=
'LLLL'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
/**
/**
* 2018-05-15 09:30:00 => 2018/05/15 周二
* 2018-05-15 09:30:00 => 2018/05/15 周二
*/
*/
Vue
.
filter
(
'time'
,
function
(
dataStr
,
pattern
=
'LT'
)
{
Vue
.
filter
(
'time'
,
function
(
dataStr
,
pattern
=
'LT'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
/**
/**
* 2018-05-15 09:30:00 => 05
* 2018-05-15 09:30:00 => 05
*/
*/
Vue
.
filter
(
'dateToMoment'
,
function
(
dataStr
,
pattern
=
'M月'
)
{
Vue
.
filter
(
'dateToMoment'
,
function
(
dataStr
,
pattern
=
'M月'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
/**
/**
* 2018-05-15 09:30:00 => 15
* 2018-05-15 09:30:00 => 15
*/
*/
Vue
.
filter
(
'dateToDay'
,
function
(
dataStr
,
pattern
=
'D'
)
{
Vue
.
filter
(
'dateToDay'
,
function
(
dataStr
,
pattern
=
'D'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
/**
/**
* 2018-05-15 09:30:00 => 9:00
* 2018-05-15 09:30:00 => 9:00
*/
*/
Vue
.
filter
(
'hour'
,
function
(
dataStr
,
pattern
=
'HH:mm'
)
{
Vue
.
filter
(
'hour'
,
function
(
dataStr
,
pattern
=
'HH:mm'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
/**
/**
* 2018-05-15 09:30:00 => 2018/05/15 周二
* 2018-05-15 09:30:00 => 2018/05/15 周二
*/
*/
Vue
.
filter
(
'YearMonthDayWeekTimeWeek'
,
function
(
dataStr
,
pattern
=
'YYYY/MM/DD dddd HH:mm'
)
{
Vue
.
filter
(
'YearMonthDayWeekTimeWeek'
,
function
(
dataStr
,
pattern
=
'YYYY/MM/DD dddd HH:mm'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
...
@@ -83,7 +83,7 @@ Vue.filter('YearMonthDayWeekTimeWeek', function(dataStr, pattern = 'YYYY/MM/DD d
...
@@ -83,7 +83,7 @@ Vue.filter('YearMonthDayWeekTimeWeek', function(dataStr, pattern = 'YYYY/MM/DD d
/**
/**
* 2018-05-15 09:30:00 => 2018/05/15 周二
* 2018-05-15 09:30:00 => 2018/05/15 周二
*/
*/
Vue
.
filter
(
'DateWeek'
,
function
(
dataStr
,
pattern
=
'YYYY/MM/DD HH:mm dddd'
)
{
Vue
.
filter
(
'DateWeek'
,
function
(
dataStr
,
pattern
=
'YYYY/MM/DD HH:mm dddd'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
...
@@ -91,7 +91,7 @@ Vue.filter('DateWeek', function(dataStr, pattern = 'YYYY/MM/DD HH:mm dddd') {
...
@@ -91,7 +91,7 @@ Vue.filter('DateWeek', function(dataStr, pattern = 'YYYY/MM/DD HH:mm dddd') {
/**
/**
* 2018-05-15 09:30:00 => 2018/05/15 周二
* 2018-05-15 09:30:00 => 2018/05/15 周二
*/
*/
Vue
.
filter
(
'MonthDayHM'
,
function
(
dataStr
,
pattern
=
'MM/D HH:mm'
)
{
Vue
.
filter
(
'MonthDayHM'
,
function
(
dataStr
,
pattern
=
'MM/D HH:mm'
)
{
return
moment
(
dataStr
).
format
(
pattern
)
return
moment
(
dataStr
).
format
(
pattern
)
})
})
src/utils/index.js
View file @
37da3b4c
...
@@ -26,14 +26,14 @@ export function parseTime(time, cFormat) {
...
@@ -26,14 +26,14 @@ export function parseTime(time, cFormat) {
date
=
new
Date
(
time
)
date
=
new
Date
(
time
)
}
}
const
formatObj
=
{
const
formatObj
=
{
y
:
date
.
getFullYear
(),
y
:
date
.
getFullYear
(),
m
:
date
.
getMonth
()
+
1
,
m
:
date
.
getMonth
()
+
1
,
d
:
date
.
getDate
(),
d
:
date
.
getDate
(),
h
:
date
.
getHours
(),
h
:
date
.
getHours
(),
i
:
date
.
getMinutes
(),
i
:
date
.
getMinutes
(),
s
:
date
.
getSeconds
(),
s
:
date
.
getSeconds
(),
a
:
date
.
getDay
()
a
:
date
.
getDay
()
},
},
timeStr
=
format
.
replace
(
/{
(
y|m|d|h|i|s|a
)
+}/g
,
(
result
,
key
)
=>
{
timeStr
=
format
.
replace
(
/{
(
y|m|d|h|i|s|a
)
+}/g
,
(
result
,
key
)
=>
{
let
value
=
formatObj
[
key
]
let
value
=
formatObj
[
key
]
// Note: getDay() returns 0 on Sunday
// Note: getDay() returns 0 on Sunday
...
@@ -174,12 +174,12 @@ export function param2Obj(url) {
...
@@ -174,12 +174,12 @@ export function param2Obj(url) {
}
}
return
JSON
.
parse
(
return
JSON
.
parse
(
'{"'
+
'{"'
+
decodeURIComponent
(
search
)
decodeURIComponent
(
search
)
.
replace
(
/"/g
,
'
\\
"'
)
.
replace
(
/"/g
,
'
\\
"'
)
.
replace
(
/&/g
,
'","'
)
.
replace
(
/&/g
,
'","'
)
.
replace
(
/=/g
,
'":"'
)
.
replace
(
/=/g
,
'":"'
)
.
replace
(
/
\+
/g
,
' '
)
+
.
replace
(
/
\+
/g
,
' '
)
+
'"}'
'"}'
)
)
}
}
...
@@ -258,7 +258,7 @@ export function getTime(type) {
...
@@ -258,7 +258,7 @@ export function getTime(type) {
export
function
debounce
(
func
,
wait
,
immediate
)
{
export
function
debounce
(
func
,
wait
,
immediate
)
{
let
timeout
,
args
,
context
,
timestamp
,
result
let
timeout
,
args
,
context
,
timestamp
,
result
const
later
=
function
()
{
const
later
=
function
()
{
// 据上一次触发时间间隔
// 据上一次触发时间间隔
const
last
=
+
new
Date
()
-
timestamp
const
last
=
+
new
Date
()
-
timestamp
...
@@ -277,7 +277,7 @@ export function debounce(func, wait, immediate) {
...
@@ -277,7 +277,7 @@ export function debounce(func, wait, immediate) {
}
}
}
}
return
function
(...
args
)
{
return
function
(...
args
)
{
context
=
this
context
=
this
timestamp
=
+
new
Date
()
timestamp
=
+
new
Date
()
const
callNow
=
immediate
&&
!
timeout
const
callNow
=
immediate
&&
!
timeout
...
...
src/utils/mt-utils.js
View file @
37da3b4c
import
wnsdk
from
'@tjmt/wnsdk'
import
wnsdk
from
'@tjmt/wnsdk'
import
{
Toast
}
from
'vant'
import
{
Toast
}
from
'vant'
import
moment
from
'moment/moment'
import
moment
from
'moment/moment'
import
Vue
from
'vue'
import
Vue
from
'vue'
...
@@ -83,9 +83,9 @@ export function transmit(data) {
...
@@ -83,9 +83,9 @@ export function transmit(data) {
owner
:
''
,
owner
:
''
,
time
:
`主题:
${
data
.
thingDO
.
sub
}
\n时间:
${
moment
(
data
.
thingDO
.
startTime
).
format
(
'LLLL'
)}
~
${
moment
(
data
.
thingDO
.
endTime
).
format
(
'LLLL'
)}
`
,
time
:
`主题:
${
data
.
thingDO
.
sub
}
\n时间:
${
moment
(
data
.
thingDO
.
startTime
).
format
(
'LLLL'
)}
~
${
moment
(
data
.
thingDO
.
endTime
).
format
(
'LLLL'
)}
`
,
logo
:
'http://127.0.0.1:8001/img/%E6%B7%BB%E5%8A%A0%E6%97%A5%E7%A8%8B@3x.e5cfb2ef.png'
,
logo
:
'http://127.0.0.1:8001/img/%E6%B7%BB%E5%8A%A0%E6%97%A5%E7%A8%8B@3x.e5cfb2ef.png'
,
success
:
function
(
result
)
{
success
:
function
(
result
)
{
},
},
error
:
function
(
error
)
{
error
:
function
(
error
)
{
}
}
})
})
}
}
...
@@ -101,7 +101,7 @@ export function choosePerson(selected = [], editSelect = []) {
...
@@ -101,7 +101,7 @@ export function choosePerson(selected = [], editSelect = []) {
.
util
.
util
.
chooseAddressBook
({
.
chooseAddressBook
({
// id: Vue.ls.get('corpId'),
// id: Vue.ls.get('corpId'),
id
:
'6'
,
id
:
'6'
,
type
:
2
,
type
:
2
,
editSelect
:
editSelect
,
editSelect
:
editSelect
,
selected
:
selected
,
selected
:
selected
,
...
...
src/views/Home/index.vue
View file @
37da3b4c
<
template
>
<
template
>
<div>
<nav-bar-view>
主页
<div>
</div>
主页
</div>
</nav-bar-view>
</
template
>
</
template
>
<
script
>
<
script
>
import
NavBarView
from
'@layouts/NavBarView'
export
default
{
export
default
{
name
:
'Home'
name
:
'Home'
,
components
:
{
NavBarView
}
}
}
</
script
>
</
script
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment