From dd05376541c3db3794da1b78427b75d3983d550b Mon Sep 17 00:00:00 2001
From: dengj <209192278@qq.com>
Date: Wed, 15 Nov 2023 12:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/InputAndSwiper/InputAndSwiper.vue | 4 +-
components/TabBar/TabBar.vue | 55 ++++++--
pages.json | 97 +++++++------
pages/index/HomeMainContent/HomeNavCard.vue | 78 +++++++++--
pages/my/login/login.vue | 136 +++++++++++++++++++
pages/my/my.vue | 105 +++++++++-----
service/request.js | 18 ++-
7 files changed, 393 insertions(+), 100 deletions(-)
create mode 100644 pages/my/login/login.vue
diff --git a/components/InputAndSwiper/InputAndSwiper.vue b/components/InputAndSwiper/InputAndSwiper.vue
index c33f410..c083e94 100644
--- a/components/InputAndSwiper/InputAndSwiper.vue
+++ b/components/InputAndSwiper/InputAndSwiper.vue
@@ -46,7 +46,9 @@
styleIsolation: 'shared', // 解除样式隔离
},
created() {
- this.open()
+ if (this.type !== '0') {
+ this.open()
+ }
},
methods: {
getUserLocation() {
diff --git a/components/TabBar/TabBar.vue b/components/TabBar/TabBar.vue
index 7fd2627..dd9d75b 100644
--- a/components/TabBar/TabBar.vue
+++ b/components/TabBar/TabBar.vue
@@ -3,24 +3,32 @@
-
-
-
+
+
+
+
+
+ {{item.text}}
+
-
- {{item.text}}
-
-
-
-
+
+
+
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index fa59bd8..343daf8 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,56 +1,89 @@
-
-
-
-
-
+
+
+
+
+
+ {{username}}
+ 账号:{{account}}
- {{username}}
- 账号:{{account}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/service/request.js b/service/request.js
index d535a2f..c31a40f 100644
--- a/service/request.js
+++ b/service/request.js
@@ -1,4 +1,4 @@
-const serverHost = 'https://spsp.feashow.com/api/'//http://xx.xxx.xx
+const serverHost = 'https://spsp.feashow.com/api/' //http://xx.xxx.xx
const service = {
get(url, data) {
@@ -131,11 +131,25 @@ const apiService = {
uploadImgUrl: serverHost + `/upload/image/`,
//登录接口
login(data) {
- const url = `/login`
+ const url = '/login/mnpLogin'
return new Promise((resolve, reject) => {
resolve(service.post(url, data))
})
},
+ //code换手机号
+ getMobile(data) {
+ const url = '/user/getMobileByMnp'
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, data))
+ })
+ },
+ // 获取客服电话
+ getCsTel() {
+ const url = '/center/cfg?key=kf_phone'
+ return new Promise((resolve, reject) => {
+ resolve(service.get(url))
+ })
+ },
// 展示用户信息
getUserInfo() {
const url = '/user'