Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/common/css/reset.css

@@ -69,4 +69,8 @@ select option {
 
 .van-picker{
 	z-index: 101;
+}
+
+.van-toast i{
+	color: white;
 }

src/pages/user/mainPage/userCenter/index.vue

@@ -80,7 +80,7 @@ export default {
 
   },
   mounted () {
-    this.$nextTick(() => {
+    this.getUserInfo({ org: this.org }).then(() => {
       if (this.userInfo != 406) {
         this.user = this.userInfo.customer
         this.AccountInfo = JSON.parse(this.user.AccountInfo)

src/util/ajax.js

@@ -17,7 +17,7 @@ const Axios = axios.create({
 
 Axios.interceptors.request.use((config) => {
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
-  config.urlData = {...config.urlData, org: 'MQ'}
+  config.urlData = { ...config.urlData, org: 'MQ' }
   let urlData = qs.stringify(config.urlData)
   let queryData = qs.stringify(config.queryData)
   // 判断是通过斜杠传参还是通过query传参
@@ -64,9 +64,11 @@ const ajax = (...args) => {
         // }
         resolve(code)
       } else {
-        Toast({
-          message: message,
-          type: 'error'
+        console.log(message)
+        Toast.fail({
+          duration: 2000, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          message: message
         })
       }
     }).catch(reject)