update

pages/login/index.vue

@@ -185,11 +185,11 @@
 	const accountType = reactive({
 		list: [{
 				label: '商户',
-				value: 'merchant'
+				value: '0'
 			},
 			{
 				label: '员工',
-				value: 'staff'
+				value: '1'
 			},
 		],
 		sel: 0
@@ -246,8 +246,8 @@
 
 	})
 	// #ifdef H5
-	vdata.formData.username = '17792050546'
-	vdata.formData.pwd = 'sy666888'
+	vdata.formData.username = 'xpc'
+	vdata.formData.pwd = '123'
 	// #endif
 	// #ifdef MP-WEIXIN
 	// vdata.formData.username = '15699991111'
@@ -268,8 +268,8 @@
 
 	const getCode = () => {
 		getCodeImg().then(res => {
-			vdata.formData.img = res.img
-			vdata.formData.uuid = res.uuid
+			vdata.formData.img = res.data.code
+			vdata.formData.uuid = res.data.uuid
 		})
 	}
 
@@ -310,7 +310,8 @@
 				// loginPromise = $loginByPwd(vdata.formData.username, vdata.formData.pwd, vdata.formData.safetyCode)
 				loginPromise = login({
 					username: vdata.formData.username,
-					password: encrypt(vdata.formData.pwd),
+					password: vdata.formData.pwd,
+					// password: encrypt(vdata.formData.pwd),
 					rememberMe: false,
 					code: vdata.formData.code,
 					uuid: vdata.formData.uuid,
@@ -330,7 +331,7 @@
 			// 请求后的操作 
 			loginPromise.then(res => {
 				// 登录成功
-				loginFinishFunc(res)
+				loginFinishFunc(res.data)
 				// 保存商户号
 				uni.setStorageSync('MerchantId', {
 					merchantName: vdata.formData.merchantName,
@@ -368,14 +369,15 @@
 	// 封装登录成功后的操作
 	async function loginFinishFunc(loginBizData) {
 		// 保存 token
-		storageManage.setLogin(loginBizData)
-		storageManage.token(loginBizData.token)
-		storageManage.shopId(loginBizData.shopId)
-		storageManage.shopUserId(loginBizData.user.user.id)
-		storageManage.userInfo(loginBizData)
-
+		uni.setStorageSync('shopInfo',loginBizData.shopInfo)
+		uni.setStorageSync('tokenInfo',loginBizData.tokenInfo)
+		uni.setStorageSync('shopId',loginBizData.shopInfo.id)
+		uni.setStorageSync('loginType',loginBizData.loginType)
 		// 跳转到首页
 		go.to("PAGES_CREATE_ORDER")
+		// uni.navigateTo({
+		// 	url:'pagesCreateOrder/index/index'
+		// })
 	}
 
 	// 点击发送验证码的函数