diff --git a/pages.json b/pages.json
index d9a90cb..36e7ed8 100644
--- a/pages.json
+++ b/pages.json
@@ -390,7 +390,7 @@
"path": "pages/im/friends/index",
"name": "imFriends",
"style": {
- "navigationBarTitleText": "我的好友",
+ "navigationBarTitleText": "通讯录",
"app-plus": {
"titleNView": {
"type": "default",
@@ -429,7 +429,9 @@
"path": "pages/im/friends/mine",
"name": "imFriendsMine",
"style": {
- "navigationBarTitleText": "我的资料"
+ "navigationBarTitleText": "我的二维码",
+ "navigationBarBackgroundColor": "#34CE98",
+ "navigationBarTextStyle": "white"
}
},
{
diff --git a/pages/im/components/friendSearchList.vue b/pages/im/components/friendSearchList.vue
index 76ae0d6..0bbb506 100644
--- a/pages/im/components/friendSearchList.vue
+++ b/pages/im/components/friendSearchList.vue
@@ -48,11 +48,11 @@
action(type, item) {
if (type === 'isFriend') {
// ,后期可以跳转到信息介绍页面,先留在这里
- return uni.showToast({
- title: '已是好友,无需重复添加',
- icon: 'none',
- duration: 2000
- });
+ // return uni.showToast({
+ // title: '已是好友,无需重复添加',
+ // icon: 'none',
+ // duration: 2000
+ // });
}
this.$emit('action', {
type,
@@ -94,7 +94,7 @@
.name {
width: 100%;
color: $text-color;
- font-size: $title-size + 2;
+ font-size: $title-size;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -106,7 +106,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- font-size: $title-size-m;
+ font-size: $title-size-m - 2;
margin-top: $margin - 10;
color: $text-gray-m;
}
@@ -115,6 +115,7 @@
.agress-btn {
display: flex;
color: #fff;
+ font-size: $title-size-m;
span {
display: inline-block;
diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index b3dc52e..4e37bcc 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -44,7 +44,7 @@
diff --git a/pages/im/friends/mine.vue b/pages/im/friends/mine.vue
index a09eec1..92bdef2 100644
--- a/pages/im/friends/mine.vue
+++ b/pages/im/friends/mine.vue
@@ -1,32 +1,20 @@
-
+
+
-
-
+
+
{{infoObj.name}}
- 地址:{{infoObj.address}}
-
-
-
-
-
-
- 保密
- 男
- 女
-
-
-
- {{infoObj.address}}
-
-
-
-
-
-
- ZH-HEALTH扫一扫上面的二维码
- 添加我的好友
+ {{infoObj.address}}
+
+
+ 扫描二维码加我ZH大健康好友
+
+
+ 复制地址
@@ -48,141 +36,126 @@
gender: 0,
hash: ''
},
+ downUrl: 'http://www.baidu.com',
qrContent: 'ADDFRIEND|'
}
},
- onLoad(e) {
- this.qrContent += e.targetId
- getUserInfo(e.targetId).then(res => {
- this.infoObj = res
- })
+ onLoad(e) {
+ this.qrContent += e.targetId
+ getUserInfo(e.targetId).then(res => {
+ this.infoObj = res
+ })
},
methods: {
-
+ copy() {
+ uni.setClipboardData({
+ data: this.downUrl,
+ success: function() {
+ uni.showToast({
+ title: ` 下载链接已复制到剪贴板 `,
+ icon: 'none',
+ position:'bottom',
+ mask: true,
+ duration: 2000
+ })
+ }
+ });
+ }
}
}