xyvcard-wechat-auth 0.0.32 → 0.0.34

package/README.md

@@ -1,15 +1,15 @@
-# 微信原生小程序模块
-
-## 编译使用
-1. pnpm install
-2. 工具->构建npm
-3. 详情->本地设置->将JS编译成ES5
-
-## 发布
-1. 修改package中的version
-2. pnpm build
-3. pnpm publish --no-git-checks
-官方
-npm config set registry https://registry.npmjs.org/
-公司镜像
+# 微信原生小程序模块
+
+## 编译使用
+1. pnpm install
+2. 工具->构建npm
+3. 详情->本地设置->将JS编译成ES5
+
+## 发布
+1. 修改package中的version
+2. pnpm build
+3. pnpm publish --no-git-checks
+官方
+npm config set registry https://registry.npmjs.org/
+公司镜像
 npm config set registry https://npm.crenjoy.com

package/dist/components/auth-user/jmash-update-user/index.json

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

package/dist/components/auth-user/jmash-update-user/index.wxml

@@ -1,35 +1,35 @@
-<!-- 我的页面 中个人信息编辑页面 -->
-<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="image-box-bgc" open-type="chooseAvatar" plain="true" bind:chooseavatar="onChooseAvatar">
-          <image class="profile-image" src="{{ resourceUrl + '/components/gray_head2x.png' }}" mode="" wx:if="{{ !userInfo.avatar }}" />
-          <image class="profile-image" src="{{ imageUrl + userInfo.avatar }}" mode="" wx:else />
-        </button>
-      </view>
-    </view>
-    <view class="main-nickname" wx:if="{{ isUserNickName }}">
-      <view class="nickname-left">昵称</view>
-      <view class="nickname-right">
-        <input value="{{ userInfo.nickName }}" type="nickname" bindinput="getNicknameValue" class="nickname-input" />
-      </view>
-    </view>
-    <view class="main-nickname" wx:if="{{ isUserRealName }}">
-      <view class="nickname-left">姓名</view>
-      <view class="nickname-right">
-        <input value="{{ userInfo.realName }}" type="realName" bindinput="setrealNameValue" class="nickname-input" />
-      </view>
-    </view>
-
-    <view class="main-phone" wx:if="{{ isUserMobilePhone }}">
-      <view class="phone-left">手机号</view>
-      <view class="phone-right">
-        <view>{{ userInfo.mobilePhone }}</view>
-        <button open-type="getPhoneNumber" class="phone-right-btn" bindgetphonenumber="getPhoneNumber" plain="true" wx:if="{{ isChangePhone }}">更换手机号</button>
-      </view>
-    </view>
-  </view>
-
+<!-- 我的页面 中个人信息编辑页面 -->
+<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="image-box-bgc" open-type="chooseAvatar" plain="true" bind:chooseavatar="onChooseAvatar">
+          <image class="profile-image" src="{{ resourceUrl + '/components/gray_head2x.png' }}" mode="" wx:if="{{ !userInfo.avatar }}" />
+          <image class="profile-image" src="{{ imageUrl + userInfo.avatar }}" mode="" wx:else />
+        </button>
+      </view>
+    </view>
+    <view class="main-nickname" wx:if="{{ isUserNickName }}">
+      <view class="nickname-left">昵称</view>
+      <view class="nickname-right">
+        <input value="{{ userInfo.nickName }}" type="nickname" bindinput="getNicknameValue" class="nickname-input" />
+      </view>
+    </view>
+    <view class="main-nickname" wx:if="{{ isUserRealName }}">
+      <view class="nickname-left">姓名</view>
+      <view class="nickname-right">
+        <input value="{{ userInfo.realName }}" type="realName" bindinput="setrealNameValue" class="nickname-input" />
+      </view>
+    </view>
+
+    <view class="main-phone" wx:if="{{ isUserMobilePhone }}">
+      <view class="phone-left">手机号</view>
+      <view class="phone-right">
+        <view>{{ userInfo.mobilePhone }}</view>
+        <button open-type="getPhoneNumber" class="phone-right-btn" bindgetphonenumber="getPhoneNumber" plain="true" wx:if="{{ isChangePhone }}">更换手机号</button>
+      </view>
+    </view>
+  </view>
+
 </view>

package/dist/components/auth-user/jmash-user/index.json

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

package/dist/components/auth-user/jmash-user/index.wxml

@@ -1,19 +1,19 @@
-<view class="auth-user-box">
-  <block wx:if="{{ token }}">
-    <view class="auth-user-l">
-      <image src="{{ BASE_URL + userInfo.avatar }}" class="avatar-img" wx:if="{{ userInfo.avatar }}"></image>
-      <image src="{{ resourceUrl }}/tswk.png" class="avatar-img" wx:else></image>
-      <view class="auth-user-r">
-        <view class="user-edit">{{ userInfo.realName }}
-          <image src="{{ resourceUrl }}/book/icon/user_edit_icon.png" class="edit_icon" bind:tap="handleUpdateUser"></image>
-        </view>
-        <text class="user-mobile">{{ userInfo.mobilePhoneIns }}</text>
-      </view>
-    </view>
-  </block>
-  <view class="auth-user-l" wx:else>
-    <image src="{{ resourceUrl }}/tswk.png" class="avatar-img"></image>
-    <text bind:tap="handleLogin">登录</text>
-  </view>
-  
+<view class="auth-user-box">
+  <block wx:if="{{ token }}">
+    <view class="auth-user-l">
+      <image src="{{ BASE_URL + userInfo.avatar }}" class="avatar-img" wx:if="{{ userInfo.avatar }}"></image>
+      <image src="{{ resourceUrl }}/tswk.png" class="avatar-img" wx:else></image>
+      <view class="auth-user-r">
+        <view class="user-edit">{{ userInfo.realName }}
+          <image src="{{ resourceUrl }}/book/icon/user_edit_icon.png" class="edit_icon" bind:tap="handleUpdateUser"></image>
+        </view>
+        <text class="user-mobile">{{ userInfo.mobilePhoneIns }}</text>
+      </view>
+    </view>
+  </block>
+  <view class="auth-user-l" wx:else>
+    <image src="{{ resourceUrl }}/tswk.png" class="avatar-img"></image>
+    <text bind:tap="handleLogin">登录</text>
+  </view>
+  
 </view>

package/dist/components/common/auth-avatar/avatar-edit/index.json

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

package/dist/components/common/auth-avatar/avatar-edit/index.wxml

@@ -1,8 +1,8 @@
-<!-- 创建卡片选择头像 样式组件 -->
-<!-- 头像背景盒子 -->
-<button plain class="auth-image-box-bgc" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
-  <!-- 显示的头像 -->
-  <image class="image-box-show" src="{{ avatar }}" mode="widthFix" />
-  <!-- 提示选择头像图片 -->
-  <image class="select-image" src="{{ resourceUrl + '/icon_image/camera2x.png' }}" mode="" />
+<!-- 创建卡片选择头像 样式组件 -->
+<!-- 头像背景盒子 -->
+<button plain class="auth-image-box-bgc" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+  <!-- 显示的头像 -->
+  <image class="image-box-show" src="{{ avatar }}" mode="widthFix" />
+  <!-- 提示选择头像图片 -->
+  <image class="select-image" src="{{ resourceUrl + '/icon_image/camera2x.png' }}" mode="" />
 </button>

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

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

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

@@ -1,5 +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 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-btn/double-btn/index.json

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

package/dist/components/common/auth-btn/double-btn/index.wxml

@@ -1,4 +1,4 @@
-<view class="auth-btn-box">
-  <button class="btn-left" style="background-color: {{ leftBgColor }}; color: {{ leftColor }}; border-radius: {{ btnRadius }}; border: {{ leftBorder }};" bind:tap="handleLeft">{{ leftText }}</button>
-  <button class="btn-right" style="background-color: {{ rightBgColor }}; color: {{ rightColor }}; border-radius: {{ btnRadius }}; border: {{ rightBorder }};" bind:tap="handleRight">{{ rightText }}</button>
+<view class="auth-btn-box">
+  <button class="btn-left" style="background: {{ leftBgColor }}; color: {{ leftColor }}; border-radius: {{ btnRadius }}; border: {{ leftBorder }};" bind:tap="handleLeft">{{ leftText }}</button>
+  <button class="btn-right" style="background: {{ rightBgColor }}; color: {{ rightColor }}; border-radius: {{ btnRadius }}; border: {{ rightBorder }};" bind:tap="handleRight">{{ rightText }}</button>
 </view>

package/dist/components/common/auth-btn/single-btn/index.json

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

package/dist/components/common/auth-btn/single-btn/index.wxml

@@ -1,6 +1,6 @@
-<button
-  bind:tap="onClick"
-  class="auth-btn"
-  style="{{ buttonStyle }}"
-  disabled="{{ disabled }}"
->{{ text }}</button>
+<button
+  bind:tap="onClick"
+  class="auth-btn"
+  style="{{ buttonStyle }}"
+  disabled="{{ disabled }}"
+>{{ text }}</button>

package/dist/components/common/auth-btn/three-btn/index.js

@@ -0,0 +1,101 @@
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 左侧的文本内容
+    leftText: {
+      type: String,
+      value: ""
+    },
+    // 右侧的文本内容
+    rightText: {
+      type: String,
+      value: ""
+    },
+    // 左侧按钮背景色
+    leftBgColor: {
+      type: String,
+      value: ""
+    },
+    // 右侧按钮背景色
+    rightBgColor: {
+      type: String,
+      value: "#2563EB"
+    },
+    // 左侧按钮字体颜色
+    leftColor: {
+      type: String,
+      value: ""
+    },
+    // 右侧按钮字体颜色
+    rightColor: {
+      type: String,
+      value: "#fff"
+    },
+    // 右侧按钮圆角
+    rightRadius: {
+      type: String,
+      value: ""
+    },
+    // 左侧按钮边框
+    leftBorder: {
+      type: String,
+      value: ""
+    },
+    // 右侧按钮边框
+    rightBorder: {
+      type: String,
+      value: ""
+    },
+    // 中间按钮文本内容
+    centerText: {
+      type: String,
+      value: ""
+    },
+    // 中间按钮背景色
+    centerBgColor: {
+      type: String,
+      value: ""
+    },
+    // 中间按钮字体颜色
+    centerColor: {
+      type: String,
+      value: ""
+    },
+    // 中间边框
+    centerBorder: {
+      type: String,
+      value: ""
+    },
+    // 中间按钮圆角
+    centerRadius: {
+      type: String,
+      value: ""
+    },
+    // 左侧按钮圆角
+    leftRadius: {
+      type: String,
+      value: ""
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {},
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    handleLeft() {
+      this.triggerEvent("leftbtn");
+    },
+    handleRight() {
+      this.triggerEvent("rightbtn");
+    },
+    // 中间按钮事件
+    handleCenter() {
+      this.triggerEvent("centerbtn");
+    }
+  }
+});

package/dist/components/common/auth-btn/three-btn/index.json

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

package/dist/components/common/auth-btn/three-btn/index.wxml

@@ -0,0 +1,5 @@
+<view class="auth-btn-box">
+  <button class="btn-left" style="background: {{ leftBgColor }}; color: {{ leftColor }}; border-radius: {{ leftRadius }}; border: {{ leftBorder }};" bind:tap="handleLeft">{{ leftText }}</button>
+  <button class="btn-left" style="background: {{ centerBgColor }}; color: {{ centerColor }}; border-radius: {{ centerRadius }}; border: {{ centerBorder }};" bind:tap="handleCenter">{{ centerText }}</button>
+  <button class="btn-right" style="background: {{ rightBgColor }}; color: {{ rightColor }}; border-radius: {{ rightRadius }}; border: {{ rightBorder }};" bind:tap="handleRight">{{ rightText }}</button>
+</view>

package/dist/components/common/auth-btn/three-btn/index.wxss

@@ -0,0 +1 @@
+.auth-btn-box{display:flex;align-items:center;justify-content:space-between;width:100%}.auth-btn-box .btn-left{width:28%;margin-right:3%;height:96rpx;font-size:32rpx;line-height:96rpx}.auth-btn-box .btn-right{height:96rpx;font-size:32rpx;width:44%;line-height:96rpx}

package/dist/components/common/auth-form/upload-image/index.d.ts

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

package/dist/components/common/auth-form/upload-image/index.js

@@ -0,0 +1,104 @@
+import { config } from "../../../../utils/config.js";
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 背景封面上传
+    coverUpload: {
+      type: String,
+      value: "/icon_image/border_plus.png"
+    },
+    // 限制上传数量
+    limit: {
+      type: Number,
+      value: 6
+    }
+  },
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    resourceUrl: config.resourceUrl,
+    baseUrl: config.baseUrl + "/v1/file/image/resize/160/160/",
+    imageArray: []
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    handleUploadImage() {
+      const that = this;
+      if (that.data.imageArray.length > that.data.limit - 1) {
+        wx.showToast({
+          title: "图片最多上传" + that.data.limit + "张",
+          icon: "none",
+          duration: 2e3
+        });
+        return;
+      }
+      wx.showActionSheet({
+        itemList: ["从相册中选择", "拍照"],
+        itemColor: "#486aff",
+        success: function(res) {
+          if (res.tapIndex === 0) {
+            that.chooseWxHeadImage("album");
+          } else if (res.tapIndex == 1) {
+            that.chooseWxHeadImage("camera");
+          }
+        }
+      });
+    },
+    chooseWxHeadImage(type) {
+      const that = this;
+      const token = wx.getStorageSync("token") ? "Bearer " + wx.getStorageSync("token") : "";
+      wx.chooseMedia({
+        count: that.data.limit,
+        sizeType: ["original", "compressed"],
+        sourceType: [type],
+        success: function(res) {
+          const tempFilePaths = res.tempFiles[0].tempFilePath;
+          wx.uploadFile({
+            url: config.baseUrl + "/v1/file/upload?tenant=" + config.tenant,
+            filePath: tempFilePaths,
+            header: {
+              "Content-Type": "multipart/form-data",
+              Authorization: token
+            },
+            formData: {
+              method: "POST"
+              //请求方式
+            },
+            name: "file",
+            success(response) {
+              if (response.statusCode === 200) {
+                const src = JSON.parse(response.data).fileSrc;
+                that.data.imageArray.push(src);
+                that.setData({
+                  imageArray: that.data.imageArray
+                });
+                console.log(that.data.imageArray);
+                that.triggerEvent("imageList", that.data.imageArray);
+              } else {
+                wx.showToast({
+                  title: "图片上传失败",
+                  icon: "none",
+                  duration: 2e3
+                });
+              }
+            }
+          });
+        }
+      });
+    },
+    // 删除图片
+    handleDel(e) {
+      var _a;
+      this.data.imageArray.splice((_a = e.currentTarget) == null ? void 0 : _a.dataset.index, 1);
+      this.setData({
+        imageArray: this.data.imageArray
+      });
+      this.triggerEvent("imageList", this.data.imageArray);
+    }
+  }
+});

package/dist/components/common/auth-form/upload-image/index.json

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

package/dist/components/common/auth-form/upload-image/index.wxml

@@ -0,0 +1,9 @@
+<view class="upload-box">
+  <view class="upload-image" wx:for="{{ imageArray }}" wx:key="index">
+    <image src="{{ baseUrl + item }}" class="plus-image"></image>
+    <image src="{{ resourceUrl }}/icon_image/close_circle2x.png" class="delete-image" data-index="{{ index }}" bind:tap="handleDel"></image>
+  </view>
+  <view class="upload-cover" bind:tap="handleUploadImage">
+    <image src="{{ resourceUrl + coverUpload }}" class="plus-image"></image>
+  </view>
+</view>

package/dist/components/common/auth-form/upload-image/index.wxss

@@ -0,0 +1 @@
+.upload-box{display:flex;align-items:center;flex-wrap:wrap}.upload-box .upload-image{margin:0 12rpx 30rpx 0;position:relative;width:calc(100% - 18px)/4;height:160rpx}.upload-box .upload-image .delete-image{width:40rpx;height:40rpx;position:absolute;right:-14rpx;top:-14rpx}.plus-image{width:160rpx;height:160rpx}

package/dist/components/common/auth-none-data/none-data-image/index.json

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

package/dist/components/common/auth-none-data/none-data-image/index.wxml

@@ -1,4 +1,4 @@
-<view class="auth-none-data" style="margin-top: {{ marginTop }}rpx; padding-top: {{ paddingTop }}rpx;">
-  <image class="holder-image" src="{{ resourceUrl + imgUrl }}" mode="heightFix" style="width: {{ imgWidth }};height: {{ imgHeight }};" />
-  <view class="holder-text" style="color: {{ contentColor }};">{{ content }}</view>
+<view class="auth-none-data" style="margin-top: {{ marginTop }}rpx; padding-top: {{ paddingTop }}rpx;">
+  <image class="holder-image" src="{{ resourceUrl + imgUrl }}" mode="heightFix" style="width: {{ imgWidth }};height: {{ imgHeight }};" />
+  <view class="holder-text" style="color: {{ contentColor }};">{{ content }}</view>
 </view>

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

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

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

@@ -1,8 +1,8 @@
-<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" wx:if="{{ titleShow }}">
-    {{ title }}
-    <image mode="aspectFit" src="{{ resourceUrl + '/icon_image/close_circle2x.png' }}" class="close-icon" bind:tap="closePopup"></image>
-  </view>
-  <slot></slot>
+<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" wx:if="{{ titleShow }}">
+    {{ title }}
+    <image mode="aspectFit" src="{{ resourceUrl + '/icon_image/close_circle2x.png' }}" class="close-icon" bind:tap="closePopup"></image>
+  </view>
+  <slot></slot>
 </view>

package/dist/components/common/auth-search/index.json

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

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

@@ -1,7 +1,7 @@
-<view class="auth-search-box" style="{{ searchStyle }}">
-  <icon type="search" color="{{ iconColor }}" size="18" class="search-icon"></icon>
-  <input class="search-input" placeholder-style="color: {{ color }};" style="color: {{ color }}; background-color: {{ backColor }}; width: {{ isSearchBtn ? '60%' : '100%' }}; {{ isSearchBtn ? '' : 'padding-right: 20px' }}" focus="{{ focus }}" placeholder="{{ placeholder }}" disabled="{{ disabled }}" value="{{ likeName }}" bindinput="handleInput" bind:tap="handleTap" />
-  <view class="search-btn" wx:if="{{ isSearchBtn }}">
-    <slot></slot>
-  </view>
+<view class="auth-search-box" style="{{ searchStyle }}">
+  <icon type="search" color="{{ iconColor }}" size="18" class="search-icon"></icon>
+  <input class="search-input" placeholder-style="color: {{ color }};" style="color: {{ color }}; background-color: {{ backColor }}; width: {{ isSearchBtn ? '60%' : '100%' }}; {{ isSearchBtn ? '' : 'padding-right: 20px' }}" focus="{{ focus }}" placeholder="{{ placeholder }}" disabled="{{ disabled }}" value="{{ likeName }}" bindinput="handleInput" bind:tap="handleTap" />
+  <view class="search-btn" wx:if="{{ isSearchBtn }}">
+    <slot></slot>
+  </view>
 </view>

package/dist/components/common/auth-top-navigation/index.js

@@ -15,7 +15,7 @@ Component({
       type: String,
       value: ""
     },
-    // 左侧icon图标 跳转到查看消息页面
+    // 是否显示左侧按钮
     isLeftIcon: {
       type: Boolean,
       value: true

package/dist/components/common/auth-top-navigation/index.json

@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "@vant/weapp/icon/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index"
+  }
 }

package/dist/components/common/auth-top-navigation/index.wxml

@@ -1,6 +1,6 @@
-<view class="auth-top" style="background-color: {{ style.color }};">
-  <view class="auth-top-navigation" style="padding-top: {{ style.paddingTop }}px; height: {{ style.height }}px;color: {{ titleColor }}">
-    <van-icon name="arrow-left" size="22px" wx:if="{{ isLeftIcon }}" color="{{ titleColor }}" bind:tap="handleBack" />
-    <text class="title">{{ title }}</text>
-  </view>
+<view class="auth-top" style="background: {{ style.color }};">
+  <view class="auth-top-navigation" style="padding-top: {{ style.paddingTop }}px; height: {{ style.height }}px;color: {{ titleColor }}">
+    <van-icon name="arrow-left" size="22px" wx:if="{{ isLeftIcon }}" color="{{ titleColor }}" bind:tap="handleBack" />
+    <text class="title">{{ title }}</text>
+  </view>
 </view>

package/dist/components/jmash-half-login/index.json

@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "@vant/weapp/popup/index",
-    "van-checkbox": "@vant/weapp/checkbox/index",
-    "van-checkbox-group": "@vant/weapp/checkbox-group/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index"
+  }
 }

package/dist/components/jmash-half-login/index.wxml

@@ -1,46 +1,46 @@
-<!--components/jmash-half-login/index.wxml-->
-<!-- 授权登录 -->
-<van-popup z-index="999999" show="{{ isShow }}" close-on-click-overlay="{{ false }}" round position="bottom" custom-style="height: 830rpx;" bind:close="onClose" custom-class="vcard-login-popup">
-
-<view class="custom-title">
-  <view class="title-left">
-    <view class="left-title">授权登录</view>
-    <view class="left-logo">
-      <image class="logo-image" src="{{ resourceUrl + '/logo/logo.png' }}" mode="" />
-      <view class="logo-text">{{ config.name }}·申请使用</view>
-    </view>
-  </view>
-  <view class="title-right" bind:tap="onClose">
-    <image class="title-image" src="{{ resourceUrl + '/icon_image/close_circle2x.png' }}" mode="widthFix" />
-  </view>
-</view>
-
-<view class="custom-main">
-  <view class="main-msg">
-    <view class="msg-itme">
-      <view class="item-title">头像</view>
-      <button plain class="item-btn" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
-        <image class="item-image" src="{{ avatar }}" mode="widthFix" />
-      </button>
-    </view>
-    <view class="msg-itme">
-      <view class="item-title">姓名</view>
-      <input bind:change="bindKeyInput" value="{{ nameValue }}" class="item-input" type="nickname" placeholder="请输入姓名" />
-    </view>
-  </view>
-
-  <view class="main-check-agreement">
-    <van-checkbox label-class="main-check-agreement-text" value="{{ isCheckBox }}" icon-size="14px" shape="square" bind:change="onChange">
-      <!-- 已阅读《用户使用协议》《隐私权政策》 -->
-      已阅读
-      <text id="0" catch:tap="goInfo">《用户使用协议》</text> <text id="1" catch:tap="goInfo">《隐私权政策》</text>
-    </van-checkbox>
-  </view>
-
-  <!-- 未勾选用户协议 -->
-  <button wx:if="{{ !isValidate }}" plain class="main-login-btn" bind:tap="onLogin">授权登录</button>
-  <!-- 已勾选用户协议 -->
-  <button wx:else plain class="main-login-btn" open-type="getPhoneNumber" bind:getphonenumber="wxPhoneLogin">授权登录</button>
-  <view class="main-login-cencl" bind:tap="onClose">取消</view>
-</view>
+<!--components/jmash-half-login/index.wxml-->
+<!-- 授权登录 -->
+<van-popup z-index="999999" show="{{ isShow }}" close-on-click-overlay="{{ false }}" round position="bottom" custom-style="height: 830rpx;" bind:close="onClose" custom-class="vcard-login-popup">
+
+<view class="custom-title">
+  <view class="title-left">
+    <view class="left-title">授权登录</view>
+    <view class="left-logo">
+      <image class="logo-image" src="{{ resourceUrl + '/logo/logo.png' }}" mode="" />
+      <view class="logo-text">{{ config.name }}·申请使用</view>
+    </view>
+  </view>
+  <view class="title-right" bind:tap="onClose">
+    <image class="title-image" src="{{ resourceUrl + '/icon_image/close_circle2x.png' }}" mode="widthFix" />
+  </view>
+</view>
+
+<view class="custom-main">
+  <view class="main-msg">
+    <view class="msg-itme">
+      <view class="item-title">头像</view>
+      <button plain class="item-btn" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+        <image class="item-image" src="{{ avatar }}" mode="widthFix" />
+      </button>
+    </view>
+    <view class="msg-itme">
+      <view class="item-title">姓名</view>
+      <input bind:change="bindKeyInput" value="{{ nameValue }}" class="item-input" type="nickname" placeholder="请输入姓名" />
+    </view>
+  </view>
+
+  <view class="main-check-agreement">
+    <van-checkbox label-class="main-check-agreement-text" value="{{ isCheckBox }}" icon-size="14px" shape="square" bind:change="onChange">
+      <!-- 已阅读《用户使用协议》《隐私权政策》 -->
+      已阅读
+      <text id="0" catch:tap="goInfo">《用户使用协议》</text> <text id="1" catch:tap="goInfo">《隐私权政策》</text>
+    </van-checkbox>
+  </view>
+
+  <!-- 未勾选用户协议 -->
+  <button wx:if="{{ !isValidate }}" plain class="main-login-btn" bind:tap="onLogin">授权登录</button>
+  <!-- 已勾选用户协议 -->
+  <button wx:else plain class="main-login-btn" open-type="getPhoneNumber" bind:getphonenumber="wxPhoneLogin">授权登录</button>
+  <view class="main-login-cencl" bind:tap="onClose">取消</view>
+</view>
 </van-popup>

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

@@ -89,10 +89,10 @@ Component({
             wx.switchTab({ url: backurl });
           } else if (this.properties.linkType === "navigateTo") {
             wx.navigateTo({ url: backurl });
-          } else if (this.properties.linkType === "reLaunch") {
-            wx.reLaunch({ url: backurl });
-          } else {
+          } else if (this.properties.linkType === "redirectTo") {
             wx.redirectTo({ url: backurl });
+          } else {
+            wx.reLaunch({ url: backurl });
           }
         });
       } else {

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

@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "auth-single-btn": "../common/auth-btn/single-btn/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "auth-single-btn": "../common/auth-btn/single-btn/index"
+  }
 }

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

@@ -1,12 +1,12 @@
-<slot name="before"></slot>
-<view class="login_box">
-  <button open-type="getPhoneNumber" style="{{ loginStyle }}" bindgetphonenumber="wxPhoneLogin" wx:if="{{ agreeStatus }}">手机号授权登录</button>
-  <button bind:tap="wxPhoneLogin" style="{{ loginStyle }}" wx:else>手机号授权登录</button>
-  <radio-group bindchange="agreeChange" class="protocol_agree">
-    <label>
-      <radio value="{{ agreeStatus }}" checked="{{ agreeStatus }}" color="{{ checkedColor }}" />
-      已阅读<text id="0" style="{{ agreementStyle }}" catch:tap="goInfo">《用户使用协议》</text> <text id="1" style="{{ agreementStyle }}" catch:tap="goInfo">《隐私权政策》</text>
-    </label>
-  </radio-group>
-  <slot name="after"></slot>
+<slot name="before"></slot>
+<view class="login_box">
+  <button open-type="getPhoneNumber" style="{{ loginStyle }}" bindgetphonenumber="wxPhoneLogin" wx:if="{{ agreeStatus }}">手机号授权登录</button>
+  <button bind:tap="wxPhoneLogin" style="{{ loginStyle }}" wx:else>手机号授权登录</button>
+  <radio-group bindchange="agreeChange" class="protocol_agree">
+    <label>
+      <radio value="{{ agreeStatus }}" checked="{{ agreeStatus }}" color="{{ checkedColor }}" />
+      已阅读<text id="0" style="{{ agreementStyle }}" catch:tap="goInfo">《用户使用协议》</text> <text id="1" style="{{ agreementStyle }}" catch:tap="goInfo">《隐私权政策》</text>
+    </label>
+  </radio-group>
+  <slot name="after"></slot>
 </view>

package/dist/styles/index.scss

@@ -1,27 +1,27 @@
-// 圆角
-$border-radius: 20rpx;
-$border-mini-radius: 10rpx;
-$border-max-radius: 50rpx;
-// 字体大小
-$font-size: 28rpx;
-$font-size-mini: 24rpx;
-// 颜色
-$white-color: #fff;
-$red-color: #EF4444;
-$green-color: #16A34A;
-$blue-color: #2563EB;
-$black-color: #000;
-// 字体颜色
-$font-color: #333;
-$font-color-grey: #666;
-$font-color-grey-opacity: #999;
-// 宽
-$width: 100%;
-// 层级
-$z-index: 99999;
-// 下拉线颜色
-$border-line: #EBEBEB;
-// 背景色
-$background-color: #f6f6f6;
-// 白色背景
+// 圆角
+$border-radius: 20rpx;
+$border-mini-radius: 10rpx;
+$border-max-radius: 50rpx;
+// 字体大小
+$font-size: 28rpx;
+$font-size-mini: 24rpx;
+// 颜色
+$white-color: #fff;
+$red-color: #EF4444;
+$green-color: #16A34A;
+$blue-color: #2563EB;
+$black-color: #000;
+// 字体颜色
+$font-color: #333;
+$font-color-grey: #666;
+$font-color-grey-opacity: #999;
+// 宽
+$width: 100%;
+// 层级
+$z-index: 99999;
+// 下拉线颜色
+$border-line: #EBEBEB;
+// 背景色
+$background-color: #f6f6f6;
+// 白色背景
 $background-white-color: #fff;

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "xyvcard-wechat-auth",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "miniprogram": "dist",
+  "scripts": {
+    "build": "build"
+  },
   "keywords": [],
   "author": "",
   "license": "",
@@ -15,8 +18,5 @@
   "devDependencies": {
     "xyvcard-wechat-build": "^0.0.2",
     "typescript": "^5.8.3"
-  },
-  "scripts": {
-    "build": "build"
   }
-}
+}