内容违规
-
+
色情低俗
-
+
时政不实信息
-
+
违法犯罪
-
+
垃圾广告、售卖假货等
-
+
造谣传播
-
+
涉嫌欺诈
-
+
侮辱漫骂
-
+
危险行为
-
+
涉嫌非法集资
-
+
价值观导向不良
@@ -56,15 +57,15 @@
侵犯名誉
-
+
侵犯名誉、隐私、肖像权等
-
+
内容盗用本人作品
-
+
内容盗用他人作品
@@ -72,11 +73,11 @@
未成年
-
+
未成年人不当行为
-
+
内容不适合未成年观看
@@ -84,19 +85,19 @@
其他
-
+
引人不适
-
+
疑似自我伤害
-
+
诱导点赞、分享、关注
-
+
- 视频举报
+
+ 视频
+ 音乐
+ 私信举报
其他
@@ -109,14 +110,14 @@ export default {
props: {},
data() {
return {
- type: 'video'
+ mode: 'video'
}
},
computed: {},
created() {
+ this.mode = this.$route.query.mode
},
activated() {
- this.type = this.$route.query.type
},
methods: {}
}
diff --git a/src/pages/home/SubmitReport.vue b/src/pages/home/SubmitReport.vue
index 1b881d3..c79da98 100644
--- a/src/pages/home/SubmitReport.vue
+++ b/src/pages/home/SubmitReport.vue
@@ -2,7 +2,10 @@
@@ -24,8 +27,8 @@
{{ desc.length }}/200
-
- 
+
+
+ ![]()
@@ -45,6 +48,7 @@ export default {
data() {
return {
type: '色情低俗',
+ mode: 'video',
desc: '',
photos: []
}
@@ -52,9 +56,7 @@ export default {
computed: {},
created() {
this.type = this.$route.query.type
- },
- activated() {
- this.type = this.$route.query.type
+ this.mode = this.$route.query.mode
},
methods: {
async upload() {
@@ -62,7 +64,7 @@ export default {
await this.$sleep(500)
this.$hideLoading()
this.photos.push(
- new URL(`../../assets/img/poster/${this.photos.length}.jpg`)
+ new URL(`../../assets/img/poster/${this.photos.length}.jpg`, import.meta.url).href,
)
}
@@ -147,6 +149,7 @@ export default {
margin-right: 1vw;
.photo {
+ object-fit: cover;
position: absolute;
width: 100%;
height: 100%;
diff --git a/src/pages/home/components/FollowSetting.vue b/src/pages/home/components/FollowSetting.vue
index b4d1940..f352594 100644
--- a/src/pages/home/components/FollowSetting.vue
+++ b/src/pages/home/components/FollowSetting.vue
@@ -24,7 +24,7 @@
发私信
-
发私信
+
举报
diff --git a/src/pages/me/MyRequestUpdate.vue b/src/pages/me/MyRequestUpdate.vue
index b0a457a..e976226 100644
--- a/src/pages/me/MyRequestUpdate.vue
+++ b/src/pages/me/MyRequestUpdate.vue
@@ -25,7 +25,7 @@ import {mapState} from "vuex";
import FromBottomDialog from "../../components/dialog/FromBottomDialog";
export default {
- name: "RequestUpdate",
+ name: "MyRequestUpdate",
components: {FromBottomDialog},
data() {
return {}
diff --git a/src/pages/message/Share2Friend.vue b/src/pages/message/Share2Friend.vue
index dc82c37..3a459b0 100644
--- a/src/pages/message/Share2Friend.vue
+++ b/src/pages/message/Share2Friend.vue
@@ -272,6 +272,7 @@ export default {
},
async getFriends() {
let res = await this.$api.user.friends()
+ console.log('getFriends', res)
if (res.code === this.SUCCESS) {
this.friends = res.data
this.friends.all = this.friends.all.sort((a, b) => {
@@ -339,6 +340,7 @@ export default {
border-bottom: 1px solid #cccccc11;
font-size: 1.4rem;
padding: 0;
+ padding-left: @padding-page;
height: 5rem;
border-radius: 2px;
display: flex;
@@ -423,13 +425,6 @@ export default {
}
}
- .fixed {
- position: fixed;
- top: 11rem;
- left: 2rem;
- right: 2rem;
- }
-
.content {
height: calc(100% - 11.2rem);
margin-top: 11.2rem;
@@ -450,7 +445,7 @@ export default {
justify-content: space-between;
.comment {
- padding: 2rem;
+ padding: 0 2rem;
display: flex;
flex: 1;
@@ -469,6 +464,10 @@ export default {
}
}
+ .wrapper {
+ padding: 1rem;
+ }
+
.create-chat {
margin: 1rem;
display: flex;
diff --git a/src/pages/message/chat/ChatDetail.vue b/src/pages/message/chat/ChatDetail.vue
index 48bfbe7..c4de8b1 100644
--- a/src/pages/message/chat/ChatDetail.vue
+++ b/src/pages/message/chat/ChatDetail.vue
@@ -7,7 +7,16 @@
-
举报
-
+ 
+
+ 多人聊天
+
@@ -25,20 +34,19 @@
-
-
+
+ 设备备注
-
+
@@ -51,6 +59,7 @@ import Switches from '../components/swtich/switches';
import People from "../../people/components/People";
import FromBottomDialog from "../../../components/dialog/FromBottomDialog";
import BlockDialog from "../components/BlockDialog";
+import CONST_VAR from "../../../utils/const_var";
export default {
name: "ChatDetail",
@@ -67,12 +76,23 @@ export default {
blockDialog: false,
list: [
{
- type: 1,
- name: 'A'
- },
- {
- type: 6,
- name: '多人聊天'
+ "id": "224e9a00-ffa0-4bc1-bb07-c318c7b02fa5",
+ "avatar": new URL('../../../assets/img/icon/avatar/1.png', import.meta.url).href,
+ "name": "何以为家",
+ "sex": "",
+ "age": null,
+ "idCard": null,
+ "phone": "",
+ "address": null,
+ "wechat": "",
+ "password": null,
+ "lastLoginTime": "1629993515",
+ "createTime": "1630035089",
+ "isDelete": 0,
+ "account": "234",
+ "pinyin": "M",
+ "select": false,
+ type: CONST_VAR.RELATE_ENUM.FOLLOW_EACH_OTHER
},
]
}
@@ -83,6 +103,25 @@ export default {
methods: {
t() {
this.enabled = !this.enabled
+ },
+ follow(index) {
+ if (this.list[index].type === this.RELATE_ENUM.FOLLOW_ME) {
+ this.list[index].type = this.RELATE_ENUM.FOLLOW_EACH_OTHER
+ }
+ },
+ unfollow(index) {
+ this.$showConfirmDialog(
+ '正在与对方相互关注，是否不再关注该用户',
+ null,
+ 'gray',
+ () => {
+ this.list[index].type = this.RELATE_ENUM.FOLLOW_ME
+ },
+ () => {
+ },
+ '取消关注',
+ '返回'
+ )
}
}
}
@@ -110,8 +149,26 @@ export default {
.People {
border-bottom: 1px solid @second-btn-color-tran;
}
+
+ .add-people {
+ transition: all 0.3s ease;
+ width: 100%;
+ height: 7rem;
+ display: flex;
+ align-items: center;
+ position: relative;
+ border-bottom: 1px solid @second-btn-color-tran;
+
+ .head-image {
+ margin-right: 1.5rem;
+ width: 4.5rem;
+ height: 4.5rem;
+ border-radius: 50%;
+ }
+ }
}
+
.setting {
.row {
padding-left: 2rem;
diff --git a/src/pages/people/components/People.vue b/src/pages/people/components/People.vue
index aed35d4..b0af304 100644
--- a/src/pages/people/components/People.vue
+++ b/src/pages/people/components/People.vue
@@ -7,21 +7,52 @@
举报
-
拉黑
-
{{ people.name }}
+
+ {{ people.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{ people.name.substr(0, people.name.indexOf(searchKey)) }}{{ searchKey }}{{ people.name.substr(people.name.indexOf(searchKey) + searchKey.length) }}
+ {{ people.name.substr(0, people.name.indexOf(searchKey)) }}{{
+ searchKey
+ }}{{ people.name.substr(people.name.indexOf(searchKey) + searchKey.length) }}
{{ people.name }}
抖音id:
- {{ people.account.substr(0, people.account.indexOf(searchKey)) }}{{ searchKey }}{{ people.account.substr(people.account.indexOf(searchKey) + searchKey.length) }}
+ {{
+ people.account.substr(0, people.account.indexOf(searchKey))
+ }}{{
+ searchKey
+ }}{{ people.account.substr(people.account.indexOf(searchKey) + searchKey.length) }}
{{ people.account }}
{{ people.name }}
@@ -38,20 +69,20 @@
-
+
-
+
-
+
-
-
+
+
@@ -63,15 +94,15 @@
-
+
-
-
+
+
-
+
@@ -83,7 +114,7 @@
- 
+
@@ -94,15 +125,15 @@
+
-
+
-
+
-
+
@@ -143,14 +174,6 @@ export default {
data() {
return {
showPopover: false,
- RELATE_ENUM: {
- RECOMMEND_NO_REMOVE: -2,//推荐,不能移除
- RECOMMEND: -1,//推荐
- FOLLOW_ME: 1,//只关注我
- FOLLOW_EACH_OTHER: 2,//互相关注
- FOLLOW_HE: 3,//我关注他
- REQUEST_FOLLOW: 4//关注请求
- }
}
},
computed: {},
diff --git a/src/router/routes.js b/src/router/routes.js
index f533d28..1174e36 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -85,10 +85,8 @@ const routes = [
{path: '/TestKeepAlive', component: TestKeepAlive},
{path: '/TestKeepAlivePage1', component: TestKeepAlivePage1},
{path: '/home', component: Index},
- {path: '/home/submit-report', component: SubmitReport},
{path: '/home/music', component: Music},
{path: '/home/music-rank-list', component: MusicRankList},
- {path: '/home/report', component: Report},
{path: '/home/search', component: Search},
{path: '/home/live', component: LivePage},
@@ -123,7 +121,6 @@ const routes = [
{path: '/message', component: Message},
{path: '/message/all', component: AllMessage},
{path: '/message/more-search', component: MoreSearch},
- {path: '/message/share-to-friend', component: Share2Friend},
{path: '/message/joined-group-chat', component: JoinedGroupChat},
{path: '/message/fans', component: Fans},
{path: '/message/visitors', component: Visitors},
@@ -160,6 +157,9 @@ const routes = [
{path: '/me/request-update', component: RequestUpdate},
{path: '/me/my-request-update', component: MyRequestUpdate},
{path: '/me/uploader', component: Uploader},
+ {path: '/home/report', component: Report},
+ {path: '/home/submit-report', component: SubmitReport},
+ {path: '/message/share-to-friend', component: Share2Friend},
]
export default routes
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 11034a3..ef77733 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,13 +2,8 @@ import * as Vuex from "vuex";
import enums from '../utils/enums'
import api from '../api/index'
import CONST_VAR from "../utils/const_var";
+import resource from "../assets/data/resource";
-let RELATE_ENUM = {
- FOLLOW_ME: 1,//只关注我
- FOLLOW_EACH_OTHER: 2,//互相关注
- FOLLOW_HE: 3,//我关注他
- REQUEST_FOLLOW: 4//关注请求
-}
const store = Vuex.createStore({
state: {
bodyHeight: document.body.clientHeight,
@@ -46,576 +41,7 @@ const store = Vuex.createStore({
"desc": `一个普普通通学表演的\n看到的人都能开开心心~~~~~~~~~~~~~`,
"is_private": 1
},
- friends: {
- "all": [
- {
- "id": "224e9a00-ffa0-4bc1-bb07-c318c7b02fa5",
- "avatar": new URL('../assets/img/icon/avatar/1.png', import.meta.url).href,
- "name": "何以为家",
- "sex": "",
- "age": null,
- "idCard": null,
- "phone": "",
- "address": null,
- "wechat": "",
- "password": null,
- "lastLoginTime": "1629993515",
- "createTime": "1630035089",
- "isDelete": 0,
- "account": "234",
- "pinyin": "M",
- "select": false,
- type: RELATE_ENUM.REQUEST_FOLLOW
- },
- {
- "id": "2b446aa8-5d31-429a-8e39-d4705eb4e900",
- "avatar": new URL('../assets/img/icon/avatar/19.png', import.meta.url).href,
- "name": "浅唱↘我们的歌",
- "sex": "",
- "age": null,
- "idCard": null,
- "phone": "",
- "address": null,
- "wechat": "",
- "password": null,
- "lastLoginTime": "1629993515",
- "createTime": "1630035089",
- "isDelete": 0,
- "account": "33453",
- "pinyin": "Q",
- "select": false,
- type: RELATE_ENUM.FOLLOW_ME
- },
- {
- "id": "2d8622b4-7112-4bc7-a0cf-00a268a85504",
- "avatar": new URL('../assets/img/icon/avatar/25.png', import.meta.url).href,
- "name": "‘心’之天空",
- "sex": "",
- "age": null,
- "idCard": null,
- "phone": "",
- "address": null,
- "wechat": "",
- "password": null,
- "lastLoginTime": "1629993515",
- "createTime": "1630035089",
- "isDelete": 0,
- "account": "234234",
- "pinyin": "#",
- "select": false,
- type: RELATE_ENUM.FOLLOW_HE
- },
- {
- "id": "2e38900b-65f7-426a-8e8b-edb403df35fb",
- "avatar": new URL('../assets/img/icon/avatar/18.png', import.meta.url).href,
- "name": "◇、_保持微笑ゞ",
- "sex": "",
- "age": null,
- "idCard": null,
- "phone": "",
- "address": null,
- "wechat": "",
- "password": null,
- "lastLoginTime": "1629993515",
- "createTime": "1630035089",
- "isDelete": 0,
- "account": "1111",
- "pinyin": "#",
- "select": false,
- type: RELATE_ENUM.FOLLOW_EACH_OTHER
- },
- {
- "id": "3cd53cb5-04f8-4439-ad2b-e57b3f9b8c73",
- "avatar": new URL('../assets/img/icon/avatar/26.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/4.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/12.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/3.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/16.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/10.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/22.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/14.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/11.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/9.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/5.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/0.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/8.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/7.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/2.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/23.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/13.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/24.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/15.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/20.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/6.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/17.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/21.png', import.meta.url).href,
- "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": [
- {
- "id": "3cd53cb5-04f8-4439-ad2b-e57b3f9b8c73",
- "avatar": new URL('../assets/img/icon/avatar/26.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/22.png', import.meta.url).href,
- "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": [
- {
- "id": "2b446aa8-5d31-429a-8e39-d4705eb4e900",
- "avatar": new URL('../assets/img/icon/avatar/19.png', import.meta.url).href,
- "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": new URL('../assets/img/icon/avatar/20.png', import.meta.url).href,
- "name": "dear°学会微笑",
- "sex": "",
- "age": null,
- "idCard": null,
- "phone": "",
- "address": null,
- "wechat": "",
- "password": null,
- "lastLoginTime": "1629993515",
- "createTime": "1630035089",
- "isDelete": 0,
- "account": "gggggg",
- "pinyin": "#",
- "select": false
- }
- ]
- },
+ friends: resource.users,
excludeRoutes: []
},
mutations: {
diff --git a/src/utils/const_var.js b/src/utils/const_var.js
index c166cbd..9ae65d0 100644
--- a/src/utils/const_var.js
+++ b/src/utils/const_var.js
@@ -10,4 +10,12 @@ export default {
PAGE_SIZE: 10,
DELAY_TIME: 250,
SUCCESS: 200,
+ RELATE_ENUM: {
+ RECOMMEND_NO_REMOVE: -2,//推荐,不能移除
+ RECOMMEND: -1,//推荐
+ FOLLOW_ME: 1,//只关注我
+ FOLLOW_EACH_OTHER: 2,//互相关注
+ FOLLOW_HE: 3,//我关注他
+ REQUEST_FOLLOW: 4//关注请求
+ }
}
diff --git a/src/utils/mixin.js b/src/utils/mixin.js
index c1b4b51..e541756 100644
--- a/src/utils/mixin.js
+++ b/src/utils/mixin.js
@@ -13,6 +13,7 @@ import NoMore from "../components/NoMore";
import Back from "../components/Back";
import Loading from "../components/Loading";
import BaseButton from "../components/BaseButton";
+import CONST_VAR from "./const_var";
export default {
components: {
@@ -34,13 +35,7 @@ export default {
data() {
return {
SUCCESS: 200,
- RELATE_ENUM: {
- RECOMMEND: -1,//推荐
- FOLLOW_ME: 1,//只关注我
- FOLLOW_EACH_OTHER: 2,//互相关注
- FOLLOW_HE: 3,//我关注他
- REQUEST_FOLLOW: 4//关注请求
- }
+ RELATE_ENUM: CONST_VAR.RELATE_ENUM
}
},
methods: {