jmash-core-mp 0.1.35 → 0.1.37

package/lib/api/dict/index.js

@@ -43,6 +43,7 @@ class DictApiImpl {
             url: "/v1/dict/dict_lay_entry/list/" + config.tenant,
             method: "GET",
             data,
+            header: { Authorization: false },
         });
     }
 }

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.35",
+  "version": "0.1.37",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/dict/index.ts

@@ -52,6 +52,7 @@ class DictApiImpl {
       url: "/v1/dict/dict_lay_entry/list/" + config.tenant,
       method: "GET",
       data,
+      header: { Authorization: false },
     });
   }
 }

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/core/jmash-login copy.mpx

@@ -1,347 +0,0 @@
-<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>
-
-    <!-- 姓名输入 -->
-    <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>
-    </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>
-  </view>
-</template>
-
-<script lang="ts">
-import { useUserStore } from '../../store/user'
-import mpx, { createComponent, ref } from '@mpxjs/core'
-
-createComponent({
-  options: {
-    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,
-      value: "/pages/home",
-    },
-    // 登录后跳转方式 "redirectTo switchTab reLaunch navigateTo"
-    linkType: {
-      type: String,
-      value: "redirectTo",
-    },
-    // 遮罩层效果
-    isShowModel: {
-      type: Boolean,
-      value: false,
-    },
-    // 是否显示隐私协议和政策
-    showPrivacyPolicy: {
-      type: Boolean,
-      value: true
-    }
-  },
-  setup(props) {
-    let config = getApp().globalData.config || { resourceUrl: '', name: '应用' };
-    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);
-    return {
-      agreeStatus,
-      nameValue,
-      avatarUrl,
-      isValidate,
-      avatar,
-      userStore
-    };
-  },
-  methods: {
-    // 协议勾选事件
-    agreeChange() {
-      this.agreeStatus = !this.agreeStatus;
-      this.validate();
-    },
-    // 跳转隐私协议
-    goPolicyInfo(e: any) {
-      const id = e.currentTarget.id
-      this.triggerEvent("policy", id);
-      mpx.navigateTo({
-        url: '/jmash/pages/auth/cms-protocol?channelAlias=' + id
-      });
-    },
-    // 头像选择
-    onChooseAvatar(e: any) {
-      this.avatarUrl = e.detail.avatarUrl;
-      this.validate();
-    },
-    // 验证
-    validate() {
-      if (!this.nameValue) {
-        this.isValidate = false;
-        return;
-      }
-      this.isValidate = true;
-    },
-    // 登录前验证
-    onLogin() {
-      console.log(this.agreeStatus);
-      if (!this.agreeStatus && this.showPrivacyPolicy) {
-        mpx.showModal({
-          title: "提示",
-          content: "您是否已阅读《用户使用协议》《隐私权政策》？",
-          success: (res) => {
-            if (res.confirm) {
-              this.agreeStatus = true;
-            }
-          },
-        });
-      }
-      if (!this.nameValue) {
-        mpx.showToast({
-          title: "请输入姓名",
-          icon: "none",
-          duration: 2000,
-        });
-      }
-    },
-    wxPhoneLogin(event: any) {
-      let that = this;
-      console.log(event);
-      if (!this.agreeStatus && this.showPrivacyPolicy) {
-        mpx.showModal({
-          title: "提示",
-          content: "您是否已阅读《用户使用协议》《隐私权政策》？",
-          success(res) {
-            if (res.confirm) {
-              that.agreeStatus = true;
-            }
-          },
-        });
-        return;
-      }
-      if (!this.nameValue) {
-        mpx.showToast({
-          title: "请输入姓名",
-          icon: "none",
-          duration: 2000,
-        });
-        return;
-      }
-      if (event.detail.errMsg === "getPhoneNumber:ok") {
-        console.log(event.detail.code);
-        this.userStore.mpRegister(event.detail.code, this.nameValue).then((resp) => {
-          if (resp.status === false) {
-            mpx.showToast({
-              title: resp.message ? resp.message : "登录失败联系管理员",
-              icon: "none",
-              duration: 2000,
-            });
-            return;
-          }
-          const backurl = decodeURIComponent(this.backurl);
-          if (this.linkType === "switchTab") {
-            mpx.switchTab({ url: backurl });
-          } else if (this.linkType === "navigateTo") {
-            mpx.navigateTo({ url: backurl });
-          } else if (this.linkType === "redirectTo") {
-            mpx.redirectTo({ url: backurl });
-          } else {
-            mpx.reLaunch({ url: backurl });
-          }
-        });
-      } else {
-        mpx.showToast({
-          title: "您已取消授权",
-          icon: "none",
-          duration: 2000,
-        });
-      }
-    }
-  }
-})
-</script>
-
-<style lang="scss">
-@use "../../styles/index.scss" as *;
-
-$primary: #07c160;
-$primary-dark: #06ad56;
-$text-1: #111111;
-$text-2: #555555;
-$text-3: #888888;
-$border: #d0d0d0;
-$bg-page: #f2f2f2;
-$bg-card: #ffffff;
-
-.login_box {
-  padding: 13% 3% 4%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .login_btn {
-    background-color: $blue-color;
-    color: $white-color;
-    padding: 16px 0;
-    width: $width;
-    font-size: $font-size;
-  }
-
-  .protocol_agree {
-    color: $font-color-grey-opacity;
-    font-size: $font-size;
-    margin-top: 20px;
-
-    text {
-      color: $blue-color;
-    }
-  }
-
-  .avatar-section {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-bottom: 32rpx;
-
-    .avatar-wrapper {
-      position: relative;
-      margin: 0;
-      padding: 0;
-      background: none;
-      border: none;
-      line-height: 1;
-
-      .avatar-img {
-        width: 120rpx;
-        height: 120rpx;
-        border-radius: 50%;
-        border: 4rpx solid $border;
-        display: block;
-      }
-
-      .avatar-badge {
-        position: absolute;
-        right: 0;
-        bottom: 0;
-        width: 36rpx;
-        height: 36rpx;
-        background: $primary;
-        border-radius: 50%;
-        border: 3rpx solid $bg-card;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .badge-icon {
-          font-size: 16rpx;
-          color: #fff;
-        }
-      }
-    }
-
-    .avatar-tip {
-      margin-top: 16rpx;
-      font-size: 20rpx;
-      color: $text-3;
-    }
-  }
-
-  .name-section {
-    width: 100%;
-    margin-bottom: 32rpx;
-
-    .name-field {
-      display: flex;
-      align-items: center;
-      background: $bg-page;
-      border-radius: 20rpx;
-      padding: 0 28rpx;
-      height: 88rpx;
-      border: 2rpx solid transparent;
-      transition: border-color 0.25s, background-color 0.25s;
-
-      .field-icon {
-        font-size: 32rpx;
-        margin-right: 16rpx;
-        flex-shrink: 0;
-      }
-
-      .name-input {
-        flex: 1;
-        min-width: 0;
-        font-size: 28rpx;
-        color: $text-1;
-        background: transparent;
-        border: none;
-        outline: none;
-        height: 80rpx;
-        line-height: 80rpx;
-        padding: 0;
-      }
-
-      .name-input::placeholder {
-        font-size: 28rpx;
-        color: $text-3;
-      }
-    }
-
-    .name-field:focus-within {
-      border-color: $primary;
-      background: $bg-card;
-    }
-  }
-}
-</style>
-
-<script type="application/json">
-{
-  "component": true,
-  "usingComponents": {}
-}
-</script>