xyvcard-wechat-auth 0.0.18 → 0.0.20

package/dist/components/common/auth-basic-title/basic-title-view/index.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/components/common/auth-basic-title/basic-title-view/index.js

@@ -0,0 +1,39 @@
+import { config } from "../../../../utils/config.js";
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 主题色
+    themeColor: {
+      type: String,
+      value: ""
+    },
+    // 标题
+    title: {
+      type: String,
+      value: ""
+    },
+    // 是否显示查看更多
+    isMore: {
+      type: Boolean,
+      value: true
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    // 图片资源路径/v1/file/path/wxapp/
+    resourceUrl: config.resourceUrl + "/images/icon_image"
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 查看更多
+    handleMore() {
+      this.triggerEvent("more");
+    }
+  }
+});

package/dist/components/common/auth-basic-title/basic-title-view/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

package/dist/components/common/auth-basic-title/basic-title-view/index.wxml

@@ -0,0 +1,5 @@
+<view class="basic-view">
+  <image class="basic-icon" src="{{ resourceUrl }}/rectangle2x_{{ themeColor }}.png" />
+  <text class="basic-title">{{ title }}</text>
+  <view class="basic-more" bind:tap="handleMore" wx:if="{{ isMore }}">查看更多</view>
+</view>

package/dist/components/common/auth-basic-title/basic-title-view/index.wxss

@@ -0,0 +1 @@
+.basic-view{display:flex;align-items:center;padding:12px 0}.basic-view .basic-icon{margin-right:8px;width:4px;height:15px}.basic-view .basic-more{margin-left:auto;color:#999;font-size:12px}.basic-view .basic-title{font-size:15px;font-weight:bold;color:#333}

package/dist/components/common/auth-popup/index.js

@@ -17,7 +17,7 @@ Component({
     // 是否显示标题
     titleShow: {
       type: Boolean,
-      value: false
+      value: true
     },
     // 高
     height: {
@@ -28,6 +28,10 @@ Component({
     backColor: {
       type: String,
       value: "#fff"
+    },
+    borderRadius: {
+      type: String,
+      value: "25px"
     }
   },
   /**
@@ -36,8 +40,7 @@ Component({
   data: {
     resourceUrl: config.resourceUrl + "/images",
     // 是否显示
-    closeModel: false,
-    titleShow: true
+    closeModel: false
   },
   /**
    * 组件的方法列表

package/dist/components/common/auth-popup/index.wxml

@@ -1,5 +1,5 @@
-<view class="auth-mask-box" wx:if="{{ show }}"></view>
-<view class="auth-mask-popup" wx:if="{{ show }}" style="height: {{ height }}; background-color: {{ backColor }};">
+<view class="auth-mask-box" wx:if="{{ show }}" bind:tap="closePopup"></view>
+<view class="auth-mask-popup" wx:if="{{ show }}" style="height: {{ height }}; background-color: {{ backColor }};border-top-left-radius: {{ borderRadius }};border-top-right-radius: {{ borderRadius }};width: 100%;">
   <view class="popup-title" titleShow="{{ titleShow }}">
     {{ title }}
     <image mode="widthFix" src="{{ resourceUrl + '/icon_image/close_circle2x.png' }}" class="close-icon" bind:tap="closePopup"></image>

package/dist/components/common/auth-popup/index.wxss

@@ -1 +1 @@
-.auth-mask-box{position:fixed;left:0;top:0;bottom:0;right:0;width:100%;background-color:rgba(0,0,0,.5);z-index:99999}.auth-mask-popup{position:fixed;bottom:0;left:0;border-top-left-radius:25px;border-top-right-radius:25px;padding:10px 4% 30px 4%;width:92%;z-index:99999}.auth-mask-popup .popup-title{color:#333;font-size:14px;padding:10px 0;font-weight:bold;display:flex;align-items:center;justify-content:space-between}.auth-mask-popup .popup-title .close-icon{width:20px}
+.auth-mask-box{position:fixed;left:0;top:0;bottom:0;right:0;width:100%;background-color:rgba(0,0,0,.5);z-index:99999}.auth-mask-popup{position:fixed;bottom:0;left:0;padding:10px 0 30px 0;width:92%;z-index:99999}.auth-mask-popup .popup-title{color:#333;font-size:14px;padding:10px 0;font-weight:bold;display:flex;align-items:center;justify-content:space-between}.auth-mask-popup .popup-title .close-icon{width:20px}

package/dist/components/jmash-login/index.js

@@ -28,10 +28,10 @@ Component({
       type: String,
       value: "/pages/home/index"
     },
-    //登录后调转是否是Tabbar
-    tabbar: {
-      type: Boolean,
-      value: true
+    // 登录后跳转方式 "redirectTo switchTab reLaunch navigateTo"
+    linkType: {
+      type: String,
+      value: ""
     },
     //遮罩层效果
     isShowModel: {
@@ -85,14 +85,22 @@ Component({
             });
             return;
           }
-          if (this.properties.tabbar) {
+          if (this.properties.linkType === "switchTab") {
             wx.switchTab({
               url: this.properties.backurl
             });
-          } else {
+          } else if (this.properties.linkType === "navigateTo") {
             wx.navigateTo({
               url: this.properties.backurl
             });
+          } else if (this.properties.linkType === "reLaunch") {
+            wx.reLaunch({
+              url: this.properties.backurl
+            });
+          } else {
+            wx.redirectTo({
+              url: this.properties.backurl
+            });
           }
         });
       } else {

package/dist/utils/common.d.ts

@@ -10,7 +10,7 @@ export declare const validateRules: (value: string, message: string, rules: any)
  * @param {string} value 需要校验的值
  * @param {string} message 错误提示信息
  */
-export declare const validateRequired: (value: string, message: string) => boolean;
+export declare const validateRequired: (value: string | number, message: string) => boolean;
 /**
  * 格式化日期时间字符串
  * @param dateTimeString 日期时间字符串

package/dist/utils/common.js

@@ -11,7 +11,8 @@ const validateRules = (value, message, rules) => {
 };
 const validateRequired = (value, message) => {
   console.log(value, message);
-  if (!value || value.trim() == "") {
+  const valueStr = typeof value === "number" ? String(value) : value;
+  if (!valueStr || valueStr.trim() == "") {
     wx.showToast({
       title: message,
       icon: "none",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-wechat-auth",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",