Merge branch 'hcb' of SH-Arbitrate/miniapp into dev

App.vue

@@ -1,38 +1,43 @@
 <script>
-  import config from './config'
-  import store from '@/store'
-  import { getToken } from '@/utils/auth'
-	import { initEid,startEid  } from './mp_ecard_sdk/main';
-  export default {
-	  globalData:{
-	  	requestUrl:'http://121.40.189.20:9001',
-	  },
-    onLaunch: function() {
-      this.initApp();
-	  initEid();
-    },
-    methods: {
-      // 初始化应用
-      initApp() {
-        // 初始化应用配置
-        this.initConfig()
-        // 检查用户登录状态
-        //#ifdef H5
-        this.checkLogin()
-        //#endif
-      },
-      initConfig() {
-        this.globalData.config = config
-      },
-      checkLogin() {
-        if (!getToken()) {
-          this.$tab.reLaunch('/pages/login') 
-        }
-      }
-    }
-  }
+	import config from './config'
+	import store from '@/store'
+	import {
+		getToken
+	} from '@/utils/auth'
+	import {
+		initEid
+	} from './mp_ecard_sdk/main';
+	export default {
+		globalData: {
+			requestUrl: 'https://www.api.xayunmei.com/API',
+		},
+		onLaunch: function() {
+			this.initApp();
+			initEid();
+			uni.setStorageSync('certificationStatus', '未认证')
+		},
+		methods: {
+			// 初始化应用
+			initApp() {
+				// 初始化应用配置
+				this.initConfig()
+				// 检查用户登录状态
+				//#ifdef H5
+				this.checkLogin()
+				//#endif
+			},
+			initConfig() {
+				this.globalData.config = config
+			},
+			checkLogin() {
+				if (!getToken()) {
+					this.$tab.reLaunch('/pages/login')
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-  @import '@/static/scss/index.scss'
-</style>
+	@import '@/static/scss/index.scss'
+</style>

api/login.js

@@ -2,58 +2,66 @@ import request from '@/utils/request'
 
 // 登录方法
 export function login(username, password, code, uuid) {
-  const data = {
-    username,
-    password,
-    code,
-    uuid
-  }
-  return request({
-    'url': '/login',
-    headers: {
-      isToken: false
-    },
-    'method': 'post',
-    'data': data
-  })
+	const data = {
+		username,
+		password,
+		code,
+		uuid
+	}
+	return request({
+		'url': '/login',
+		headers: {
+			isToken: false
+		},
+		'method': 'post',
+		'data': data
+	})
 }
 
 // 注册方法
 export function register(data) {
-  return request({
-    url: '/register',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
+	return request({
+		url: '/register',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		data: data
+	})
 }
 
 // 获取用户详细信息
 export function getInfo() {
-  return request({
-    'url': '/getInfo',
-    'method': 'get'
-  })
+	return request({
+		'url': '/getInfo',
+		'method': 'get'
+	})
 }
 
 // 退出方法
 export function logout() {
-  return request({
-    'url': '/logout',
-    'method': 'post'
-  })
+	return request({
+		'url': '/logout',
+		'method': 'post'
+	})
 }
 
 // 获取验证码
 export function getCodeImg() {
-  return request({
-    'url': '/captchaImage',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
+	return request({
+		'url': '/captchaImage',
+		headers: {
+			isToken: false
+		},
+		method: 'get',
+		timeout: 20000
+	})
 }
+
+// 获取eidtoken
+export function getEidtoken() {
+	return request({
+		'url': '/identityAuthentication/selectIdentityAuthenticaEIDtoken',
+		method: 'post',
+	})
+}

config.js

@@ -1,27 +1,28 @@
 // 应用全局配置
 module.exports = {
-  baseUrl: 'http://121.40.189.20:9001',
-   // baseUrl: 'http://192.168.3.77:8080',
-  // baseUrl: 'http://localhost:8080',
-  // 应用信息
-  appInfo: {
-    // 应用名称
-    name: "arbitrate-wx",
-    // 应用版本
-    version: "1.1.0",
-    // 应用logo
-    logo: "/static/chuizi.png",
-    // 官方网站
-    site_url: "http://ruoyi.vip",
-    // 政策协议
-    agreements: [{
-        title: "隐私政策",
-        url: "https://ruoyi.vip/protocol.html"
-      },
-      {
-        title: "用户服务协议",
-        url: "https://ruoyi.vip/protocol.html"
-      }
-    ]
-  }
-}
+	baseUrl: 'https://api.xayunmei.com/zhongcaiapi/',
+	// baseUrl: 'http://121.40.189.20:9001',
+	// baseUrl: 'http://192.168.3.77:8080',
+	// baseUrl: 'http://localhost:8080',
+	// 应用信息
+	appInfo: {
+		// 应用名称
+		name: "arbitrate-wx",
+		// 应用版本
+		version: "1.1.0",
+		// 应用logo
+		logo: "/static/chuizi.png",
+		// 官方网站
+		site_url: "http://ruoyi.vip",
+		// 政策协议
+		agreements: [{
+				title: "隐私政策",
+				url: "https://ruoyi.vip/protocol.html"
+			},
+			{
+				title: "用户服务协议",
+				url: "https://ruoyi.vip/protocol.html"
+			}
+		]
+	}
+}

mp_ecard_sdk/globalConfig.js

@@ -1 +1,3 @@
-export default{normalPath:"/pages"};
+export default {
+	normalPath: ""
+};

pages/im/index.vue

@@ -12,8 +12,9 @@
 			}
 		},
 		onLoad: function() {
-			// this.name = this.$store.state.user.name;
-			this.sendImg = `https://txroom.xayunmei.com`
+			this.name = this.$store.state.user.name;
+			this.sendImg = `https://txroom.xayunmei.com/#/?name=${this.name}`
+			// this.sendImg = `http://localhost:8080/#/?name=${this.name}`
 		},
 
 	}

pages/login.vue

@@ -1,206 +1,207 @@
 <template>
-  <view class="normal-login-container">
-    <view class="logo-content align-center justify-center flex">
-      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
-      </image>
-      <text class="title">法务平台</text>
-    </view>
-    <view class="login-form-content">
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-user icon"></view>
-        <input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
-      </view>
-      <view class="input-item flex align-center">
-        <view class="iconfont icon-password icon"></view>
-        <input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
-      </view>
-      <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
-        <view class="iconfont icon-code icon"></view>
-        <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
-        <view class="login-code"> 
-          <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
-        </view>
-      </view>
-      <view class="action-btn">
-        <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
-      </view>
-      <view class="reg text-center" v-if="register">
-        <text class="text-grey1">没有账号？</text>
-        <text @click="handleUserRegister" class="text-blue">立即注册</text>
-      </view>
-	 <!-- <view class="reg text-center" v-if="register">
+	<view class="normal-login-container">
+		<view class="logo-content align-center justify-center flex">
+			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+			</image>
+			<text class="title">法务平台</text>
+		</view>
+		<view class="login-form-content">
+			<view class="input-item flex align-center">
+				<view class="iconfont icon-user icon"></view>
+				<input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
+			</view>
+			<view class="input-item flex align-center">
+				<view class="iconfont icon-password icon"></view>
+				<input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
+			</view>
+			<view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
+				<view class="iconfont icon-code icon"></view>
+				<input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+				<view class="login-code">
+					<image :src="codeUrl" @click="getCode" class="login-code-img"></image>
+				</view>
+			</view>
+			<view class="action-btn">
+				<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
+			</view>
+			<view class="reg text-center" v-if="register">
+				<text class="text-grey1">没有账号？</text>
+				<text @click="handleUserRegister" class="text-blue">立即注册</text>
+			</view>
+			<!-- <view class="reg text-center" v-if="register">
 	    <text class="text-grey1">使用其他方式登录：</text>
 	    <text @click="handleUserRegister" class="text-blue"></text>
 	  </view> -->
-     <!-- <view class="xieyi text-center">
+			<!-- <view class="xieyi text-center">
         <text class="text-grey1">登录即代表同意</text>
         <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
         <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
       </view> -->
-    </view>
-     
-  </view>
+		</view>
+
+	</view>
 </template>
 
 <script>
-  import { getCodeImg } from '@/api/login'
-
-  export default {
-    data() {
-      return {
-        codeUrl: "",
-        captchaEnabled: true,
-        // 用户注册开关
-        register: true,
-        globalConfig: getApp().globalData.config,
-        loginForm: {
-          username: "admin",
-          password: "admin123",
-          code: "",
-          uuid: ''
-        }
-      }
-    },
-    created() {
-      this.getCode()
-    },
-    methods: {
-      // 用户注册
-      handleUserRegister() {
-        this.$tab.redirectTo(`/pages/register`)
-      },
-      // 隐私协议
-      handlePrivacy() {
-        let site = this.globalConfig.appInfo.agreements[0]
-        this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
-      },
-      // 用户协议
-      handleUserAgrement() {
-        let site = this.globalConfig.appInfo.agreements[1]
-        this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
-      },
-      // 获取图形验证码
-      getCode() {
-        getCodeImg().then(res => {
-          this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
-          if (this.captchaEnabled) {
-            this.codeUrl = 'data:image/gif;base64,' + res.img
-            this.loginForm.uuid = res.uuid
-          }
-        })
-      },
-      // 登录方法
-      async handleLogin() {
-        if (this.loginForm.username === "") {
-          this.$modal.msgError("请输入您的账号")
-        } else if (this.loginForm.password === "") {
-          this.$modal.msgError("请输入您的密码")
-        } else if (this.loginForm.code === "" && this.captchaEnabled) {
-          this.$modal.msgError("请输入验证码")
-        } else {
-          this.$modal.loading("登录中，请耐心等待...")
-          this.pwdLogin()
-        }
-      },
-      // 密码登录
-      async pwdLogin() {
-        this.$store.dispatch('Login', this.loginForm).then(() => {
-          this.$modal.closeLoading()
-          this.loginSuccess()
-        }).catch(() => {
-          if (this.captchaEnabled) {
-            this.getCode()
-          }
-        })
-      },
-      // 登录成功后，处理函数
-      loginSuccess(result) {
-        // 设置用户信息
-        this.$store.dispatch('GetInfo').then(res => {
-          this.$tab.reLaunch('/pages/index')
-        })
-      }
-    }
-  }
+	import {
+		getCodeImg
+	} from '@/api/login'
+
+	export default {
+		data() {
+			return {
+				codeUrl: "",
+				captchaEnabled: true,
+				// 用户注册开关
+				register: true,
+				globalConfig: getApp().globalData.config,
+				loginForm: {
+					username: "admin",
+					password: "admin123",
+					code: "",
+					uuid: ''
+				}
+			}
+		},
+		created() {
+			this.getCode()
+		},
+		methods: {
+			// 用户注册
+			handleUserRegister() {
+				this.$tab.redirectTo(`/pages/register`)
+			},
+			// 隐私协议
+			handlePrivacy() {
+				let site = this.globalConfig.appInfo.agreements[0]
+				this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+			},
+			// 用户协议
+			handleUserAgrement() {
+				let site = this.globalConfig.appInfo.agreements[1]
+				this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+			},
+			// 获取图形验证码
+			getCode() {
+				getCodeImg().then(res => {
+					this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+					if (this.captchaEnabled) {
+						this.codeUrl = 'data:image/gif;base64,' + res.img
+						this.loginForm.uuid = res.uuid
+					}
+				})
+			},
+			// 登录方法
+			async handleLogin() {
+				if (this.loginForm.username === "") {
+					this.$modal.msgError("请输入您的账号")
+				} else if (this.loginForm.password === "") {
+					this.$modal.msgError("请输入您的密码")
+				} else if (this.loginForm.code === "" && this.captchaEnabled) {
+					this.$modal.msgError("请输入验证码")
+				} else {
+					this.$modal.loading("登录中，请耐心等待...")
+					this.pwdLogin()
+				}
+			},
+			// 密码登录
+			async pwdLogin() {
+				this.$store.dispatch('Login', this.loginForm).then(() => {
+					this.$modal.closeLoading()
+					this.loginSuccess()
+				}).catch(() => {
+					if (this.captchaEnabled) {
+						this.getCode()
+					}
+				})
+			},
+			// 登录成功后，处理函数
+			loginSuccess(result) {
+				// 设置用户信息
+				this.$store.dispatch('GetInfo').then(res => {
+					this.$tab.reLaunch('/pages/index')
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
-
-  .normal-login-container {
-    width: 100%;
-
-    .logo-content {
-      width: 100%;
-      font-size: 21px;
-      text-align: center;
-      padding-top: 15%;
-
-      image {
-        border-radius: 4px;
-      }
-
-      .title {
-        margin-left: 10px;
-      }
-    }
-
-    .login-form-content {
-      text-align: center;
-      margin: 20px auto;
-      margin-top: 15%;
-      width: 80%;
-
-      .input-item {
-        margin: 20px auto;
-        background-color: #f5f6f7;
-        height: 45px;
-        border-radius: 20px;
-
-        .icon {
-          font-size: 38rpx;
-          margin-left: 10px;
-          color: #999;
-        }
-
-        .input {
-          width: 100%;
-          font-size: 14px;
-          line-height: 20px;
-          text-align: left;
-          padding-left: 15px;
-        }
-
-      }
-
-      .login-btn {
-        margin-top: 40px;
-        height: 45px;
-      }
-      
-      .reg {
-        margin-top: 15px;
-      }
-      
-      .xieyi {
-        color: #333;
-        margin-top: 20px;
-      }
-      
-      .login-code {
-        height: 38px;
-        float: right;
-      
-        .login-code-img {
-          height: 38px;
-          position: absolute;
-          margin-left: 10px;
-          width: 200rpx;
-        }
-      }
-    }
-  }
-
-</style>
+	page {
+		background-color: #ffffff;
+	}
+
+	.normal-login-container {
+		width: 100%;
+
+		.logo-content {
+			width: 100%;
+			font-size: 21px;
+			text-align: center;
+			padding-top: 15%;
+
+			image {
+				border-radius: 4px;
+			}
+
+			.title {
+				margin-left: 10px;
+			}
+		}
+
+		.login-form-content {
+			text-align: center;
+			margin: 20px auto;
+			margin-top: 15%;
+			width: 80%;
+
+			.input-item {
+				margin: 20px auto;
+				background-color: #f5f6f7;
+				height: 45px;
+				border-radius: 20px;
+
+				.icon {
+					font-size: 38rpx;
+					margin-left: 10px;
+					color: #999;
+				}
+
+				.input {
+					width: 100%;
+					font-size: 14px;
+					line-height: 20px;
+					text-align: left;
+					padding-left: 15px;
+				}
+
+			}
+
+			.login-btn {
+				margin-top: 40px;
+				height: 45px;
+			}
+
+			.reg {
+				margin-top: 15px;
+			}
+
+			.xieyi {
+				color: #333;
+				margin-top: 20px;
+			}
+
+			.login-code {
+				height: 38px;
+				float: right;
+
+				.login-code-img {
+					height: 38px;
+					position: absolute;
+					margin-left: 10px;
+					width: 200rpx;
+				}
+			}
+		}
+	}
+</style>

pages/work/index.vue

@@ -12,7 +12,12 @@
 		</uni-swiper-dot>
 
 		<!-- 宫格组件 -->
-		<uni-section class="uni-section" title="系统管理" type="line" @click="certification">
+		<uni-section v-if="certificationStatus == '已认证'" class="uni-section" title="系统管理" type="line">
+			<template v-slot:right>
+				{{certificationStatus}}
+			</template>
+		</uni-section>
+		<uni-section v-else class="uni-section" title="系统管理" type="line" @click="certification">
 			<template v-slot:right>
 				{{certificationStatus}}
 			</template>
@@ -89,6 +94,9 @@
 	import {
 		startEid
 	} from '../../mp_ecard_sdk/main.js'
+	import {
+		getEidtoken
+	} from "../../api/login.js"
 	export default {
 		data() {
 			return {
@@ -104,7 +112,8 @@
 						image: 'https://img.tukuppt.com/bg_grid/00/81/07/DGEl4suqeV.jpg!/fh/350'
 					}
 				],
-				certificationStatus: "未认证"
+				certificationStatus: "未认证",
+				eidToken: ""
 			}
 		},
 		methods: {
@@ -116,6 +125,14 @@
 			},
 			changeGrid(e) {
 				// this.$modal.showToast('模块建设中~')
+				if (this.certificationStatus == "未认证") {
+					uni.showToast({
+						title: '请先完成实名认证',
+						icon: 'none',
+						duration: 1000
+					})
+					return
+				}
 				switch (e) {
 					case 0:
 						uni.navigateTo({
@@ -131,14 +148,22 @@
 						break;
 				}
 			},
+			// 获取eidtoken
+			getEidtokenFn() {
+				getEidtoken({}).then(res => {
+					console.log(res.data.eidToken, "kkkkkkkkk");
+					this.eidToken = res.data.eidToken
+				})
+			},
 			// 点击实名认证
 			certification() {
-				uni.navigateTo({
-					url: ('/mp_ecard_sdk/index/index')
-				})
+				let that = this
+				// uni.navigateTo({
+				// 	url: ('/mp_ecard_sdk/index/index')
+				// })
 				startEid({
 					data: {
-						token,
+						token: this.eidToken,
 					},
 					verifyDoneCallback(res) {
 						const {
@@ -148,10 +173,17 @@
 						console.log('收到核身完成的res:', res);
 						console.log('核身的token是:', token);
 						console.log('是否完成核身:', verifyDone);
+						// flagShow = '已认证'
+						// console.log(flagShow, "JKJJKJKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKk");
+						// console.log(this, "PPPPPPPPPPPPPPP");
+						that.certificationStatus = '已认证'
 					},
 				});
 			}
-		}
+		},
+		onLoad() {
+			this.getEidtokenFn()
+		},
 	}
 </script>
 

store/getters.js

@@ -1,8 +1,8 @@
 const getters = {
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  roles: state => state.user.roles,
-  permissions: state => state.user.permissions
+	token: state => state.user.token,
+	avatar: state => state.user.avatar,
+	name: state => state.user.name,
+	roles: state => state.user.roles,
+	permissions: state => state.user.permissions
 }
-export default getters
+export default getters

store/modules/user.js

@@ -1,98 +1,116 @@
 import config from '@/config'
 import storage from '@/utils/storage'
 import constant from '@/utils/constant'
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import {
+	login,
+	logout,
+	getInfo
+} from '@/api/login'
+import {
+	getToken,
+	setToken,
+	removeToken
+} from '@/utils/auth'
 
 const baseUrl = config.baseUrl
 
 const user = {
-  state: {
-    token: getToken(),
-    name: storage.get(constant.name),
-    avatar: storage.get(constant.avatar),
-    roles: storage.get(constant.roles),
-    permissions: storage.get(constant.permissions)
-  },
+	state: {
+		token: getToken(),
+		name: storage.get(constant.name),
+		avatar: storage.get(constant.avatar),
+		roles: storage.get(constant.roles),
+		permissions: storage.get(constant.permissions)
+	},
 
-  mutations: {
-    SET_TOKEN: (state, token) => {
-      state.token = token
-    },
-    SET_NAME: (state, name) => {
-      state.name = name
-      storage.set(constant.name, name)
-    },
-    SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
-      storage.set(constant.avatar, avatar)
-    },
-    SET_ROLES: (state, roles) => {
-      state.roles = roles
-      storage.set(constant.roles, roles)
-    },
-    SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
-      storage.set(constant.permissions, permissions)
-    }
-  },
+	mutations: {
+		SET_TOKEN: (state, token) => {
+			state.token = token
+		},
+		SET_NAME: (state, name) => {
+			state.name = name
+			storage.set(constant.name, name)
+		},
+		SET_AVATAR: (state, avatar) => {
+			state.avatar = avatar
+			storage.set(constant.avatar, avatar)
+		},
+		SET_ROLES: (state, roles) => {
+			state.roles = roles
+			storage.set(constant.roles, roles)
+		},
+		SET_PERMISSIONS: (state, permissions) => {
+			state.permissions = permissions
+			storage.set(constant.permissions, permissions)
+		}
+	},
 
-  actions: {
-    // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
-      return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
-          setToken(res.token)
-          commit('SET_TOKEN', res.token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
+	actions: {
+		// 登录
+		Login({
+			commit
+		}, userInfo) {
+			const username = userInfo.username.trim()
+			const password = userInfo.password
+			const code = userInfo.code
+			const uuid = userInfo.uuid
+			return new Promise((resolve, reject) => {
+				login(username, password, code, uuid).then(res => {
+					setToken(res.token)
+					commit('SET_TOKEN', res.token)
+					resolve()
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
 
-    // 获取用户信息
-    GetInfo({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.user
-          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/profile.jpg") : baseUrl + user.avatar
-          const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
-          if (res.roles && res.roles.length > 0) {
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', username)
-          commit('SET_AVATAR', avatar)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
+		// 获取用户信息
+		GetInfo({
+			commit,
+			state
+		}) {
+			return new Promise((resolve, reject) => {
+				getInfo().then(res => {
+					const user = res.user
+					const avatar = (user == null || user.avatar == "" || user.avatar == null) ?
+						require("@/static/images/profile.jpg") : baseUrl + user.avatar
+					const username = (user == null || user.userName == "" || user.userName ==
+						null) ? "" : user.userName
+					if (res.roles && res.roles.length > 0) {
+						commit('SET_ROLES', res.roles)
+						commit('SET_PERMISSIONS', res.permissions)
+					} else {
+						commit('SET_ROLES', ['ROLE_DEFAULT'])
+					}
+					commit('SET_NAME', username)
+					commit('SET_AVATAR', avatar)
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
 
-    // 退出系统
-    LogOut({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          removeToken()
-          storage.clean()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    }
-  }
+		// 退出系统
+		LogOut({
+			commit,
+			state
+		}) {
+			return new Promise((resolve, reject) => {
+				logout(state.token).then(() => {
+					commit('SET_TOKEN', '')
+					commit('SET_ROLES', [])
+					commit('SET_PERMISSIONS', [])
+					removeToken()
+					storage.clean()
+					resolve()
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		}
+	}
 }
 
-export default user
+export default user

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -3,6 +3,6 @@
   "projectname": "若依移动端",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false
+    "urlCheck": true
   }
 }

utils/auth.js

@@ -1,13 +1,13 @@
 const TokenKey = 'App-Token'
 
 export function getToken() {
-  return uni.getStorageSync(TokenKey)
+	return uni.getStorageSync(TokenKey)
 }
 
 export function setToken(token) {
-  return uni.setStorageSync(TokenKey, token)
+	return uni.setStorageSync(TokenKey, token)
 }
 
 export function removeToken() {
-  return uni.removeStorageSync(TokenKey)
-}
+	return uni.removeStorageSync(TokenKey)
+}