master
sjm 2 years ago
parent 313a758aef
commit 0bcb4aa20e

@ -7,6 +7,7 @@ const getters = {
token: state => state.user.token, token: state => state.user.token,
avatar: state => state.user.avatar, avatar: state => state.user.avatar,
name: state => state.user.name, name: state => state.user.name,
userId: state => state.user.userId,
introduction: state => state.user.introduction, introduction: state => state.user.introduction,
roles: state => state.user.roles, roles: state => state.user.roles,
permissions: state => state.user.permissions, permissions: state => state.user.permissions,

@ -7,10 +7,14 @@ const user = {
name: '', name: '',
avatar: '', avatar: '',
roles: [], roles: [],
permissions: [] permissions: [],
userId: null,
}, },
mutations: { mutations: {
SET_USERID: (state, userId) => {
state.userId = userId
},
SET_TOKEN: (state, token) => { SET_TOKEN: (state, token) => {
state.token = token state.token = token
}, },
@ -59,6 +63,7 @@ const user = {
commit('SET_ROLES', ['ROLE_DEFAULT']) commit('SET_ROLES', ['ROLE_DEFAULT'])
} }
commit('SET_NAME', user.userName) commit('SET_NAME', user.userName)
commit('SET_USERID', user.userId)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
resolve(res) resolve(res)
}).catch(error => { }).catch(error => {

@ -20,6 +20,7 @@ const allowDisparity = 1000 * 60 * 60 * 24 * 7
*/ */
export function isStarRepo(owner, repo, userId, redirectUrl,productName,productLink) { export function isStarRepo(owner, repo, userId, redirectUrl,productName,productLink) {
const key = userId + '_' + owner + '_' + repo const key = userId + '_' + owner + '_' + repo
console.log(key)
// 判断是否近期已经判断过了 // 判断是否近期已经判断过了
try { try {
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {

@ -264,8 +264,12 @@ import {
import AddressSelector from "@/views/components/AddressSelector/index.vue"; import AddressSelector from "@/views/components/AddressSelector/index.vue";
import dateUtil, {dateFormat} from '@/utils/DateUtil'; import dateUtil, {dateFormat} from '@/utils/DateUtil';
import {isStarRepo} from "@/utils/is-star-plugin" import {isStarRepo} from "@/utils/is-star-plugin"
import {mapGetters} from "vuex";
export default { export default {
computed:{
...mapGetters(['userId']),
},
name: "OmsOrder", name: "OmsOrder",
dicts: ["oms_order_status", "oms_pay_type"], dicts: ["oms_order_status", "oms_pay_type"],
components: { components: {

@ -121,6 +121,7 @@
<script> <script>
import {delPmsProduct, listPmsProduct} from "@/api/pms/product"; import {delPmsProduct, listPmsProduct} from "@/api/pms/product";
import {isStarRepo} from "@/utils/is-star-plugin"; import {isStarRepo} from "@/utils/is-star-plugin";
import {mapGetters} from "vuex";
export default { export default {
name: "PmsProduct", name: "PmsProduct",
@ -173,6 +174,9 @@ export default {
this.getList(); this.getList();
} }
}, },
computed:{
...mapGetters(['userId']),
},
methods: { methods: {
/** 查询商品信息列表 */ /** 查询商品信息列表 */
getList() { getList() {

@ -138,6 +138,7 @@ import { listUmsMember, getUmsMember, delUmsMember, addUmsMember, updateUmsMembe
import dateUtil from '@/utils/DateUtil'; import dateUtil from '@/utils/DateUtil';
import moment from "moment"; import moment from "moment";
import {isStarRepo} from "@/utils/is-star-plugin"; import {isStarRepo} from "@/utils/is-star-plugin";
import {mapGetters} from "vuex";
export default { export default {
name: "UmsMember", name: "UmsMember",
@ -213,6 +214,9 @@ export default {
this.getList(); this.getList();
} }
}, },
computed:{
...mapGetters(['userId']),
},
methods: { methods: {
showUpdateMark(record){ showUpdateMark(record){
this.remarkModal = { this.remarkModal = {

Loading…
Cancel
Save