diff --git a/package.json b/package.json index af85f78..a1836aa 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "dependencies": { "axios": "^0.21.1", "core-js": "^3.6.5", + "dayjs": "^1.10.6", "lodash": "^4.17.21", "mitt": "^2.1.0", "mockjs": "^1.1.0", diff --git a/src/App.vue b/src/App.vue index 1d55ca7..f31487f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -71,6 +71,7 @@ export default { '/chat', '/chat-detail', '/set-remark', + '/me/request-update', '/me/right-menu/look-history', '/me/right-menu/minor-protection/index', '/me/right-menu/minor-protection/detail-setting', diff --git a/src/assets/img/icon/newicon/bqm.webp b/src/assets/img/icon/newicon/bqm.webp deleted file mode 100644 index b73fdb7..0000000 Binary files a/src/assets/img/icon/newicon/bqm.webp and /dev/null differ diff --git a/src/assets/img/icon/newicon/bwb.png b/src/assets/img/icon/newicon/bwb.png deleted file mode 100644 index 29e930a..0000000 Binary files a/src/assets/img/icon/newicon/bwb.png and /dev/null differ diff --git a/src/components/BaseButton.vue b/src/components/BaseButton.vue index 005fdf5..a08e4e1 100644 --- a/src/components/BaseButton.vue +++ b/src/components/BaseButton.vue @@ -223,7 +223,7 @@ export default { } &.no-border { - border: none; + border: none!important; background: rgb(212 212 212 / 36%); } } diff --git a/src/components/NoMore.vue b/src/components/NoMore.vue index 5a3ac32..bf1d871 100644 --- a/src/components/NoMore.vue +++ b/src/components/NoMore.vue @@ -1,17 +1,12 @@ diff --git a/src/components/Share.vue b/src/components/Share.vue index e9cf865..13e0681 100644 --- a/src/components/Share.vue +++ b/src/components/Share.vue @@ -3,6 +3,7 @@ v-model="modelValue" @cancel="closeShare" :show-heng-gang="false" + :touch-moved="false" maskMode="light" height="37rem" mode="dark"> diff --git a/src/components/dialog/FromBottomDialog.vue b/src/components/dialog/FromBottomDialog.vue index bb83303..4bf1077 100644 --- a/src/components/dialog/FromBottomDialog.vue +++ b/src/components/dialog/FromBottomDialog.vue @@ -41,6 +41,11 @@ export default { // default: 'light' // default: 'white' }, + //触摸，是否可以滑动 + touchMoved: { + type: Boolean, + default:true + }, maskMode: { type: String, default: 'dark' @@ -138,11 +143,13 @@ export default { this.$emit('cancel') }, start(e) { + if (!this.touchMoved)return; if (this.$refs.dialog.scrollTop !== 0) return this.startLocationY = e.touches[0].pageY this.startTime = Date.now() }, move(e) { + if (!this.touchMoved)return; if (this.$refs.dialog.scrollTop !== 0) return this.moveYDistance = e.touches[0].pageY - this.startLocationY if (this.moveYDistance > 0) { @@ -150,6 +157,7 @@ export default { } }, end(e) { + if (!this.touchMoved)return; //点击 if (Date.now() - this.startTime < 150) return diff --git a/src/pages/home/Index2.vue b/src/pages/home/Index2.vue index feffa60..065eb75 100644 --- a/src/pages/home/Index2.vue +++ b/src/pages/home/Index2.vue @@ -173,8 +173,8 @@ @@ -256,114 +256,180 @@ export default { ], localVideos: [ { - videoUrl: mp40, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/0.mp4', - videoPoster: src1Bg, - isLoved: true, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "64e630f4-4dde-4f36-904c-d5ac87a603cb", + "posterUrl": "images/20210815/9.png", + "videoUrl": mp40, + "title": "", + "likeNum": "2974815", + "commentNum": "18643", + "sharedNum": "56", + "duration": null, + "musicId": "162e69b5-e7fa-4901-b8c2-642ec5120aaf", + "browseCount": 10, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp41, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/1.mp4', - videoPoster: src1Bg, - isLoved: true, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "e59e3bf5-5ef7-4d9e-b697-5f9793cbcbbf", + "posterUrl": "images/20210815/11.png", + "videoUrl": mp41, + "title": "", + "likeNum": "6845576", + "commentNum": "13878", + "sharedNum": "23", + "duration": null, + "musicId": "9f84ace3-fb8c-4425-9497-0ead5552d3bd", + "browseCount": 12, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp42, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/2.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "21c4d0e6-4895-44cf-abae-1ad6d4e51cfe", + "posterUrl": "images/20210815/11.png", + "videoUrl": mp42, + "title": "", + "likeNum": "4312856", + "commentNum": "14431", + "sharedNum": "46", + "duration": null, + "musicId": "d0ed8333-f5dd-450d-8601-8680fd000b1a", + "browseCount": 16, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp43, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/3.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "064641ac-ad85-4bf4-8635-cf551c1c8e72", + "posterUrl": "images/20210815/1.png", + "videoUrl": mp43, + "title": "", + "likeNum": "9138571", + "commentNum": "11676", + "sharedNum": "44", + "duration": null, + "musicId": "1b6adc43-bde8-49ce-8189-85c628d4e581", + "browseCount": 17, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp44, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/4.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "390fa5ba-c818-4f07-bcc2-9131c632f4e0", + "posterUrl": "images/20210815/6.png", + "videoUrl": mp44, + "title": "", + "likeNum": "2110846", + "commentNum": "14968", + "sharedNum": "89", + "duration": null, + "musicId": "d7bc93e8-5855-4493-a2b7-a102331e2af4", + "browseCount": 17, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp45, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/5.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "7bb2ba92-5d84-4182-8bd5-961adcec7ea0", + "posterUrl": "images/20210815/11.png", + "videoUrl": mp45, + "title": "", + "likeNum": "4969051", + "commentNum": "27551", + "sharedNum": "68", + "duration": null, + "musicId": "29bdd695-dff5-47cc-8757-6de238d41fbf", + "browseCount": 18, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp46, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/6.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "5556b24d-ac38-4528-87eb-2ac98c202202", + "posterUrl": "images/20210815/11.png", + "videoUrl": mp46, + "title": "", + "likeNum": "6497884", + "commentNum": "13283", + "sharedNum": "50", + "duration": null, + "musicId": "f11ca116-cce4-489f-a2d5-2564f12fe26f", + "browseCount": 31, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp47, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/7.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "37d1300e-6051-471b-9b10-80a171a23564", + "posterUrl": "images/20210815/11.png", + "videoUrl": mp47, + "title": "", + "likeNum": "2686730", + "commentNum": "50", + "sharedNum": "44", + "duration": null, + "musicId": "5065d308-04f9-4bd5-9a41-87f18669462c", + "browseCount": 33, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp48, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/8.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "5c0dc10a-2d21-41de-9055-d5e6f071391a", + "posterUrl": "images/20210815/2.png", + "videoUrl": mp48, + "title": "", + "likeNum": "1844972", + "commentNum": "5841", + "sharedNum": "83", + "duration": null, + "musicId": "de466ede-b5aa-4d6d-80ca-b14e8adfa70b", + "browseCount": 33, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp49, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/9.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "e489d928-bd07-4767-8ca2-67ebe10086cd", + "posterUrl": "images/20210815/11.png", + "videoUrl": mp49, + "title": "", + "likeNum": "7449972", + "commentNum": "5261", + "sharedNum": "75", + "duration": null, + "musicId": "3cba7f06-8641-4a1b-8462-027024c7ae0c", + "browseCount": 33, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, { - videoUrl: mp410, - // videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/10.mp4', - videoPoster: src1Bg, - isLoved: false, - loves: 1234, - comments: 666, - shared: 999, - duration: 99 + "id": "e489d928-bd07-4767-8ca2-67ebe10086cd1", + "posterUrl": "images/20210815/11.png", + "videoUrl": mp410, + "title": "", + "likeNum": "7449972", + "commentNum": "5261", + "sharedNum": "75", + "duration": null, + "musicId": "3cba7f06-8641-4a1b-8462-027024c7ae0c", + "browseCount": 33, + "createTime": "1630175885", + "createBy": "3e301843-e8bb-41c0-8240-9c4b42a17341", + "status": 1, + "canDownload": true }, ], isCommenting: false, @@ -407,9 +473,6 @@ export default { let video = $(this).find('video') if ($(this).data('index') === newVal) { video.trigger('play') - video.on('canplay', () => { - video.trigger('play') - }) } else { video.trigger('pause') setTimeout(() => { @@ -436,6 +499,10 @@ export default { this.$notice('操作成功，将减少此类视频的推荐') }, async getData() { + if (process.env.NODE_ENV !== 'development') { + this.totalSize = 11 + return this.videos = this.$clone(this.localVideos) + } this.loading = true let res = await this.$api.videos.recommended({pageNo: this.pageNo, pageSize: this.pageSize}) this.loading = false diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue index e1bdb11..1a37fe6 100644 --- a/src/pages/me/Me.vue +++ b/src/pages/me/Me.vue @@ -13,7 +13,9 @@
- +
@@ -26,25 +28,22 @@
- -
-
- 关注 + +
+
+ 获赞 + 18
-
- - -
-
-
-
- 编辑资料 - -
-
- - 熟人 +
+ 粉丝 + 62 +
+
+ 关注 + 8
+

ttentau

@@ -53,14 +52,10 @@ 抖音号：605128307
-
+
{{ userinfo.desc }}
@@ -77,26 +72,14 @@ {{ userinfo.school.name }}
-
-
8获赞
-
8关注
-
8粉丝
-
+
-
-
- -
-
抖音商城
-
发现超值好物
-
+
+
+ 编辑资料
-
- -
-
我的音乐
-
已收藏20首
-
+
+ 添加朋友
@@ -776,7 +759,7 @@ export default { width: 100%; font-size: 1.4rem; - .mask{ + .mask { background: #0000004f; position: absolute; top: 0; @@ -980,14 +963,17 @@ export default { } } + .desc { header { color: white; height: 12rem; background-image: url('../../assets/img/header-bg.png'); + //background-image: url('data:image/jpeg;base64,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'); background-size: cover; background-position: center; background-repeat: no-repeat; + box-sizing: border-box; } @@ -1005,46 +991,38 @@ export default { .head-image { background: black; - padding: .3rem; + padding: 2px; border-radius: 50%; - width: 80px; - height: 80px; + width: 8rem; + height: 8rem; } - .my-buttons { - margin-left: 1rem; - flex: 1; + .heat { + margin-top: 1rem; + width: calc(100% - 12rem); + color: @second-text-color; display: flex; + align-items: center; + justify-content: space-between; - div { - font-size: 1.2rem; - display: flex; - align-items: center; - justify-content: center; - float: left; - border-radius: .2rem; - background: @second-btn-color; - margin-left: .5rem; - padding: 0 1rem; - height: 3rem; + .num { + margin-top: .5rem; color: white; - - &:nth-child(0) { - flex: 2; - } - - &:nth-child(1) { - flex: 1; - padding: 0 2.5rem; - } - - img { - padding: 0 .6rem; - height: 1.2rem; - } + font-size: 1.6rem; + font-weight: bold; + margin-right: 3px; } + .text { + font-size: 1.2rem; + margin-right: 10px; + display: flex; + align-items: center; + flex-direction: column; + + } } + } .description { @@ -1052,40 +1030,6 @@ export default { color: white; transform: translateY(-2rem); - .signature { - //color: @second-text-color; - color: white; - font-size: 1.3rem; - display: flex; - align-items: center; - margin-bottom: .5rem; - - img { - height: 1.2rem; - margin-left: .6rem; - } - } - - .more { - color: @second-text-color; - display: flex; - - .item { - padding: .2rem .5rem; - border-radius: .2rem; - background: @second-btn-color-tran; - font-size: 1rem; - display: flex; - align-items: center; - margin-right: .5rem; - - img { - height: 1rem; - margin-right: .2rem; - } - } - } - .number { color: @second-text-color; padding-bottom: 2rem; @@ -1099,62 +1043,61 @@ export default { } } - .heat { - margin-top: 1rem; - color: darkgray; + } + + .signature { + color: @second-text-color; + display: flex; + align-items: center; + margin-bottom: .5rem; + + img { + height: 1.2rem; + margin-left: .6rem; + } + } + + .more { + color: @second-text-color; + display: flex; + + .item { + padding: .2rem .5rem; + border-radius: .2rem; + background: @second-btn-color-tran; + font-size: 1rem; display: flex; align-items: center; + margin-right: .5rem; - .num { - color: white; - font-size: 1.4rem; - font-weight: bold; - margin-right: .3rem; - } - - .text { - font-size: 1.2rem; - margin-right: 1rem; + img { + height: 1rem; + margin-right: .2rem; } } } - .other { + .my-buttons { display: flex; - margin-bottom: 1rem; + justify-content: space-between; - .item { - margin-right: 2.5rem; + div { + width: 49%; + font-size: 1.2rem; display: flex; - - img { - margin-right: .8rem; - border-radius: .4rem; - background: @second-btn-color-tran; - padding: .8rem; - height: 2.2rem; - } - - .right { - display: flex; - justify-content: space-between; - flex-direction: column; - - .top { - color: white; - font-size: 1.4rem; - } - - .bottom { - color: @second-text-color; - font-size: 1.2rem; - } - } + align-items: center; + justify-content: center; + border-radius: .2rem; + background: @second-btn-color; + height: 3rem; + color: white; } + } } } + .ul { font-size: 1.4rem; width: 100%; diff --git a/src/pages/me/RequestUpdate.vue b/src/pages/me/RequestUpdate.vue new file mode 100644 index 0000000..1532f12 --- /dev/null +++ b/src/pages/me/RequestUpdate.vue @@ -0,0 +1,184 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index 0584a17..3ed5e0c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -47,6 +47,8 @@ import Share2Friend from "../pages/message/Share2Friend"; import JoinedGroupChat from "../pages/message/JoinedGroupChat"; import Report from "../pages/home/Report"; import SubmitReport from "../pages/home/SubmitReport"; +import Me3 from "../pages/me/Me3"; +import RequestUpdate from "../pages/me/RequestUpdate"; const routes = [ // {path: '', component: Music}, @@ -64,6 +66,8 @@ const routes = [ {path: '/message/share-to-friend', component: Share2Friend}, {path: '/message/joined-group-chat', component: JoinedGroupChat}, {path: '/me', component: Me}, + {path: '/me/request-update', component: RequestUpdate}, + // {path: '/me', component: Me3}, {path: '/edit-userinfo', component: EditUserInfo}, {path: '/edit-userinfo-item', component: EditUserInfoItem}, {path: '/music', component: Music}, diff --git a/src/store/index.js b/src/store/index.js index c607a9b..3a98d84 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -26,7 +26,578 @@ const store = Vuex.createStore({ displayType: enums.DISPLAY_TYPE.ALL, } }, - friends: {} + friends: { + all: { + "all": [ + { + "id": "224e9a00-ffa0-4bc1-bb07-c318c7b02fa5", + "avatar": "images/20210816/1.png", + "name": "冒安志", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "234", + "pinyin": "M", + "select": false + }, + { + "id": "2b446aa8-5d31-429a-8e39-d4705eb4e900", + "avatar": "images/20210816/19.png", + "name": "浅唱↘我们的歌", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "33453", + "pinyin": "Q", + "select": false + }, + { + "id": "2d8622b4-7112-4bc7-a0cf-00a268a85504", + "avatar": "images/20210816/25.png", + "name": "‘心’之天空", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "234234", + "pinyin": "#", + "select": false + }, + { + "id": "2e38900b-65f7-426a-8e8b-edb403df35fb", + "avatar": "images/20210816/18.png", + "name": "◇、_保持微笑ゞ", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "1111", + "pinyin": "#", + "select": false + }, + { + "id": "3cd53cb5-04f8-4439-ad2b-e57b3f9b8c73", + "avatar": "images/20210816/26.png", + "name": "好◇°我会Yi直在●", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "sdfs", + "pinyin": "H", + "select": false + }, + { + "id": "46c77017-9dc6-4a48-bf96-560c6e7db06f", + "avatar": "images/20210816/4.png", + "name": "甫韦茹", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "dgfdfg", + "pinyin": "F", + "select": false + }, + { + "id": "4df770d7-a414-4e02-8f9e-72ebd87eb93e", + "avatar": "images/20210816/12.png", + "name": "幸福泡泡", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "df", + "pinyin": "X", + "select": false + }, + { + "id": "5ebb4d7a-c7ad-43c7-a830-9eb3ee423cb7", + "avatar": "images/20210816/3.png", + "name": "蔡傲安", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "ssss", + "pinyin": "C", + "select": false + }, + { + "id": "7226092d-a2c5-4ffd-98d7-3b7ac814bca3", + "avatar": "images/20210816/16.png", + "name": "心若向阳无谓伤悲", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "asdfasd", + "pinyin": "X", + "select": false + }, + { + "id": "72aef2a9-5573-4205-9288-706e19bccc7f", + "avatar": "images/20210816/10.png", + "name": "A倒影着稚嫩的少年", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "wfghdf", + "pinyin": "#", + "select": false + }, + { + "id": "77c82d2e-9be1-45c2-a733-00445d2e7f2c", + "avatar": "images/20210816/22.png", + "name": "一只喵的旅行。", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "sadf", + "pinyin": "Y", + "select": false + }, + { + "id": "7b30566d-70eb-4a31-ae43-200917269a43", + "avatar": "images/20210816/14.png", + "name": "℉阳光下的小情绪", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "asdfa", + "pinyin": "#", + "select": false + }, + { + "id": "90c6ccd8-0653-4789-9348-28fba06d6ae3", + "avatar": "images/20210816/11.png", + "name": "思念一直在", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "as", + "pinyin": "S", + "select": false + }, + { + "id": "a2c1310f-1a3c-430f-9b7c-557b9ccdd33d", + "avatar": "images/20210816/9.png", + "name": "阎韶丽", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "vbvd", + "pinyin": "Y", + "select": false + }, + { + "id": "a7443b4f-b0fa-4409-a693-5f090aa763ee", + "avatar": "images/20210816/5.png", + "name": "马佳婉清", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "sdf", + "pinyin": "M", + "select": false + }, + { + "id": "b49fd828-f8a7-4be0-a3bc-0a8fa312b2e8", + "avatar": "images/20210816/0.png", + "name": "倒影着稚嫩的少年", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "eeee", + "pinyin": "D", + "select": false + }, + { + "id": "b632bffe-1cfb-408a-8255-b558e2faf49a", + "avatar": "images/20210816/8.png", + "name": "买易槐", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "xczxc", + "pinyin": "M", + "select": false + }, + { + "id": "c01f10dd-a270-42ab-876f-64a8beb22a69", + "avatar": "images/20210816/7.png", + "name": "章昊苍", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "gggggggggr", + "pinyin": "Z", + "select": false + }, + { + "id": "d0bf11a3-a25b-4865-a047-c67de8e8af7b", + "avatar": "images/20210816/2.png", + "name": "凌依晨", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "12", + "pinyin": "L", + "select": false + }, + { + "id": "d300b7a5-115d-41ba-a071-7d1781da331f", + "avatar": "images/20210816/23.png", + "name": "为你锁住心", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "1629993515", + "pinyin": "W", + "select": false + }, + { + "id": "deceba30-80fc-45c2-bd56-8d65091bb104", + "avatar": "images/20210816/13.png", + "name": "原味青春", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "werwe", + "pinyin": "Y", + "select": false + }, + { + "id": "e0c3d20d-5978-4339-962f-cffc6e29aff1", + "avatar": "images/20210816/24.png", + "name": "一起走过的日子°", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "dfgdfg", + "pinyin": "Y", + "select": false + }, + { + "id": "e1fb6274-10fa-4d50-b9b1-6eefacfc2341", + "avatar": "images/20210816/15.png", + "name": "看，熟悉旳风景", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "aasdasd", + "pinyin": "K", + "select": false + }, + { + "id": "eab1ef9b-70e6-4249-8d78-b4f6e1b0cb08", + "avatar": "images/20210816/20.png", + "name": "dear°学会微笑", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "gggggg", + "pinyin": "#", + "select": false + }, + { + "id": "ecb405e2-d057-4c85-a12b-a5fe9a7b8a05", + "avatar": "images/20210816/6.png", + "name": "富察昕昕", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "ghjg", + "pinyin": "F", + "select": false + }, + { + "id": "f09652a3-d6e1-4517-a15e-583a24a250e1", + "avatar": "images/20210816/17.png", + "name": "蓝天下的迷彩?", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "yhjh", + "pinyin": "L", + "select": false + }, + { + "id": "f676cc30-cc81-487a-9450-cbb1f3c5cde8", + "avatar": "images/20210816/21.png", + "name": "伱的微笑", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "ghj", + "pinyin": "N", + "select": false + } + ] + }, + recent: { + "recent": [ + { + "id": "3cd53cb5-04f8-4439-ad2b-e57b3f9b8c73", + "avatar": "images/20210816/26.png", + "name": "好◇°我会Yi直在●", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "sdfs", + "pinyin": "H", + "select": false + }, + { + "id": "77c82d2e-9be1-45c2-a733-00445d2e7f2c", + "avatar": "images/20210816/22.png", + "name": "一只喵的旅行。", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "sadf", + "pinyin": "Y", + "select": false + } + ] + }, + eachOther: { + "eachOther": [ + { + "id": "2b446aa8-5d31-429a-8e39-d4705eb4e900", + "avatar": "images/20210816/19.png", + "name": "浅唱↘我们的歌", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "33453", + "pinyin": "Q", + "select": false + }, + { + "id": "eab1ef9b-70e6-4249-8d78-b4f6e1b0cb08", + "avatar": "images/20210816/20.png", + "name": "dear°学会微笑", + "sex": "", + "age": null, + "idCard": null, + "phone": "", + "address": null, + "wechat": "", + "password": null, + "lastLoginTime": "1629993515", + "createTime": "1630035089", + "isDelete": 0, + "account": "gggggg", + "pinyin": "#", + "select": false + } + ] + } + } }, mutations: { setUserinfo(store, val) { diff --git a/src/utils/global-methods.js b/src/utils/global-methods.js index 28ee1ca..aeb5751 100644 --- a/src/utils/global-methods.js +++ b/src/utils/global-methods.js @@ -5,7 +5,7 @@ import ConfirmDialog from "../components/dialog/ConfirmDialog"; import Loading from "../components/Loading"; import Config from '../config' import NoticeDialog from "../components/dialog/NoticeDialog"; - +import dayjs from 'dayjs' export default { $showLoading() { const app = Vue.createApp({ @@ -269,4 +269,30 @@ export default { localStorage.removeItem(key) } }, + + $dateFormat(val, type) { + if (!val) return + if (val.length === 10){ + val+='000' + } + if (typeof val === 'string' && (val.length === 10 || val.length === 13)) { + val = Number(val) + } + switch (type) { + case 'Y': + return dayjs(val).format('YYYY') + case 'M': + return dayjs(val).format('YYYY-MM') + case 'M_CN': + return dayjs(val).format('YYYY年MM月') + case 'D': + return dayjs(val).format('YYYY-MM-DD') + case 'm': + return dayjs(val).format('YYYY-MM-DD HH:mm') + case 'S': + return dayjs(val).format('YYYY-MM-DD HH:mm:ss') + default: + return dayjs(val).format('YYYY-MM-DD HH:mm:ss') + } + }, } \ No newline at end of file