From f04dc14f2ef59f597dd0b4867f4f894572a20606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 27 Aug 2021 18:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/api.js | 3 +-
common/http.interceptor.js | 2 +-
pages.json | 23 +++++++----
pages/index/index.vue | 7 +++-
pages/my/editInfo.vue | 51 ++++++++++++++---------
pages/my/index.vue | 4 +-
pages/my/memberDetails.vue | 1 +
pages/my/officialAccount.vue | 2 +-
pages/userList/userList.vue | 80 ++++++++++++++++++++++++++++++------
pages/webview/index.vue | 25 +++++++++++
10 files changed, 153 insertions(+), 45 deletions(-)
create mode 100644 pages/webview/index.vue
diff --git a/common/api.js b/common/api.js
index 08d1232..75e2798 100644
--- a/common/api.js
+++ b/common/api.js
@@ -14,4 +14,5 @@ export const API_MEMBERS_WALL = '/api/members/wall'; // 获取首页上墙会员
export const API_MEMBERS_ALL = '/api/members/all'; // 会员列表
export const API_MEMBERS_DETAIL = '/api/members/detail'; // 会员详情
export const API_MEMBERS_PARAMS = '/api/members/params'; // 获得查询参数
-export const API_UCENTER = '/api/ucenter'; // 个人中心落地页
\ No newline at end of file
+export const API_UCENTER = '/api/ucenter'; // 个人中心落地页
+export const API_USER_DETAIL = '/api/user/detail'; // 个人中心，个人资料
\ No newline at end of file
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index dbf0892..151f61d 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -11,7 +11,7 @@ const install = (Vue, vm) => {
dataType: 'json', // 返回数据时自动 JSON.parse()
showLoading: true, // 是否显示请求中的loading
loadingText: '正在加载',
- loadingTime: 800 // 延迟800毫秒时显示加载框
+ loadingTime: 0 // 延迟800毫秒时显示加载框
});
// 请求前拦截, 现在不做拦截
diff --git a/pages.json b/pages.json
index 79b0e7d..678e471 100644
--- a/pages.json
+++ b/pages.json
@@ -10,6 +10,13 @@
"enablePullDownRefresh": true
}
},
+ {
+ "path": "pages/login/index",
+ "style": {
+ "navigationBarTitleText": "登录中",
+ "enablePullDownRefresh": true
+ }
+ },
{
"path": "pages/wallMember/wallMember",
"style": {
@@ -73,13 +80,6 @@
"navigationBarTitleText": "我要上墙"
}
},
- {
- "path": "pages/login/index",
- "style": {
- "navigationBarTitleText": "登录",
- "enablePullDownRefresh": true
- }
- },
{
"path": "pages/my/index",
"style": {
@@ -201,7 +201,8 @@
{
"path": "pages/userList/userList",
"style": {
- "navigationBarTitleText": "相亲交友"
+ "navigationBarTitleText": "相亲交友",
+ "enablePullDownRefresh": true
}
},
{
@@ -292,6 +293,12 @@
"navigationBarBackgroundColor": "#FE3EA5",
"navigationBarTextStyle": "white"
}
+ },
+ {
+ "path": "pages/webview/index",
+ "style": {
+ "navigationBarTitleText": "相亲交友"
+ }
}
],
"globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fb99dc5..87c11e7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -70,7 +70,6 @@
// #ifdef H5
this.href_str = JSON.stringify(location.href);
let options = this.strToObj();
- console.log("options", options)
if(options.code){
this.login(options.code)
}else if(this.$isRight(uni.getStorageSync('user_info'))){
@@ -104,8 +103,12 @@
code: code,
scopes: 'snsapi_userinfo'
}).then(res => {
- console.log(res)
uni.setStorageSync('user_info', res?.data?.user);
+ var url = window.location.href; //获取当前页面的url
+ if(url.indexOf("?")!=-1){ //判断是否存在参数
+ url = url.replace(/(\?|#)[^'"]*/, ''); //去除参数
+ window.history.pushState({}, 0, url);
+ }
this.getMembersWall();
this.getMembers();
}).catch(err => {
diff --git a/pages/my/editInfo.vue b/pages/my/editInfo.vue
index 955bfef..ef77bc9 100644
--- a/pages/my/editInfo.vue
+++ b/pages/my/editInfo.vue
@@ -3,55 +3,49 @@
-
+
-
+
-
+
+ 去编辑
了解Ta的购车、住房情况和家庭成员资料成员资料成员资料成员资料成员资料成员资料成员资料
-
-
+ -->
+
基本资料
- 其他省市
- 未婚
- 180cm
- 70kg
+ {{ item }}
-
+
工作经济家庭
- 已购车无贷款
- 本科
- 6万-8万
+ {{ item }}
-
+
择偶要求
- 未婚
- 180cm
+ {{ item }}
@@ -61,6 +55,24 @@