diff --git a/src/App.vue b/src/App.vue
index 5a528eaa..f087ea1a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -93,7 +93,7 @@
promises.push(this.friendStore.loadFriend());
promises.push(this.groupStore.loadGroup());
promises.push(this.chatStore.loadChat());
- promises.push(this.configStore.loadConfig());
+ // promises.push(this.configStore.loadConfig());
return Promise.all(promises);
});
},
diff --git a/src/chat-store/configStore.js b/src/chat-store/configStore.js
index 00488187..0537d82d 100644
--- a/src/chat-store/configStore.js
+++ b/src/chat-store/configStore.js
@@ -1,36 +1,36 @@
import { defineStore } from 'pinia';
-import http from '../common/request'
+import http from '../common/request';
export default defineStore('configStore', {
- state: () => {
- return {
- appInit: false,
- webrtc: {}
- }
- },
- actions: {
- setConfig(config) {
- this.webrtc = config.webrtc;
- },
- setAppInit(appInit) {
- this.appInit = appInit;
- },
- clear() {
- this.webrtc = {};
- },
- loadConfig() {
- return new Promise((resolve, reject) => {
- http({
- url: '/system/config',
- method: 'GET'
- }).then((config) => {
- console.log("系统配置", config)
- this.setConfig(config);
- resolve();
- }).catch((res) => {
- reject(res);
- });
- })
- }
- }
-})
\ No newline at end of file
+ state: () => {
+ return {
+ appInit: false,
+ webrtc: {},
+ };
+ },
+ actions: {
+ setConfig(config) {
+ this.webrtc = config.webrtc;
+ },
+ setAppInit(appInit) {
+ this.appInit = appInit;
+ },
+ clear() {
+ this.webrtc = {};
+ },
+ loadConfig() {
+ // return new Promise((resolve, reject) => {
+ // http({
+ // url: '/system/config',
+ // method: 'GET'
+ // }).then((config) => {
+ // console.log("系统配置", config)
+ // this.setConfig(config);
+ // resolve();
+ // }).catch((res) => {
+ // reject(res);
+ // });
+ // })
+ },
+ },
+});
diff --git a/src/pages.json b/src/pages.json
index 95166eed..16a9ad3b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -133,6 +133,20 @@
"navigationBarTitleText": "我的",
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "pages/wechat-tabbar/index",
+ "style": {
+ "navigationBarTitleText": "邀请福利",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/wechat-tabbar/me",
+ "style": {
+ "navigationBarTitleText": "我的",
+ "navigationStyle": "custom"
+ }
}
// #endif
],
diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue
index 8c1119d9..cabb3001 100644
--- a/src/pages/home/detail.vue
+++ b/src/pages/home/detail.vue
@@ -18,8 +18,8 @@
v-if="userDetail?.member?.memberId"
class="py-1 px-2 text-xs bg-color-theme-dark rounded-full mr-3"
>
- {{ userDetail.member?.memberCity ? userDetail.member?.memberCity + ' · ' : '' }}
- {{ userDetail.distance?.toFixed(2) }}km
+ {{ userDetail.member.memberCity ? userDetail.member.memberCity + ' · ' : '' }}
+ {{ userDetail.distance ? userDetail.distance.toFixed(2) + 'km' : '' }}
diff --git a/src/pages/profile/about.vue b/src/pages/profile/about.vue
index a1c8fe52..8234c494 100644
--- a/src/pages/profile/about.vue
+++ b/src/pages/profile/about.vue
@@ -8,11 +8,16 @@
-
+
+
+ 荷塘月色
+
+
+
-
+
diff --git a/src/pages/profile/face-verify.vue b/src/pages/profile/face-verify.vue
index cf652a21..219a23c5 100644
--- a/src/pages/profile/face-verify.vue
+++ b/src/pages/profile/face-verify.vue
@@ -17,6 +17,7 @@
+
@@ -57,7 +58,7 @@
-
+
+
基本资料
上传本人头像,女生更放心与你见面~
@@ -209,7 +213,7 @@
开始认证
@@ -218,13 +222,15 @@
为保护您的隐私,您的信息只有认证过的女生可以看到,请放心认证
+
+
-
-
diff --git a/src/pages/tabbar/components/user-ablum.vue b/src/pages/tabbar/components/user-ablum.vue
index 3e6bdf91..f246bceb 100644
--- a/src/pages/tabbar/components/user-ablum.vue
+++ b/src/pages/tabbar/components/user-ablum.vue
@@ -22,6 +22,8 @@