updata

src/pages/components/tabbar.vue

@@ -1,81 +0,0 @@
-<!-- tabbar -->
-<template name="tab-bar">
-  <views class="tabbar">
-
-    <view class="tabbar-warp" v-for="(item,index) in tabList" :key="index">
-      <view class="navigator" :class="currentIndex === index ? 'active' : ''"  @tap='switchTab(index)'>
-        <view class="icon">
-          <image :src="item.icon"></image>
-        </view>
-        <view class="test">{{item.text}}</view>
-      </view>
-    </view>
-
-  </views>
-</template>
-
-<script>
-
-export default {
-  name: 'tabbar',
-  components: {},
-  data () {
-    //这里存放数据
-    return {
-      tabList: [
-        {
-          icon: 'icon-emotion',
-          text: 'tab01',
-          badge: 1
-        },
-        {
-          icon: 'icon-qianbao',
-          text: 'tab02',
-        },
-        {
-          icon: 'icon-choose01',
-          text: 'tab03',
-          badgeDot: true
-        }
-      ],
-      currentIndex: 0,
-
-    };
-  },
-  //方法集合
-  methods: {
-
-  }
-}
-</script>
-<style lang='less' scoped>
-.tabbar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  height: 50upx;
-  align-items: center;
-  border-top:1upx solid rgba(0, 0, 0, 0.33);
-  z-index: 99;
-  .tabbar-warp {
-    .navigator {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      .icon {
-        image {
-          width: 24upx;
-          height: 24upx;
-        }
-      }
-      .text {
-        color: rgb(183, 183, 183);
-      }
-    }
-    .active {
-      transform: scale(1.1);
-    }
-  }
-}
-</style>

src/pages/index/setting/setting.vue

@@ -57,6 +57,7 @@ export default {
 				console.log(res);
 				this.$mHelper.toast('退出成功')
 				uni.removeStorageSync('user')
+				uni.removeStorageSync('role')
 				this.$mRouter.reLaunch({route: '/pages/public/login'})
 			});
 		}

src/pages/order/order.vue

@@ -263,11 +263,6 @@ export default {
       startY: 0,
     };
   },
-  onReady () {
-    // this.roleList = this.$mStore.getters.hasrole.reverse()
-    let role = uni.getStorageSync('role')
-    this.roleList = role.reverse()
-  },
   // 下拉刷新page.json中要配置
   onPullDownRefresh() {
     this.startdate = '';

src/pages/public/login.vue

@@ -140,10 +140,6 @@ export default {
       await this.$http
         .post(loginApi, params)
         .then((r) => {
-          // console.log(r);
-          // let role = JSON.stringify(r.data.page)
-          // console.log(role);
-          // uni.setStorageSync('role',r.data.page)
           this.$mHelper.toast('恭喜您，登录成功！');
           this.$mStore.commit('login', r.data);            
           this.$mRouter.reLaunch({ route: '/pages/index/index' });

src/store/index.js

@@ -8,11 +8,13 @@ Vue.use(Vuex);
 
 const ACCESSTOKEN = uni.getStorageSync('accessToken') || '';
 const REFERRER = uni.getStorageSync('referrer') || '';
-const USER = uni.getStorageSync('user') || {};
 const REFRESHTOKEN = uni.getStorageSync('refreshToken') || '';
+
+const USER = uni.getStorageSync('user') || {};
 const ROLE = uni.getStorageSync('role')
 
 const store = new Vuex.Store({
+    // 数据存放
     state: {
         //用户token
         accessToken: ACCESSTOKEN,
@@ -28,6 +30,7 @@ const store = new Vuex.Store({
         networkState: 'unknown',
         refreshToken: REFRESHTOKEN
     },
+    // store 的计算属性 返回值会根据它的依赖被缓存起来，且只有当它的依赖值发生了改变才会被重新计算。
     getters: {
 		// 获取网络状态
 		networkStatus: state => {
@@ -54,13 +57,13 @@ const store = new Vuex.Store({
             }
         }
     },
+    // 方法函数，一般用于计算state中的数据
     mutations: {
         login(state, provider) {
-            console.log('provider');
-            console.log(provider);
-			state.accessToken=provider.access_token;
-			state.refreshToken=provider.refresh_token;
-			state.userInfo = provider.member;
+           
+			// state.accessToken=provider.access_token;
+			// state.refreshToken=provider.refresh_token;
+			// state.userInfo = provider.member;
 			state.user = provider;
             uni.setStorageSync('user', provider.token);
             uni.setStorageSync('role',provider.pages)
@@ -88,6 +91,7 @@ const store = new Vuex.Store({
             state.networkState = provider;
         }
     },
+    // 异步操作
     actions: {
         networkStateChange({commit}, info) {
             commit('setNetworkState', info);