jmash-core-mp 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "dependencies": {
     "@mpxjs/api-proxy": "^2.10.19",

package/src/api/auth/index.ts

@@ -21,7 +21,10 @@ class AuthApi {
       url: "/v1/front/rbac/miniapp_login/" + config.tenant,
       method: "POST",
       data,
-      header: { "content-type": "application/json" },
+      header: {
+        "content-type": "application/json",
+        Authorization: false,
+      },
     });
   }
   // 手机号注册登录

package/src/api/files/index.ts

@@ -90,7 +90,7 @@ class FileApi {
   uploadFile(file: string): Promise<FileInfo> {
     const that = this;
     return new Promise((resolve, reject) => {
-      wx.uploadFile({
+      const p = mpx.uploadFile({
         url: that.uploadUrl(),
         filePath: file,
         name: "file",
@@ -98,33 +98,24 @@ class FileApi {
           "Content-Type": "multipart/form-data",
           Authorization: db.getBearerToken(),
         },
-        success(response) {
-          if (response.statusCode === 200) {
-            resolve({
-              code: response.statusCode,
-              message: response.errMsg,
-              data: JSON.parse(response.data),
-            } as any);
-          } else if (response.statusCode === 401) {
-            //TODO console.log("token过期....")
-            // 清理登录信息
-            wx.clearStorage();
-          } else {
-            mpx.showToast({
-              title: response.errMsg,
-              icon: "none",
-              duration: 2000,
-            });
-            resolve({
-              code: response.statusCode,
-              message: response.errMsg,
-              data: JSON.parse(response.data),
-            } as any);
-          }
-        },
-        fail(error) {
-          reject(error);
-        },
+      } as WechatMiniprogram.UploadFileOption) as any;
+      p.then((res: any) => {
+        console.log("uploadFile", res);
+        if (res.statusCode === 200) {
+          resolve(JSON.parse(res.data) as FileInfo);
+        } else if (res.statusCode === 401) {
+          // 清理登录信息
+          mpx.clearStorage();
+        } else {
+          mpx.showToast({
+            title: res.errMsg,
+            icon: "none",
+            duration: 2000,
+          });
+          resolve(JSON.parse(res.data) as FileInfo);
+        }
+      }).catch((err: any) => {
+        reject(err);
       });
     });
   }
@@ -132,21 +123,20 @@ class FileApi {
   // 上传文件
   downloadFile(url: string): Promise<FileDownInfo> {
     return new Promise((resolve, reject) => {
-      wx.downloadFile({
+      const p = mpx.downloadFile({
         url: url,
         header: {
           Authorization: db.getBearerToken(),
         },
-        success(response) {
-          resolve({
-            statusCode: response.statusCode,
-            tempFilePath: response.tempFilePath,
-            filePath: response.tempFilePath,
-          } as FileDownInfo);
-        },
-        fail(error) {
-          reject(error);
-        },
+      }) as any;
+      p.then((res: any) => {
+        resolve({
+          statusCode: res.statusCode,
+          tempFilePath: res.tempFilePath,
+          filePath: res.tempFilePath,
+        } as FileDownInfo);
+      }).catch((err: any) => {
+        reject(err);
       });
     });
   }

package/src/app.mpx

@@ -1,19 +1,24 @@
 <script lang="ts">
 import mpx, { createApp } from '@mpxjs/core';
+//api代理
+import apiProxy from '@mpxjs/api-proxy';
+mpx.use(apiProxy, { usePromise: true })
 //状态管理
 import { createPinia } from '@mpxjs/pinia';
 createPinia();
 //网络请求和App配置
 import { mpxFetch, config } from "./index";
 mpx.use(mpxFetch);
-//api代理
-import apiProxy from '@mpxjs/api-proxy';
-mpx.use(apiProxy, { usePromise: true })
+
 createApp({
   globalData: {
     config: config
   }
 })
+// 只有运行时才能调用
+const accountInfo = mpx.getAccountInfoSync();
+// 微信
+config.appId = accountInfo.miniProgram.appId;
 </script>
 
 <style></style>

package/src/components/auth-user/jmash-update-user.mpx

@@ -0,0 +1,344 @@
+<template>
+  <!-- 我的页面 中个人信息编辑页面 -->
+  <view class="my-information">
+    <view class="main">
+      <!-- 头像区域 -->
+      <view class="main-profile" wx:if="{{ isUserAvatar }}">
+        <view class="profile-left">头像</view>
+        <view class="profile-right">
+          <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+            <image class="avatar-img" src="{{ resourceUrl + '/components/gray_head2x.png' }}" mode="aspectFill"
+              wx:if="{{ !userInfo.avatar }}" />
+            <image class="avatar-img" src="{{ imageUrl + userInfo.avatar }}" mode="aspectFill" wx:else />
+            <view class="avatar-badge">
+              <text class="badge-icon">✎</text>
+            </view>
+          </button>
+        </view>
+      </view>
+
+      <!-- 昵称 -->
+      <view class="main-nickname" wx:if="{{ isUserNickName }}">
+        <view class="nickname-left">昵称</view>
+        <view class="nickname-right">
+          <input wx:model="{{ userInfo.nickName }}" wx:model-prop="value" type="nickname" class="nickname-input"
+            placeholder="请输入昵称" />
+        </view>
+      </view>
+
+      <!-- 姓名 -->
+      <view class="main-nickname" wx:if="{{ isUserRealName }}">
+        <view class="nickname-left">姓名</view>
+        <view class="nickname-right">
+          <input wx:model="{{ userInfo.realName }}" wx:model-prop="value" type="text" class="nickname-input"
+            placeholder="请输入姓名" />
+        </view>
+      </view>
+
+      <!-- 手机号 -->
+      <view class="main-phone" wx:if="{{ isUserMobilePhone }}">
+        <view class="phone-left">手机号</view>
+        <view class="phone-right">
+          <view class="phone-number">{{ userInfo.mobilePhone }}</view>
+          <button open-type="getPhoneNumber" class="phone-right-btn" bindgetphonenumber="getPhoneNumber"
+            wx:if="{{ isChangePhone }}">更换手机号</button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 保存按钮 -->
+    <view class="main-btn">
+      <button class="main-btn-item" bindtap="handleUpdateUser">保存</button>
+    </view>
+  </view>
+</template>
+
+<script lang="ts">
+import mpx, { createComponent } from '@mpxjs/core'
+import { config } from '../../utils/config'
+import { UpdateUserReq, UserInfo } from '../../api/auth/types'
+import { authApi } from '../../api/auth/index'
+import { fileApi } from '../../api/files/index';
+import { db } from '../../utils/db';
+import { FileInfo } from '../../api/files/types';
+import { auth } from '../../utils/auth';
+
+createComponent({
+  properties: {
+    // 是否显示用户头像
+    isUserAvatar: {
+      type: Boolean,
+      value: true
+    },
+    // 是否显示昵称
+    isUserNickName: {
+      type: Boolean,
+      value: true
+    },
+    // 是否显示姓名
+    isUserRealName: {
+      type: Boolean,
+      value: true
+    },
+    // 是否显示手机号
+    isUserMobilePhone: {
+      type: Boolean,
+      value: true
+    },
+    // 是否显示更换手机号
+    isChangePhone: {
+      type: Boolean,
+      value: true
+    }
+  },
+  data: {
+    resourceUrl: config.resourceUrl + "/images",
+    imageUrl: config.baseUrl + "/v1/file/path/",
+    userInfo: {} as UserInfo
+  },
+  ready() {
+    this.getUserInfo();
+  },
+  /**
+ * 组件的方法列表
+ */
+  methods: {
+    // 获取用户信息
+    getUserInfo() {
+      console.log("getUserInfo");
+      auth.getUserInfo().then((resp: UserInfo) => {
+        console.log("getUserInfo", resp);
+        this.userInfo = resp;
+      })
+    },
+
+    // 获取微信头像
+    onChooseAvatar(e: any) {
+      console.log("onChooseAvatar", e);
+      const { avatarUrl } = e.detail;
+
+      fileApi.uploadFile(avatarUrl).then((res: FileInfo) => {
+        console.log("uploadFile1", res);
+        this.userInfo.avatar = res.fileSrc;
+      });
+    },
+
+    // 更换手机号
+    getPhoneNumber(e: any) {
+      if (e.detail.errMsg === "getPhoneNumber:ok") {
+        // 授权成功后,调用rbac模块接口 已登陆状态小程序更换绑定手机号
+        authApi.replaceBindphone({
+          appId: config.appId,
+          phoneCode: e.detail.code,
+          componentAppid: config.componentAppid
+        }).then((res) => {
+          if (res.data) {
+            auth.getUserInfo(false).then((res) => {
+              this.userInfo = res as UserInfo;
+            });
+          }
+        })
+      }
+    },
+    // 更新用户信息
+    handleUpdateUser() {
+      let updateReq: UpdateUserReq = { ...this.userInfo } as UpdateUserReq;
+      updateReq.requestId = Math.random() * 10 + "";
+      updateReq.updateMask = "nickName,avatar,realName";
+      authApi.updateUserInfo(updateReq).then((res) => {
+        // 保存成功后重新设置本地缓存信息,并跳转到我的页面
+        if (res.statusCode === 200) {
+          db.setUserInfo(res.data)
+          mpx.navigateBack({
+            delta: 1
+          })
+        }
+      })
+    }
+  }
+}
+
+)
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+// 颜色变量
+$primary: #07c160;
+$primary-dark: #06ad56;
+$text-1: #111111;
+$text-2: #555555;
+$text-3: #888888;
+$border: #e8e8e8;
+$bg-page: #f2f2f2;
+$bg-card: #ffffff;
+
+.my-information {
+  background-color: $bg-page;
+  width: 100%;
+  min-height: 100vh;
+  position: relative;
+  padding: 30rpx 0;
+
+  .main {
+    background-color: $bg-card;
+    margin: 0 30rpx;
+    border-radius: 24rpx;
+    overflow: hidden;
+    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+
+    .main-profile,
+    .main-nickname,
+    .main-phone {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 120rpx;
+      padding: 0 32rpx;
+      border-bottom: 1rpx solid $border;
+      transition: background-color 0.2s;
+
+      &:last-child {
+        border-bottom: none;
+      }
+
+      &:active {
+        background-color: rgba(0, 0, 0, 0.02);
+      }
+
+      .profile-left,
+      .nickname-left,
+      .phone-left {
+        font-size: 30rpx;
+        color: $text-1;
+        font-weight: 500;
+      }
+
+      .profile-right {
+        .avatar-wrapper {
+          position: relative;
+          margin: 0;
+          padding: 0;
+          background: transparent;
+          border: none;
+          line-height: 1;
+
+          .avatar-img {
+            width: 88rpx;
+            height: 88rpx;
+            border-radius: 50%;
+            border: 2rpx solid $border;
+            display: block;
+          }
+
+          .avatar-badge {
+            position: absolute;
+            right: -4rpx;
+            bottom: -4rpx;
+            width: 36rpx;
+            height: 36rpx;
+            background: $primary;
+            border-radius: 50%;
+            border: 2rpx solid $bg-card;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            .badge-icon {
+              font-size: 16rpx;
+              color: #fff;
+            }
+          }
+        }
+      }
+
+      .nickname-right,
+      .phone-right {
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+        flex: 1;
+        margin-left: 30rpx;
+      }
+
+      .nickname-input {
+        flex: 1;
+        text-align: right;
+        font-size: 30rpx;
+        color: $text-1;
+        background: transparent;
+        border: none;
+        outline: none;
+        height: 80rpx;
+        line-height: 80rpx;
+        padding: 0;
+
+        &::placeholder {
+          color: $text-3;
+        }
+      }
+
+      .phone-right {
+        .phone-number {
+          font-size: 30rpx;
+          color: $text-1;
+          font-weight: 500;
+        }
+
+        .phone-right-btn {
+          background-color: #e6f7ff;
+          border-radius: 24rpx;
+          margin-left: 20rpx;
+          border: none;
+          font-size: 24rpx;
+          color: $primary;
+          padding: 12rpx 24rpx;
+          height: auto;
+          line-height: 1.4;
+        }
+      }
+    }
+
+    .main-phone {
+      border-bottom: none;
+    }
+  }
+
+  // 保存按钮样式
+  .main-btn {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 60rpx 30rpx;
+  }
+
+  .main-btn-item {
+    width: 100%;
+    height: 88rpx;
+    border-radius: 44rpx;
+    font-size: 32rpx;
+    font-weight: 600;
+    letter-spacing: 2rpx;
+    background-color: $primary;
+    color: #fff;
+    border: none;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: background-color 0.2s;
+    box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.3);
+
+    &:active {
+      background-color: $primary-dark;
+    }
+  }
+}
+</style>
+
+<script type="application/json">
+{
+  "component": true,
+  "usingComponents": {}
+}
+</script>

package/src/components/auth-user/jmash-user.mpx

@@ -2,32 +2,46 @@
   <view class="auth-user-box">
     <block wx:if="{{ token }}">
       <view class="auth-user-l">
-        <image src="{{ baseUrl+'/v1/file/image/clip/200/200/' + userInfo.avatar }}" class="avatar-img"
-          wx:if="{{ userInfo.avatar }}"></image>
-        <image src="{{ resourceUrl + '/images/mall/' + defaultAvatar }}" class="avatar-img" style="border-radius:50%"
-          wx:elif="{{ defaultAvatar }}"></image>
-        <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img" wx:else></image>
+        <!-- 头像 -->
+        <view class="avatar-wrapper" bind:tap="handleUpdateUser">
+          <image src="{{ baseUrl+'/v1/file/image/clip/200/200/' + userInfo.avatar }}" class="avatar-img"
+            wx:if="{{ userInfo.avatar }}" mode="aspectFill"></image>
+          <image src="{{ resourceUrl + '/images/mall/' + defaultAvatar }}" class="avatar-img"
+            wx:elif="{{ defaultAvatar }}" mode="aspectFill"></image>
+          <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img" wx:else mode="aspectFill"></image>
+          <view class="avatar-badge">
+            <text class="badge-icon">✎</text>
+          </view>
+        </view>
+
+        <!-- 用户信息 -->
         <view class="auth-user-r">
-          <view class="user-edit">{{ userInfo.realName }}
-            <image src="{{ resourceUrl }}/images/mall/book/icon/user_edit_icon.png" class="edit_icon"
-              bind:tap="handleUpdateUser">
-            </image>
+          <view class="user-edit" bind:tap="handleUpdateUser">
+            <text class="user-name">{{ userInfo.realName }}</text>
+            <text class="edit-icon">✎</text>
           </view>
           <text class="user-mobile">{{ userInfo.mobilePhoneIns }}</text>
         </view>
       </view>
     </block>
-    <view class="auth-user-l" wx:else>
-      <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img"></image>
-      <text bind:tap="handleLogin">登录</text>
+
+    <!-- 未登录状态 -->
+    <view class="auth-user-l not-logged-in" wx:else>
+      <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img" mode="aspectFill"></image>
+      <view class="auth-user-r">
+        <view class="login-btn" bind:tap="handleLogin">
+          <text class="login-text">登录</text>
+        </view>
+      </view>
     </view>
   </view>
 </template>
 
-<script>
+<script lang="ts">
 import mpx, { createComponent, ref, onShow } from '@mpxjs/core'
 import { db } from '../../utils/db';
-import { authApi } from '../../api/auth/index';
+import { auth } from "../../utils/auth";
+import { UserInfo } from "../../api/auth/types";
 
 createComponent({
   properties: {
@@ -35,32 +49,52 @@ createComponent({
       type: String,
       value: ''
     },
+    backurl: {
+      type: String,
+      value: '/pages/home'
+    },
+    tabbar: {
+      type: String,
+      value: 'false'
+    }
   },
   setup(props, context) {
     let config = getApp().globalData.config;
     let resourceUrl = ref(config.resourceUrl);
     let baseUrl = ref(config.baseUrl);
     let token = ref('');
-    let userInfo = ref({});
-
-    onShow(() => {
-      token.value = db.getToken();
-      authApi.userInfo().then((resp) => {
-        userInfo.value = resp.data;
-      })
-    })
+    let userInfo = ref({} as UserInfo);
+    let refreshFunc = () => {
+      // 检查登录是否有效？
+      if (auth.checkLogin()) {
+        token.value = db.getToken();
+        auth.getUserInfo().then((resp) => {
+          userInfo.value = resp;
+        })
+      }
+    };
+    onShow(refreshFunc);
     console.log(resourceUrl);
-    return { resourceUrl, baseUrl, token, userInfo };
+    return { resourceUrl, baseUrl, token, userInfo, refreshFunc };
   },
   methods: {
     handleLogin() {
-      mpx.navigateTo({
-        url: '/jmash/pages/auth/login'
-      })
+      console.log("handleLogin");
+      //检查登录并跳转登录
+      auth.loginOnlyAC().then(() => {
+        //登录成功，加载业务
+        console.log("静默登录成功");
+        this.refreshFunc();
+      }).catch(() => {
+        console.log("登录失败！");
+        mpx.navigateTo({
+          url: '/jmash/pages/auth/login' + "?backurl=" + encodeURIComponent(this.properties.backurl) + "&tabbar=" + this.properties.tabbar
+        })
+      });
     },
     handleUpdateUser() {
       mpx.navigateTo({
-        url: '/pages/user/index'
+        url: '/jmash/pages/auth/update-user'
       })
     },
   }
@@ -71,41 +105,113 @@ createComponent({
 <style lang="scss">
 @use "../../styles/index.scss" as *;
 
+// 颜色变量
+$primary: #07c160;
+$text-1: #111111;
+$text-2: #666666;
+$text-3: #999999;
+$border: #e8e8e8;
+$bg-page: #f5f5f5;
+$bg-card: #ffffff;
+
 .auth-user-box {
   display: flex;
   align-items: center;
-  padding: 30rpx 0 30rpx 30rpx;
+  padding: 48rpx 32rpx;
+  background-color: $bg-card;
 
   .auth-user-l {
     display: flex;
     align-items: center;
-    font-size: 30rpx;
-    font-weight: bold;
+    flex: 1;
 
-    .avatar-img {
-      width: 120rpx;
-      height: 120rpx;
-      border-radius: $border-max-radius;
-      margin-right: 20rpx;
+    .avatar-wrapper {
+      position: relative;
+      margin-right: 24rpx;
+      flex-shrink: 0;
+
+      .avatar-img {
+        width: 104rpx;
+        height: 104rpx;
+        border-radius: 50%;
+        background-color: $bg-page;
+        display: block;
+      }
+
+      .avatar-badge {
+        position: absolute;
+        right: -2rpx;
+        bottom: -2rpx;
+        width: 32rpx;
+        height: 32rpx;
+        background: $primary;
+        border-radius: 50%;
+        border: 2rpx solid $bg-card;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .badge-icon {
+          font-size: 14rpx;
+          color: #fff;
+        }
+      }
     }
   }
 
   .auth-user-r {
+    flex: 1;
+    min-width: 0;
+
     .user-edit {
       display: flex;
       align-items: center;
+      margin-bottom: 8rpx;
+      cursor: pointer;
+
+      .user-name {
+        font-size: 34rpx;
+        font-weight: 600;
+        color: $text-1;
+        line-height: 1.2;
+      }
 
-      .edit_icon {
-        width: 34rpx;
-        height: 34rpx;
+      .edit-icon {
+        font-size: 18rpx;
+        color: $text-3;
         margin-left: 10rpx;
       }
     }
 
     .user-mobile {
-      font-size: $font-size;
-      color: $font-color-grey;
-      font-weight: 500;
+      font-size: 26rpx;
+      color: $text-2;
+      line-height: 1.4;
+    }
+  }
+
+  // 未登录状态
+  .not-logged-in {
+    .avatar-img {
+      opacity: 0.5;
+      margin-right: 24rpx;
+    }
+
+    .auth-user-r {
+      .login-btn {
+        display: flex;
+        align-items: center;
+        padding: 16rpx 32rpx;
+        background-color: $primary;
+        border-radius: 40rpx;
+        cursor: pointer;
+
+        .login-text {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #fff;
+        }
+      }
     }
   }
 }
@@ -116,4 +222,4 @@ createComponent({
   "component": true,
   "usingComponents": {}
 }
-</script>
+</script>

package/src/packages/index.mpx

@@ -2,6 +2,7 @@
 {
     "pages": [
         "./pages/auth/login",
+        "./pages/auth/update-user",
         "./pages/auth/cms-protocol"
     ]
 }

package/src/packages/pages/auth/login.mpx

@@ -1,5 +1,5 @@
 <template>
-  <jmash-login tabbar="{{ tabbar }}" backurl="{{ backurl }}">
+  <jmash-login linkType="{{ linkType }}" backurl="{{ backurl }}">
     <image mode="widthFix" src="{{ resourceUrl }}/images/login_bg.png" class="index_bj" slot="before">
       <image mode="widthFix" src="{{ resourceUrl }}/images/logo.png" class="login_logo"></image>
     </image>
@@ -11,13 +11,23 @@
 import { createPage, ref } from '@mpxjs/core'
 
 createPage({
+  properties: {
+    tabbar: {
+      type: String,
+      value: 'false'
+    },
+    backurl: {
+      type: String,
+      value: '/pages/home'
+    }
+  },
   setup(props) {
     let resourceUrl = ref(getApp().globalData.config.resourceUrl);
     let appName = ref(getApp().globalData.config.name);
-    let tabbar = ref(props.tabbar === 'true');
-    let backurl = ref(props.backurl || '');
-    console.log(appName);
-    return { resourceUrl, appName, tabbar, backurl };
+    let linkType = ref(props.tabbar === 'true' ? "switchTab" : "redirectTo");
+    let backurl = ref(props.backurl);
+    console.log(appName, linkType, backurl);
+    return { resourceUrl, appName, linkType, backurl };
   }
 })
 </script>

package/src/packages/pages/auth/update-user.mpx

@@ -0,0 +1,18 @@
+<template>
+    <jmash-update-user></jmash-update-user>
+</template>
+
+<script>
+import { createPage } from '@mpxjs/core'
+createPage({})
+</script>
+
+<style lang="scss"></style>
+
+<script type="application/json">
+{
+    "usingComponents": {
+        "jmash-update-user": "../../../components/auth-user/jmash-update-user.mpx"
+    }
+}
+</script>

package/src/pages/home.mpx

@@ -6,17 +6,20 @@
 
 <script>
 import { createPage } from '@mpxjs/core'
-import { db } from '../utils/db'
 import mpx from '@mpxjs/core'
+import { auth } from "../utils/auth.ts";
 
 createPage({
   setup() {
-    // 无法退回,检查登录状态
-    if (!db.getToken()) {
+    //检查登录并跳转登录
+    auth.loginOnlyAC().then(() => {
+      //登录成功，加载业务
+      console.log("静默登录成功");
+    }).catch(() => {
       mpx.navigateTo({
         url: '/jmash/pages/auth/login'
       })
-    }
+    });
     return {}
   }
 })

package/src/pages/tabbar/home.mpx

@@ -13,10 +13,9 @@ import { auth } from '../../utils/auth'
 
 createPage({
   onShow() {
-    console.log(this.getTabBar);
     if (typeof this.getTabBar === 'function' &&
       this.getTabBar()) {
-      console.log(this.getTabBar().$refs.tabBar.activeTab("Home"));
+      this.getTabBar().$refs.tabBar.activeTab("Home");
     }
   },
   methods: {

package/src/pages/tabbar/my.mpx

@@ -1,6 +1,6 @@
 <template>
   <view class="basic-component-page">
-    <jmash-user></jmash-user>
+    <jmash-user tabbar="true" backurl="/pages/tabbar/my"></jmash-user>
     <text>{{ title }}</text>
   </view>
 </template>
@@ -13,10 +13,9 @@ createPage({
     title: 'MY',
   },
   onShow() {
-    console.log(this.getTabBar);
     if (typeof this.getTabBar === 'function' &&
       this.getTabBar()) {
-      console.log(this.getTabBar().$refs.tabBar.activeTab("My"));
+      this.getTabBar().$refs.tabBar.activeTab("My");
     }
   }
 })

package/src/utils/auth.ts

@@ -1,5 +1,4 @@
-import { config } from "./config";
-import { db } from "./db";
+import mpx from "@mpxjs/core";
 import { authApi } from "../api/auth/index";
 import {
   LoginReq,
@@ -9,7 +8,8 @@ import {
   UserInfo,
 } from "../api/auth/types";
 import { ResponseData } from "../types/core";
-import mpx from "@mpxjs/core";
+import { config } from "./config";
+import { db } from "./db";
 
 // 认证
 class Auth {
@@ -76,6 +76,7 @@ class Auth {
     if (db.getToken() && !db.isTokenExpires()) {
       return true;
     }
+
     return false;
   }
 
@@ -133,6 +134,7 @@ class Auth {
                     response.statusCode === 200 &&
                     response.data.status === true
                   ) {
+                    console.log("silentLogin-res", response);
                     db.setToken(response.data.token);
                     console.log("login success");
                     this.getUserInfo(false);
@@ -161,7 +163,7 @@ class Auth {
   // 手机号code 注册登录
   phoneCodeLogin(phoneCode: string, nickName: string = ""): Promise<LoginRes> {
     return new Promise<LoginRes>((resolve, reject) => {
-      wx.login({
+      mpx.login({
         success: (res) => {
           // 发送 res.code 到后台换取 openId, sessionKey, unionId
           if (res.code) {

package/src/utils/config.ts

@@ -3,7 +3,7 @@ import { AppConfig } from "../types/core";
 const config: AppConfig = {
   name: "Jmash Core MPX",
   dev: true,
-  testNewUser: true,
+  testNewUser: false,
   tenant: "xyvcard",
   baseUrl: "https://mm.sooyie.cn",
   resourceUrl: "https://mm.sooyie.cn/v1/file/path/wxapp",
@@ -17,7 +17,7 @@ const config: AppConfig = {
 
 if (__mpx_mode__ === "wx") {
   // 微信
-  config.appId = "wx2a8b3d689b8959eb";
+  config.appId = "wx2a8b3d689b8959eb1";
 } else if (__mpx_mode__ === "ali") {
   // 支付宝
   config.appId = "2016102700684542";

package/src/utils/request.ts

@@ -19,8 +19,7 @@ mpx.xfetch.interceptors.request.use(function (config) {
   if (!config.url.startsWith("http")) {
     config.url = appconfig.baseUrl + config.url;
   }
-  console.log(config);
-
+  console.log("request:", config);
   // Grpc Gateway 清理默认值,Enum,时间等不能空;
   grpc.clearEmpty(config.params);
   grpc.clearEmpty(config.data);
@@ -28,7 +27,10 @@ mpx.xfetch.interceptors.request.use(function (config) {
     config.header = {};
   }
   //配置其他认证请求头信息
-  if (config.header.Authorization && config.header.Authorization === false) {
+  if (
+    config.header.Authorization !== undefined &&
+    config.header.Authorization === false
+  ) {
     delete config.header.Authorization;
     return config;
   }
@@ -40,7 +42,6 @@ mpx.xfetch.interceptors.request.use(function (config) {
   }
   // 请求设置token和租户
   const expire = db.isTokenExpires();
-  console.log("expire", expire);
   if (!expire) {
     config.header["Authorization"] = "Bearer " + db.getToken();
     const organTenant = db.getOrganTenant(config.tenant);
@@ -49,7 +50,9 @@ mpx.xfetch.interceptors.request.use(function (config) {
     } else {
       delete config.header["Grpc-Metadata-Tenant"];
     }
-    console.log(config);
+    //console.log("header:", config.header);
+  } else {
+    console.log("token expire", expire);
   }
 
   const isRefreshToken = config.url.endsWith("/v1/rbac/auth/refresh_token");
@@ -61,6 +64,7 @@ mpx.xfetch.interceptors.request.use(function (config) {
       refreshToken(db.getRefreshToken())
         .then((res) => {
           // token 刷新后将数组的方法重新执行
+          console.log("refreshToken-res", res);
           db.setToken(res.data);
           requests.forEach((cb) => cb(res.data.accessToken));
           requests = []; // 刷新完清空
@@ -117,6 +121,7 @@ function refreshToken(refreshToken: string) {
       tenant: appconfig.tenant,
       clientId: appconfig.appId,
     },
+    header: { Authorization: false },
   });
 }
 

package/src/components/auth-user/jmash-update-user/index.mpx

@@ -1,31 +0,0 @@
-<template>
-  <view class="update-user-component">
-    <text>用户信息更新组件</text>
-  </view>
-</template>
-
-<script>
-import { createComponent } from '@mpxjs/core'
-
-createComponent({
-  data: {
-    title: '用户信息更新'
-  }
-})
-</script>
-
-<style lang="scss">
-.update-user-component {
-  padding: 40rpx;
-  text-align: center;
-  font-size: 32rpx;
-  color: #333;
-}
-</style>
-
-<script type="application/json">
-{
-  "component": true,
-  "usingComponents": {}
-}
-</script>

package/src/components/common/auth-avatar/avatar-edit/index.mpx

@@ -1,31 +0,0 @@
-<template>
-  <view class="avatar-edit-component">
-    <text>头像编辑组件</text>
-  </view>
-</template>
-
-<script>
-import { createComponent } from '@mpxjs/core'
-
-createComponent({
-  data: {
-    title: '头像编辑'
-  }
-})
-</script>
-
-<style lang="scss">
-.avatar-edit-component {
-  padding: 40rpx;
-  text-align: center;
-  font-size: 32rpx;
-  color: #333;
-}
-</style>
-
-<script type="application/json">
-{
-  "component": true,
-  "usingComponents": {}
-}
-</script>