优化user store、完成部分个人中心

src/core/models/user.js

@@ -19,11 +19,16 @@ export default {
                         }
                     }).then((response) => {
                         uni.setStorageSync("open_id", response.data.openid);
-                        resolve(response.data);
+                        return resolve(response.data);
                     });
                 }
             });
             // #endif
+            // #ifdef H5
+            return resolve({
+                openid: "mobile_000000000000000000"
+            });
+            // #endif
         });
     },
     /**

src/pages/member/member.vue

@@ -2,18 +2,24 @@
     <app-layout title="我的" btnType="unset">
         <view class="member-header">
             <view class="headimg">
-                <image class="img-src" :src="info.headimg" mode="aspectFill" />
+                <image class="img-src" :src="require('@/static/temp/member/1.png')" mode="aspectFill" />
             </view>
-            <view class="member-desc">
+            <view class="member-desc" v-if="isLogin">
-                <text class="nickname">{{ info.nickname }}</text>
+                <text class="nickname">{{ userInfo.nickname || "微信用户" }}</text>
                 <view class="mobile">
-                    <text class="text">{{ info.mobile }}</text>
+                    <text class="text">{{ userInfo.mobile }}</text>
+                </view>
+            </view>
+            <view class="member-desc" v-else @click="utils.toPage('/pages/auth/auth')">
+                <text class="nickname">请登录后再操作</text>
+                <view class="mobile">
+                    <text class="text">点击去登录</text>
                 </view>
             </view>
         </view>
         <view class="menu-container">
             <view class="common-form-widget-group">
-                <view class="widget-item" @click="utils.toPage('/pages/address/address?openType=list')">
+                <view class="widget-item" @click="toPage('/pages/address/address?openType=list')">
                     <text class="iconfont icon-dingwei icon"></text>
                     <text class="title limit-line clamp-1">我的地址</text>
                     <text class="iconfont icon-jinru more"></text>
@@ -28,7 +34,7 @@
                     <text class="title limit-line clamp-1">联系客服</text>
                     <text class="iconfont icon-jinru more"></text>
                 </view>
-                <view class="widget-item" @click="utils.toPage('/pages/member/setting')">
+                <view class="widget-item" @click="toPage('/pages/member/setting')">
                     <text class="iconfont icon-shezhixitongshezhigongnengshezhishuxing icon"></text>
                     <text class="title limit-line clamp-1">设置</text>
                     <text class="iconfont icon-jinru more"></text>
@@ -40,19 +46,17 @@
                     <text class="title limit-line clamp-1">我是师傅</text>
                     <text class="iconfont icon-jinru more"></text>
                 </view>
-                <view class="widget-item" @click="utils.toPage('/pages/service/other/project')">
+                <view class="widget-item" @click="toPage('/pages/service/other/project')">
                     <text class="iconfont icon-cailiaogongcheng icon"></text>
                     <text class="title limit-line clamp-1">工程安装</text>
                     <text class="iconfont icon-jinru more"></text>
                 </view>
-                <view class="widget-item" @click="utils.toPage('/pages/service/other/business')">
+                <view class="widget-item" @click="toPage('/pages/service/other/business')">
                     <text class="iconfont icon-qiye icon"></text>
                     <text class="title limit-line clamp-1">企业安装合作</text>
                     <text class="iconfont icon-jinru more"></text>
                 </view>
             </view>
-
-            
         </view>
     </app-layout>
 </template>
@@ -65,19 +69,15 @@ export default {
     data() {
         return {
             utils: this.$utils,
-            info: {
-                nickname: "微信用户",
-                mobile: "131****6080",
-                headimg: require("@/static/temp/member/1.png"),
-            },
         };
     },
     components: {
         AppLayout,
     },
     computed: {
-        ...mapState("user", {
+        ...mapState({
-            userInfo: (state) => state.userInfo,
+            isLogin: (state) => state.user.token.length > 0,
+            userInfo: (state) => state.user.info,
         }),
     },
     onLoad() {},
@@ -85,7 +85,15 @@ export default {
     onReady() {},
     onReachBottom() {},
     onPullDownRefresh() {},
-    methods: {},
+    methods: {
+        toPage(url) {
+            if (!this.isLogin) {
+                this.$store.commit("user/showLoginModal", true);
+                return;
+            }
+            this.$utils.toPage(url);
+        },
+    },
 };
 </script>
 

src/store/modules/user.js

@@ -5,7 +5,13 @@ export default {
         showLoginModal: false,
         openId: "",
         token: "",
-        info: null,
+        info: {
+            id: 0,
+            nickname: "",
+            openid: "",
+            mobile: "",
+            create_time: 0,
+        },
     },
     getters: {},
     mutations: {