diff --git a/src/http/http.js b/src/http/http.js index b51a9b7..64c4927 100644 --- a/src/http/http.js +++ b/src/http/http.js @@ -1,8 +1,8 @@ import axios from 'axios'; +import { $globalStore } from "../common/globalStore" // import router from '@/router/home'; // import {cache} from '@/store/store'; axios.defaults.withCredentials = true -const { useCommon } = $globalStore; const http = axios.create({ traditional: true, contentType : "application/json", @@ -14,8 +14,8 @@ http.interceptors.request.use( config => { if(!config.headers['Content-Type']){ config.headers['Content-Type'] = 'application/json' - config.headers['Authorization'] = 'Bearer '+ useCommon.token } + config.headers['token'] = $globalStore.useCommon.token return config }, err => { diff --git a/src/store/Common.js b/src/store/Common.js index ae2cf71..0eb870e 100644 --- a/src/store/Common.js +++ b/src/store/Common.js @@ -6,17 +6,17 @@ export default defineStore('useCommon', { subMsgKey: "", // 定义通知(由于路由不再支持parmas传参丢失) goods_card_num: 0, is_reload_card: false, - id:"", - //企业统一信用代码 - enterpriseNumber:"", - //企业名称 - enterpriseName:"", - //当前登录用户ID - userId:"", - // token - token: "", - //当前登录用户的手机号 - phonenumber:"" + id:"", + //企业统一信用代码 + enterpriseNumber:"", + //企业名称 + enterpriseName:"", + //当前登录用户ID + userId:"", + // token + token: "", + //当前登录用户的手机号 + phonenumber:"" }), getters: {}, actions: { @@ -32,26 +32,26 @@ export default defineStore('useCommon', { SET_RELAOD_SHOP(data) { this.is_reload_card = data; }, - //修改用户关联的企业纳税识别号 - SET_USER_ENTERPRISE_NUMBER(data){ - this.enterpriseNumber = data; - }, - //修改用户关联的企业纳税识别号 - SET_USER_ENTERPRISE_NAME(data){ - this.enterpriseName = data; - }, - //设置用户ID - SET_USER_ID(data){ - this.userId = data; - }, - //设置用户token - SET_TOKEN(data){ - this.token = data; - }, - //设置用户手机号码 - SET_USER_PHONENUMBER(data){ - this.phonenumber = data; - }, + //修改用户关联的企业纳税识别号 + SET_USER_ENTERPRISE_NUMBER(data){ + this.enterpriseNumber = data; + }, + //修改用户关联的企业纳税识别号 + SET_USER_ENTERPRISE_NAME(data){ + this.enterpriseName = data; + }, + //设置用户ID + SET_USER_ID(data){ + this.userId = data; + }, + //设置用户token + SET_TOKEN(data){ + this.token = data; + }, + //设置用户手机号码 + SET_USER_PHONENUMBER(data){ + this.phonenumber = data; + }, // 获取多语言数据 async getLang(params) { let url = $globalRequestUrl({ diff --git a/src/views/Home.vue b/src/views/Home.vue index 0f8fa8d..1ac9e27 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -138,17 +138,13 @@ onMounted(() => { const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f'; const nonce = generateRandomNumber(); const timestamp = `${Date.now()}`; - console.log(nonce); - console.log(timestamp); const str = [access_secret, nonce, timestamp] .sort() .reduce((str, item) => str += item, ''); - console.log(str); // 最终还需要转成全小写 const signature = sha1(str).toString().toLowerCase(); - console.log(signature); //深i企鉴权 w6s.config({ access_key: access_key, diff --git a/src/views/login.vue b/src/views/login.vue index 81d72d0..56b30b7 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -38,7 +38,7 @@ const onSubmit = async (values) => { console.log(values); // await getGoodsnum(); // await getLang(); - values.password = Encrypt(values.password); + values.secretKey = Encrypt(values.password); // return; userLogin(values,success=>{ console.log(success);