From 08b73a91cec8c8ef430b8d5bc5b4a631bcbbe7f2 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 21 七月 2024 18:13:49 +0800
Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer
---
store/index.js | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/store/index.js b/store/index.js
index edf7a1b..2f2a20c 100644
--- a/store/index.js
+++ b/store/index.js
@@ -35,6 +35,8 @@
// remoteip:'',//服务器ip
sign: {
'enterprise': 0,
+ 'info': 0,
+ 'flower': 0,
},
defaultaddress: {}
},
@@ -245,13 +247,13 @@
}
return resp
},
- regSupplier: async function({
+ regUser: async function({
commit,
dispatch,
state
}, data) {
{
- const resp = await http.request('post', '/api/register/supplier', {
+ const resp = await http.request('post', '/api/register/' + data.type, {
data: {
username: data.username,
password: data.password,
@@ -279,10 +281,11 @@
state
}, data) {
{
- const resp = await http.request('post', '/api/login/partner' + (data
- .phoneNumber ? '/phone' : ''), {
+ const resp = await http.request('post', '/api/login/partner' + ((data
+ .phoneNumber || data.tel) ? '/phone' : ''), {
data: {
- username: data.username,
+ username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
+ data.tel) : data.username,
password: data.password,
tel: data.phoneNumber || data.tel,
smsCode: data.smsCode || ''
@@ -339,10 +342,11 @@
state
}, data) {
{
- const resp = await http.request('post', '/api/login/supplier' + (data
- .phoneNumber ? '/phone' : ''), {
+ const resp = await http.request('post', '/api/login/supplier' + ((data
+ .phoneNumber || data.tel) ? '/phone' : ''), {
data: {
- username: data.username,
+ username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
+ data.tel) : data.username,
password: data.password,
tel: data.phoneNumber || data.tel,
smsCode: data.smsCode || ''
@@ -393,8 +397,8 @@
}
},
-
- loginCustomer:async function({
+
+ loginCustomer: async function({
commit,
dispatch,
state
@@ -403,7 +407,8 @@
const resp = await http.request('post', '/api/login/customer' + (data
.phoneNumber ? '/phone' : ''), {
data: {
- username: data.username,
+ username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
+ data.tel) : data.username,
password: data.password,
tel: data.phoneNumber || data.tel,
smsCode: data.smsCode || ''
@@ -428,7 +433,7 @@
}
},
-
+
}
})
--
Gitblit v1.9.3