@uxda/appkit 4.2.56 → 4.2.58

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, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, uploadFile, hideLoading, useDidShow, useRouter } from '@tarojs/taro';
+import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, useDidShow, getStorageSync, 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';
@@ -290,6 +290,25 @@ function useEncode() {
   };
 }
 
+const globalData = {};
+
+const appKitOptions = {
+  app: () => "",
+  tenant: () => "",
+  token: () => "",
+  tempToken: () => "",
+  baseUrl: () => "",
+  401() {
+  },
+  gray: () => ""
+};
+const useAppKitOptions = () => {
+  if (!globalData.$appKitOptions) {
+    globalData.$appKitOptions = appKitOptions;
+  }
+  return globalData.$appKitOptions;
+};
+
 const mappings = {
   downloadUrl: "thrumb",
   fileId: "id",
@@ -303,14 +322,18 @@ const transformFields = (row) => {
   return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings[k] || k, v]));
 };
 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) => {
-      Taro.uploadFile({
+      uploadFile({
         url: config.baseUrl + url,
         filePath: file.path,
         name: "file",
-        header: config.headers ?? {
-          token: Taro.getStorageSync("session")
+        header: {
+          ...config.headers,
+          token: appkitOptions.tempToken() || appkitOptions.token()
         },
         success: (rsp) => {
           const { data } = rsp;
@@ -372,25 +395,6 @@ function useCrypto(config) {
   };
 }
 
-const globalData = {};
-
-const appKitOptions = {
-  app: () => "",
-  tenant: () => "",
-  token: () => "",
-  tempToken: () => "",
-  baseUrl: () => "",
-  401() {
-  },
-  gray: () => ""
-};
-const useAppKitOptions = () => {
-  if (!globalData.$appKitOptions) {
-    globalData.$appKitOptions = appKitOptions;
-  }
-  return globalData.$appKitOptions;
-};
-
 const defaultLogOptions = {
   projectName: "ddyk-dev",
   logStore: "ddjf-internet-web",
@@ -1169,8 +1173,19 @@ var script$D = /* @__PURE__ */ defineComponent({
         onUploadFile(csRes);
       }
     }
-    function onPhotograph() {
+    async function onPhotograph() {
       if (props.disabled) return;
+      if (Taro.getEnv() === "WEB") {
+        const csRes = await chooseMedia({
+          count: 1,
+          sourceType: ["album"],
+          // "camera" | "album"
+          maxDuration: 60
+          // 使用duration属性判断是图片还是视频，图片没有该属性
+        });
+        onUploadFile(csRes);
+        return;
+      }
       activeSheetVisible.value = true;
     }
     return (_ctx, _cache) => {
@@ -1428,14 +1443,6 @@ const endpointsList$2 = {
    * http://ytech.dev.ddjf.info/payment/doc.html#/%E5%AE%A2%E6%88%B7%E5%9F%9FAPI/%E6%94%AF%E4%BB%98%E4%B8%AD%E5%BF%83-%E5%AF%B9%E5%A4%96%E6%8E%A5%E5%8F%A3/rechargePayUsingPOST
    */
   \u83B7\u53D6\u5FAE\u4FE1\u652F\u4ED8\u53C2\u6570\u5305: {
-    // {
-    //   "amount": 100,
-    //   "appCode": "crm",
-    //   "caseCode": "aiApproveRecharge",
-    //   "tenantId": "17454646",
-    //   "transFlowNo": "4343244",
-    //   "certificateNo": "o7k8L0QTqcwRIBKVUPzI7iPfghLM"
-    // }
     path: "/payment/outer/payment/rechargePay",
     translate: (params) => ({
       amount: params.amount,
@@ -1762,6 +1769,7 @@ var script$B = /* @__PURE__ */ defineComponent({
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
           console.log(result);
+          window.location.href = props.payFinishJumpUrl;
         });
       } else {
         wx.login({
@@ -2129,6 +2137,7 @@ var script$x = /* @__PURE__ */ defineComponent({
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
           console.log(result);
+          window.location.href = props.payFinishJumpUrl;
         });
       } else {
         wx.login({
@@ -4157,7 +4166,7 @@ var script$j = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const areaFormatOptions = computed(() => {
-      const { province_list, city_list, county_list } = JSON.parse(Taro.getStorageSync("wechat_area"));
+      const { province_list, city_list, county_list } = JSON.parse(getStorageSync("wechat_area"));
       const map = /* @__PURE__ */ new Map();
       city_list.forEach((item) => {
         const provinceShortId = item.id.slice(0, 2);
@@ -5509,7 +5518,6 @@ var script$c = /* @__PURE__ */ defineComponent({
     const emits = __emit;
     return (_ctx, _cache) => {
       const _component_rich_text = resolveComponent("rich-text");
-      const _component_scroll_view = resolveComponent("scroll-view");
       return openBlock(), createElementBlock("div", _hoisted_1$b, [
         createVNode(script$d, {
           bordered: false,
@@ -5520,7 +5528,7 @@ var script$c = /* @__PURE__ */ defineComponent({
         }, null, 8, ["value"]),
         createElementVNode("div", _hoisted_2$7, [
           unref(list).length ? (openBlock(), createElementBlock("div", _hoisted_3$5, [
-            createVNode(_component_scroll_view, {
+            createVNode(unref(ScrollView), {
               class: "content",
               "scroll-y": true,
               "refresher-enabled": true,
@@ -6013,7 +6021,7 @@ var script$9 = /* @__PURE__ */ defineComponent({
       });
       const appkitOptions = useAppKitOptions();
       const $http = useHttp();
-      let Res = await Taro.uploadFile({
+      let Res = await uploadFile({
         url: `${appkitOptions.baseUrl()}/cas/file/uploadImg`,
         filePath,
         name: "file",
@@ -6147,7 +6155,6 @@ var script$9 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_nut_cell = Cell;
       const _component_nut_button = Button;
-      const _component_scroll_view = resolveComponent("scroll-view");
       const _component_nut_input = Input;
       const _component_nut_dialog = Dialog;
       const _component_nut_popup = Popup;
@@ -6155,7 +6162,7 @@ var script$9 = /* @__PURE__ */ defineComponent({
         Fragment,
         null,
         [
-          createVNode(_component_scroll_view, {
+          createVNode(unref(ScrollView), {
             "scroll-y": !userState.visible && !avatarVisible.value,
             class: "user-info"
           }, {
@@ -7822,15 +7829,15 @@ var script$4 = /* @__PURE__ */ defineComponent({
               type: item.fileType,
               status: "uploading"
             });
-            await uploadFile(formState.attachment[formState.attachment.length - 1]);
+            await uploadFile$1(formState.attachment[formState.attachment.length - 1]);
           }
         }
       });
     }
-    async function uploadFile(item) {
+    async function uploadFile$1(item) {
       const appkitOptions = useAppKitOptions();
       const token = appkitOptions.tempToken() || appkitOptions.token();
-      let Res = await Taro.uploadFile({
+      let Res = await uploadFile({
         url: `${appkitOptions.baseUrl()}/saas-base/file/upload`,
         filePath: item.url,
         name: "file",

package/package.json

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

package/src/components/dd-area/index.vue

@@ -4,7 +4,7 @@
 <!--* TIP: 微信原生实现多列选择器-->
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
-import Taro from '@tarojs/taro'
+import Taro, {getStorageSync} from '@tarojs/taro'
 import DdIcon from '../dd-icon/index.vue'
 
 interface AreaItem {
@@ -36,7 +36,7 @@ const props = withDefaults(defineProps<PropsType>(), {
 const emit = defineEmits(['update:value', 'change', 'cancel'])
 
 const areaFormatOptions = computed<AreaItem[]>(() => {
-  const { province_list, city_list, county_list } = JSON.parse(Taro.getStorageSync('wechat_area'))
+  const { province_list, city_list, county_list } = JSON.parse(getStorageSync('wechat_area'))
   const map = new Map()
   city_list.forEach((item: any) => {
     const provinceShortId = item.id.slice(0, 2)

package/src/notice/components/NoticeList.vue

@@ -1,41 +1,18 @@
 <template>
   <div class="notice-list">
-    <DdSearch
-      :bordered="false"
-      :focus="false"
-      :value="query.title"
-      placeholder="请输入关键字搜索"
-      @search="onSearch"
-    />
+    <DdSearch :bordered="false" :focus="false" :value="query.title" placeholder="请输入关键字搜索" @search="onSearch" />
 
     <div style="flex: 1; overflow: hidden">
       <div class="wrapper" v-if="list.length">
-        <scroll-view
-          class="content"
-          :scroll-y="true"
-          :refresher-enabled="true"
-          :refresherTriggered="isRefresh"
-          @refresherrefresh="onRefresh"
-          :lower-threshold="100"
-          @scrolltolower="runNext"
-          bindscroll=""
-        >
-          <div
-            class="card"
-            :class="{ active: item.isRead != '1' }"
-            v-for="(item, index) in list"
-            :key="index"
-            @click="notifyRead(item, index)"
-          >
+        <ScrollView class="content" :scroll-y="true" :refresher-enabled="true" :refresherTriggered="isRefresh"
+          @refresherrefresh="onRefresh" :lower-threshold="100" @scrolltolower="runNext" bindscroll="">
+          <div class="card" :class="{ active: item.isRead != '1' }" v-for="(item, index) in list" :key="index"
+            @click="notifyRead(item, index)">
             <div class="point"></div>
             <div>
               <div class="time">{{ formatMinutes(item.receiveTime) }}</div>
-              <div
-                v-if="app !== 'loankit' || (app === 'loankit' && item.title !== item.context)"
-                class="text tit"
-                style="display: flex; align-items: center"
-                :class="{ gray: item.isRead == '1' }"
-              >
+              <div v-if="app !== 'loankit' || (app === 'loankit' && item.title !== item.context)" class="text tit"
+                style="display: flex; align-items: center" :class="{ gray: item.isRead == '1' }">
                 {{ item.title }}
                 <div class="notice-list-label" v-if="showApp && appMap[item.appCode]">
                   {{ appMap[item.appCode] }}
@@ -43,26 +20,19 @@
               </div>
               <div class="text" :class="{ gray: item.isRead == '1' }">
                 <rich-text style="white-space: pre-wrap" :nodes="item.context"></rich-text>
-                <span
-                  v-if="item.link && item.msgType == 3"
-                  class="notice-list-file"
-                  @click="onNoticeView(item.link)"
-                >
+                <span v-if="item.link && item.msgType == 3" class="notice-list-file" @click="onNoticeView(item.link)">
                   查看附件
                 </span>
               </div>
             </div>
           </div>
           <div v-if="isLast" class="cue-text" style="padding-bottom: 40px">没有更多了</div>
-        </scroll-view>
+        </ScrollView>
       </div>
       <div v-else class="no-data">
         <div class="no-data-img">
-          <img
-            style="width: 100%; height: 100%"
-            src="https://cdn.ddjf.com/static/images/loan-manage/no-data.png"
-            alt=""
-          />
+          <img style="width: 100%; height: 100%" src="https://cdn.ddjf.com/static/images/loan-manage/no-data.png"
+            alt="" />
         </div>
         <div class="text">暂无记录</div>
       </div>
@@ -79,6 +49,7 @@ import { useNotice } from './useNotice'
 import { useCommonList } from './useCommonList'
 import { NoticeListQueryTypes, NoticeListTypes } from '../types'
 import { useAppKitOptions } from '../../Appkit'
+import { ScrollView } from '@tarojs/components'
 
 const props = withDefaults(
   defineProps<{
@@ -190,20 +161,24 @@ const emits = defineEmits(['view'])
   overflow: hidden;
   display: flex;
   flex-direction: column;
+
   .wrapper {
     height: 100%;
     padding: 10px 12px;
     box-sizing: border-box;
+
     .content {
       height: 100%;
       background: #ffffff;
       border-radius: 10px;
+
       .card {
         margin: 0 10px;
         min-height: 64px;
         background: #fff;
         position: relative;
         padding: 10px;
+
         &::before {
           content: '';
           position: absolute;
@@ -213,6 +188,7 @@ const emits = defineEmits(['view'])
           width: 1px;
           background: #d8d8d8;
         }
+
         &::after {
           content: '';
           position: absolute;
@@ -222,12 +198,15 @@ const emits = defineEmits(['view'])
           width: 1px;
           background: #d8d8d8;
         }
+
         &:first-child::before {
           display: none;
         }
+
         &:last-child::after {
           display: none;
         }
+
         .point {
           width: 5px;
           height: 5px;
@@ -238,6 +217,7 @@ const emits = defineEmits(['view'])
           top: 18px;
           z-index: 9;
         }
+
         .time {
           font-size: 13px;
           color: #353535;
@@ -245,26 +225,32 @@ const emits = defineEmits(['view'])
           opacity: 0.2;
           margin-bottom: 5px;
         }
+
         .text {
           font-size: 14px;
           line-height: 20px;
           color: #9fa0a1;
         }
+
         &.active {
           .point {
             background-color: #f43309;
           }
+
           .text {
             color: #171a1d;
             font-size: 13px;
+
             &.tit {
               font-size: 15px;
               margin-bottom: 4px;
             }
           }
+
           .notice-list-label {
             opacity: 1;
           }
+
           .notice-list-file {
             opacity: 1;
           }
@@ -272,18 +258,21 @@ const emits = defineEmits(['view'])
       }
     }
   }
+
   .no-data {
     background-color: #fff;
     display: flex;
     align-items: center;
     flex-direction: column;
     height: 100%;
+
     .text {
       height: 20px;
       font-size: 14px;
       color: #7e7e7e;
       line-height: 20px;
     }
+
     &-img {
       width: 238px;
       height: 157px;
@@ -291,17 +280,20 @@ const emits = defineEmits(['view'])
       margin-bottom: 19px;
     }
   }
+
   &-file {
     font-size: 10px;
     color: var(--app-primary-color, #017fff);
     opacity: 0.5;
   }
+
   .cue-text {
     font-size: 13px;
     color: rgba(60, 60, 60, 0.5);
     padding: 30px 0 calc(30px + env(safe-area-inset-bottom, 0px));
     text-align: center;
   }
+
   &-label {
     border: 1px solid #caa264;
     color: #caa264;

package/src/payment/api/endpoints.ts

@@ -26,14 +26,6 @@ const endpointsList: HttpEndpoints = {
    * http://ytech.dev.ddjf.info/payment/doc.html#/%E5%AE%A2%E6%88%B7%E5%9F%9FAPI/%E6%94%AF%E4%BB%98%E4%B8%AD%E5%BF%83-%E5%AF%B9%E5%A4%96%E6%8E%A5%E5%8F%A3/rechargePayUsingPOST
    */
   获取微信支付参数包: {
-    // {
-    //   "amount": 100,
-    //   "appCode": "crm",
-    //   "caseCode": "aiApproveRecharge",
-    //   "tenantId": "17454646",
-    //   "transFlowNo": "4343244",
-    //   "certificateNo": "o7k8L0QTqcwRIBKVUPzI7iPfghLM"
-    // }
     path: '/payment/outer/payment/rechargePay',
     translate: (params: PaymentParams) => ({
       amount: params.amount,

package/src/payment/components/RechargeView.vue

@@ -102,6 +102,7 @@ const onPayClick = () => {
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
       console.log(result), 'result'
+      window.location.href = props.payFinishJumpUrl as string
     })
   } else {
     wx.login({

package/src/payment/components/TradeView.vue

@@ -173,6 +173,7 @@ const onPayClick = () => {
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
       console.log(result), 'result'
+      window.location.href = props.payFinishJumpUrl as string
     })
   } else {
     wx.login({

package/src/shared/components/OcrIcon.vue

@@ -190,9 +190,20 @@ async function chooseImages(item: any) {
   }
 }
 
-function onPhotograph() {
+async function onPhotograph() {
   if (props.disabled) return
 
+  if (Taro.getEnv() === 'WEB') {
+    const csRes = await chooseMedia({
+      count: 1,
+      sourceType: ['album'], // "camera" | "album"
+      maxDuration: 60, // 使用duration属性判断是图片还是视频，图片没有该属性
+    })
+
+    onUploadFile(csRes)
+    return
+  }
+
   activeSheetVisible.value = true
 }
 </script>

package/src/shared/composables/useUpload.ts

@@ -1,20 +1,21 @@
-import Taro from '@tarojs/taro'
+import Taro, { uploadFile } from '@tarojs/taro'
 import { Media } from '@uxda/nutshell/taro'
+import { useAppKitOptions } from '../../Appkit'
 
 export type UploadConfig = {
-  baseUrl: string,
-  name?: string,
+  baseUrl: string
+  name?: string
   headers?: Record<string, string>
 }
 
-const mappings: {[x: string]: keyof Media} = {
+const mappings: { [x: string]: keyof Media } = {
   downloadUrl: 'thrumb',
   fileId: 'id',
   fileName: 'name',
   fileSize: 'size',
   fileSuffix: 'ext',
   fileType: 'type',
-  originalUrl: 'url'
+  originalUrl: 'url',
 }
 
 const transformFields = (row: any) => {
@@ -24,14 +25,19 @@ const transformFields = (row: any) => {
 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) => {
-      Taro.uploadFile({
+      uploadFile({
         url: config.baseUrl + url,
         filePath: file.path!,
         name: 'file',
-        header: config.headers ?? {
-          token: Taro.getStorageSync('session')
+        header: {
+          ...config.headers,
+          token: appkitOptions.tempToken() || appkitOptions.token(),
         },
         success: (rsp: any) => {
           const { data } = rsp
@@ -42,7 +48,7 @@ export const useUpload = (config: UploadConfig) => {
             resolve(transformFields(response.result))
           } catch (e) {
             reject({
-              message: '文件上传异常'
+              message: '文件上传异常',
             })
           }
         },
@@ -50,6 +56,6 @@ export const useUpload = (config: UploadConfig) => {
     })
   }
   return {
-    upload
+    upload,
   }
-}
+}

package/src/user/components/UserFeedback.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { showToast, showLoading, chooseMedia } from '@tarojs/taro'
+import Taro, { showToast, showLoading, chooseMedia, uploadFile as TaroUploadFile } from '@tarojs/taro'
 import { onMounted, reactive, ref } from 'vue'
 import { useAppKitOptions } from '../../Appkit'
 import { useHttp } from '../api'
@@ -139,7 +139,7 @@ async function uploadFile(item: any) {
   const appkitOptions = useAppKitOptions()
   const token = appkitOptions.tempToken() || appkitOptions.token()
 
-  let Res: any = await Taro.uploadFile({
+  let Res: any = await TaroUploadFile({
     url: `${appkitOptions.baseUrl()}/saas-base/file/upload`,
     filePath: item.url,
     name: 'file',

package/src/user/components/UserInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view :scroll-y="!userState.visible && !avatarVisible" class="user-info">
+  <ScrollView :scroll-y="!userState.visible && !avatarVisible" class="user-info">
     <DdSkeleton v-if="firstLoading" :row="3"></DdSkeleton>
     <div v-else class="user-info-wrap">
       <div class="user-info-tit">账号信息</div>
@@ -78,7 +78,7 @@
           type="primary">退出登录</nut-button>
       </div>
     </div>
-  </scroll-view>
+  </ScrollView>
 
   <!-- 修改用户名弹框 -->
   <nut-dialog title="输入新的用户名" :border="false" pop-class="change-username-popup" v-model:visible="userState.visible"
@@ -128,12 +128,13 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { useDidShow, showToast, showLoading, hideLoading } from "@tarojs/taro";
+import Taro, { useDidShow, showToast, showLoading, hideLoading, uploadFile } from "@tarojs/taro";
 import { ref, onMounted, reactive, onUnmounted } from "vue";
 import { useAppKitOptions } from "../../Appkit";
 import { useEncode } from "../../shared/composables/useEncode";
 import DdSkeleton from "../../components/dd-skeleton/index.vue";
 import { useHttp } from "../api";
+import { ScrollView } from '@tarojs/components'
 
 const props = withDefaults(
   defineProps<{
@@ -216,7 +217,7 @@ async function updateImage(filePath: string) {
   const appkitOptions = useAppKitOptions();
   const $http = useHttp();
 
-  let Res: any = await Taro.uploadFile({
+  let Res: any = await uploadFile({
     url: `${appkitOptions.baseUrl()}/cas/file/uploadImg`,
     filePath: filePath,
     name: "file",