@uxda/appkit 1.2.80 → 3.2.20

package/src/balance/components/PromoterCard.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="promoter-card" v-if="applyRecord.distributorFlag === 'Y' || applyRecord.accessCheckStatus === 'Y'">
+    <img class="arrow"
+      src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTciIGhlaWdodD0iMjkiIHZpZXdCb3g9IjAgMCAxNyAyOSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE1LjM4MTQgMTIuMzIwN0MxNi43NjI4IDEzLjUxNyAxNi43NjI4IDE1LjY1OTkgMTUuMzgxNCAxNi44NTYyTDEuNjU0NjUgMjguNzQzOUMxLjAwNzAxIDI5LjMwNDggLTEuMzA0NTZlLTA2IDI4Ljg0NDggLTEuMjY3MTFlLTA2IDI3Ljk4OEwtOS41Njc5OGUtMDggMS4xODg5Qy01LjgyM2UtMDggMC4zMzIxNDYgMS4wMDcwMSAtMC4xMjc5MDUgMS42NTQ2NSAwLjQzMjk3MUwxNS4zODE0IDEyLjMyMDdaIiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfMTAyN185OTYpIi8+CjxkZWZzPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXJfMTAyN185OTYiIHgxPSI0NiIgeTE9IjE1IiB4Mj0iLTUuNSIgeTI9IjE1IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNFRjlENTciLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjRkZENDUwIi8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg=="
+      alt="">
+    <div class="promoter-card-tab" v-if="useCase === 'company' && isAdmin">
+      <div class="promoter-card-tab-item" @click="onTabChange('person')" :class="{ focus: tab === 'person' }">个人</div>
+      <div class="promoter-card-tab-item" @click="onTabChange('company')" :class="{ focus: tab === 'company' }">企业</div>
+    </div>
+    <div class="promoter-card-hd" @click="emits('blance', tab)"
+      v-if="applyRecord.distributorFlag === 'Y' || applyRecord.accessCheckStatus === 'Y'">
+      <div class="promoter-card-hd-info">可提现余额(元)</div>
+      <div class="promoter-card-hd-num number">{{ formatAmount(promoter.balance || 0) }}
+        <img class="arrow-img" style="margin-left: 12px;" src="https://cdn.ddjf.com/static/images/appkit/arrow.png"
+          alt="">
+      </div>
+    </div>
+    <div class="promoter-card-ft">
+      <div class="promoter-card-ft-item" v-if="applyRecord.accessCheckStatus === 'Y'">
+        <div class="promoter-card-ft-info">销售累计收益(元)
+          <IconFont class="icon" name="ask" @click="onHelpClick('profits')" />
+        </div>
+        <div class="promoter-card-ft-num number" @click="emits('profits', tab)">
+          {{ formatAmount(promoter.totalIncome || 0) }}
+          <img class="arrow-img" src="https://cdn.ddjf.com/static/images/appkit/arrow.png" alt="">
+        </div>
+      </div>
+      <div class="promoter-card-ft-line"
+        v-if="applyRecord.accessCheckStatus === 'Y' && applyRecord.distributorFlag === 'Y'">
+      </div>
+      <div class="promoter-card-ft-item" v-if="applyRecord.distributorFlag === 'Y'">
+        <div class="promoter-card-ft-info">返佣累计收益(元)
+          <IconFont class="icon" name="ask" @click="onHelpClick('rebate')" />
+        </div>
+        <div class="promoter-card-ft-num number" @click="emits('rebate', tab)">
+          {{ formatAmount(promoter.totalRebateIncome || 0) }}
+          <img class="arrow-img" src="https://cdn.ddjf.com/static/images/appkit/arrow.png" alt="">
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { endpoints, useHttp } from '../api'
+import { Promoter } from '../types'
+import Taro, { useDidShow } from '@tarojs/taro'
+import { useAmount } from '../../shared/composables/useAmount'
+import { IconFont } from '@nutui/icons-vue-taro'
+
+type PromoterCardProps = {
+  useCase: string
+  applyRecord: any
+  isAdmin?: boolean
+}
+const props = withDefaults(defineProps<PromoterCardProps>(), {
+  useCase: '',
+  applyRecord: {},
+  isAdmin: false
+})
+
+const { formatAmount } = useAmount()
+const tab = ref('person')
+
+const promoter = ref<Promoter>({
+  balance: 0,
+  totalIncome: 0,
+  totalRebateIncome: 0,
+})
+
+function onTabChange(type: string) {
+  tab.value = type
+  loadPromoter()
+}
+
+async function loadPromoter() {
+  const $http = useHttp()
+  $http
+    .get<Promoter>(endpoints.获取推广方账户信息, {
+      useCase: tab.value,
+    })
+    .then((data) => {
+      promoter.value.balance = data?.balance || 0
+      promoter.value.totalIncome = data?.totalIncome || 0
+      promoter.value.totalRebateIncome = data?.totalRebateIncome || 0
+    })
+}
+
+const emits = defineEmits([
+  /**
+   * 跳可提现余额
+   */
+  'blance',
+  /**
+   * 跳收益页面
+   */
+  'profits',
+  /**
+   * 跳返佣统计页面
+   */
+  'rebate',
+])
+
+useDidShow(() => {
+  Object.keys(props.applyRecord)?.length && loadPromoter()
+})
+watch(() => props.applyRecord, () => {
+  Object.keys(props.applyRecord)?.length && loadPromoter()
+})
+
+defineExpose({
+  reload: loadPromoter,
+})
+
+const toastMap = {
+  profits: '推广北斗星报告获取，每笔报告销售收益= 客户查询价 - 我的成本价',
+  rebate: '推荐朋友使用北斗星、企明星获取，返佣收益= 返佣基数 * 返佣比例',
+}
+function onHelpClick(type: string) {
+  Taro.showModal({
+    content: toastMap[type],
+    showCancel: false,
+    confirmText: '知道了',
+  })
+}
+</script>
+
+<style lang="scss">
+.promoter-card {
+  position: relative;
+  padding: 20px;
+  background: #fff;
+  box-sizing: border-box;
+  margin: 0 auto;
+  border-radius: 15px;
+
+  .icon {
+    font-size: 10px;
+    color: rgba(53, 53, 53, 0.3);
+  }
+
+  .arrow {
+    position: absolute;
+    left: 0;
+    top: 22px;
+    width: 9px;
+    height: 16px;
+  }
+
+  &-hd {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    color: #353535;
+    margin-bottom: 12px;
+
+    &-num {
+      font-size: 26px;
+      font-weight: bold;
+      margin-top: 8px;
+      display: flex;
+      align-items: center;
+    }
+
+    &-info {
+      font-size: 14px;
+    }
+
+
+  }
+
+  &-ft {
+    display: flex;
+    align-items: center;
+
+    &-item {
+      flex: 1;
+    }
+
+    &-info {
+      font-size: 12px;
+      color: #434242;
+      margin-bottom: 5px;
+      display: flex;
+      align-items: center;
+    }
+
+    &-num {
+      display: flex;
+      align-items: center;
+      font-size: 20px;
+      color: #353535;
+    }
+
+    &-line {
+      width: 1px;
+      height: 19px;
+      background: rgba(53, 53, 53, 0.2);
+      margin-right: 30px;
+    }
+  }
+
+  &-tab {
+    position: absolute;
+    top: 10px;
+    right: 13px;
+    border-radius: 4px;
+    overflow: hidden;
+    background: rgba(204, 204, 204, 0.2);
+
+    &-item {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      height: 29px;
+      width: 90px;
+      box-sizing: border-box;
+      padding: 0 10px;
+      font-size: 13px;
+      color: #353535;
+
+      &.focus {
+        background: linear-gradient(90deg, #FFEBC1 0%, #FFF9ED 100%);
+        font-weight: bold;
+        border-radius: 4px;
+      }
+    }
+  }
+
+  .arrow-img {
+    width: 16px;
+    height: 12px;
+    margin-left: 5px;
+  }
+}
+</style>

package/src/balance/components/index.ts

@@ -1,9 +1,8 @@
 import BalanceCard from './BalanceCard.vue'
 import AccountView from './AccountView.vue'
 import BalanceReminder from './BalanceReminder.vue'
+import DateRange from './DateRange.vue'
+import ListFilter from './ListFilter.vue'
+import PromoterCard from './PromoterCard.vue'
 
-export {
-  BalanceCard,
-  AccountView,
-  BalanceReminder,
-}
+export { BalanceCard, AccountView, BalanceReminder, DateRange, ListFilter, PromoterCard }

package/src/balance/types.ts

@@ -89,3 +89,9 @@ export type 权益类目 = {
   name: string
   code: string
 }
+
+export type Promoter = {
+  balance: number
+  totalIncome: number
+  totalRebateIncome: number
+}

package/src/index.ts

@@ -72,9 +72,9 @@ const AppKit = {
     nutComponents.forEach((component) => {
       app.use(component)
     })
-    Object.entries(appComponents).forEach(([name, component]) => {
-      app.component(name, component)
-    })
+    // Object.entries(appComponents).forEach(([name, component]) => {
+    //   app.component(name, component)
+    // })
   },
 }
 

package/src/notice/api/index.ts

@@ -2,7 +2,9 @@ import Taro from '@tarojs/taro'
 import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
+import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
 
+const logger = useLogger()
 /**
  * 小程序端 Http
  * 使用 Taro.request 实现
@@ -10,17 +12,39 @@ import { useAppKitOptions } from '../../Appkit'
 const vendor = {
   async request<T>(config: HttpRequestConfig) {
     return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      const header = {
+        ...config.headers,
+        traceId: generateUniqueId('appkit'),
+      }
+      const startTime = new Date().getTime()
+
       Taro.request({
         url: config.url,
         method: config.method,
-        header: config.headers,
+        header,
         data: config.data,
       })
         .then(({ data }) => {
-          resolve({
-            status: +data.code,
-            message: data.msg,
-            data: data.result as T,
+          if (data.success) {
+            resolve({
+              status: +data.code,
+              message: data.msg,
+              data: data.result as T,
+            })
+          } else if (data.code !== '401') {
+            Taro.showToast({
+              title: data.msg,
+              icon: 'none',
+            })
+          }
+
+          // 记录阿里日志
+          const endTime = new Date().getTime()
+          logger.info({
+            send: JSON.stringify({ url: config.url, data: config.data }),
+            receive: JSON.stringify(data),
+            traceId: header.traceId,
+            duration: endTime - startTime,
           })
         })
         .catch((e: any) => {

package/src/notice/components/NoticeBanner.vue

@@ -40,7 +40,7 @@ import DdNoticeBar from '../../components/dd-notice-bar/index.vue'
 import NoticePopup from './NoticePopup.vue'
 import Taro from '@tarojs/taro'
 import { useNotice } from './useNotice'
-import debounce from 'lodash/debounce'
+import debounce from 'lodash-es/debounce'
 import { useSafeArea } from '../../shared/composables'
 
 const props = withDefaults(

package/src/notice/components/NoticeEntry.vue

@@ -15,7 +15,7 @@ import { ref } from 'vue'
 import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
 import Taro, { useDidShow } from '@tarojs/taro'
-import debounce from 'lodash/debounce'
+import debounce from 'lodash-es/debounce'
 
 const props = withDefaults(
   defineProps<{
@@ -66,7 +66,7 @@ async function getNotice() {
 
 <style lang="scss">
 .notice-entry {
-  position: fixed;
+  position: absolute;
   right: 0;
   top: 120px;
   min-width: 66px;

package/src/notice/components/NoticePopup.vue

@@ -155,6 +155,7 @@ const emits = defineEmits(['close', 'view'])
       align-items: center;
       justify-content: center;
       border-radius: 15px;
+      z-index: 10;
     }
   }
 }

package/src/payment/api/index.ts

@@ -2,7 +2,9 @@ import Taro from '@tarojs/taro'
 import { HttpRequestConfig, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
+import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
 
+const logger = useLogger()
 /**
  * 小程序端 Http
  * 使用 Taro.request 实现
@@ -10,17 +12,39 @@ import { useAppKitOptions } from '../../Appkit'
 const vendor = {
   async request<T>(config: HttpRequestConfig) {
     return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      const header = {
+        ...config.headers,
+        traceId: generateUniqueId('appkit'),
+      }
+      const startTime = new Date().getTime()
+
       Taro.request({
         url: config.url,
         method: config.method,
-        header: config.headers,
+        header,
         data: config.data,
       })
         .then(({ data }) => {
-          resolve({
-            status: data.code,
-            message: data.msg,
-            data: data.result as T,
+          if (data.success) {
+            resolve({
+              status: +data.code,
+              message: data.msg,
+              data: data.result as T,
+            })
+          } else if (data.code !== '401') {
+            Taro.showToast({
+              title: data.msg,
+              icon: 'none',
+            })
+          }
+
+          // 记录阿里日志
+          const endTime = new Date().getTime()
+          logger.info({
+            send: JSON.stringify({ url: config.url, data: config.data }),
+            receive: JSON.stringify(data),
+            traceId: header.traceId,
+            duration: endTime - startTime,
           })
         })
         .catch((e: any) => {
@@ -30,12 +54,17 @@ const vendor = {
   },
 }
 
-function useHttp() {
+interface DefaultHeaderType {
+  Token?: string
+  Appcode?: string
+  Tenant?: string
+}
+function useHttp(defaultHeader?: DefaultHeaderType) {
   const appkitOptions = useAppKitOptions()
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`,
+    Appcode: defaultHeader?.Appcode || appkitOptions.app(),
+    cookie: `tid=${defaultHeader?.Tenant || appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : '0',
   }
   /**

package/src/payment/components/AmountPicker.vue

@@ -1,15 +1,7 @@
 <template>
-  <nut-grid
-    class="amount-picker"
-    :column-num="3"
-    :gutter="10"
-    :border="false">
-    <nut-grid-item
-      class="tile"
-      v-for="(amount, index) in items"
-      :class="{selected: state.selected === index}"
-      @click="() => onGridItemClick(index)"
-      :key="index">
+  <nut-grid class="amount-picker" :column-num="3" :gutter="10" :border="false">
+    <nut-grid-item class="tile" v-for="(amount, index) in items" :class="{ selected: state.selected === index }"
+      @click="() => onGridItemClick(index)" :key="index">
       <h4 class="token-line number">{{ amount.token }}</h4>
       <h5>¥<span class="number">{{ amount.amount }}</span></h5>
     </nut-grid-item>
@@ -56,14 +48,17 @@ const onGridItemClick = (index: number) => {
 <style lang="scss">
 .amount-picker {
   padding: 14px 0 14px 14px;
+
   .nut-grid-item__content {
-    border: solid 2px transparent;
+    border: solid 1px transparent;
     background: linear-gradient(#f5f5f5, #f5f5f5) padding-box,
       linear-gradient(to bottom, #cccccc88, #cccccc88) border-box;
     border-radius: 5px;
   }
+
   .tile {
     height: 80px;
+
     &.selected {
       .nut-grid-item__content {
         background: linear-gradient(#FFF7E3, #FEFDE6) padding-box,
@@ -71,6 +66,7 @@ const onGridItemClick = (index: number) => {
       }
     }
   }
+
   h4.token-line {
     background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
     background-size: 20px;
@@ -82,6 +78,7 @@ const onGridItemClick = (index: number) => {
     line-height: 25px;
     font-size: 18px;
   }
+
   h5 {
     line-height: 18px;
     color: #353535;

package/src/payment/components/RechargeView.vue

@@ -1,33 +1,22 @@
 <template>
   <view class="view recharge-view">
     <view class="flex-grow">
-      <amount-picker :items="amounts"
-        :selected="state.selected"
-        @change="onAmountSelect" />
+      <amount-picker :items="amounts" :selected="state.selected" @change="onAmountSelect" />
     </view>
     <view class="amount-footer">
       <view class="agreement">
-        <nut-checkbox v-model="state.agreed">我已阅读并同意<a class="link inline" @click="onAgreementLinkClick">《大道云平台云豆充值服务协议》</a></nut-checkbox>
+        <nut-checkbox v-model="state.agreed">我已阅读并同意<a class="link inline"
+            @click="onAgreementLinkClick">《大道云平台云豆充值服务协议》</a></nut-checkbox>
       </view>
-      <nut-button block
-        shape="square"
-        :loading="state.buttonLoading"
-        @click="onPayClick"
+      <nut-button block shape="square" :loading="state.buttonLoading" @click="onPayClick"
         class="recharge-button">立即充值</nut-button>
     </view>
-    <app-drawer
-      v-model="state.agreementOpen"
-      title="充值协议">
-      <user-agreement />
-    </app-drawer>
   </view>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, reactive, ref } from 'vue'
 import AmountPicker from './AmountPicker.vue'
-import UserAgreement from './UserAgreement.vue'
-import { AppDrawer } from '../../shared'
 import { useHttp, endpoints } from '../api'
 import { requestPayment } from '../services'
 import Taro from '@tarojs/taro'
@@ -54,7 +43,8 @@ export interface RechargeViewProps {
 const props = defineProps<RechargeViewProps>()
 
 const emit = defineEmits<{
-  (event: 'complete', value: boolean): void
+  (event: 'complete', value: boolean): void,
+  (event: 'agree'): void,
 }>()
 
 const state = reactive({
@@ -66,8 +56,11 @@ const state = reactive({
 
 const amounts = ref<any[]>([])
 
-const onAgreementLinkClick = ($event) => {
-  state.agreementOpen = true
+const onAgreementLinkClick = (e) => {
+  e.preventDefault()
+  e.stopImmediatePropagation()
+  emit('agree')
+  // state.agreementOpen = true
 }
 
 const onAmountSelect = (selected: number) => {
@@ -75,10 +68,10 @@ const onAmountSelect = (selected: number) => {
 }
 
 onMounted(() => {
-  const $http = useHttp()
+  const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' ? props.app : '', Tenant: props.tenant })
+
   $http.get<any[]>(endpoints.获取充值金额列表, {
     app: props.app,
-    // stage: 'aiApproveRecharge', // 支付场景
     tenant: props.tenant
   }).then(response => {
     amounts.value = response
@@ -95,7 +88,7 @@ const onPayClick = () => {
   }
   state.buttonLoading = true
   wx.login({
-    success ({code}: {code: string}) {
+    success({ code }: { code: string }) {
       requestPayment({
         amount: amounts.value[state.selected].amount,
         app: props.app, // 'crm',
@@ -117,12 +110,16 @@ const onPayClick = () => {
   height: 100%;
   display: flex;
   flex-direction: column;
+  --nut-primary-color: #017fff;
+
   .flex-grow {
     flex-grow: 1;
   }
+
   .amount-footer {
     padding: 10px;
     padding-bottom: 20px;
+
     .agreement {
       font-size: 12px;
       display: flex;
@@ -130,6 +127,7 @@ const onPayClick = () => {
       align-items: cebter;
       height: 40px;
     }
+
     .recharge-button {
       background: linear-gradient(90deg, #FFEBC1 0%, #FFD7A7 52.29%, #FFB875 100%);
       color: #353535;
@@ -137,14 +135,17 @@ const onPayClick = () => {
       border: 0;
       border-radius: 8px;
     }
+
     .nut-checkbox {
       line-height: 40px;
     }
+
     .nut-checkbox__label {
       margin-left: 8px;
       flex: flex;
       font-size: 12px;
     }
+
     .link {
       display: inline;
       color: #FD6701;