Browse Source

no message

linwenxin 1 week ago
parent
commit
21e5c2a029
3 changed files with 7 additions and 12 deletions
  1. 6 8
      src/common/utils/navPag.js
  2. 0 3
      src/main.js
  3. 1 1
      src/store/modules/user/index.js

+ 6 - 8
src/common/utils/navPag.js

@@ -168,14 +168,13 @@ export function webViewHref(url, pam = {}, crossPagePam = {}) {
   var defaultPam = {
     ...pam,
     ...crossPagePam,
-    code2: store.state.user.code2 || '',
-    'x-token': store.state.user.token,
+    appId: store.state.user.appId,
     openId: store.state.user.openId,
     userId: store.state.user.userId,
+    code2: store.state.user.code2 || '',
+    'x-token': store.state.user.token,
     mobile: store.state.user.mobile,
     username: store.state.user.name,
-    useravatar: store.state.user.avatar,
-    appId: store.state.user.appId,
     ...(() => {
       if (store.state.user.miniOpenId) {
         return {
@@ -222,14 +221,13 @@ export function webHref(url, pam = {}, crossPagePam = {}) {
   var defaultPam = {
     ...pam,
     ...crossPagePam,
-    code2: store.state.user.code2 || '',
-    'x-token': store.state.user.token,
+    appId: store.state.user.appId,
     openId: store.state.user.openId,
     userId: store.state.user.userId,
+    code2: store.state.user.code2 || '',
+    'x-token': store.state.user.token,
     mobile: store.state.user.mobile,
     username: store.state.user.name,
-    useravatar: store.state.user.avatar,
-    appId: store.state.user.appId,
     ...(() => {
       if (store.state.user.miniOpenId) {
         return {

+ 0 - 3
src/main.js

@@ -42,9 +42,6 @@ if (getQueryVariable('openId')) {
 if (getQueryVariable('username')) {
   setStorage('name', getQueryVariable('username') || '')
 }
-if (getQueryVariable('useravatar')) {
-  setStorage('avatar', getQueryVariable('useravatar') || '')
-}
 if (getQueryVariable('userId')) {
   setStorage('userId', getQueryVariable('userId') || '')
 }

+ 1 - 1
src/store/modules/user/index.js

@@ -27,7 +27,7 @@ const state = {
   openId: getQueryVariable('openId') || getStorage('openId') || '',
   token: getStorage('token') || getQueryVariable('x-token') || '',
   name: getQueryVariable('username') || getStorage('name') || '',
-  avatar: getQueryVariable('useravatar') || getStorage('avatar') || '',
+  avatar: '',
   userId: getQueryVariable('userId') || getStorage('userId') || '',
   mobile: getQueryVariable('mobile') || getStorage('mobile') || '',
   appId: getQueryVariable('appid') || getQueryVariable('appId') || '',