diff --git a/App.vue b/App.vue
index b58d51c..2205725 100644
--- a/App.vue
+++ b/App.vue
@@ -1,81 +1,88 @@
-
-
-
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 89eeca6..ea66a66 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -310,10 +310,7 @@
text: "设置",
page: "/pages/settings/settings"
}
- ],
-
-
-
+ ],
roleLevel: 500,
showTipModel: false,
info: {},
@@ -328,9 +325,15 @@
orderNum: 0
}
};
+ },
+ created() {
+ this.$store.commit('setIsLogin')
+ this.isLogin = this.$store.state.isLogin
+ console.log(this.$store.state.isLogin)
+ this.roleLevel = this.$store.state.roleLevel
},
onLoad() {
- if (uni.getStorageSync("auth").token) {
+ if (this.isLogin) {
this.getUserInfo()
this.getTotalEarning()
}
@@ -347,9 +350,7 @@
*/
},
onShow() {
- console.log(uni.getStorageSync("auth"))
- if (uni.getStorageSync("auth").token) {
- this.isLogin = true
+ if (this.isLogin) {
this.userInfo.nickname = uni.getStorageSync("userInfo").nickname
this.userInfo.headImgUrl = uni.getStorageSync("userInfo").headImgUrl
this.myIncome()
diff --git a/store/index.js b/store/index.js
index 90221b6..b63f6eb 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,58 +1,66 @@
-import Vue from "vue" //引入vue
-import Vuex from "vuex" // 引入vuex
-Vue.use(Vuex) // 让vue使用vuex
-const store = new Vuex.Store({
- state: {
- selectCity:"",//城市信息
- preOrderMsg: {},//预购订单信息
- returnGoodsMsg:{},//售后商品信息
- logisticsDetail:[],//物流信息
- userInfo:{},//邀请人的信息
- videoDetail:{},//小视频详情
- invitationNo: '' ,// 本人邀请码
- roleLevel:500,//用户等级默认设置会员
- invite: '' ,// 别人的邀请码
- url: null, // 跳转到登录页面时原地址
- },
- mutations: {
- setRoleLevel(state, val){
- state.roleLevel = val
- },
- changeCity(state, name) {
- state.selectCity = name
- },
- updatePreOrderMsg(state, obj) {
- let newObj = Object.assign({}, obj)
- state.preOrderMsg = newObj
- },
- setReturnGoodsMsg(state,obj){
- let newObj = Object.assign({}, obj)
- state.returnGoodsMsg = newObj
- },
- setLogisticsDetail(state,arr){
- let newArr = arr
- state.logisticsDetail = newArr
- },
- setUserInfo(state,obj){
- let newObj = Object.assign({}, obj)
- state.userInfo = newObj
- },
- setVideoDetail(state,obj){
- let newObj = Object.assign({}, obj)
- state.videoDetail = newObj
- },
- setinvitationNo(state,val){
- state.invitationNo = val
- },
- setinvite(state,val){
- state.invite = val
- },
- setUrl(state, val) {
- state.url = val
- },
- removeUrl(state) {
- state.url = null
- }
- }
-})
+import Vue from "vue" //引入vue
+import Vuex from "vuex" // 引入vuex
+Vue.use(Vuex) // 让vue使用vuex
+const store = new Vuex.Store({
+ state: {
+ selectCity: "", //城市信息
+ preOrderMsg: {}, //预购订单信息
+ returnGoodsMsg: {}, //售后商品信息
+ logisticsDetail: [], //物流信息
+ userInfo: {}, //邀请人的信息
+ videoDetail: {}, //小视频详情
+ invitationNo: '', // 本人邀请码
+ invite: '', // 别人的邀请码
+ url: null, // 跳转到登录页面时原地址
+ roleLevel: 500, //用户等级默认设置会员
+ isLogin: false,
+ },
+ mutations: {
+ setIsLogin(state) {
+ if (uni.getStorageSync("auth").token) {
+ state.isLogin = true
+ } else {
+ state.isLogin = false
+ }
+ },
+ setRoleLevel(state, val) {
+ state.roleLevel = val
+ },
+ changeCity(state, name) {
+ state.selectCity = name
+ },
+ updatePreOrderMsg(state, obj) {
+ let newObj = Object.assign({}, obj)
+ state.preOrderMsg = newObj
+ },
+ setReturnGoodsMsg(state, obj) {
+ let newObj = Object.assign({}, obj)
+ state.returnGoodsMsg = newObj
+ },
+ setLogisticsDetail(state, arr) {
+ let newArr = arr
+ state.logisticsDetail = newArr
+ },
+ setUserInfo(state, obj) {
+ let newObj = Object.assign({}, obj)
+ state.userInfo = newObj
+ },
+ setVideoDetail(state, obj) {
+ let newObj = Object.assign({}, obj)
+ state.videoDetail = newObj
+ },
+ setinvitationNo(state, val) {
+ state.invitationNo = val
+ },
+ setinvite(state, val) {
+ state.invite = val
+ },
+ setUrl(state, val) {
+ state.url = val
+ },
+ removeUrl(state) {
+ state.url = null
+ }
+ }
+})
export default store