ZaiZai 1 gadu atpakaļ
vecāks
revīzija
75e3029958

+ 4 - 4
package.json

@@ -19,7 +19,7 @@
     "dependencies": {
         "axios": "^1.7.2",
         "crypto-js": "^4.2.0",
-        "dayjs": "^1.11.11",
+        "dayjs": "^1.11.12",
         "echarts": "^5.5.1",
         "element-plus": "^2.7.7",
         "hc-vue3-ui": "^4.1.0",
@@ -29,17 +29,17 @@
         "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "split.js": "^1.6.5",
-        "vue": "3.4.31",
+        "vue": "3.4.33",
         "vue-router": "^4.4.0",
         "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
-        "@iconify-json/iconoir": "^1.1.44",
+        "@iconify-json/iconoir": "^1.1.45",
         "@iconify-json/ri": "^1.1.21",
         "@unocss/eslint-config": "0.58.2",
         "@unocss/eslint-plugin": "0.58.2",
         "@vitejs/plugin-vue": "^4.5.2",
-        "@vue/compiler-sfc": "^3.4.31",
+        "@vue/compiler-sfc": "^3.4.33",
         "archiver": "^7.0.1",
         "bignumber.js": "^9.1.2",
         "eslint": "^8.56.0",

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240722094032"
+  "value": "20240722173341"
 }

+ 2 - 2
src/config/index.json

@@ -1,8 +1,8 @@
 {
     "version": "20230607160059",
     "target1": "http://127.0.0.1:8090",
-    "target": "http://192.168.0.125:8090",
-    "target3": "http://39.108.216.210:8090",
+    "target2": "http://192.168.0.125:8090",
+    "target": "http://39.108.216.210:8090",
     "target4": "http://192.168.0.109:8090",
     "target5": "http://192.168.0.102:8090",
     "smsPhone": "",

+ 0 - 1
src/views/debit-pay/material/material.vue

@@ -49,7 +49,6 @@ import { useAppStore } from '~src/store'
 import { HcDelMsg } from 'hc-vue3-ui'
 import { getArrValue } from 'js-fast-way'
 import mainApi from '~api/debit-pay/material/material'
-import HcDataModal from '~src/views/debit-pay/material/components/order/dataModal.vue'
 import HcdataModal from './components/material/dataModal.vue'
 
 //初始化

+ 6 - 19
src/views/debit-pay/material/order.vue

@@ -263,31 +263,18 @@ const editId = ref('')
 const rowEditClick = (row) => {
     isDataModal.value = true
     editId.value = row.id
-
 }
-const delRowClick = async (row)=>{
-    await HcDelMsg({
-        type: 'delete',
-        title: '确认删除提醒',
-        text: '请谨慎考虑后,确认是否需要删除?',
-        confirmText: '确认删除',
-        cancelText: '取消操作',
-    }, async (instance, resolve) => {
-        instance.confirmButtonLoading = true
-        instance.confirmButtonText = 'Loading...'
-         await removeProPay(row.id)
-         instance.confirmButtonLoading = false
-         resolve()
+const delRowClick = (row)=>{
+    HcDelMsg(async (resolve) => {
+        await removeProPay(row.id)
+        resolve()
     })
 }
 const removeProPay = async (id) => {
-    const { error, code, msg } = await mainApi.remove({
-        ids: id,
-    })
+    const { error, code, msg } = await mainApi.remove({ ids: id })
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
-       getTableData()
-
+       getTableData().then()
     } else {
         window.$message.error(msg ?? '操作失败')
     }

+ 133 - 9
yarn.lock

@@ -505,10 +505,10 @@
   resolved "http://39.108.216.210:9000/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
-"@iconify-json/iconoir@^1.1.44":
-  version "1.1.44"
-  resolved "http://39.108.216.210:9000/@iconify-json/iconoir/-/iconoir-1.1.44.tgz#753b36abee9ecedee5fb06e5c89924319de25f6d"
-  integrity sha512-XZZ6+nIgS3BUWTmIvZ1Um/TZcUsOEVDGOTZ50hihoTWYjfLLmPlxS/jxrTTpjJO/98wbyiDz4WOXFGqBrXMLPw==
+"@iconify-json/iconoir@^1.1.45":
+  version "1.1.45"
+  resolved "http://39.108.216.210:9000/@iconify-json/iconoir/-/iconoir-1.1.45.tgz#1cc8811af3eebb130d9c66054b6c90f0f38b49b5"
+  integrity sha512-3V0SpKdB0E3tr2YuxrLsazekNgBo8PZjTa+tII+0BuOZ2+LCRTIzRfxpzGNjEexl3poAwkp7/xTns93c870tAQ==
   dependencies:
     "@iconify/types" "*"
 
@@ -995,6 +995,17 @@
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
 
+"@vue/compiler-core@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/compiler-core/-/compiler-core-3.4.33.tgz#0b6013f9300822fd6cb7c8f7683c0483fa456165"
+  integrity sha512-MoIREbkdPQlnGfSKDMgzTqzqx5nmEjIc0ydLVYlTACGBsfvOJ4tHSbZXKVF536n6fB+0eZaGEOqsGThPpdvF5A==
+  dependencies:
+    "@babel/parser" "^7.24.7"
+    "@vue/shared" "3.4.33"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.0"
+
 "@vue/compiler-dom@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz#30961ca847f5d6ad18ffa26236c219f61b195f6b"
@@ -1003,7 +1014,15 @@
     "@vue/compiler-core" "3.4.31"
     "@vue/shared" "3.4.31"
 
-"@vue/compiler-sfc@3.4.31", "@vue/compiler-sfc@^3.4.31":
+"@vue/compiler-dom@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.33.tgz#1ceea5408a0e06c857a78d7a2be7fe3b63cf9f64"
+  integrity sha512-GzB8fxEHKw0gGet5BKlpfXEqoBnzSVWwMnT+dc25wE7pFEfrU/QsvjZMP9rD4iVXHBBoemTct8mN0GJEI6ZX5A==
+  dependencies:
+    "@vue/compiler-core" "3.4.33"
+    "@vue/shared" "3.4.33"
+
+"@vue/compiler-sfc@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz#cc6bfccda17df8268cc5440842277f61623c591f"
   integrity sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==
@@ -1018,6 +1037,21 @@
     postcss "^8.4.38"
     source-map-js "^1.2.0"
 
+"@vue/compiler-sfc@3.4.33", "@vue/compiler-sfc@^3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.33.tgz#6ea43dee6bb341967be26b47786f1f73a8e089a2"
+  integrity sha512-7rk7Vbkn21xMwIUpHQR4hCVejwE6nvhBOiDgoBcR03qvGqRKA7dCBSsHZhwhYUsmjlbJ7OtD5UFIyhP6BY+c8A==
+  dependencies:
+    "@babel/parser" "^7.24.7"
+    "@vue/compiler-core" "3.4.33"
+    "@vue/compiler-dom" "3.4.33"
+    "@vue/compiler-ssr" "3.4.33"
+    "@vue/shared" "3.4.33"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.10"
+    postcss "^8.4.39"
+    source-map-js "^1.2.0"
+
 "@vue/compiler-ssr@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz#f62ffecdf15bacb883d0099780cf9a1e3654bfc4"
@@ -1026,6 +1060,14 @@
     "@vue/compiler-dom" "3.4.31"
     "@vue/shared" "3.4.31"
 
+"@vue/compiler-ssr@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.33.tgz#59ed58f97abb691e6c3973616bb27a12b8c5b135"
+  integrity sha512-0WveC9Ai+eT/1b6LCV5IfsufBZ0HP7pSSTdDjcuW302tTEgoBw8rHVHKPbGUtzGReUFCRXbv6zQDDgucnV2WzQ==
+  dependencies:
+    "@vue/compiler-dom" "3.4.33"
+    "@vue/shared" "3.4.33"
+
 "@vue/devtools-api@^6.5.0", "@vue/devtools-api@^6.5.1":
   version "6.6.1"
   resolved "http://39.108.216.210:9000/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
@@ -1038,6 +1080,13 @@
   dependencies:
     "@vue/shared" "3.4.31"
 
+"@vue/reactivity@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/reactivity/-/reactivity-3.4.33.tgz#9d258a8bab369ce57402c51728d3769ecf7adb99"
+  integrity sha512-B24QIelahDbyHipBgbUItQblbd4w5HpG3KccL+YkGyo3maXyS253FzcTR3pSz739OTphmzlxP7JxEMWBpewilA==
+  dependencies:
+    "@vue/shared" "3.4.33"
+
 "@vue/runtime-core@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.31.tgz#ad3a41ad76385c0429e3e4dbefb81918494e10cf"
@@ -1046,6 +1095,14 @@
     "@vue/reactivity" "3.4.31"
     "@vue/shared" "3.4.31"
 
+"@vue/runtime-core@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.33.tgz#c9481aa6d0785f7349a69f3e971082ac0ff720ee"
+  integrity sha512-6wavthExzT4iAxpe8q37/rDmf44nyOJGISJPxCi9YsQO+8w9v0gLCFLfH5TzD1V1AYrTAdiF4Y1cgUmP68jP6w==
+  dependencies:
+    "@vue/reactivity" "3.4.33"
+    "@vue/shared" "3.4.33"
+
 "@vue/runtime-dom@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.31.tgz#bae7ad844f944af33699c73581bc36125bab96ce"
@@ -1056,6 +1113,16 @@
     "@vue/shared" "3.4.31"
     csstype "^3.1.3"
 
+"@vue/runtime-dom@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.33.tgz#1a36e05478fd24c718f9c5ea9f4bac7d0481c779"
+  integrity sha512-iHsMCUSFJ+4z432Bn9kZzHX+zOXa6+iw36DaVRmKYZpPt9jW9riF32SxNwB124i61kp9+AZtheQ/mKoJLerAaQ==
+  dependencies:
+    "@vue/reactivity" "3.4.33"
+    "@vue/runtime-core" "3.4.33"
+    "@vue/shared" "3.4.33"
+    csstype "^3.1.3"
+
 "@vue/server-renderer@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.31.tgz#bbe990f793c36d62d05bdbbaf142511d53e159fd"
@@ -1064,11 +1131,24 @@
     "@vue/compiler-ssr" "3.4.31"
     "@vue/shared" "3.4.31"
 
+"@vue/server-renderer@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.33.tgz#b0c4981b2d7758356811fc9d7314a576de2a6d25"
+  integrity sha512-jTH0d6gQcaYideFP/k0WdEu8PpRS9MF8d0b6SfZzNi+ap972pZ0TNIeTaESwdOtdY0XPVj54XEJ6K0wXxir4fw==
+  dependencies:
+    "@vue/compiler-ssr" "3.4.33"
+    "@vue/shared" "3.4.33"
+
 "@vue/shared@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.31.tgz#af9981f57def2c3f080c14bf219314fc0dc808a0"
   integrity sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==
 
+"@vue/shared@3.4.33":
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.33.tgz#2c4f2cfa988bb81e05372f6de556b254ff13e92a"
+  integrity sha512-aoRY0jQk3A/cuvdkodTrM4NMfxco8n55eG4H7ML/CRy7OryHfiqvug4xrCBBMbbN+dvXAetDDwZW9DXWWjBntA==
+
 "@vueuse/core@^9.1.0":
   version "9.13.0"
   resolved "http://39.108.216.210:9000/@vueuse/core/-/core-9.13.0.tgz#2f69e66d1905c1e4eebc249a01759cf88ea00cf4"
@@ -1464,6 +1544,11 @@ dayjs@^1.11.11:
   resolved "http://39.108.216.210:9000/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
   integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
 
+dayjs@^1.11.12:
+  version "1.11.12"
+  resolved "http://39.108.216.210:9000/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"
+  integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
+
 dayjs@^1.11.3:
   version "1.11.10"
   resolved "http://39.108.216.210:9000/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
@@ -2464,6 +2549,11 @@ picocolors@^1.0.0:
   resolved "http://39.108.216.210:9000/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
+picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "http://39.108.216.210:9000/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
+
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "http://39.108.216.210:9000/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -2503,6 +2593,15 @@ postcss@^8.4.27, postcss@^8.4.32, postcss@^8.4.38:
     picocolors "^1.0.0"
     source-map-js "^1.2.0"
 
+postcss@^8.4.39:
+  version "8.4.39"
+  resolved "http://39.108.216.210:9000/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3"
+  integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.1"
+    source-map-js "^1.2.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "http://39.108.216.210:9000/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -2704,8 +2803,16 @@ streamx@^2.15.0:
   optionalDependencies:
     bare-events "^2.2.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "http://39.108.216.210:9000/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0:
   version "4.2.3"
   resolved "http://39.108.216.210:9000/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -2737,8 +2844,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "http://39.108.216.210:9000/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "http://39.108.216.210:9000/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -2961,6 +3074,17 @@ vue@3.4.31:
     "@vue/server-renderer" "3.4.31"
     "@vue/shared" "3.4.31"
 
+vue@3.4.33:
+  version "3.4.33"
+  resolved "http://39.108.216.210:9000/vue/-/vue-3.4.33.tgz#42a186220c96b93143076871d0c7d7bc46540e4a"
+  integrity sha512-VdMCWQOummbhctl4QFMcW6eNtXHsFyDlX60O/tsSQuCcuDOnJ1qPOhhVla65Niece7xq/P2zyZReIO5mP+LGTQ==
+  dependencies:
+    "@vue/compiler-dom" "3.4.33"
+    "@vue/compiler-sfc" "3.4.33"
+    "@vue/runtime-dom" "3.4.33"
+    "@vue/server-renderer" "3.4.33"
+    "@vue/shared" "3.4.33"
+
 vuedraggable@^4.1.0:
   version "4.1.0"
   resolved "http://39.108.216.210:9000/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"