@uxda/appkit 4.3.13 → 4.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.3.13",
+  "version": "4.3.15",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -34,7 +34,7 @@
     "@tarojs/shared": "^4.1.7",
     "@tarojs/taro": "^4.1.7",
     "@types/wechat-miniprogram": "^3.4.7",
-    "@uxda/nutshell": "^1.6.98",
+    "@uxda/nutshell": "^1.0.0",
     "dayjs": "^1.11.18",
     "dsbridge": "^3.1.4",
     "lodash-es": "^4.17.21",
@@ -75,5 +75,8 @@
     "unplugin-auto-import": "^20.2.0",
     "unplugin-vue-components": "^29.1.0",
     "webpack": "^5.78.0"
+  },
+  "peerDependencies": {
+    "@uxda/nutshell": "^1.0.0"
   }
 }

package/src/balance/api/index.ts

@@ -65,7 +65,7 @@ function useHttp() {
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    tid: appkitOptions.tenant(),
+    cookie: `tid=${appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : '0',
   }
   /**

package/src/balance/components/PromoterCard.vue

@@ -152,7 +152,6 @@ function onHelpClick(type: string) {
   showModal({
     content: toastMap[type],
     showCancel: false,
-    confirmColor: '#017fff',
     confirmText: '知道了',
   })
 }

package/src/notice/api/index.ts

@@ -65,7 +65,7 @@ function useHttp() {
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    tid: appkitOptions.tenant(),
+    cookie: `tid=${appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : '0',
   }
   /**

package/src/notice/components/NoticeList2.vue

@@ -1,106 +1,41 @@
 <template>
   <ns-page class="news-list">
     <div class="tabContainer" :class="{ inH5: isWeb() }">
-      <!-- <ns-tabs
-        v-model="state.tab"
-        fill="#fff"
-        square
-        size="xl"
-        style="height: 46px"
-        @change="onTabChange"
-      >
+      <!-- <ns-search
+       v-track-search="{
+          trackInput: false,
+          trackSubmit: true,
+          minLength: 2,
+        }"
+        style="margin: 0 12px"
+        placeholder="请输入关键字搜索"
+        v-model="state.search"
+      ></ns-search> -->
+      <ns-tabs v-model="state.tab" fill="#fff" square size="xl" style="height: 46px" @change="onTabChange">
         <ns-tabs-item key="全部" tab="全部"></ns-tabs-item>
         <ns-tabs-item key="业务消息" tab="业务消息"></ns-tabs-item>
         <ns-tabs-item key="系统公告" tab="系统公告"></ns-tabs-item>
         <ns-tabs-item key="未读" tab="未读"></ns-tabs-item>
-      </ns-tabs> -->
-      <ns-tabs
-        v-model="state.tab"
-        fill="#fff"
-        square
-        size="xl"
-        style="height: 46px"
-        class="news-tab"
-        :items="tabList"
-      >
-        <template #titles>
-          <div
-            v-for="item in tabList"
-            :class="{ customLine: state.tab === item.value }"
-            :key="item.value"
-            class="nut-tabs__titles-item custom-tab-item"
-            @click="
-              state.tab = item.value;
-              onTabChange();
-            "
-          >
-            <div
-              class="custom-title"
-              :class="{ active: state.tab === item.value }"
-            >
-              <div>{{ item.label }}</div>
-              <div
-                class="custom-title-dot"
-                v-if="item.value === '未读' && noticeShow"
-              >
-                •••
-              </div>
-            </div>
-          </div>
-        </template>
       </ns-tabs>
-
       <div v-if="state.list.length > 0" class="read-all">
-        <div v-track-click class="btn" @click="readAll">全部已读</div>
+        <div v-track-click class="btn"  @click="readAll">全部已读</div>
       </div>
     </div>
-    <ns-page-content
-      class="mt-68px"
-      scrollable
-      refreshable
-      :refresh-triggered="isRefresh"
-      @pull-down-refresh="onRefresh"
-      @bottom-reached="nextPage"
-    >
+    <ns-page-content class="mt-68px" scrollable refreshable :refresh-triggered="isRefresh"
+      @pull-down-refresh="onRefresh" @bottom-reached="nextPage">
       <ns-skeleton :row="8" v-if="显示骨架屏" />
 
       <template v-else>
-        <ns-repeator
-          v-slot="item"
-          align="stretch"
-          direction="column"
-          :gap="10"
-          :data="state.list"
-          :show-no-more="paging.isLastPage"
-        >
-          <ns-card
-            v-track-click="'消息详情'"
-            :r="5"
-            fill="#fff"
-            class="news-item w-full"
-            @click="itemClick(item)"
-          >
-            <div
-              v-if="item.标题"
-              :style="{ color: item.已读 ? '#35353599' : '#353535' }"
-              class="news-item-title"
-            >
-              <img
-                v-if="item.是公告"
-                class="news-item-title-icon"
-                src="https://cdn.ddjf.com/static/images/fnfundkit/ic_msg_system_notice.png"
-              />
+        <ns-repeator v-slot="item" align="stretch" direction="column" :gap="10" :data="state.list"
+          :show-no-more="paging.isLastPage">
+          <ns-card v-track-click="'消息详情'" :r="5" fill="#fff" class="news-item w-full" @click="itemClick(item)">
+            <div v-if="item.标题" :style="{ color: item.已读 ? '#35353599' : '#353535' }" class="news-item-title">
+              <img v-if="item.是公告" class="news-item-title-icon"
+                src="https://cdn.ddjf.com/static/images/loan-manage-app/ic_msg_system_notice.webp" />
               {{ item.标题 }}
             </div>
-            <nut-ellipsis
-              :style="{ color: item.已读 ? '#35353566' : '#353535CC' }"
-              class="news-item-content"
-              direction="end"
-              rows="3"
-              expand-text="展开"
-              collapse-text="收起"
-              :content="item.内容"
-            ></nut-ellipsis>
+            <nut-ellipsis :style="{ color: item.已读 ? '#35353566' : '#353535CC' }" class="news-item-content"
+              direction="end" rows="3" expand-text="展开" collapse-text="收起" :content="item.内容"></nut-ellipsis>
             <div class="news-item-time">{{ item.时间 }}</div>
           </ns-card>
         </ns-repeator>
@@ -112,12 +47,12 @@
 </template>
 
 <script setup lang="ts">
-import { useDidShow } from '@tarojs/taro';
-import { showLoading, hideLoading } from '@tarojs/taro';
-import { type WithPaging, usePaging } from '@uxda/nutshell/taro';
-import { useHttp, endpoints } from '../api';
-import { reactive, ref } from 'vue';
-import { useAppKitOptions } from '../../Appkit';
+import { useDidShow } from '@tarojs/taro'
+import { showLoading, hideLoading } from '@tarojs/taro'
+import { type WithPaging, usePaging } from '@uxda/nutshell/taro'
+import { useHttp, endpoints } from '../api'
+import { reactive, ref } from 'vue'
+import { useAppKitOptions } from '../../Appkit'
 import {
   NsTabs,
   NsTabsItem,
@@ -127,7 +62,7 @@ import {
   NsPageContent,
   NsSkeleton,
   NsEmpty,
-} from '@uxda/nutshell/taro';
+} from "@uxda/nutshell/taro";
 import { isWeb } from '../../utils/utils';
 
 const props = withDefaults(
@@ -137,56 +72,31 @@ const props = withDefaults(
     app: string;
   }>(),
   {
-    deviceType: '2',
-    userId: '',
-    app: '',
+    deviceType: "2",
+    userId: "",
+    app: "",
   }
 );
 
-interface tabListType {
-  label: string;
-  value: string;
-  hasRead?: boolean;
-}
-const tabList = ref<tabListType[]>([
-  {
-    label: '全部',
-    value: '全部',
-  },
-  {
-    label: '业务消息',
-    value: '业务消息',
-  },
-  {
-    label: '系统公告',
-    value: '系统公告',
-  },
-  {
-    label: '未读',
-    value: '未读',
-  },
-]);
-
 const $http = useHttp(),
-  显示骨架屏 = ref(true);
+  显示骨架屏 = ref(true)
 
 useDidShow(() => {
-  nextPage(1);
-  getNotice();
-});
+  nextPage(1)
+})
 const state = reactive({
   search: '',
   tab: '全部',
   list: [] as any[],
-});
+})
 
 async function load(page: number) {
   if (!props.app?.replace(',cloudkitPro', '')) {
-    state.list = [];
-    return { paging: { page: 1, pageSize: 10, total: 0 }, data: [] };
+    state.list = []
+    return { paging: { page: 1, pageSize: 10, total: 0 }, data: [] }
   }
 
-  const appkitOptions = useAppKitOptions();
+  const appkitOptions = useAppKitOptions()
   const data = {
     page,
     pageSize: 10,
@@ -195,109 +105,85 @@ async function load(page: number) {
     userId: props.userId,
     deviceType: props.deviceType,
     readOrderStatus: '1',
-  };
+  }
 
   if (state.tab == '业务消息') {
-    data['msgType'] = '1';
+    data['msgType'] = '1'
   } else if (state.tab == '系统公告') {
-    data['msgType'] = '3';
+    data['msgType'] = '3'
   }
 
   if (state.tab == '未读') {
-    data['isRead'] = '0';
+    data['isRead'] = '0'
   }
 
-  const ep = endpoints['消息列表'];
+  const ep = endpoints['消息列表']
   return $http.post<WithPaging<any[]>>(ep, data).then((res) => {
-    显示骨架屏.value = false;
+    显示骨架屏.value = false
     if (page === 1) {
-      state.list = [];
+      state.list = []
     }
-    state.list = [...state.list, ...res.data];
-    return { paging: res.paging, data: res.data };
-  });
+    state.list = [...state.list, ...res.data]
+    return { paging: res.paging, data: res.data }
+  })
 }
 
-const { paging, nextPage } = usePaging(load);
+const { paging, nextPage } = usePaging(load)
 
 function onTabChange() {
-  显示骨架屏.value = true;
-  nextPage(1);
+  显示骨架屏.value = true
+  nextPage(1)
 }
 
-const isRefresh = ref(false);
+const isRefresh = ref(false)
 async function onRefresh() {
-  isRefresh.value = true;
-  await nextPage(1);
-  isRefresh.value = false;
+  isRefresh.value = true
+  await nextPage(1)
+  isRefresh.value = false
 }
 
 function itemClick(item: any) {
-  read(item);
-  getNotice();
-  emits('itemClick', item);
+  read(item)
+
+  emits('itemClick', item)
 }
 
 function read(item: any) {
-  if (item.isRead == '1') return;
-  const ep = endpoints['已读'];
+  if (item.isRead == '1') return
+  const ep = endpoints['已读']
   $http.post(ep, [item.id]).then(() => {
-    item['已读'] = true;
-  });
+    item['已读'] = true
+  })
 }
 
 async function readAll() {
   try {
     showLoading({
       title: '请稍后...',
-      mask: true,
-    });
+    })
 
-    const appkitOptions = useAppKitOptions();
-    const ep = endpoints['全部已读'];
+    const appkitOptions = useAppKitOptions()
+    const ep = endpoints['全部已读']
     const data = {
       tenantId: appkitOptions.tenant(),
       userId: props.userId,
       deviceType: props.deviceType,
-    };
+    }
     $http.post(ep, data).then(() => {
       state.list.forEach((item) => {
-        item['已读'] = true;
-      });
-    });
+        item['已读'] = true
+      })
+    })
   } finally {
-    setTimeout(() => {
-      getNotice();
-    }, 300);
-    hideLoading();
+    hideLoading()
   }
 }
 
-// 通知红点
-const noticeShow = ref(false);
-async function getNotice() {
-  const appkitOptions = useAppKitOptions();
-  const $http = useHttp();
-
-  $http
-    .get('/cas/msg/count-unread', {
-      deviceType: 2,
-      appCode: props.app,
-      tenantId: appkitOptions.tenant(),
-      userId: props.userId,
-    })
-    .then((result: any) => {
-      if (typeof result === 'object') return;
-
-      noticeShow.value = result > 0;
-    });
-}
-
-const emits = defineEmits(['itemClick']);
+const emits = defineEmits(['itemClick'])
 
 defineExpose({
   readAll,
-});
+})
 </script>
 
 <style lang="scss">
@@ -351,51 +237,4 @@ defineExpose({
     }
   }
 }
-.news-tab {
-  .nut-tabs__list {
-    display: flex;
-  }
-  .custom-tab-item {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    padding: 10px;
-  }
-  .customLine {
-    position: relative;
-  }
-  .customLine::after {
-    content: '';
-    position: absolute;
-    width: 50px;
-    height: 2px;
-    background: #017fff;
-    bottom: 0;
-    left: 50%;
-    transform: translateX(-50%);
-  }
-  .custom-title {
-    color: #8a8a8a;
-    font-size: 15px;
-    display: flex;
-    align-items: center;
-    &-dot {
-      height: 12px;
-      line-height: 12px;
-      padding: 0 6px;
-      color: #fff;
-      border-radius: 8px;
-      background: #e04747;
-      margin-left: 2px;
-      font-size: 9px;
-    }
-  }
-  .custom-title.active {
-    color: #017fff;
-    font-weight: 600;
-    font-size: 17px;
-  }
-}
 </style>

package/src/notice/components/useCommonList.ts

@@ -30,7 +30,6 @@ export function useCommonList<R, Q extends QueryLimit>(
     loading &&
       showLoading({
         title: '加载中...',
-        mask: true,
       })
     isLoading.value = true
 

package/src/payment/api/endpoints.ts

@@ -13,6 +13,7 @@ const endpointsList: HttpEndpoints = {
       appCode: data.app,
       // caseCode: 'recharge', // 这个参数可以不要
       tenantId: data.tenant,
+      scene: data.scene,
     }),
     transform: (data: any) =>
       data.amountList.map((d: any) => ({
@@ -44,6 +45,9 @@ const endpointsList: HttpEndpoints = {
       } catch (e) {}
       return {
         json, // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
         paymentId: data.payId, // 查询用支付ID
       }
     },
@@ -59,16 +63,17 @@ const endpointsList: HttpEndpoints = {
       accountAuthFlag: params.accountAuthFlag || false,
       channelCode: params.channelCode || null,
       payFinishJumpUrl: params.payFinishJumpUrl || null,
-      useCloudBean: params.useCloudBean || false,
     }),
     transform: (data: any) => {
-      console.log(data, 'data-----')
       let json = null
       try {
         json = JSON.parse(data.prePayStr)
       } catch (e) {}
       return {
         json, // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
         paymentId: data.payId, // 查询用支付ID
       }
     },
@@ -77,6 +82,13 @@ const endpointsList: HttpEndpoints = {
     path: '/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig',
     transform: (data: any) => data,
   },
+  获取支付结果: {
+    path: '/payment/outer/payment/getPayResult',
+    translate: (data: any) => ({
+      thirdPayId: data.thirdPayId,
+    }),
+    transform: (data: any) => data,
+  },
 } as const
 
 const keys = Object.keys(endpointsList as any)

package/src/payment/api/index.ts

@@ -51,7 +51,6 @@ const vendor = {
               title: data.msg,
               icon: 'none',
             })
-            reject(data.msg)
           }
         })
         .catch((e: any) => {
@@ -71,7 +70,7 @@ function useHttp(defaultHeader?: DefaultHeaderType) {
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: defaultHeader?.Appcode || appkitOptions.app(),
-    tid: defaultHeader?.Tenant || appkitOptions.tenant(),
+    cookie: `tid=${defaultHeader?.Tenant || appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : '0',
   }
 

package/src/payment/components/RechargeResult.vue

@@ -30,6 +30,7 @@ const views = {
 function onBackClick () {
   emit('dismiss')
 }
+
 </script>
 
 <style lang="scss">

package/src/payment/components/RechargeView.vue

@@ -22,7 +22,7 @@ import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
 import { requestBrandWCPay, requestPayment } from '../services'
 import Taro, { showToast, useRouter } from '@tarojs/taro'
-import { isWechat } from '../../shared/composables/useDeviceEnv'
+import { isAlipay, isAndroid, isChrome, isIOS, isSafari, isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -61,6 +61,7 @@ const state = reactive({
   selected: 0,
   agreementOpen: false,
   buttonLoading: false,
+  thirdPayId: '',
 })
 
 const amounts = ref<any[]>([])
@@ -81,7 +82,8 @@ onMounted(async () => {
 
   $http.get<any[]>(endpoints.获取充值金额列表, {
     app: props.app,
-    tenant: props.tenant
+    tenant: props.tenant,
+    scene: isWechat() ? '' : 'APP'
   }).then(response => {
     amounts.value = response
     emit('loaded')
@@ -99,28 +101,30 @@ const onPayClick = () => {
   state.buttonLoading = true
 
   if (Taro.getEnv() === 'WEB') {
-    if (!isWechat()) {
-      showToast({
-        title: '请使用微信浏览器打开',
-        icon: 'none',
-      })
-      state.buttonLoading = false
-      return false
-    }
+    // if (!isWechat()) {
+    //   showToast({
+    //     title: '请使用微信浏览器打开',
+    //     icon: 'none',
+    //   })
+    //   state.buttonLoading = false
+    //   return false
+    // }
     requestBrandWCPay({
       amount: amounts.value[state.selected].amount,
       app: 'loankitMp',
       tenant: props.tenant,
       accountAuthFlag: false,
-      channelCode: 'centergzh',
+      channelCode: getChannelCode(),
       payFinishJumpUrl: props.payFinishJumpUrl,
       fromMini: !!params.from,
       clientInfo: 'H5'
-    }).then(result => {
-      console.log(result, '------requestBrandWCPay')
+    }).then((result: any) => {
       state.buttonLoading = false
       if (typeof result === 'boolean' && result) {
         window.location.href = props.payFinishJumpUrl as string
+      } else if (typeof result === 'object' && result?.paymentType === 'H5' && result?.prePayStr) {
+        state.thirdPayId = result?.thirdPayId || ''
+        window.location.href = result?.prePayStr;
       } else {
         emit('complete', result)
       }
@@ -143,6 +147,34 @@ const onPayClick = () => {
     })
   }
 }
+
+// 根据环境判断渠道编码
+function getChannelCode() {
+  if (isWechat()) {
+    return 'centergzh';
+  } else if (isAlipay() || isAndroid() || (isIOS() && !isChrome() && !isSafari())) {
+    return 'YundouZfb';
+  } else {
+    return 'distributor';
+  }
+}
+
+const payResultCheck = () => {
+  if (!state.thirdPayId) return
+  
+  const $http = useHttp()
+  $http.get<any>(endpoints.获取支付结果, {
+    thirdPayId: state.thirdPayId
+  }).then(response => {
+    if (response.payStatus === 'paid') {
+      emit('complete', true)
+    }
+  })
+}
+
+defineExpose({
+  payResultCheck
+})
 </script>
 
 <style lang="scss">