Commit f12ac4a2 by liuliufashi

update

parent 4f3f6d65
import axios from "axios"; import axios from "axios";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { getToken } from "./token"; import { getToken } from "./token";
// 创建axios实例 // 创建axios实例
const instance = axios.create({ const instance = axios.create({
...@@ -12,11 +13,13 @@ const instance = axios.create({ ...@@ -12,11 +13,13 @@ const instance = axios.create({
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
}); });
const token:String = getToken();
// 请求拦截器 // 请求拦截器
instance.interceptors.request.use( instance.interceptors.request.use(
function (config: any) { function (config: any) {
const token:String = getToken();
// 这里判断localStorage里面是否存在token,如果有则在请求头里面设置 // 这里判断localStorage里面是否存在token,如果有则在请求头里面设置
if (token) { if (token) {
config.headers.Authorization = token; config.headers.Authorization = token;
......
export const setToken = (token:String) =>{ export const setToken = (token:String) =>{
console.log(token,'token');
if(localStorage.getItem('session_id')){ if(localStorage.getItem('session_id')){
localStorage.removeItem('session_id') localStorage.removeItem('session_id')
localStorage.setItem('session_id',JSON.stringify(token)) localStorage.setItem('session_id',JSON.stringify(token))
......
...@@ -77,7 +77,7 @@ import { defineExpose, reactive, ref, toRaw,onMounted } from "vue"; ...@@ -77,7 +77,7 @@ import { defineExpose, reactive, ref, toRaw,onMounted } from "vue";
import { onLogin } from "@/api/index"; import { onLogin } from "@/api/index";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { useStore } from "vuex"; import { useStore } from "vuex";
import { setToken } from "@/utils/token"; import { setToken,getToken } from "@/utils/token";
import { setUserInfo,setUid } from "@/utils/userInfo"; import { setUserInfo,setUid } from "@/utils/userInfo";
interface FormState { interface FormState {
username: string; username: string;
...@@ -105,16 +105,18 @@ const onSubmit = async () => { ...@@ -105,16 +105,18 @@ const onSubmit = async () => {
password: toRaw(formState).password, password: toRaw(formState).password,
}; };
if(checked.value) { if(checked.value) {
const data: any = await onLogin(JSON.stringify(user)); const data: any = await onLogin(JSON.stringify(user));
loading.value = true loading.value = true
if (data.message === "ok" && data.state === 1) { if (data.message === "ok" && data.state === 1) {
setUserInfo(user); setUserInfo(user);
setUid(data.data.uid) setUid(data.data.uid)
setToken(data.data.session_id); setToken(data.data.session_id);
const token = getToken()
router.push({ router.push({
path: "/home", path: "/home",
}); });
} else { } else {
loading.value = false loading.value = false
message.warning(data.data); message.warning(data.data);
......
...@@ -80,11 +80,11 @@ ...@@ -80,11 +80,11 @@
<a-form-item :label="appidName" has-feedback labelAlign="left" v-bind="validateInfos.appid"> <a-form-item :label="appidName" has-feedback labelAlign="left" v-bind="validateInfos.appid">
<a-input v-model:value="modelRef.appid" placeholder="请输入appid" /> <a-input v-model:value="modelRef.appid" placeholder="请输入appid" />
</a-form-item> </a-form-item>
<a-form-item :label="goodsId" has-feedback labelAlign="left" v-bind="validateInfos.privatekey"> <a-form-item :label="goodsId" has-feedback labelAlign="left" v-bind="validateInfos.alipaypublickey">
<a-input v-model:value="modelRef.privatekey" placeholder="请输入商户id" /> <a-input v-model:value="modelRef.alipaypublickey" placeholder="请输入商户id" />
</a-form-item> </a-form-item>
<a-form-item :label="labelKey" has-feedback labelAlign="left" v-bind="validateInfos.alipaypublickey"> <a-form-item :label="labelKey" has-feedback labelAlign="left" v-bind="validateInfos.privatekey">
<a-input v-model:value="modelRef.alipaypublickey" placeholder="请输入密钥" /> <a-input v-model:value="modelRef.privatekey" placeholder="请输入密钥" />
</a-form-item> </a-form-item>
<!-- <a-form-item <!-- <a-form-item
label="域名配置:" label="域名配置:"
...@@ -249,8 +249,8 @@ const onSubmit = async () => { ...@@ -249,8 +249,8 @@ const onSubmit = async () => {
paytype: dataFrom.value.paytype, paytype: dataFrom.value.paytype,
status: dataFrom.value.status, status: dataFrom.value.status,
weight: dataFrom.value.weight, weight: dataFrom.value.weight,
mchid: toRaw(modelRef).privatekey, mchid: toRaw(modelRef).alipaypublickey,
mchkey: toRaw(modelRef).alipaypublickey, mchkey: toRaw(modelRef).privatekey,
...toRaw(modelRef), ...toRaw(modelRef),
uid uid
}; };
...@@ -285,7 +285,6 @@ const onSubmit = async () => { ...@@ -285,7 +285,6 @@ const onSubmit = async () => {
let prarms:any = { let prarms:any = {
} }
if(query.value.paytype == "1"){ if(query.value.paytype == "1"){
prarms = { prarms = {
amount: dataFrom.value.amount, amount: dataFrom.value.amount,
id: dataFrom.value.id, id: dataFrom.value.id,
...@@ -293,8 +292,8 @@ const onSubmit = async () => { ...@@ -293,8 +292,8 @@ const onSubmit = async () => {
paytype: dataFrom.value.paytype, paytype: dataFrom.value.paytype,
status: dataFrom.value.status, status: dataFrom.value.status,
weight: dataFrom.value.weight, weight: dataFrom.value.weight,
mchid: toRaw(modelRef).privatekey, mchid: toRaw(modelRef).alipaypublickey,
mchkey: toRaw(modelRef).alipaypublickey, mchkey: toRaw(modelRef).privatekey,
...toRaw(modelRef), ...toRaw(modelRef),
uid, uid,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment