@uxda/appkit 4.2.58 → 4.2.60

package/dist/appkit.css

@@ -1473,6 +1473,8 @@ page {
   margin-right: 4px;
 }
 .notice-popup-bd {
+  position: relative;
+  z-index: 10;
   color: #353535;
   box-shadow: 0px 2px 8px 0px rgba(255, 255, 255, 0.2) inset, 0px 1px 1px 0px rgba(255, 255, 255, 0.5019607843) inset, 0px 0px 1px 0px rgba(255, 255, 255, 0.6980392157);
   border-radius: 3px;
@@ -1489,6 +1491,8 @@ page {
   font-weight: 600;
 }
 .notice-popup-ft {
+  position: relative;
+  z-index: 10;
   display: flex;
   align-items: center;
   justify-content: center;

package/dist/index.js

@@ -4,7 +4,7 @@ import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
 import { defineComponent, reactive, createBlock, openBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, withDirectives, vShow, useModel, mergeModels, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
-import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, useDidShow, getStorageSync, useRouter } from '@tarojs/taro';
+import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, useDidShow, showModal, getStorageSync, chooseImage, useRouter } from '@tarojs/taro';
 import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isIdentityCard from 'validator/es/lib/isIdentityCard';
@@ -324,13 +324,16 @@ const transformFields = (row) => {
 const useUpload = (config) => {
   const appkitOptions = useAppKitOptions();
   console.log("===config", config);
-  console.log("===config", appkitOptions.tempToken() || appkitOptions.token());
   const upload = (url, file) => {
     return new Promise((resolve, reject) => {
+      console.log(file, "----file");
       uploadFile({
         url: config.baseUrl + url,
         filePath: file.path,
         name: "file",
+        formData: {
+          objectNo: `min${Date.now()}`
+        },
         header: {
           ...config.headers,
           token: appkitOptions.tempToken() || appkitOptions.token()
@@ -1267,7 +1270,7 @@ var script$C = /* @__PURE__ */ defineComponent({
       console.log("===onIconClick");
       let result = null;
       try {
-        const csRes = await Taro.chooseMedia({
+        const csRes = await chooseMedia({
           count: 1,
           sourceType: ["album", "camera"]
         });
@@ -3975,7 +3978,7 @@ var script$l = /* @__PURE__ */ defineComponent({
       rebate: "\u63A8\u8350\u670B\u53CB\u4F7F\u7528\u5317\u6597\u661F\u3001\u4F01\u660E\u661F\u83B7\u53D6\uFF0C\u8FD4\u4F63\u6536\u76CA= \u8FD4\u4F63\u57FA\u6570 * \u8FD4\u4F63\u6BD4\u4F8B"
     };
     function onHelpClick(type) {
-      Taro.showModal({
+      showModal({
         content: toastMap[type],
         showCancel: false,
         confirmText: "\u77E5\u9053\u4E86"
@@ -5997,7 +6000,7 @@ var script$9 = /* @__PURE__ */ defineComponent({
     }
     const avatarVisible = ref(false);
     async function toUpload() {
-      if (!userInfo.value.avatar) {
+      if (!userInfo.value.avatar && Taro.getEnv() !== "WEB") {
         const profile = await Taro.getUserProfile({
           desc: "\u5934\u50CF\u7528\u4E8E\u6539\u53D8\u9ED8\u8BA4\u5934\u50CF"
         });
@@ -6006,7 +6009,7 @@ var script$9 = /* @__PURE__ */ defineComponent({
         });
         updateImage(res.tempFilePath);
       } else {
-        let res = await Taro.chooseImage({
+        let res = await chooseImage({
           count: 1
         });
         if (res.tempFilePaths) {
@@ -6126,7 +6129,7 @@ var script$9 = /* @__PURE__ */ defineComponent({
       });
     }
     function toLogout() {
-      Taro.showModal({
+      showModal({
         title: "\u63D0\u793A",
         content: "\u786E\u5B9A\u8981\u9000\u51FA\u767B\u5F55\u5417\uFF1F",
         confirmText: "\u786E\u5B9A",
@@ -7708,7 +7711,7 @@ var script$5 = /* @__PURE__ */ defineComponent({
     async function onConfirm() {
       const [err, res] = await cropperRef.value.crop();
       if (err) {
-        Taro.showModal({
+        showModal({
           title: "\u6E29\u99A8\u63D0\u793A",
           content: err.message,
           confirmColor: "#017fff"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.58",
+  "version": "4.2.60",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/balance/components/PromoterCard.vue

@@ -45,7 +45,7 @@
 import { ref, watch } from 'vue'
 import { endpoints, useHttp } from '../api'
 import { Promoter } from '../types'
-import Taro, { useDidShow } from '@tarojs/taro'
+import Taro, { useDidShow, showModal } from '@tarojs/taro'
 import { useAmount } from '../../shared/composables/useAmount'
 import { IconFont } from '@nutui/icons-vue-taro'
 
@@ -118,7 +118,7 @@ const toastMap = {
   rebate: '推荐朋友使用北斗星、企明星获取，返佣收益= 返佣基数 * 返佣比例',
 }
 function onHelpClick(type: string) {
-  Taro.showModal({
+  showModal({
     content: toastMap[type],
     showCancel: false,
     confirmText: '知道了',

package/src/balance/components/SecondBalance.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="second-balance">
-    <page-header title="权益余额" />
+    <page-header :title="Taro.getEnv() !== 'WEB' ? '权益余额' : ''" />
     <div class="positions" v-if="data.length">
       <div class="position" v-for="(item, index) in data" :key="index">
         <div class="icon"></div>
@@ -13,6 +13,7 @@
 </template>
 
 <script lang="ts" setup>
+import Taro from "@tarojs/taro";
 import { Privilege } from "../types";
 import EmptyView from "../../shared/components/EmptyView.vue";
 
@@ -30,8 +31,10 @@ withDefaults(defineProps<SecondBalanceProps>(), {
 <style lang="scss">
 .second-balance {
   width: 100vw;
+
   .positions {
     padding: 15px;
+
     .position {
       border-radius: 5px;
       background: #f7f8fa;
@@ -42,6 +45,7 @@ withDefaults(defineProps<SecondBalanceProps>(), {
       margin-bottom: 10px;
       padding: 0 10px;
       gap: 10px;
+
       .icon {
         width: 30px;
         height: 30px;
@@ -53,12 +57,14 @@ withDefaults(defineProps<SecondBalanceProps>(), {
         flex-basis: 30px;
         flex-grow: 0;
       }
+
       .title {
         flex-grow: 1;
         color: #353535;
         font-size: 14px;
         font-weight: 500;
       }
+
       .amount {
         flex-grow: 0;
         color: #9e7b5a;

package/src/notice/components/NoticePopup.vue

@@ -1,24 +1,12 @@
 <template>
-  <nut-popup
-    pop-class="notice-popup"
-    :close-on-click-overlay="false"
-    v-model:visible="showPopup"
-    round
-  >
+  <nut-popup pop-class="notice-popup" :close-on-click-overlay="false" v-model:visible="showPopup" round>
     <div class="notice-popup-hd">
-      <img
-        class="notice-popup-hd-icon"
-        src="https://cdn.ddjf.com/static/images/customer-center/system-notice-1.png"
-        alt=""
-      />系统公告
+      <img class="notice-popup-hd-icon" src="https://cdn.ddjf.com/static/images/customer-center/system-notice-1.png"
+        alt="" />系统公告
     </div>
     <div class="notice-popup-bd">
       <div style="white-space: pre-wrap">{{ message.context.replace('【系统公告】 ', '') }}</div>
-      <div
-        v-if="message.jumpUrl || message.link"
-        class="notice-popup-bd-link"
-        @click="toViewAttachment"
-      >
+      <div v-if="message.jumpUrl || message.link" class="notice-popup-bd-link" @click="toViewAttachment">
         点击查看附件
       </div>
     </div>
@@ -43,7 +31,7 @@ const props = withDefaults(
 
 const showPopup = ref(true)
 
-onMounted(() => {})
+onMounted(() => { })
 
 // 关闭
 function onCancel() {
@@ -86,6 +74,7 @@ const emits = defineEmits(['close', 'view'])
   padding: 20px 15px;
   border-radius: 10px !important;
   background: linear-gradient(136.72deg, #d0fdfe 6.02%, #a2b9ff 59.97%, #6593ff 108.78%);
+
   &::after {
     content: '';
     position: absolute;
@@ -97,6 +86,7 @@ const emits = defineEmits(['close', 'view'])
     z-index: 1;
     border-radius: 10px;
   }
+
   &::before {
     content: '';
     width: 236px;
@@ -119,13 +109,17 @@ const emits = defineEmits(['close', 'view'])
     align-items: center;
     margin-bottom: 20px;
     font-weight: 600;
+
     &-icon {
       width: 20px;
       height: 20px;
       margin-right: 4px;
     }
   }
+
   &-bd {
+    position: relative;
+    z-index: 10;
     color: #353535;
     box-shadow: 0px 2px 8px 0px #ffffff33 inset, 0px 1px 1px 0px #ffffff80 inset,
       0px 0px 1px 0px #ffffffb2;
@@ -136,16 +130,21 @@ const emits = defineEmits(['close', 'view'])
     padding: 15px 10px;
     box-sizing: border-box;
     font-size: 10px;
+
     &-link {
       color: #007fff;
       margin-top: 2px;
       font-weight: 600;
     }
   }
+
   &-ft {
+    position: relative;
+    z-index: 10;
     display: flex;
     align-items: center;
     justify-content: center;
+
     &-btn {
       background: #007fff;
       color: #fff;

package/src/shared/components/OcrBusinessLicense.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { showToast, showLoading, hideLoading, uploadFile } from '@tarojs/taro';
+import Taro, { showToast, showLoading, hideLoading, uploadFile, chooseMedia } from '@tarojs/taro';
 import { NsIcon } from '@uxda/nutshell/taro';
 import { useAppKitOptions } from '../../Appkit';
 
@@ -60,7 +60,7 @@ async function onIconClick() {
   console.log('===onIconClick');
   let result: OcrResult | null = null;
   try {
-    const csRes = await Taro.chooseMedia({
+    const csRes = await chooseMedia({
       count: 1,
       sourceType: ['album', 'camera']
     });

package/src/shared/composables/useUpload.ts

@@ -27,14 +27,17 @@ type UploadFunction = (url: string, file: Media) => Promise<Media>
 export const useUpload = (config: UploadConfig) => {
   const appkitOptions = useAppKitOptions()
   console.log('===config', config)
-  console.log('===config', appkitOptions.tempToken() || appkitOptions.token())
 
   const upload: UploadFunction = (url: string, file: Media) => {
     return new Promise<Media>((resolve, reject) => {
+      console.log(file, '----file')
       uploadFile({
         url: config.baseUrl + url,
         filePath: file.path!,
         name: 'file',
+        formData: {
+          objectNo: `min${Date.now()}`,
+        },
         header: {
           ...config.headers,
           token: appkitOptions.tempToken() || appkitOptions.token(),

package/src/user/components/UserHeadCrop.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { useRouter } from '@tarojs/taro'
+import Taro, { useRouter, showModal } from '@tarojs/taro'
 import { ref } from 'vue'
 import btCropper from '../../components/bt-cropper/index.vue'
 
@@ -28,7 +28,7 @@ function onCancel() {
 async function onConfirm() {
   const [err, res] = await cropperRef.value.crop()
   if (err) {
-    Taro.showModal({
+    showModal({
       title: '温馨提示',
       content: err.message,
       confirmColor: '#017fff',

package/src/user/components/UserInfo.vue

@@ -128,7 +128,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { useDidShow, showToast, showLoading, hideLoading, uploadFile } from "@tarojs/taro";
+import Taro, { useDidShow, showToast, showLoading, hideLoading, uploadFile, showModal, chooseImage } from "@tarojs/taro";
 import { ref, onMounted, reactive, onUnmounted } from "vue";
 import { useAppKitOptions } from "../../Appkit";
 import { useEncode } from "../../shared/composables/useEncode";
@@ -187,7 +187,7 @@ const avatarVisible = ref(false);
 
 // 去上传头像
 async function toUpload() {
-  if (!userInfo.value.avatar) {
+  if (!userInfo.value.avatar && Taro.getEnv() !== "WEB") {
     const profile = await Taro.getUserProfile({
       desc: "头像用于改变默认头像",
     });
@@ -198,7 +198,7 @@ async function toUpload() {
 
     updateImage(res.tempFilePath);
   } else {
-    let res = await Taro.chooseImage({
+    let res = await chooseImage({
       count: 1,
     });
     if (res.tempFilePaths) {
@@ -348,7 +348,7 @@ function onNickNameOk() {
 }
 // 退出登录
 function toLogout() {
-  Taro.showModal({
+  showModal({
     title: "提示",
     content: "确定要退出登录吗？",
     confirmText: "确定",