Merge branch 'master' of http://git.jhcs888.com/zpj/zh-new-promotion

service/router.js

@@ -59,7 +59,7 @@ router.beforeEach( async (to, from, next) => {
 				await userWxAppletLogin(from).then((res)=>{
 					if (res.code === 1) {
 						uni.setStorageSync('userNmae',res.data.name)
-						uni.setStorageSync('token_str',res.data.token)
+						uni.setStorageSync('token_str',res.data.token_str)
 						uni.setStorageSync('m_id',res.data.m_id)
 						next()
 					} else {