提交小程序

pages.json

@@ -1,19 +1,20 @@
 {
 	"pages": [
 		{
-			"path": "pages/demo/index",
+			"path": "pages/login",
 			"style": {
-				"navigationBarTitleText": "通知公告",
+				"navigationBarTitleText": "登录",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/login",
+			"path": "pages/demo/index",
 			"style": {
-				"navigationBarTitleText": "登录",
+				"navigationBarTitleText": "通知公告",
 				"navigationStyle": "custom"
 			}
 		},
+		
 		{
 			"path": "pages/demo/my",
 			"style": {

pages/demo/index.vue

@@ -33,6 +33,8 @@
 </template>
 
 <script>
+import { getToken } from '../../utils/auth';
+import {getUserProfile} from '@/api/system/user';
 	export default {
 		data() {
 			return {
@@ -46,13 +48,21 @@
 			}
 		},
 		onLoad(options) {
-			this.userInfo = getApp().globalData.userInfo
+			console.log("token");
+			console.log(getToken())
+			this.userInfo = getApp().globalData.userInfo;
+			this.ss();
 		},
 		methods: {
 			tiaozhuan(){
 				uni.navigateTo({
 					url:"/pages/delis"
 				})
+			},
+			ss(){
+				getUserProfile().then(res => {
+					this.rows = res.data;
+				})
 			}
 		}
 	}

pages/login.vue

@@ -12,9 +12,6 @@
 </template>
 
 <script>
-	import {
-		wxLogin
-	} from '@/api/login'
 	export default {
 		data() {
 			return {
@@ -30,11 +27,11 @@
 		         success (res) {
 		           if (res.code) {
 		             //发起网络请求
-					 wxLogin(res.code).then(res => {
-						 _this.$modal.closeLoading()
-						uni.switchTab({
-							url:'/pages/demo/index'
-						})
+					 _this.$store.dispatch('Login', res.code).then(() => {
+					 	_this.$modal.closeLoading()
+					 	uni.switchTab({
+					 		url:'/pages/demo/index'
+					 	})
 					 })
 		           } else {
 		             console.log('登录失败！' + res.errMsg)

store/modules/user.js

@@ -1,7 +1,7 @@
 import config from '@/config'
 import storage from '@/utils/storage'
 import constant from '@/utils/constant'
-import { login, logout, getInfo } from '@/api/login'
+import { wxLogin, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const baseUrl = config.baseUrl
@@ -39,16 +39,11 @@ const user = {
 
   actions: {
     // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
-	  const type = userInfo.type
+    Login({ commit }, code) {
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid,type).then(res => {
-          setToken(res.data.token)
-          commit('SET_TOKEN', res.data.token)
+        wxLogin(code).then(res => {
+          setToken(res.token)
+          commit('SET_TOKEN', res.token)
           resolve()
         }).catch(error => {
           reject(error)

utils/request.js

@@ -8,6 +8,7 @@ let timeout = 10000
 const baseUrl = config.baseUrl
 
 const request = config => {
+	debugger
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}