Merge branch 'master' of http://git.izouma.com/panhui/card-wechat

src/mixins/common.js

@@ -1,6 +1,13 @@
 export default {
     methods: {
-        navigateTo(url) {
+        navigateTo(url, checkLogin = true) {
+            if (checkLogin && !this.$store.state.userInfo) {
+                wx.navigateTo({
+                    url: '/pages/authorized'
+                });
+                return;
+            }
+
             if (url) {
                 wx.navigateTo({
                     url: url

src/pages/mine.vue

@@ -14,7 +14,7 @@
             <van-image src="/native/svgs/img_defaultphoto.svg" width="90" height="90" round class="avatar" fit="cover">
             </van-image>
 
-            <van-button type="primary" @click="login">点击授权登录</van-button>
+            <van-button type="primary" v-if="!userInfo" @click="login">点击授权登录</van-button>
             <van-image
                 class="authentication"
                 width="100%"
@@ -25,7 +25,7 @@
         </div>
 
         <van-grid class="menu" column-num="3" :border="false" clickable>
-            <van-grid-item text="我发布的" url="/pages/minePublish">
+            <van-grid-item text="我发布的" @click="navigateTo('/pages/minePublish')">
                 <img class="gird-icon" src="/native/svgs/info_icon_fabu.svg" slot="icon" alt="" />
             </van-grid-item>
             <van-grid-item text="我卖出的">

src/store/index.js

@@ -26,8 +26,12 @@ export default new Vuex.Store({
     actions: {
         getUserInfo(context) {
             return http.http.get('/user/my').then(res => {
-                res.phone = res.phone || '';
-                context.commit('setUserInfo', res);
+                if (res.sex || res.nickname.indexOf('用户') === -1) {
+                    context.commit('setUserInfo', res);
+                } else {
+                    context.commit('setUserInfo', null);
+                }
+
                 return Promise.resolve(res);
             });
         }