jmash-core-mp 0.1.34 → 0.1.36

package/lib/api/region/index.js

@@ -12,6 +12,7 @@ class RegionApiImpl {
             url: "/v1/region/dict_region/list/" + config.tenant,
             method: "GET",
             data: query,
+            header: { Authorization: false },
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/region/index.ts

@@ -15,6 +15,7 @@ class RegionApiImpl {
       url: "/v1/region/dict_region/list/" + config.tenant,
       method: "GET",
       data: query,
+      header: { Authorization: false },
     });
   }
 }

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

@@ -43,18 +43,18 @@
           <view class="phone-number">{{ userInfo.mobilePhone }}</view>
           <!-- 微信 -->
           <button open-type="getPhoneNumber" class="phone-right-btn" bindgetphonenumber="getPhoneNumberWechat"
-            wx:if="{{ isChangePhone && __mpx_mode__ === 'wx' }}">更换手机号</button>
+            wx:if="{{ isChangePhone && __mpx_mode__ === 'wx' }}" style="{{ phoneBtnStyle }}">更换手机号</button>
           <!-- 支付宝 -->
           <button open-type="getAuthorize" scope="phoneNumber" class="phone-right-btn"
             wx:if="{{ isChangePhone && __mpx_mode__ === 'ali' }}" onGetAuthorize="getPhoneNumberAli"
-            onError="onPhoneAuthFail">更换手机号</button>
+            onError="onPhoneAuthFail" style="{{ phoneBtnStyle }}">更换手机号</button>
         </view>
       </view>
     </view>
 
     <!-- 保存按钮 -->
     <view class="main-btn">
-      <button class="main-btn-item" bindtap="handleUpdateUser">保存</button>
+      <button class="main-btn-item" bindtap="handleUpdateUser" style="{{ saveBtnStyle }}">保存</button>
     </view>
   </view>
 </template>
@@ -100,6 +100,9 @@ createComponent({
     imageUrl: getApp().globalData.config.baseUrl + "/v1/file/path/",
     userInfo: {} as UserInfo,
     userStore: {} as any,
+    themeColor: (getApp().globalData.config.themeColor || "#2563EB"),
+    phoneBtnStyle: "color: " + (getApp().globalData.config.themeColor || "#2563EB"),
+    saveBtnStyle: "background-color: " + (getApp().globalData.config.themeColor || "#2563EB") + ";color: #fff",
   },
   ready() {
     this.userStore = useUserStore();
@@ -363,17 +366,14 @@ $bg-card: #ffffff;
     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);
+    transition: opacity 0.2s;
 
     &:active {
-      background-color: $primary-dark;
+      opacity: 0.8;
     }
   }
 }

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

@@ -13,7 +13,8 @@
         <!-- 用户信息 -->
         <view class="auth-user-r">
           <view class="user-edit">
-            <text class="user-name" style="color: {{ userNameColor }}">{{ userInfo.realName || '微信用户' }}</text>
+            <text class="user-name" style="color: {{ userNameColor }}">{{ userInfo.realName || userInfo.nickName ||
+              '微信用户' }}</text>
             <view class="edit-icon-bg">
               <text class="edit-icon">✎</text>
             </view>
@@ -91,6 +92,7 @@ createComponent({
       }
     };
     onShow(refreshFunc);
+    // TODO: 讨论是否改为 checkLogin()，避免 token 过期时"伪登录"导致显示"微信用户"
     const isLogin = computed(() => userStore.accessToken !== '');
     return { resourceUrl, baseUrl, userInfo, userStore, refreshFunc, isLogin };
   },

package/src/components/core/jmash-login.mpx

@@ -1,38 +1,41 @@
 <template>
-  <slot name="before"></slot>
-  <view class="login_box">
-    <!-- 头像区域 -->
-    <view class="avatar-section">
-      <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
-        <image class="avatar-img" src="{{ avatarUrl || avatar }}" mode="aspectFill" />
-        <view class="avatar-badge">
-          <text class="badge-icon">✎</text>
-        </view>
-      </button>
-      <text class="avatar-tip">点击更换头像</text>
-    </view>
+  <!-- <slot name="before"></slot> -->
+  <view class="login-page">
+    <view class="login_box">
+      <text class="app-name">{{ config.xcxName }}</text>
+      <!-- 头像区域 -->
+      <view class="avatar-section">
+        <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+          <image class="avatar-img" src="{{ avatarUrl || avatar }}" mode="aspectFill" />
+          <view class="avatar-badge">
+            <text class="badge-icon">✎</text>
+          </view>
+        </button>
+        <text class="avatar-tip">点击更换头像</text>
+      </view>
 
-    <!-- 姓名输入 -->
-    <view class="name-section">
-      <view class="name-field">
-        <text class="field-icon">👤</text>
-        <input name="nickname" type="nickname" class="weui-input name-input" placeholder="请输入您的姓名" bindinput="validate"
-          wx:model="{{ nameValue }}" />
+      <!-- 姓名输入 -->
+      <view class="name-section">
+        <view class="name-field">
+          <cube-icon class="field-icon" type="user" size="36rpx" color="#999" />
+          <input name="nickname" type="nickname" class="weui-input name-input" placeholder="请输入您的姓名"
+            bindinput="validate" wx:model="{{ nameValue }}" />
+        </view>
       </view>
-    </view>
 
-    <button open-type="getPhoneNumber" style="{{ loginStyle }}" bind:getphonenumber="wxPhoneLogin"
-      wx:if="{{ agreeStatus && isValidate }}">手机号授权登录</button>
-    <button bind:tap="onLogin" style="{{ loginStyle }}" wx:else>授权登录</button>
-    <checkbox-group bindchange="agreeChange" class="protocol_agree" wx:if="{{ showPrivacyPolicy }}">
-      <label>
-        <checkbox value="{{ agreeStatus+'' }}" checked="{{ agreeStatus }}" color="{{ checkedColor }}" />
-        已阅读
-        <text id="user" style="{{ agreementStyle }}" catch:tap="goPolicyInfo">《用户使用协议》</text>
-        <text id="privacy" style="{{ agreementStyle }}" catch:tap="goPolicyInfo">《隐私权政策》</text>
-      </label>
-    </checkbox-group>
-    <slot name="after"></slot>
+      <button open-type="getPhoneNumber" style="{{ loginStyle }}" bind:getphonenumber="wxPhoneLogin"
+        wx:if="{{ agreeStatus && isValidate }}">手机号授权登录</button>
+      <button bind:tap="onLogin" style="{{ loginStyle }}" wx:else>授权登录</button>
+      <checkbox-group bindchange="agreeChange" class="protocol_agree" wx:if="{{ showPrivacyPolicy }}">
+        <label>
+          <checkbox value="{{ agreeStatus+'' }}" checked="{{ agreeStatus }}" color="{{ checkedColor }}" />
+          已阅读
+          <text id="user" style="{{ agreementStyle }}" catch:tap="goPolicyInfo">《用户使用协议》</text>
+          <text id="privacy" style="{{ agreementStyle }}" catch:tap="goPolicyInfo">《隐私权政策》</text>
+        </label>
+      </checkbox-group>
+      <slot name="after"></slot>
+    </view>
   </view>
 </template>
 
@@ -45,23 +48,6 @@ createComponent({
     multipleSlots: true,
   },
   properties: {
-    // 登录按钮样式
-    loginStyle: {
-      type: String,
-      value:
-        "width: 100%;background-color: #2563EB;color: #fff;font-size: 15px;",
-    },
-    // 单选框选中的颜色
-    checkedColor: {
-      type: String,
-      value: "#0551ff",
-    },
-
-    // 协议样式
-    agreementStyle: {
-      type: String,
-      value: "color: #0551ff",
-    },
     // 登录后跳转页面
     backurl: {
       type: String,
@@ -84,21 +70,29 @@ createComponent({
     }
   },
   setup(props) {
-    let config = getApp().globalData.config || { resourceUrl: '', name: '应用' };
+    mpx.setNavigationBarTitle({ title: "登录" });
+    let config = getApp().globalData.config || { resourceUrl: '', xcxName: '应用' };
+    let themeColor = config.themeColor || "#2563EB";
     let agreeStatus = ref(false);
     let nameValue = ref('');
     let avatarUrl = ref('');
     let isValidate = ref(false);
     let userStore = useUserStore();
     let avatar = ref(config.resourceUrl + "/images/components/gray_head2x.png");
-    console.log(avatar);
+    let loginStyle = "width: 100%;background-color: " + themeColor + ";color: #fff;font-size: 15px;padding:11rpx 0";
+    let checkedColor = themeColor;
+    let agreementStyle = "color: " + themeColor;
     return {
       agreeStatus,
       nameValue,
       avatarUrl,
       isValidate,
       avatar,
-      userStore
+      userStore,
+      config,
+      loginStyle,
+      checkedColor,
+      agreementStyle
     };
   },
   methods: {
@@ -175,7 +169,7 @@ createComponent({
       }
       if (event.detail.errMsg === "getPhoneNumber:ok") {
         console.log(event.detail.code);
-        this.userStore.mpRegister(event.detail.code, this.nameValue).then((resp) => {
+        this.userStore.mpRegister(event.detail.code, this.nameValue, this.avatarUrl || this.avatar).then((resp) => {
           if (resp.status === false) {
             mpx.showToast({
               title: resp.message ? resp.message : "登录失败联系管理员",
@@ -219,12 +213,43 @@ $border: #d0d0d0;
 $bg-page: #f2f2f2;
 $bg-card: #ffffff;
 
+.login-page {
+  position: relative;
+  min-height: 100vh;
+}
+
+.back-bar {
+  position: fixed;
+  top: 88rpx;
+  left: 16rpx;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60rpx;
+  height: 60rpx;
+
+  .back-arrow {
+    font-size: 48rpx;
+    color: #333;
+    line-height: 1;
+  }
+}
+
 .login_box {
-  padding: 13% 3% 4%;
+  padding: 5% 3% 4%;
   display: flex;
   flex-direction: column;
   align-items: center;
 
+  .app-name {
+    font-size: 50rpx;
+    color: $text-1;
+    margin-bottom: 302rpx;
+    margin-top: 78rpx;
+    letter-spacing: 3rpx;
+  }
+
   .login_btn {
     background-color: $blue-color;
     color: $white-color;
@@ -257,6 +282,10 @@ $bg-card: #ffffff;
       border: none;
       line-height: 1;
 
+      &::after {
+        border: none;
+      }
+
       .avatar-img {
         width: 120rpx;
         height: 120rpx;
@@ -342,6 +371,8 @@ $bg-card: #ffffff;
 <script type="application/json">
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index"
+  }
 }
-</script>
+</script>

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

@@ -53,6 +53,7 @@ createPage({
 
 <script type="application/json">
 {
+  "navigationBarTitleText": "登录",
   "usingComponents": {
     "jmash-login": "../../../components/core/jmash-login.mpx"
   }