请求处理代理

商品管理
商品分类
用户管理
桌台
代客下单
进销存
交班
预定座位
充值管理
存酒管理

jeepay-ui-uapp-merchant/pages/login/index.vue

@@ -99,6 +99,9 @@ import timer from '@/commons/utils/timer.js'
 import formUtil from '@/commons/utils/formUtil.js'
 import EnvChangeTips from './components/EnvChangeTips.vue'
 import { getExtStoreId } from "@/commons/utils/versionManage.js"
+import {
+		$login
+	} from '@/http/newApi/login.js';
 const loginFormRef = ref()
 const envChangeTipsRef = ref()
 const refAgr = ref()
@@ -148,16 +151,18 @@ const vdata = reactive({
 	
 })
 
+vdata.formData.username='19502966242'
+vdata.formData.pwd='11280923'
+
 const getCode=()=>{
 	$isCode().then(res=>
 	{
-		console.log(res);
 		vdata.formData.imgCodeUrl=res.bizData.imageBase64Data
 		vdata.formData.vercodeToken=res.bizData.vercodeToken
 	})
 }
 
-getCode()
+// getCode()
 
 
 
@@ -165,11 +170,12 @@ onMounted(() => {
 	getExtStoreId()
 	
 	// 查询是否包含网站信息， 否则更新
-	if(!vdata.siteInfos || Object.keys(vdata.siteInfos) <= 0){
-		$getSiteInfos().then( ( { bizData } ) => {
-			vdata.siteInfos = storageManage.siteInfos(bizData)
-		})
-	}
+	
+	// if(!vdata.siteInfos || Object.keys(vdata.siteInfos) <= 0){
+	// 	$getSiteInfos().then( ( { bizData } ) => {
+	// 		vdata.siteInfos = storageManage.siteInfos(bizData)
+	// 	})
+	// }
 	
 })
 
@@ -194,7 +200,11 @@ function loginFunc(){
 		let loginPromise = null;
 		
 		if(vdata.loginType == 'pwd'){ // 用户名密码登录 
-			loginPromise = $loginByPwd(vdata.formData.username, vdata.formData.pwd, vdata.formData.safetyCode)
+			// loginPromise = $loginByPwd(vdata.formData.username, vdata.formData.pwd, vdata.formData.safetyCode)
+			loginPromise = $login({
+				account: vdata.formData.username,
+				password: vdata.formData.pwd
+			})
 			
 		}else if(vdata.loginType == 'sms'){ // 短信验证码登录
 			loginPromise = $phoneCodeLogin(vdata.formData.loginPhone, vdata.formData.smsCode)
@@ -206,14 +216,13 @@ function loginFunc(){
 		
 		// 请求后的操作 
 		loginPromise.then(({bizData}) => {
-			
+			console.log(bizData);
 			if(bizData.isMFA){ // 需要 二次认证登录
 				
 				infoBox.showToast('请输入安全码')
 				vdata.isShowSafetyCode = true
 				return false;
 			}
-			
 			// 登录成功
 			loginFinishFunc(bizData)
 			
@@ -243,7 +252,9 @@ const toPrivacy = () => {
 async function loginFinishFunc(loginBizData){
 	
 	// 保存 token
-	storageManage.token(loginBizData.iToken)
+	storageManage.token(loginBizData.iToken||loginBizData.tokenValue)
+	console.log(loginBizData.iToken||loginBizData.tokenValue);
+	storageManage.shopId(loginBizData.shopId)
 	
 	// 请求用户信息
 	return $userInfo().then(({bizData}) => {