李浩杰 преди 4 години
родител
ревизия
bc8cd04ea3

+ 1 - 0
app/Http/Controllers/Api/mini/AuthController.php

xqd
@@ -31,6 +31,7 @@ class AuthController extends BaseController
                 if(isset($data['openId'])) {
                     $user = User::where('open_id', $data['openId'])->first();
                     if(empty($user)) return $this->error(['msg' => '用户不存在,请先绑定账户']);
+                    return $data;
                     $user->update([
                         'nickname' => $data['nickName'],
                         'avatar' => $data['avatarUrl']

+ 2 - 0
mini/app.js

xqd
@@ -7,6 +7,8 @@ App({
       wx.redirectTo({
         url: '/pages/login/index',
       })
+    } else {
+      this.globalData.userInfo = userinfo
     }
 
     // 展示本地存储能力

+ 2 - 1
mini/app.json

xqd
@@ -15,6 +15,7 @@
     "van-button": "@vant/weapp/button/index",
     "van-field": "@vant/weapp/field/index",
     "van-divider": "@vant/weapp/divider/index",
-    "navbar": "/components/navbar"
+    "navbar": "/components/navbar",
+    "van-icon": "@vant/weapp/icon/index"
   }
 }

+ 3 - 0
mini/app.wxss

xqd
@@ -39,4 +39,7 @@
 }
 .sg-font-small {
   font-size: 0.9rem;
+}
+.sg-index-bg {
+  background-color: #5693FC;
 }

+ 2 - 2
mini/components/navbar/index.wxml

xqd
@@ -1,8 +1,8 @@
 <!--components/navbar/index.wxml-->
 <view class="sg-nav-box">
   <view class="sg-nav-list">
-    <view class="sg-nav-item" wx:for="{{ menus }}" wx:key="{{index}}" data-url="{{ item.url }}" data-index="{{index}}" data-key="{{item.key}}">
-      <image src="{{ activeMenu == item.key ? item.img + '-selected.png' : '.png' }}" mode="widthFix" class="sg-img"></image>
+    <view class="sg-nav-item {{ activeMenu == item.key ? 'sg-selected sg-primary-color' : '' }}" wx:for="{{ menus }}" wx:key="index" data-url="{{ item.url }}" data-index="{{index}}" data-key="{{item.key}}">
+      <image src="{{ activeMenu == item.key ? item.img + '-selected.png' : item.img + '.png' }}" mode="widthFix" class="sg-img"></image>
       <view class="sg-name">{{ item.name }}</view>
     </view>
   </view>

+ 31 - 1
mini/components/navbar/index.wxss

xqd
@@ -1 +1,31 @@
-/* components/navbar/index.wxss */
+/* components/navbar/index.wxss */
+.sg-nav-box .sg-img {
+  width: 40rpx;
+}
+.sg-nav-box {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  padding: 10rpx 0;
+  border-top: 1px solid #ebedf0;
+  font-size: 0.8rem;
+  z-index: 1000;
+}
+.sg-nav-box .sg-nav-list {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.sg-nav-box .sg-nav-list .sg-nav-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.sg-nav-item .sg-name {
+  margin-top: 5rpx;
+}
+.sg-nav-item.sg-selected {
+  color: #5693FC;
+}

+ 3 - 0
mini/pages/index/index.json

xqd
@@ -1,3 +1,6 @@
 {
+  "navigationBarBackgroundColor": "#5693FC",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "城通设备管理",
   "usingComponents": {}
 }

+ 21 - 0
mini/pages/index/index.wxml

xqd
@@ -1,4 +1,25 @@
 <!--index.wxml-->
 <view class="sg-container">
+  <view class="sg-top-box sg-index-bg">
+    <view class="sg-top-item">
+      <van-icon name="edit" />
+      <view class="sg-top-name">新建项目</view>
+    </view>
+    <view class="sg-top-item">
+      <van-icon name="user-o" />
+      <view class="sg-top-name">成员添加</view>
+    </view>
+    <view class="sg-top-item sg-right-border">
+      <van-icon name="delete" />
+      <view class="sg-top-name">草稿箱</view>
+    </view>
+    <view class="sg-top-item">
+      <van-icon name="comment-o" />
+      <view class="sg-top-name">消息提示</view>
+    </view>
+    <view class="sg-top-item">
+      <image class="sg-avatar" src="{{ userInfo.avatar }}" mode="widthFix"></image>
+    </view>
+  </view>
   <navbar></navbar>
 </view>

+ 3 - 17
mini/pages/index/index.wxss

xqd
@@ -1,21 +1,7 @@
 /**index.wxss**/
-.userinfo {
+.sg-top-box {
+  color: white;
   display: flex;
-  flex-direction: column;
   align-items: center;
-}
-
-.userinfo-avatar {
-  width: 128rpx;
-  height: 128rpx;
-  margin: 20rpx;
-  border-radius: 50%;
-}
-
-.userinfo-nickname {
-  color: #aaa;
-}
-
-.usermotto {
-  margin-top: 200px;
+  justify-content: space-around;
 }