jmash-core-mp 0.1.15 → 0.1.17

package/lib/utils/request.js

@@ -103,8 +103,8 @@ mpx.xfetch.interceptors.response.use(function (res) {
         }
         return Promise.reject(res);
     }
-    // 也可以返回promise
-    return res;
+    // 返回promise,通过catch ,处理 code,message.
+    return Promise.reject(res);
 });
 //刷新Token
 function refreshToken(refreshToken) {

package/package.json

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

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

@@ -1,356 +1,359 @@
-<template>
-  <view class="auth-user-box">
-    <block wx:if="{{ isLogin }}">
-      <view class="auth-user-l">
-        <!-- 头像 -->
-        <view class="avatar-wrapper">
-          <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" bind:tap="handleUpdateUser">
-          <view class="user-edit">
-            <text class="user-name" style="color: {{ userNameColor }}">{{ userInfo.realName || '微信用户' }}</text>
-            <view class="edit-icon-bg">
-              <text class="edit-icon">✎</text>
-            </view>
-          </view>
-          <text class="user-mobile" style="color: {{ userMobileColor }}">{{ userInfo.mobilePhoneIns || '未绑定手机号'
-          }}</text>
-        </view>
-
-        <!-- 右侧箭头 -->
-        <view class="right-arrow" bind:tap="handleUpdateUser">
-          <text class="arrow-icon">›</text>
-        </view>
-      </view>
-    </block>
-
-    <!-- 未登录状态 -->
-    <view class="auth-user-l not-logged-in" wx:else>
-      <view class="not-logged-wrapper">
-        <view class="avatar-wrapper" bind:tap="handleLogin">
-          <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" mode="aspectFill"></image>
-          <view class="avatar-plus">
-            <text class="plus-icon">+</text>
-          </view>
-        </view>
-        <view class="auth-user-r">
-          <text class="login-hint-text">登录后解锁更多功能</text>
-          <view class="login-btn" bind:tap="handleLogin">
-            <text class="login-text">立即登录</text>
-            <text class="login-arrow">›</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script lang="ts">
-import mpx, { createComponent, ref, onShow, computed } from '@mpxjs/core'
-import { useUserStore } from '../../store/user'
-import { UserInfo } from "../../api/auth/types";
-
-createComponent({
-  properties: {
-    defaultAvatar: {
-      type: String,
-      value: ''
-    },
-    backurl: {
-      type: String,
-      value: '/pages/home'
-    },
-    tabbar: {
-      type: String,
-      value: 'false'
-    },
-    userNameColor: {
-      type: String,
-      value: '#111111'
-    },
-    userMobileColor: {
-      type: String,
-      value: '#999999'
-    }
-  },
-  setup(props, context) {
-    let config = getApp().globalData.config;
-    let resourceUrl = ref(config.resourceUrl);
-    let baseUrl = ref(config.baseUrl);
-    let userInfo = ref({} as UserInfo);
-    let userStore = useUserStore();
-    let refreshFunc = () => {
-      // 检查登录是否有效？
-      if (userStore.checkLogin()) {
-        userStore.getUserInfo().then((resp) => {
-          userInfo.value = resp;
-        });
-      }
-    };
-    onShow(refreshFunc);
-    //console.log(resourceUrl);
-    const isLogin = computed(() => userStore.accessToken !== '');
-    return { resourceUrl, baseUrl, userInfo, userStore, refreshFunc, isLogin };
-  },
-  methods: {
-    handleLogin() {
-      console.log("handleLogin");
-      //检查登录并跳转登录
-      this.userStore.loginOnlyAC().then(() => {
-        //登录成功，加载业务
-        console.log("静默登录成功");
-        this.refreshFunc();
-      }).catch(() => {
-        console.log("登录失败1！", this.backurl);
-        mpx.navigateTo({
-          url: '/jmash/pages/auth/login' + "?backurl=" + encodeURIComponent(this.backurl) + "&tabbar=" + this.tabbar
-        })
-      });
-    },
-    handleUpdateUser() {
-      mpx.navigateTo({
-        url: '/jmash/pages/auth/update-user'
-      })
-    },
-  }
-
-})
-</script>
-
-<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: 32rpx 24rpx;
-  // background: linear-gradient(135deg, #ffffff 0%, #fafafa 100%);
-  border-radius: 20rpx;
-  margin: 16rpx 16rpx 24rpx;
-  // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
-  transition: all 0.3s;
-  background: transparent;
-
-  &:active {
-    transform: translateY(1rpx);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .auth-user-l {
-    display: flex;
-    align-items: center;
-    flex: 1;
-    width: 100%;
-
-    .avatar-wrapper {
-      position: relative;
-      margin-right: 20rpx;
-      flex-shrink: 0;
-      cursor: pointer;
-
-      .avatar-img {
-        width: 130rpx;
-        height: 130rpx;
-        border-radius: 50%;
-        background-color: $bg-page;
-        display: block;
-        transition: all 0.3s;
-        border: 3rpx solid rgba(7, 193, 96, 0.1);
-        box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.1);
-
-        &:active {
-          transform: scale(1.05);
-        }
-
-        &.not-logged {
-          opacity: 0.4;
-          filter: grayscale(100%);
-          box-shadow: none;
-        }
-      }
-
-      .avatar-badge {
-        position: absolute;
-        right: -2rpx;
-        bottom: -2rpx;
-        width: 36rpx;
-        height: 36rpx;
-        background: $primary;
-        border-radius: 50%;
-        border: 2rpx solid $bg-card;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0 2rpx 6rpx rgba(7, 193, 96, 0.3);
-
-        .badge-icon {
-          font-size: 16rpx;
-          color: #fff;
-        }
-      }
-    }
-  }
-
-  .auth-user-r {
-    flex: 1;
-    min-width: 0;
-
-    .user-edit {
-      display: flex;
-      align-items: center;
-      margin-bottom: 10rpx;
-      cursor: pointer;
-
-      .user-name {
-        font-size: 32rpx;
-        font-weight: 600;
-        color: $text-1;
-        line-height: 1.2;
-      }
-
-      .edit-icon-bg {
-        width: 32rpx;
-        height: 32rpx;
-        background: rgba(7, 193, 96, 0.1);
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-left: 8rpx;
-
-        .edit-icon {
-          font-size: 14rpx;
-          color: $primary;
-        }
-      }
-    }
-
-    .user-mobile {
-      font-size: 24rpx;
-      color: $text-3;
-      line-height: 1.4;
-    }
-  }
-
-  .right-arrow {
-    flex-shrink: 0;
-    width: 32rpx;
-    height: 32rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .arrow-icon {
-      font-size: 28rpx;
-      color: $text-3;
-      font-weight: 300;
-      line-height: 1;
-    }
-  }
-
-  // 未登录状态
-  .not-logged-in {
-    .not-logged-wrapper {
-      display: flex;
-      align-items: center;
-      width: 100%;
-    }
-
-    .avatar-wrapper {
-      .avatar-plus {
-        position: absolute;
-        right: -4rpx;
-        bottom: -4rpx;
-        width: 40rpx;
-        height: 40rpx;
-        background: $primary;
-        border-radius: 50%;
-        border: 3rpx solid $bg-card;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.3);
-
-        .plus-icon {
-          font-size: 36rpx;
-          color: #fff;
-          line-height: 1;
-          font-weight: 300;
-        }
-      }
-    }
-
-    .auth-user-r {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-width: 0;
-      margin-left: 8rpx;
-
-      .login-hint-text {
-        font-size: 24rpx;
-        color: $text-3;
-        margin-bottom: 12rpx;
-        line-height: 1.4;
-      }
-
-      .login-btn {
-        display: inline-flex;
-        align-items: center;
-        padding: 12rpx 24rpx;
-        background: linear-gradient(135deg, #07c160 0%, #05a050 100%);
-        border-radius: 40rpx;
-        cursor: pointer;
-        box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.25);
-        transition: all 0.3s;
-        width: fit-content;
-
-        &:active {
-          transform: scale(0.98);
-          box-shadow: 0 2rpx 6rpx rgba(7, 193, 96, 0.2);
-        }
-
-        .login-text {
-          font-size: 26rpx;
-          font-weight: 600;
-          color: #fff;
-        }
-
-        .login-arrow {
-          font-size: 30rpx;
-          color: #fff;
-          margin-left: 4rpx;
-          line-height: 1;
-          font-weight: 300;
-        }
-      }
-    }
-  }
-}
-</style>
-
-<script type="application/json">
-{
-  "component": true,
-  "usingComponents": {}
-}
-</script>
+<template>
+  <view class="auth-user-box">
+    <block wx:if="{{ isLogin }}">
+      <view class="auth-user-l" bind:tap="handleUpdateUser">
+        <!-- 头像 -->
+        <view class="avatar-wrapper">
+          <image src="{{ baseUrl+'/v1/file/image/clip/200/200/' + userInfo.avatar }}" class="avatar-img"
+            wx:if="{{ userInfo.avatar }}" mode="aspectFill"></image>
+          <image src="{{ 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" bind:tap="handleUpdateUser">
+          <view class="user-edit">
+            <text class="user-name" style="color: {{ userNameColor }}">{{ userInfo.realName || '微信用户' }}</text>
+            <view class="edit-icon-bg">
+              <text class="edit-icon">✎</text>
+            </view>
+          </view>
+          <text class="user-mobile" style="color: {{ userMobileColor }}">{{ userInfo.mobilePhoneIns || '未绑定手机号'
+          }}</text>
+        </view>
+
+        <!-- 右侧箭头 -->
+        <!-- <view class="right-arrow" bind:tap="handleUpdateUser">
+          <text class="arrow-icon">›</text>
+        </view> -->
+      </view>
+    </block>
+
+    <!-- 未登录状态 -->
+    <view class="auth-user-l not-logged-in" wx:else>
+      <view class="not-logged-wrapper">
+        <view class="avatar-wrapper" bind:tap="handleLogin">
+          <!--  <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" mode="aspectFill"></image> -->
+          <image src="{{ defaultAvatar }}" class="avatar-img not-logged" wx:if="{{ defaultAvatar }}" mode="aspectFill">
+          </image>
+          <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" wx:else mode="aspectFill">
+          </image>
+          <view class="avatar-plus">
+            <text class="plus-icon">+</text>
+          </view>
+        </view>
+        <view class="auth-user-r">
+          <text class="login-hint-text">登录后解锁更多功能</text>
+          <view class="login-btn" bind:tap="handleLogin">
+            <text class="login-text">立即登录</text>
+            <text class="login-arrow">›</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts">
+import mpx, { createComponent, ref, onShow, computed } from '@mpxjs/core'
+import { useUserStore } from '../../store/user'
+import { UserInfo } from "../../api/auth/types";
+
+createComponent({
+  properties: {
+    defaultAvatar: {
+      type: String,
+      value: ''
+    },
+    backurl: {
+      type: String,
+      value: '/pages/home'
+    },
+    tabbar: {
+      type: String,
+      value: 'false'
+    },
+    userNameColor: {
+      type: String,
+      value: '#111111'
+    },
+    userMobileColor: {
+      type: String,
+      value: '#999999'
+    }
+  },
+  setup(props, context) {
+    let config = getApp().globalData.config;
+    let resourceUrl = ref(config.resourceUrl);
+    let baseUrl = ref(config.baseUrl);
+    let userInfo = ref({} as UserInfo);
+    let userStore = useUserStore();
+    let refreshFunc = () => {
+      // 检查登录是否有效？
+      if (userStore.checkLogin()) {
+        userStore.getUserInfo().then((resp) => {
+          userInfo.value = resp;
+        });
+      }
+    };
+    onShow(refreshFunc);
+    //console.log(resourceUrl);
+    const isLogin = computed(() => userStore.accessToken !== '');
+    return { resourceUrl, baseUrl, userInfo, userStore, refreshFunc, isLogin };
+  },
+  methods: {
+    handleLogin() {
+      console.log("handleLogin");
+      //检查登录并跳转登录
+      this.userStore.loginOnlyAC().then(() => {
+        //登录成功，加载业务
+        console.log("静默登录成功");
+        this.refreshFunc();
+      }).catch(() => {
+        console.log("登录失败1！", this.backurl);
+        mpx.navigateTo({
+          url: '/jmash/pages/auth/login' + "?backurl=" + encodeURIComponent(this.backurl) + "&tabbar=" + this.tabbar
+        })
+      });
+    },
+    handleUpdateUser() {
+      mpx.navigateTo({
+        url: '/jmash/pages/auth/update-user'
+      })
+    },
+  }
+
+})
+</script>
+
+<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: 32rpx 24rpx 32rpx 0;
+  // background: linear-gradient(135deg, #ffffff 0%, #fafafa 100%);
+  border-radius: 20rpx;
+  margin: 16rpx 16rpx 24rpx 0;
+  // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+  transition: all 0.3s;
+  background: transparent;
+
+  &:active {
+    transform: translateY(1rpx);
+    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
+  }
+
+  .auth-user-l {
+    display: flex;
+    align-items: center;
+    flex: 1;
+    width: 100%;
+
+    .avatar-wrapper {
+      position: relative;
+      margin-right: 30rpx;
+      flex-shrink: 0;
+      cursor: pointer;
+
+      .avatar-img {
+        width: 130rpx;
+        height: 130rpx;
+        border-radius: 50%;
+        // background-color: $bg-page;
+        display: block;
+        transition: all 0.3s;
+        // border: 3rpx solid rgba(7, 193, 96, 0.1);
+        // box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.1);
+
+        &:active {
+          transform: scale(1.05);
+        }
+
+        &.not-logged {
+          opacity: 0.4;
+          filter: grayscale(100%);
+          box-shadow: none;
+        }
+      }
+
+      .avatar-badge {
+        position: absolute;
+        right: -2rpx;
+        bottom: -2rpx;
+        width: 36rpx;
+        height: 36rpx;
+        background: $primary;
+        border-radius: 50%;
+        border: 2rpx solid $bg-card;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        box-shadow: 0 2rpx 6rpx rgba(7, 193, 96, 0.3);
+
+        .badge-icon {
+          font-size: 16rpx;
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  .auth-user-r {
+    flex: 1;
+    min-width: 0;
+
+    .user-edit {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10rpx;
+      cursor: pointer;
+
+      .user-name {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: $text-1;
+        line-height: 1.2;
+      }
+
+      .edit-icon-bg {
+        width: 36rpx;
+        height: 36rpx;
+        background: $primary;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-left: 8rpx;
+
+        .edit-icon {
+          font-size: 16rpx;
+          color: #fff;
+        }
+      }
+    }
+
+    .user-mobile {
+      font-size: 24rpx;
+      color: $text-3;
+      line-height: 1.4;
+    }
+  }
+
+  .right-arrow {
+    flex-shrink: 0;
+    width: 32rpx;
+    height: 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .arrow-icon {
+      font-size: 66rpx;
+      color: $text-3;
+      font-weight: 300;
+      line-height: 1;
+    }
+  }
+
+  // 未登录状态
+  .not-logged-in {
+    .not-logged-wrapper {
+      display: flex;
+      align-items: center;
+      width: 100%;
+    }
+
+    .avatar-wrapper {
+      .avatar-plus {
+        position: absolute;
+        right: -4rpx;
+        bottom: -4rpx;
+        width: 40rpx;
+        height: 40rpx;
+        background: $primary;
+        border-radius: 50%;
+        border: 3rpx solid $bg-card;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.3);
+
+        .plus-icon {
+          font-size: 36rpx;
+          color: #fff;
+          line-height: 1;
+          font-weight: 300;
+        }
+      }
+    }
+
+    .auth-user-r {
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      min-width: 0;
+      margin-left: 8rpx;
+
+      .login-hint-text {
+        font-size: 24rpx;
+        color: $text-3;
+        margin-bottom: 12rpx;
+        line-height: 1.4;
+      }
+
+      .login-btn {
+        display: inline-flex;
+        align-items: center;
+        padding: 12rpx 24rpx;
+        background: linear-gradient(135deg, #07c160 0%, #05a050 100%);
+        border-radius: 40rpx;
+        cursor: pointer;
+        box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.25);
+        transition: all 0.3s;
+        width: fit-content;
+
+        &:active {
+          transform: scale(0.98);
+          box-shadow: 0 2rpx 6rpx rgba(7, 193, 96, 0.2);
+        }
+
+        .login-text {
+          font-size: 26rpx;
+          font-weight: 600;
+          color: #fff;
+        }
+
+        .login-arrow {
+          font-size: 30rpx;
+          color: #fff;
+          margin-left: 4rpx;
+          line-height: 1;
+          font-weight: 300;
+        }
+      }
+    }
+  }
+}
+</style>
+
+<script type="application/json">
+{
+  "component": true,
+  "usingComponents": {}
+}
+</script>

package/src/components/common/jmash-none-data.mpx

@@ -1,77 +1,82 @@
-<template>
-  <view class="auth-none-data" style="margin-top: {{ marginTop }}rpx; padding-top: {{ paddingTop }}rpx;">
-    <image src="{{ resourceUrl + imgUrl }}" mode="heightFix" style="width: {{ imgWidth }};height: {{ imgHeight }};" />
-    <view class="holder-text" style="color: {{ contentColor }};">{{ content }}</view>
-  </view>
-</template>
-<script lang="ts">
-import { createComponent } from "@mpxjs/core"
-import { config } from "../../utils/config";
-
-createComponent({
-  properties: {
-    // 上外边距
-    marginTop: {
-      type: Number,
-      value: 300
-    },
-    // 上内边距
-    paddingTop: {
-      type: Number,
-      value: 0
-    },
-    // 文本内容
-    content: {
-      type: String,
-      value: "暂无数据"
-    },
-    // 图片的宽
-    imgWidth: {
-      type: String,
-      value: "auto"
-    },
-    // 图片的高
-    imgHeight: {
-      type: String,
-      value: "125px"
-    },
-    // 图片的路径
-    imgUrl: {
-      type: String,
-      value: "/components/contacts_nomore2x.png"
-    },
-    contentColor: {
-      type: String,
-      value: "#b6b6b6"
-    }
-  },
-  setup() {
-    let resourceUrl = config.resourceUrl + "/images/"
-
-    return {
-      resourceUrl
-    }
-  }
-})
-</script>
-
-<style lang="scss">
-@use "../../styles/index.scss" as *;
-
-.auth-none-data {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-
-  .holder-text {
-    font-size: $font-size;
-  }
-}
-</style>
-
-<script type="application/json">
-  {
-    "component": true
-  }
-</script>
+<template>
+  <view class="auth-none-data" style="margin-top: {{ marginTop }}rpx; padding-top: {{ paddingTop }}rpx;">
+    <image src="{{ resourceUrl + imgUrl }}" mode="heightFix" style="width: {{ imgWidth }};height: {{ imgHeight }};" />
+    <view class="holder-text" style="color: {{ contentColor }};margin-top: {{ imgTextGap }}rpx;">{{ content }}</view>
+  </view>
+</template>
+<script lang="ts">
+import { createComponent } from "@mpxjs/core"
+import { config } from "../../utils/config";
+
+createComponent({
+  properties: {
+        // 图片与文本之间的间距
+    imgTextGap: {
+      type: Number,
+      value: 0
+    },
+    // 上外边距
+    marginTop: {
+      type: Number,
+      value: 300
+    },
+    // 上内边距
+    paddingTop: {
+      type: Number,
+      value: 0
+    },
+    // 文本内容
+    content: {
+      type: String,
+      value: "暂无数据"
+    },
+    // 图片的宽
+    imgWidth: {
+      type: String,
+      value: "auto"
+    },
+    // 图片的高
+    imgHeight: {
+      type: String,
+      value: "125px"
+    },
+    // 图片的路径
+    imgUrl: {
+      type: String,
+      value: "/components/contacts_nomore2x.png"
+    },
+    contentColor: {
+      type: String,
+      value: "#b6b6b6"
+    }
+  },
+  setup() {
+    let resourceUrl = config.resourceUrl + "/images/"
+
+    return {
+      resourceUrl
+    }
+  }
+})
+</script>
+
+<style lang="scss">
+@use "../../styles/index.scss" as *;
+
+.auth-none-data {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+
+  .holder-text {
+    font-size: $font-size;
+  }
+}
+</style>
+
+<script type="application/json">
+  {
+    "component": true
+  }
+</script>

package/src/pages/index.mpx

@@ -1,44 +1,44 @@
-<template>
-  <view class="page-body">
-    <button type="default" bind:tap="toHomePage">Welcome to Jmash Core MP</button>
-  </view>
-</template>
-
-<script>
-import mpx, { createPage } from '@mpxjs/core'
-
-createPage({
-  setup(props, context) {
-    return {};
-  },
-  methods: {
-    toHomePage() {
-      mpx.switchTab({
-        url: '/pages/tabbar/home'
-      })
-    },
-  }
-})
-</script>
-
-<style lang="scss">
-.page-body {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 40rpx;
-  gap: 30rpx;
-
-  button {
-    width: 80%;
-    height: 80rpx;
-    font-size: 32rpx;
-  }
-}
-</style>
-
-<script type="application/json">
-{
-  "usingComponents": {}
-}
-</script>
+<template>
+  <view class="page-body">
+    <button type="default" bind:tap="toHomePage">Welcome to Jmash Core MP</button>
+  </view>
+</template>
+
+<script>
+import mpx, { createPage } from '@mpxjs/core'
+
+createPage({
+  setup(props, context) {
+    return {};
+  },
+  methods: {
+    toHomePage() {
+      mpx.switchTab({
+        url: '/pages/tabbar/home'
+      })
+    },
+  }
+})
+</script>
+
+<style lang="scss">
+.page-body {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 40rpx;
+  gap: 30rpx;
+
+  button {
+    width: 80%;
+    height: 80rpx;
+    font-size: 32rpx;
+  }
+}
+</style>
+
+<script type="application/json">
+{
+  "usingComponents": {}
+}
+</script>

package/src/utils/request.ts

@@ -113,8 +113,8 @@ mpx.xfetch.interceptors.response.use(function (res) {
     }
     return Promise.reject(res);
   }
-  // 也可以返回promise
-  return res;
+  // 返回promise,通过catch ,处理 code,message.
+  return Promise.reject(res);
 });
 
 //刷新Token

package/lib/types/core.d.ts

@@ -1,41 +0,0 @@
-/// <reference types="miniprogram-api-typings" />
-/// <reference types="miniprogram-api-typings" />
-export type ResponseData<T extends string | WechatMiniprogram.IAnyObject | ArrayBuffer = string | WechatMiniprogram.IAnyObject | ArrayBuffer> = WechatMiniprogram.RequestSuccessCallbackResult<T>;
-export interface AppConfig {
-    tenant: string;
-    name: string;
-    baseUrl: string;
-    resourceUrl: string;
-    appId: string;
-    componentAppid: string;
-    wechatComponentAppId: string;
-    wechatAppId: string;
-    wechatBiz: string;
-    siteId: string;
-    dev: boolean;
-    testNewUser: boolean;
-}
-export interface ValidateData {
-    validate: boolean;
-    message: string;
-}
-export interface EventBase {
-    changedTouches?: any;
-    currentTarget: EventTarget;
-    target?: EventTarget;
-    type?: string;
-    detail?: any;
-    touches: any;
-}
-export interface EventTarget {
-    dataset: any;
-    id: string | number;
-    offsetLeft?: number;
-    offsetTop?: number;
-}
-export interface CanvasResponse {
-    width?: number;
-    height?: number;
-    nodeCanvasType?: string;
-    node: any;
-}