From 32ab1af0797e3e8ab60dc646fc2c30cddf1dfa1f Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 22 七月 2024 11:34:18 +0800
Subject: [PATCH] update需求更新
---
store/index.js | 176 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 37 deletions(-)
diff --git a/store/index.js b/store/index.js
index acd54c7..7452b61 100644
--- a/store/index.js
+++ b/store/index.js
@@ -35,6 +35,8 @@
// remoteip:'',//服务器ip
sign: {
'enterprise': 0,
+ 'info': 0,
+ 'flower': 0,
},
defaultaddress: {}
},
@@ -82,14 +84,8 @@
setColorIndex(state, index) {
state.colorIndex = index
},
- setMatchLeftWindow(state, matchLeftWindow) {
- state.noMatchLeftWindow = !matchLeftWindow
- },
setActive(state, tabPage) {
state.active = tabPage
- },
- setLeftWinActive(state, leftWinActive) {
- state.leftWinActive = leftWinActive
},
setActiveOpen(state, activeOpen) {
state.activeOpen = activeOpen
@@ -161,29 +157,6 @@
}
})
},
- getPhoneNumber: function({
- commit
- }, univerifyInfo) {
- return new Promise((resolve, reject) => {
- uni.request({
- url: 'https://97fca9f2-41f6-449f-a35e-3f135d4c3875.bspapp.com/http/univerify-login',
- method: 'POST',
- data: univerifyInfo,
- success: (res) => {
- const data = res.data
- if (data.success) {
- resolve(data.phoneNumber)
- } else {
- reject(res)
- }
-
- },
- fail: (err) => {
- reject(res)
- }
- })
- })
- },
getCurrentInfo: async function({
commit,
state
@@ -231,7 +204,7 @@
state.isBind = true
storage.setItem("token", resp.data.access_token || "")
state.hasLogin = true
- if(inviter){
+ if (inviter) {
storage.removeItem('inviter');
storage.removeItem('inviterTime');
storage.removeItem('inviterName');
@@ -245,18 +218,49 @@
}
return resp
},
- loginSupplier: async function({
+ regUser: async function({
commit,
dispatch,
state
}, data) {
{
- const resp = await http.request('post', '/api/login/supplier'+(data.phoneNumber?'/phone':''), {
+ const resp = await http.request('post', '/api/register/' + data.type, {
data: {
username: data.username,
password: data.password,
- tel:data.phoneNumber,
- smsCode:data.smsCode || ''
+ tel: data.phoneNumber || data.tel,
+ smsCode: data.smsCode || '',
+ dto: data.dto || undefined
+ },
+ params: {
+ clientType: data.clientType || 'app'
+ }
+ })
+ console.log('resp', resp)
+ if (resp && resp.code == 0) {
+
+
+ } else {
+
+ }
+ return resp
+ }
+
+ },
+ loginPartner: async function({
+ commit,
+ dispatch,
+ state
+ }, data) {
+ {
+ const resp = await http.request('post', '/api/login/partner' + ((data
+ .phoneNumber || data.tel) ? '/phone' : ''), {
+ data: {
+ username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
+ data.tel) : data.username,
+ password: data.password,
+ tel: data.phoneNumber || data.tel,
+ smsCode: data.smsCode || ''
},
params: {
clientType: data.clientType || 'app'
@@ -270,7 +274,7 @@
storage.setItem('token', resp.data.access_token)
commit("updateLogin", true)
await dispatch('getCurrentInfo')
-
+
console.log('login,reLaunch')
// #ifdef APP
var KeepAliveModule = uni.requireNativePlugin("yh-nl") //保活组件
@@ -294,7 +298,7 @@
// url: '/views/app/app-home/app-home'
// })
uni.reLaunch({
- url: '/pages/home/farmer-home'
+ url: '/pages/home/supplier-home'
})
} else {
// this.$message.showToast('登录失败')
@@ -303,7 +307,105 @@
return resp
}
- }
+ },
+ loginSupplier: async function({
+ commit,
+ dispatch,
+ state
+ }, data) {
+ {
+ const resp = await http.request('post', '/api/login/supplier' + ((data
+ .phoneNumber || data.tel) ? '/phone' : ''), {
+ data: {
+ username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
+ data.tel) : data.username,
+ password: data.password,
+ tel: data.phoneNumber || data.tel,
+ smsCode: data.smsCode || ''
+ },
+ params: {
+ clientType: data.clientType || 'app'
+ }
+ })
+ console.log('resp', resp)
+ if (resp && resp.code == 0) {
+ // await getCurrentInfo()
+ // // this.$message.showToast('登录成功')
+ // console.log(resp)
+ storage.setItem('token', resp.data.access_token)
+ commit("updateLogin", true)
+ await dispatch('getCurrentInfo')
+
+ console.log('login,reLaunch')
+ // #ifdef APP
+ var KeepAliveModule = uni.requireNativePlugin("yh-nl") //保活组件
+
+ KeepAliveModule && KeepAliveModule.startLocation({
+ intervalTime: 5000, //定位间隔时间
+ gaodeApiKey: "0eef1axxxxxx7964", //高德地图Key，已停用，引入插件配置
+ locationMode: 1, //定位模式
+ purpose: 0, //定位场景
+ ifUpload: true, //是否上报服务器
+ uploadUrl: "http://bio51-api.fixbug.fun/api/current/employee/location", //上报接口
+ params: "{'lat':'1','lng':'3'}", //其他参数
+ headers: "{'authorization1':'Bearer xOHeJhg'}",
+ }, function(res) {
+ console.log("启用结果：", res);
+ let ret = KeepAliveModule.getCurrentLocation();
+ console.log("启用结果2：", ret);
+ });
+ // #endif
+ // uni.redirectTo({
+ // url: '/views/app/app-home/app-home'
+ // })
+ uni.reLaunch({
+ url: '/pages/home/supplier-home'
+ })
+ } else {
+ // this.$message.showToast('登录失败')
+
+ }
+ return resp
+ }
+
+ },
+
+ loginCustomer: async function({
+ commit,
+ dispatch,
+ state
+ }, data) {
+ {
+ const resp = await http.request('post', '/api/login/customer' + (data
+ .phoneNumber ? '/phone' : ''), {
+ data: {
+ username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
+ data.tel) : data.username,
+ password: data.password,
+ tel: data.phoneNumber || data.tel,
+ smsCode: data.smsCode || ''
+ },
+ params: {
+ clientType: data.clientType || 'app'
+ }
+ })
+ console.log('resp', resp)
+ if (resp && resp.code == 0) {
+ storage.setItem('token', resp.data.access_token)
+ commit("updateLogin", true)
+ await dispatch('getCurrentInfo')
+ uni.reLaunch({
+ url: '/pages/home/home'
+ })
+ } else {
+
+
+ }
+ return resp
+ }
+
+ },
+
}
})
--
Gitblit v1.9.3