diff --git a/App.vue b/App.vue
index b59f73f..2acac8d 100644
--- a/App.vue
+++ b/App.vue
@@ -5,9 +5,7 @@
export default {
onLaunch: function() {
im.initIm('lmxuhwaglu76d')
-
return
-
//#ifdef APP-PLUS
// 获取系统版本号
getVersions({
diff --git a/apis/index.js b/apis/index.js
index 8070ca2..5a6e2a0 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -64,6 +64,12 @@ const request = (parameter, hideLoding = true) => {
return
}
errToast(res.statusCode)
+ },
+ fail(err) {
+ uni.showToast({
+ title: err.errMsg,
+ icon : 'none'
+ })
}
})
})
diff --git a/pages.json b/pages.json
index a931635..6290634 100644
--- a/pages.json
+++ b/pages.json
@@ -144,7 +144,7 @@
"path": "pages/store/index",
"name": "Store",
"style": {
- "navigationBarTitleText": "健康生活",
+ "navigationBarTitleText": "好物",
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": {
@@ -420,7 +420,7 @@
"path": "pages/im/friends/index",
"name": "imFriends",
"style": {
- "navigationBarTitleText": "我的好友"
+ "navigationBarTitleText": "我的好友"
}
},
{
@@ -434,7 +434,8 @@
"path": "pages/im/friends/info",
"name": "imFriendsInfo",
"style": {
- "navigationBarTitleText": ""
+ "navigationBarTitleText": "好友资料",
+ "navigationBarBackgroundColor":"#FFFFFF"
}
},
{
diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue
index 9861044..33a8231 100644
--- a/pages/auth/auth.vue
+++ b/pages/auth/auth.vue
@@ -82,20 +82,20 @@ export default {
smsAuth({
mobileNo: this.phone,
code: this.code,
- })
- .then((res) => {
- this.$store.commit(
- "setToken",
- res.token_type + " " + res.access_token
- );
- this.$Router.back();
- })
- .catch((err) => {
- uni.showToast({
- title: err.message,
- icon: "none",
- });
- });
+ }).then((res) => {
+ console.log(111)
+ this.$store.commit(
+ "setToken",
+ res.token_type + " " + res.access_token
+ );
+ this.$Router.back();
+ }).catch((err) => {
+ console.log(2222)
+ uni.showToast({
+ title: err.message,
+ icon: "none",
+ });
+ });
},
// 获取验证码
getPhoneCode() {
diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue
index 536cf4d..fbfaf2f 100644
--- a/pages/im/friends/index.vue
+++ b/pages/im/friends/index.vue
@@ -13,14 +13,14 @@
-
+
-
+
-
+
diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue
index f9d78a3..811e102 100644
--- a/pages/im/friends/info.vue
+++ b/pages/im/friends/info.vue
@@ -1,8 +1,28 @@
-
-
- 好友资料,
- 发送消息
-
+
+
+
+
+
+ 唐明明
+
+
+
+
+
+
+
+
+ 黑龙江 哈尔滨
+
+
+
+
+
-
diff --git a/pages/im/index.vue b/pages/im/index.vue
index a2bde3b..bdfce3c 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -92,7 +92,7 @@
}
this.getConversationList()
this.isShown = true
- }
+ }
},
onHide() {
this.isShown = false
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a43271e..8ad47fd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
- 欢迎使用ZH健康
+ 欢迎使用ZH-HEALTH健康
diff --git a/pages/menu/classify.vue b/pages/menu/classify.vue
index a953069..4fce58f 100644
--- a/pages/menu/classify.vue
+++ b/pages/menu/classify.vue
@@ -1,6 +1,6 @@
-
+
-
+
diff --git a/pages/menu/index.vue b/pages/menu/index.vue
index 465dd6d..ddbefe2 100644
--- a/pages/menu/index.vue
+++ b/pages/menu/index.vue
@@ -16,11 +16,11 @@
:btnStyle="{'padding': '30rpx'}"
@onMenu="$Router.push({ name: 'menuDetails', params: {id: $event.recipe_id, title: $event.name }})"
/>
-
+ /> -->
@@ -75,8 +75,7 @@
}
}
.box {
- padding: 0 $padding;
- box-sizing: border-box;
+
}
}
diff --git a/pages/service/index.vue b/pages/service/index.vue
index 459937e..1cab832 100644
--- a/pages/service/index.vue
+++ b/pages/service/index.vue
@@ -4,7 +4,7 @@
- ZH大家庭
+ ZH-HEALTH生活
会员卡
diff --git a/pages/store/list.vue b/pages/store/list.vue
index 5a33e78..0ac7e71 100644
--- a/pages/store/list.vue
+++ b/pages/store/list.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/pages/topic/index.vue b/pages/topic/index.vue
index 03f7535..9ad0e01 100644
--- a/pages/topic/index.vue
+++ b/pages/topic/index.vue
@@ -1,28 +1,30 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -90,6 +92,19 @@