@uxda/appkit 4.2.78 → 4.2.80

package/dist/index.js

@@ -504,6 +504,35 @@ function useLogger(options) {
   };
 }
 
+function useWxAuth() {
+  function toWxAuth(source, redirectUri) {
+    const $http = useHttp$2();
+    $http.get("/cas/auth/render/", {
+      source,
+      redirectUri
+    }).then((res) => {
+      location.replace(res);
+    });
+  }
+  async function toCallbackLogin({ code, state, source }, cb) {
+    const $http = useHttp$2();
+    const res = await $http.post(
+      `/cas/auth/callbackLogin/${source}`,
+      { code, state, source },
+      {
+        "Content-Type": "application/x-www-form-urlencoded"
+      }
+    );
+    if (res) {
+      cb && cb(res);
+    }
+  }
+  return {
+    toWxAuth,
+    toCallbackLogin
+  };
+}
+
 const _hoisted_1$E = {
   key: 0,
   class: "page-title"
@@ -924,6 +953,13 @@ const vendor$3 = {
         header,
         data: config.data
       }).then(({ data }) => {
+        const endTime = (/* @__PURE__ */ new Date()).getTime();
+        logger$3.info({
+          send: JSON.stringify({ url: config.url, data: config.data }),
+          receive: JSON.stringify(data),
+          traceId: header.traceId,
+          duration: endTime - startTime
+        });
         if (data.success) {
           resolve({
             status: +data.code,
@@ -936,13 +972,6 @@ const vendor$3 = {
             icon: "none"
           });
         }
-        const endTime = (/* @__PURE__ */ new Date()).getTime();
-        logger$3.info({
-          send: JSON.stringify({ url: config.url, data: config.data }),
-          receive: JSON.stringify(data),
-          traceId: header.traceId,
-          duration: endTime - startTime
-        });
       }).catch((e) => {
         reject(e);
       });
@@ -1414,11 +1443,12 @@ const get = (url, data) => {
     method: HttpMethod.get
   });
 };
-const post = (url, data) => {
+const post = (url, data, headers) => {
   return request({
     url,
     data,
-    method: HttpMethod.post
+    method: HttpMethod.post,
+    headers
   });
 };
 const defaultClientConfig = {
@@ -1544,6 +1574,13 @@ const vendor$2 = {
         header,
         data: config.data
       }).then(({ data }) => {
+        const endTime = (/* @__PURE__ */ new Date()).getTime();
+        logger$2.info({
+          send: JSON.stringify({ url: config.url, data: config.data }),
+          receive: JSON.stringify(data),
+          traceId: header.traceId,
+          duration: endTime - startTime
+        });
         if (data.success) {
           resolve({
             status: +data.code,
@@ -1556,13 +1593,6 @@ const vendor$2 = {
             icon: "none"
           });
         }
-        const endTime = (/* @__PURE__ */ new Date()).getTime();
-        logger$2.info({
-          send: JSON.stringify({ url: config.url, data: config.data }),
-          receive: JSON.stringify(data),
-          traceId: header.traceId,
-          duration: endTime - startTime
-        });
       }).catch((e) => {
         reject(e);
       });
@@ -4916,6 +4946,13 @@ const vendor$1 = {
         header,
         data: config.data
       }).then(({ data }) => {
+        const endTime = (/* @__PURE__ */ new Date()).getTime();
+        logger$1.info({
+          send: JSON.stringify({ url: config.url, data: config.data }),
+          receive: JSON.stringify(data),
+          traceId: header.traceId,
+          duration: endTime - startTime
+        });
         if (data.success) {
           resolve({
             status: +data.code,
@@ -4928,13 +4965,6 @@ const vendor$1 = {
             icon: "none"
           });
         }
-        const endTime = (/* @__PURE__ */ new Date()).getTime();
-        logger$1.info({
-          send: JSON.stringify({ url: config.url, data: config.data }),
-          receive: JSON.stringify(data),
-          traceId: header.traceId,
-          duration: endTime - startTime
-        });
       }).catch((e) => {
         reject(e);
       });
@@ -4990,7 +5020,8 @@ const _hoisted_2$c = { style: { "white-space": "pre-wrap" } };
 var script$i = /* @__PURE__ */ defineComponent({
   __name: "NoticePopup",
   props: {
-    message: { type: null, required: true, default: {} }
+    message: { type: null, required: true, default: {} },
+    device: { type: String, required: false, default: "MINI" }
   },
   emits: ["close", "view"],
   setup(__props, { emit: __emit }) {
@@ -5009,7 +5040,7 @@ var script$i = /* @__PURE__ */ defineComponent({
     async function onClose() {
       const $http = useHttp$1();
       $http.post("/cas/msg/setMsgStatus", {
-        device: "MINI",
+        device: props.device || "MINI",
         noticeStatus: 0,
         receiveId: props.message.id
       }).then(() => {
@@ -5104,7 +5135,8 @@ var script$h = /* @__PURE__ */ defineComponent({
   props: {
     app: { type: String, required: true, default: "" },
     bannerStyle: { type: null, required: false, default: "" },
-    fixed: { type: Boolean, required: false, default: false }
+    fixed: { type: Boolean, required: false, default: false },
+    device: { type: String, required: false, default: "MINI" }
   },
   emits: ["detail", "close", "view", "popup", "hasBanner"],
   setup(__props, { emit: __emit }) {
@@ -5140,7 +5172,7 @@ var script$h = /* @__PURE__ */ defineComponent({
       const appkitOptions = useAppKitOptions();
       const $http = useHttp$1();
       $http.post("/cas/msg/queryNoticeMsg", {
-        device: "MINI",
+        device: props.device || "MINI",
         deviceType: 2,
         msgType: 3,
         appCode: props.app || appkitOptions.app(),
@@ -5180,8 +5212,7 @@ var script$h = /* @__PURE__ */ defineComponent({
       stopMessageCarousel();
       const $http = useHttp$1();
       $http.post("/cas/msg/setMsgStatus", {
-        device: "MINI",
-        deviceType: 0,
+        device: props.device || "MINI",
         noticeStatus: 1,
         receiveId: item.id
       }).then(() => {
@@ -5209,6 +5240,11 @@ var script$h = /* @__PURE__ */ defineComponent({
       startMessageCarousel();
     }, 100);
     const emits = __emit;
+    function onPopupClose() {
+      setTimeout(() => {
+        popMessages.value.splice(0, 1);
+      }, 100);
+    }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(
         Fragment,
@@ -5236,7 +5272,7 @@ var script$h = /* @__PURE__ */ defineComponent({
                     onClose: ($event) => unref(onClose)(item, key)
                   }, {
                     default: withCtx(() => [
-                      _cache[3] || (_cache[3] = createElementVNode(
+                      _cache[2] || (_cache[2] = createElementVNode(
                         "img",
                         {
                           class: "notice-banner-icon",
@@ -5273,10 +5309,11 @@ var script$h = /* @__PURE__ */ defineComponent({
           createCommentVNode(" \u7CFB\u7EDF\u516C\u544A\u5F3A\u5236\u5F39\u6846 "),
           popMessages.value.length ? (openBlock(), createBlock(script$i, {
             key: 1,
+            device: _ctx.device,
             message: popMessages.value[0],
-            onClose: _cache[1] || (_cache[1] = ($event) => popMessages.value.splice(0, 1)),
-            onView: _cache[2] || (_cache[2] = ($event) => onView(popMessages.value[0]))
-          }, null, 8, ["message"])) : createCommentVNode("v-if", true)
+            onClose: onPopupClose,
+            onView: _cache[1] || (_cache[1] = ($event) => onView(popMessages.value[0]))
+          }, null, 8, ["device", "message"])) : createCommentVNode("v-if", true)
         ],
         64
         /* STABLE_FRAGMENT */
@@ -5951,6 +5988,13 @@ const vendor = {
         header,
         data: config.data
       }).then(({ data }) => {
+        const endTime = (/* @__PURE__ */ new Date()).getTime();
+        logger.info({
+          send: JSON.stringify({ url: config.url, data: config.data }),
+          receive: JSON.stringify(data),
+          traceId: header.traceId,
+          duration: endTime - startTime
+        });
         if (data.success) {
           resolve({
             status: +data.code,
@@ -5963,13 +6007,6 @@ const vendor = {
             icon: "none"
           });
         }
-        const endTime = (/* @__PURE__ */ 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) => {
         reject(e);
       });
@@ -9297,4 +9334,4 @@ const AppKit = {
   }
 };
 
-export { script$s as AccountView, script$L as AmountPicker, script$J as AppDrawer, script$I as AppVerify, script$y as BalanceCard, script$r as BalanceReminder, script$q as DateRange, script$G as DeviceVersion, script$o as ListFilter, script$4 as LoginSetting, script$h as NoticeBanner, script$g as NoticeEntry, script$e as NoticeList, script$E as OcrBusinessLicense, script$F as OcrIcon, script$K as PageHeader, script$n as PromoterCard, script$B as RechargeResult, script$D as RechargeView, script$j as SelfRegistration, script as SharePoster, script$z as TradeView, script$C as UserAgreement, script$2 as UserAuth, script$a as UserBinding, script$9 as UserBindingSuccess, script$d as UserEntry, script$6 as UserFeedback, script$5 as UserFeedbackEntry, script$7 as UserHeadCrop, script$b as UserInfo, script$3 as UserResourceEmpty, components, createHttp, AppKit as default, defaultCryptoConfig, generateUniqueId, getSdkConfig, jssdkServices, requestPayment$2 as requestPayment, requestWxH5Pay, services$1 as services, useAppKit, useCountdown, useCrypto, useEncode, useLogger, useSafeArea, useTabbar, useUpload, useValidator };
+export { script$s as AccountView, script$L as AmountPicker, script$J as AppDrawer, script$I as AppVerify, script$y as BalanceCard, script$r as BalanceReminder, script$q as DateRange, script$G as DeviceVersion, script$o as ListFilter, script$4 as LoginSetting, script$h as NoticeBanner, script$g as NoticeEntry, script$e as NoticeList, script$E as OcrBusinessLicense, script$F as OcrIcon, script$K as PageHeader, script$n as PromoterCard, script$B as RechargeResult, script$D as RechargeView, script$j as SelfRegistration, script as SharePoster, script$z as TradeView, script$C as UserAgreement, script$2 as UserAuth, script$a as UserBinding, script$9 as UserBindingSuccess, script$d as UserEntry, script$6 as UserFeedback, script$5 as UserFeedbackEntry, script$7 as UserHeadCrop, script$b as UserInfo, script$3 as UserResourceEmpty, components, createHttp, AppKit as default, defaultCryptoConfig, generateUniqueId, getSdkConfig, jssdkServices, requestPayment$2 as requestPayment, requestWxH5Pay, services$1 as services, useAppKit, useCountdown, useCrypto, useEncode, useLogger, useSafeArea, useTabbar, useUpload, useValidator, useWxAuth };

package/package.json

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

package/src/balance/api/index.ts

@@ -25,6 +25,15 @@ const vendor = {
         data: config.data,
       })
         .then(({ data }) => {
+          // 记录阿里日志
+          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,
+          })
+
           if (data.success) {
             resolve({
               status: +data.code,
@@ -37,15 +46,6 @@ const vendor = {
               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) => {
           reject(e)

package/src/index.ts

@@ -71,6 +71,7 @@ const AppKit = {
     appKitOptions.baseUrl = options.baseUrl
     appKitOptions[401] = options[401]
     appKitOptions.gray = options.gray
+
     nutComponents.forEach((component) => {
       app.use(component)
     })

package/src/notice/api/index.ts

@@ -25,6 +25,15 @@ const vendor = {
         data: config.data,
       })
         .then(({ data }) => {
+          // 记录阿里日志
+          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,
+          })
+
           if (data.success) {
             resolve({
               status: +data.code,
@@ -37,15 +46,6 @@ const vendor = {
               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) => {
           reject(e)

package/src/notice/components/NoticeBanner.vue

@@ -12,7 +12,7 @@
   </div>
 
   <!-- 系统公告强制弹框 -->
-  <NoticePopup v-if="popMessages.length" :message="popMessages[0]" @close="popMessages.splice(0, 1)"
+  <NoticePopup v-if="popMessages.length" :device="device" :message="popMessages[0]" @close="onPopupClose"
     @view="onView(popMessages[0])" />
 </template>
 
@@ -32,11 +32,13 @@ const props = withDefaults(
     app: string
     bannerStyle?: any
     fixed?: boolean
+    device?: string
   }>(),
   {
     app: '',
     bannerStyle: '',
     fixed: false,
+    device: 'MINI',
   }
 )
 
@@ -78,7 +80,7 @@ async function queryNoticeMsg() {
   const $http = useHttp()
   $http
     .post('/cas/msg/queryNoticeMsg', {
-      device: 'MINI',
+      device: props.device || 'MINI',
       deviceType: 2,
       msgType: 3,
       appCode: props.app || appkitOptions.app(),
@@ -128,8 +130,7 @@ const onClose = debounce((item: any, index: number) => {
   const $http = useHttp()
   $http
     .post('/cas/msg/setMsgStatus', {
-      device: 'MINI',
-      deviceType: 0,
+      device: props.device || 'MINI',
       noticeStatus: 1,
       receiveId: item.id,
     })
@@ -173,6 +174,12 @@ const onTouchEnd = debounce(() => {
 
 // 父组件事件
 const emits = defineEmits(['detail', 'close', 'view', 'popup', 'hasBanner'])
+
+function onPopupClose() {
+  setTimeout(() => {
+    popMessages.value.splice(0, 1)
+  }, 100);
+}
 </script>
 
 <style lang="scss">

package/src/notice/components/NoticePopup.vue

@@ -23,9 +23,11 @@ import { useHttp } from '../api'
 const props = withDefaults(
   defineProps<{
     message: any
+    device?: string
   }>(),
   {
     message: {},
+    device: 'MINI',
   }
 )
 
@@ -53,7 +55,7 @@ async function onClose() {
 
   $http
     .post('/cas/msg/setMsgStatus', {
-      device: 'MINI',
+      device: props.device || 'MINI',
       noticeStatus: 0,
       receiveId: props.message.id,
     })

package/src/payment/api/index.ts

@@ -25,6 +25,15 @@ const vendor = {
         data: config.data,
       })
         .then(({ data }) => {
+          // 记录阿里日志
+          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,
+          })
+
           if (data.success) {
             resolve({
               status: +data.code,
@@ -37,15 +46,6 @@ const vendor = {
               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) => {
           reject(e)
@@ -67,6 +67,7 @@ function useHttp(defaultHeader?: DefaultHeaderType) {
     cookie: `tid=${defaultHeader?.Tenant || appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : '0',
   }
+
   /**
    * 传入配置获取 Http instanse
    */

package/src/shared/composables/index.ts

@@ -6,3 +6,4 @@ export * from './useEncode'
 export * from './useUpload'
 export * from './useCrypto'
 export * from './useLogger'
+export * from './useWxAuth'

package/src/shared/composables/useWxAuth.ts

@@ -0,0 +1,48 @@
+/**
+ * @description: H5微信授权相关
+ */
+
+import { useHttp } from '../../payment/api'
+
+export function useWxAuth() {
+  /**
+   * 跳转微信授权页面，授权完成后，返回授权码code与state
+   * @param source 设备码
+   * @param redirectUri 重定向地址
+   */
+  function toWxAuth(source, redirectUri) {
+    const $http = useHttp()
+    $http
+      .get('/cas/auth/render/', {
+        source,
+        redirectUri,
+      })
+      .then((res: any) => {
+        location.replace(res)
+      })
+  }
+
+  /**
+   * 授权回调后，登录cas获取用户信息
+   * @param source
+   * @param state
+   */
+  async function toCallbackLogin({ code, state, source }, cb) {
+    const $http = useHttp()
+    const res = await $http.post(
+      `/cas/auth/callbackLogin/${source}`,
+      { code, state, source },
+      {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      }
+    )
+    if (res) {
+      cb && cb(res)
+    }
+  }
+
+  return {
+    toWxAuth,
+    toCallbackLogin,
+  }
+}

package/src/shared/http/Http.ts

@@ -8,6 +8,7 @@ import {
   ResponseRaw,
   Paging,
   HttpTranslate,
+  RequestHeaders,
 } from './types'
 /**
  * Useage:
@@ -96,11 +97,16 @@ const get: HttpInstance['get'] = <T = ResponseData>(url: string, data?: RequestD
   })
 }
 
-const post: HttpInstance['post'] = <T = ResponseData>(url: string, data: RequestData) => {
+const post: HttpInstance['post'] = <T = ResponseData>(
+  url: string,
+  data: RequestData,
+  headers?: RequestHeaders
+) => {
   return request<T>({
     url,
     data,
     method: HttpMethod.post,
+    headers,
   })
 }
 

package/src/shared/http/types.ts

@@ -3,21 +3,21 @@
  * createHttp() 使用的配置
  */
 export type HttpClientConfig = {
-  vendor?: HttpVendor,
-  baseUrl: string,
+  vendor?: HttpVendor
+  baseUrl: string
   /**
    * 向 HTTP header 加入的数据
    * 通常含有 JWT token 以及其他参数
    */
-  headers?: HeaderParams,
-  paging?: Paging,
+  headers?: HeaderParams
+  paging?: Paging
   /**
    * 拦截器组
    * 请求返回异常时进行一定的操作
    */
-  interceptors?: HttpInterceptor[],
-  translates?: HttpTranslates,
-  transforms?: HttpTransforms,
+  interceptors?: HttpInterceptor[]
+  translates?: HttpTranslates
+  transforms?: HttpTransforms
 }
 
 /**
@@ -25,7 +25,7 @@ export type HttpClientConfig = {
  * Axios/Taro.request
  */
 export type HttpVendor = {
-  request <T = ResponseData>(config: HttpRequestConfig): Promise<ResponseRaw<T>>
+  request<T = ResponseData>(config: HttpRequestConfig): Promise<ResponseRaw<T>>
 }
 
 export type HttpInterceptor = (raw: ResponseRaw) => boolean
@@ -35,11 +35,11 @@ export type HttpInterceptor = (raw: ResponseRaw) => boolean
  * 沿用 Axios 的部分配置
  */
 export type HttpRequestConfig<D = RequestData> = {
-  url: string,
-  method?: HttpMethod,
-  baseUrl?: string,
-  headers?: HeaderData,
-  data?: D,
+  url: string
+  method?: HttpMethod
+  baseUrl?: string
+  headers?: HeaderData
+  data?: D
 }
 
 /**
@@ -47,12 +47,14 @@ export type HttpRequestConfig<D = RequestData> = {
  */
 export type RequestData = Record<string, any>
 
+export type RequestHeaders = Record<string, any>
+
 /**
  * 接口请求返回的标准格式
  */
 export type ResponseRaw<T = ResponseData> = {
-  status: number,
-  message: string,
+  status: number
+  message: string
   data: T
 }
 
@@ -63,8 +65,8 @@ export type ResponseData = Record<string, any> | any[]
 
 export type HttpInstance = {
   request<T = ResponseData>(config: HttpRequestConfig): Promise<T>
-  get<T = ResponseData>(url: string, data?: RequestData): Promise<T>,
-  post<T = ResponseData>(url: string, data?: RequestData): Promise<T>,
+  get<T = ResponseData>(url: string, data?: RequestData): Promise<T>
+  post<T = ResponseData>(url: string, data?: RequestData, headers?: RequestHeaders): Promise<T>
 }
 
 /**
@@ -88,7 +90,7 @@ export enum HttpMethod {
 
 export enum HttpError {
   auth = 'auth',
-  server = 'server'
+  server = 'server',
 }
 
 export type HeaderData = Record<string, string>
@@ -107,9 +109,9 @@ export type HttpTransform = (data: ResponseData) => ResponseData
  * 接口设置
  */
 export type HttpEndpoint = {
-  path: string,
-  translate?: HttpTranslate,
-  transform?: HttpTransform,
+  path: string
+  translate?: HttpTranslate
+  transform?: HttpTransform
 }
 
 /**
@@ -126,33 +128,33 @@ export type PagingParams = {
   /**
    * 页数
    */
-  page: number,
+  page: number
   /**
    * 页数据条数
    */
-  pageSize: number,
+  pageSize: number
 }
 
 export type PagingData = {
   /**
    * 页总数
    */
-  totalPages: number,
+  totalPages: number
 }
 
 /**
  * Wrapped with Paging Data
  */
 export type WithPaging<T = ResponseData> = {
-  [K in keyof PagingData]: PagingData[K];
+  [K in keyof PagingData]: PagingData[K]
 } & {
-  data: T;
+  data: T
 }
 
 /**
  * 分页设置
  */
 export type Paging = {
-  translate (params: PagingParams): any,
-  transform (resonse: any): PagingData,
-}
+  translate(params: PagingParams): any
+  transform(resonse: any): PagingData
+}

package/src/user/api/index.ts

@@ -25,6 +25,15 @@ const vendor = {
         data: config.data,
       })
         .then(({ data }) => {
+          // 记录阿里日志
+          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,
+          })
+
           if (data.success) {
             resolve({
               status: +data.code,
@@ -37,15 +46,6 @@ const vendor = {
               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) => {
           reject(e)