私信给朋友
-
+
@@ -21,7 +21,7 @@
-
+
更多
diff --git a/src/components/UserPanel2.vue b/src/components/UserPanel2.vue
index 95da82f..c5d4b04 100644
--- a/src/components/UserPanel2.vue
+++ b/src/components/UserPanel2.vue
@@ -110,7 +110,7 @@
diff --git a/src/pages/home/LivePage.vue b/src/pages/home/LivePage.vue
index 5e8a801..229b5d8 100644
--- a/src/pages/home/LivePage.vue
+++ b/src/pages/home/LivePage.vue
@@ -33,13 +33,13 @@
107
-
+
diff --git a/src/pages/home/SearchPage.vue b/src/pages/home/SearchPage.vue
index 55e80c5..a186106 100644
--- a/src/pages/home/SearchPage.vue
+++ b/src/pages/home/SearchPage.vue
@@ -1,7 +1,7 @@
-
+
{{ isExpand ? '清除全部搜索记录' : '展开全部' }}
diff --git a/src/pages/home/components/FollowSetting.vue b/src/pages/home/components/FollowSetting.vue
index bde973e..674e6f8 100644
--- a/src/pages/home/components/FollowSetting.vue
+++ b/src/pages/home/components/FollowSetting.vue
@@ -14,7 +14,7 @@
成都验证码
私信给朋友
-
+
$emit('showShare'))">
diff --git a/src/pages/home/components/FollowSetting2.vue b/src/pages/home/components/FollowSetting2.vue
index 9b7662c..deeaea4 100644
--- a/src/pages/home/components/FollowSetting2.vue
+++ b/src/pages/home/components/FollowSetting2.vue
@@ -14,7 +14,7 @@
成都验证码
私信给朋友
-
+
diff --git a/src/pages/home/components/PlayFeedback.vue b/src/pages/home/components/PlayFeedback.vue
index 6f9cac1..2c21398 100644
--- a/src/pages/home/components/PlayFeedback.vue
+++ b/src/pages/home/components/PlayFeedback.vue
@@ -4,7 +4,7 @@
请选择要反馈的问题
diff --git a/src/pages/home/components/ShareTo.vue b/src/pages/home/components/ShareTo.vue
index 570470e..6753db0 100644
--- a/src/pages/home/components/ShareTo.vue
+++ b/src/pages/home/components/ShareTo.vue
@@ -86,7 +86,7 @@
去相册查看
-
+
diff --git a/src/pages/home/components/ShareToFriend.vue b/src/pages/home/components/ShareToFriend.vue
index 1a49812..4a3d7af 100644
--- a/src/pages/home/components/ShareToFriend.vue
+++ b/src/pages/home/components/ShareToFriend.vue
@@ -52,7 +52,7 @@
已加入的群聊
-
+
@@ -71,7 +71,7 @@
-
+
已加入的群聊
diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue
index 2a120aa..e7b2005 100644
--- a/src/pages/me/Me.vue
+++ b/src/pages/me/Me.vue
@@ -163,7 +163,7 @@
全部
-
+
@@ -186,7 +186,7 @@
全部
-
+
diff --git a/src/pages/me/MyCard.vue b/src/pages/me/MyCard.vue
index ea84192..834c283 100644
--- a/src/pages/me/MyCard.vue
+++ b/src/pages/me/MyCard.vue
@@ -1,7 +1,7 @@
diff --git a/src/pages/me/MyMusic.vue b/src/pages/me/MyMusic.vue
index 21a68c3..d15a632 100644
--- a/src/pages/me/MyMusic.vue
+++ b/src/pages/me/MyMusic.vue
@@ -1,13 +1,13 @@
@@ -102,9 +102,9 @@
diff --git a/src/pages/me/Uploader.vue b/src/pages/me/Uploader.vue
index 90bcab4..c76fced 100644
--- a/src/pages/me/Uploader.vue
+++ b/src/pages/me/Uploader.vue
@@ -135,7 +135,7 @@
查看更多
-
+
diff --git a/src/pages/me/VideoDetail.vue b/src/pages/me/VideoDetail.vue
index 4e905ef..7472851 100644
--- a/src/pages/me/VideoDetail.vue
+++ b/src/pages/me/VideoDetail.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/pages/me/components/CollectMusic.vue b/src/pages/me/components/CollectMusic.vue
index 493afd2..1180207 100644
--- a/src/pages/me/components/CollectMusic.vue
+++ b/src/pages/me/components/CollectMusic.vue
@@ -41,7 +41,7 @@
{{ item.name }}
{{ item.author }}
-
+
diff --git a/src/pages/me/components/GuessMusic.vue b/src/pages/me/components/GuessMusic.vue
index 391849a..c47ac37 100644
--- a/src/pages/me/components/GuessMusic.vue
+++ b/src/pages/me/components/GuessMusic.vue
@@ -41,7 +41,7 @@
{{ item.name }}
{{ item.author }}
-
+
diff --git a/src/pages/me/rightMenu/MinorProtection/DetailSetting.vue b/src/pages/me/rightMenu/MinorProtection/DetailSetting.vue
index 7d11d1c..e5c8090 100644
--- a/src/pages/me/rightMenu/MinorProtection/DetailSetting.vue
+++ b/src/pages/me/rightMenu/MinorProtection/DetailSetting.vue
@@ -30,7 +30,7 @@
{{ triggerTime }}分钟
-
+
diff --git a/src/pages/me/rightMenu/Setting.vue b/src/pages/me/rightMenu/Setting.vue
index fbb72e5..1fe710d 100644
--- a/src/pages/me/rightMenu/Setting.vue
+++ b/src/pages/me/rightMenu/Setting.vue
@@ -13,7 +13,7 @@
帐号与安全
-
+
@@ -22,7 +22,7 @@
隐私设置
-
+
@@ -35,7 +35,7 @@
通知设置
-
+
@@ -44,7 +44,7 @@
动态壁纸
-
+
@@ -53,7 +53,7 @@
通用设置
-
+
@@ -66,7 +66,7 @@
头条主页
-
+
@@ -79,7 +79,7 @@
广告反馈与设置
-
+
@@ -88,7 +88,7 @@
用户协议
-
+
@@ -97,7 +97,7 @@
社区自律公约
-
+
@@ -106,7 +106,7 @@
隐私政策
-
+
@@ -115,7 +115,7 @@
应用权限
-
+
@@ -124,7 +124,7 @@
第三方SDK列表
-
+
@@ -133,7 +133,7 @@
关于抖音
-
+
@@ -142,7 +142,7 @@
反馈与帮助
-
+
@@ -151,7 +151,7 @@
清理占用空间
-
+
@@ -163,7 +163,7 @@
切换空间
-
+
@@ -172,7 +172,7 @@
退出登录
-
+
diff --git a/src/pages/me/userinfo/AddSchool.vue b/src/pages/me/userinfo/AddSchool.vue
index f82eb47..3a05266 100644
--- a/src/pages/me/userinfo/AddSchool.vue
+++ b/src/pages/me/userinfo/AddSchool.vue
@@ -15,21 +15,21 @@
学校
{{ isEmpty(localSchool.name) }}
-
+
院系
{{ isEmpty(localSchool.department) }}
-
+
入学时间
{{ isEmpty(localSchool.joinTime) }}
-
+
@@ -37,14 +37,14 @@
学历
{{ isEmpty(localSchool.education) }}
-
+
展示范围
{{ displayType }}
-
+
diff --git a/src/pages/me/userinfo/ChooseLocation.vue b/src/pages/me/userinfo/ChooseLocation.vue
index eb1fe4d..474300f 100644
--- a/src/pages/me/userinfo/ChooseLocation.vue
+++ b/src/pages/me/userinfo/ChooseLocation.vue
@@ -23,7 +23,7 @@
diff --git a/src/pages/me/userinfo/ChooseProvince.vue b/src/pages/me/userinfo/ChooseProvince.vue
index 77c4a6f..0a7ff9a 100644
--- a/src/pages/me/userinfo/ChooseProvince.vue
+++ b/src/pages/me/userinfo/ChooseProvince.vue
@@ -10,7 +10,7 @@
diff --git a/src/pages/me/userinfo/EditUserInfo.vue b/src/pages/me/userinfo/EditUserInfo.vue
index 23d3852..0625250 100644
--- a/src/pages/me/userinfo/EditUserInfo.vue
+++ b/src/pages/me/userinfo/EditUserInfo.vue
@@ -20,28 +20,28 @@
名字
{{ isEmpty(userinfo.nickname) }}
-
+
抖音号
{{ isEmpty(userinfo.unique_id) }}
-
+
简介
{{ isEmpty(userinfo.desc) }}
-
+
性别
{{ isEmpty(userinfo.sex) }}
-
+
@@ -49,21 +49,21 @@
{{ isEmpty(userinfo.birthday) }}
-
+
所在地
{{ isEmpty(userinfo.location) }}
-
+
学校
{{ isEmpty(userinfo.school.name) }}
-
+
diff --git a/src/pages/message/AllMessage.vue b/src/pages/message/AllMessage.vue
index 6d1447d..1a27c4f 100644
--- a/src/pages/message/AllMessage.vue
+++ b/src/pages/message/AllMessage.vue
@@ -100,7 +100,7 @@
查看全部
-
+
diff --git a/src/pages/message/Message.vue b/src/pages/message/Message.vue
index f1b61e8..23411a3 100644
--- a/src/pages/message/Message.vue
+++ b/src/pages/message/Message.vue
@@ -43,7 +43,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
@@ -287,7 +287,7 @@
已加入的群聊
-
+
@@ -309,7 +309,7 @@
-
+
已加入的群聊
@@ -322,7 +322,7 @@
{{ text.length > 20 ? text.substr(0, 20) + '...' : text }}
(3)
-
+
@@ -372,7 +372,7 @@
联系人
更多联系人
-
+
已加入的群聊
-
+
最近聊天
diff --git a/src/pages/message/chat/Chat.vue b/src/pages/message/chat/Chat.vue
index a9bea50..7ed7ace 100644
--- a/src/pages/message/chat/Chat.vue
+++ b/src/pages/message/chat/Chat.vue
@@ -3,7 +3,7 @@
diff --git a/src/pages/message/notice/MoneyNotice.vue b/src/pages/message/notice/MoneyNotice.vue
index fd9bf06..9e159c6 100644
--- a/src/pages/message/notice/MoneyNotice.vue
+++ b/src/pages/message/notice/MoneyNotice.vue
@@ -43,7 +43,7 @@
查看详情
-
+
diff --git a/src/pages/message/notice/SystemNotice.vue b/src/pages/message/notice/SystemNotice.vue
index 6c70a33..17738ed 100644
--- a/src/pages/message/notice/SystemNotice.vue
+++ b/src/pages/message/notice/SystemNotice.vue
@@ -22,7 +22,7 @@
{{ item.content }}
查看详情
-
+
diff --git a/src/pages/message/notice/TaskNotice.vue b/src/pages/message/notice/TaskNotice.vue
index 30a8de5..4747f0f 100644
--- a/src/pages/message/notice/TaskNotice.vue
+++ b/src/pages/message/notice/TaskNotice.vue
@@ -31,7 +31,7 @@
{{ item.content }}
查看详情
-
+
diff --git a/src/pages/people/FindAcquaintance.vue b/src/pages/people/FindAcquaintance.vue
index 2fe94f4..a44eee8 100644
--- a/src/pages/people/FindAcquaintance.vue
+++ b/src/pages/people/FindAcquaintance.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/pages/slideHooks/Shop.vue b/src/pages/slideHooks/Shop.vue
index 7587742..b9c908c 100644
--- a/src/pages/slideHooks/Shop.vue
+++ b/src/pages/slideHooks/Shop.vue
@@ -1,13 +1,189 @@
-
+
+
+
+
+

+
更多
+
+
+
+
+
+

+
我的订单 快捷查单
+
+
+

+
购物车 空空如也
+
+
+
+
+
+
+
![]()
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/pages/test/Test.vue b/src/pages/test/Test.vue
index 6c7e458..6739b5d 100644
--- a/src/pages/test/Test.vue
+++ b/src/pages/test/Test.vue
@@ -3,7 +3,8 @@
-
+
+
@@ -23,10 +24,12 @@ import slideHooks from '../slideHooks'
import TestSwiperJs from "./TestSwiperJs";
import {mat4} from "gl-matrix";
import UserPanel from "@/components/UserPanel.vue";
+import Shop from "@/pages/slideHooks/Shop.vue";
export default {
name: "Test",
components: {
+ Shop,
UserPanel,
slideHooks,
TestSlide,