ci-plus 1.2.9 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {

package/src/utils/cardPrint.ts

@@ -6,16 +6,15 @@
  * @since : 创建时间 2024-03-15 15:16:12
  */
 // import { scan_card_code_get } from '@/api/InventoryBatch'
-import { ElMessage } from 'element-plus'
+import { ElMessage, MessageParamsWithType } from 'element-plus'
 import { setDate } from '@/utils/Dayjs'
 import apis from '@/utils/baseApi'
 import axios from 'axios'
 import { ref } from 'vue'
 const { storageModule } = apis
 
-let baseUrls = new URL(storageModule).origin + '/' // 图片的地址前缀
-
-let url = storageModule + 'scan_card_code_get/'
+let baseUrls = storageModule //new URL(storageModule).origin + '/' // 图片的地址前缀
+let apiurl = storageModule + 'scan_card_code_get/'
 
 export const cardPrint = (
   cParams: any,
@@ -23,7 +22,7 @@ export const cardPrint = (
   baseUrl?: string,
 ): any => {
   // 通过表示卡号获取打印信息
-  let _URL = baseUrl ? baseUrl : url
+  let _URL = baseUrl ? baseUrl : apiurl
   axios
     .get(_URL, {
       params: {
@@ -31,12 +30,12 @@ export const cardPrint = (
         ...cParams,
       },
     })
-    .then((_res) => {
+    .then((_res: { data: { code: number; data: any[]; msg: MessageParamsWithType } }) => {
       console.log('res: ', _res)
-      if (_res.data.code != 200) return ElMessage.error(_res.data.msg)
-      if (_res.data.data && _res.data.data.length < 1)
+      if (_res.data.code != 200 || (_res.data.data && _res.data.data.length < 1)) {
+        callback([])
         return ElMessage.error(_res.data.msg)
-
+      }
       let data = _res.data.data
       console.log('data: ', data)
       let dataInfo: any[] = []
@@ -775,11 +774,11 @@ export const cardPrint = (
 
         dataInfo.push(obj)
       })
-      console.log('dataInfo: ', dataInfo)
+      console.log('处理好的标识卡信息：', dataInfo)
       callback(dataInfo)
     })
-    .catch((err) => {
-      console.log('err: ', err)
+    .catch((err: any) => {
+      console.log('错误: ', err)
       callback([])
     })
 }