diff --git a/.env.dev b/.env.dev index fe5d3bb..a00c521 100644 --- a/.env.dev +++ b/.env.dev @@ -12,7 +12,7 @@ VITE_ROUTER_BASE=/ VITE_ROUTER_HISTORY=hash # api -VITE_API_BASIC= +VITE_API_BASIC=http://10.10.1.36:8040 VITE_API_HTTP=/api/v1/ # storage VITE_STORAGE_NAMESPACE = gin-admin_local_ \ No newline at end of file diff --git a/config/useServer.js b/config/useServer.js index acb6a73..6418cf9 100644 --- a/config/useServer.js +++ b/config/useServer.js @@ -3,7 +3,7 @@ export default () => ({ port: 8080, proxy: { '/api': { - target: 'http://101.42.232.163:8080/api', + target: 'http://10.10.1.36:8040/api', // target: 'http://127.0.0.1:8045/api', changeOrigin: true, rewrite: (path) => path.replace('/api', ''), diff --git a/package-lock.json b/package-lock.json index a3c1264..1363074 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "gin-admin", + "name": "guxuan-admin", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "gin-admin", + "name": "guxuan-admin", "version": "1.0.0", "dependencies": { "@ant-design/colors": "^7.0.0", diff --git a/src/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html index 4c24f3f..b3815ac 100644 --- a/src/assets/iconfont/demo_index.html +++ b/src/assets/iconfont/demo_index.html @@ -47,7 +47,7 @@
  • Symbol
    • - 查看项目 + 查看项目
    @@ -55,9 +55,57 @@ @@ -78,9 +126,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1751597994649') format('woff2'),
-       url('iconfont.woff?t=1751597994649') format('woff'),
-       url('iconfont.ttf?t=1751597994649') format('truetype');
+  src: url('iconfont.woff2?t=1765335998037') format('woff2'),
+       url('iconfont.woff?t=1765335998037') format('woff'),
+       url('iconfont.ttf?t=1765335998037') format('truetype');
 }

    第二步：定义使用 iconfont 的样式

    @@ -107,11 +155,83 @@ diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index c67bdd0..1c99c8c 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { - font-family: "iconfont"; /* Project id 4966438 */ - src: url('iconfont.woff2?t=1751597994649') format('woff2'), - url('iconfont.woff?t=1751597994649') format('woff'), - url('iconfont.ttf?t=1751597994649') format('truetype'); + font-family: "iconfont"; /* Project id 5085063 */ + src: url('iconfont.woff2?t=1765335998037') format('woff2'), + url('iconfont.woff?t=1765335998037') format('woff'), + url('iconfont.ttf?t=1765335998037') format('truetype'); } .iconfont { @@ -13,7 +13,39 @@ -moz-osx-font-smoothing: grayscale; } -.icon-gonggao:before { - content: "\e62a"; +.icon-liwuhuodong:before { + content: "\e600"; +} + +.icon-querenhetongquerenhetongqueding:before { + content: "\e690"; +} + +.icon-icon:before { + content: "\e686"; +} + +.icon-chongzhi:before { + content: "\e601"; +} + +.icon-liushui:before { + content: "\e69b"; +} + +.icon-kaipiao:before { + content: "\e69c"; +} + +.icon-duanxin:before { + content: "\e603"; +} + +.icon-zhifudingjin:before { + content: "\e61e"; +} + +.icon-shengji:before { + content: "\e63c"; } diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js index 84ec440..720d051 100644 --- a/src/assets/iconfont/iconfont.js +++ b/src/assets/iconfont/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4966438='',(n=>{var t=(e=(e=document.getElementsByTagName("script"))[e.length-1]).getAttribute("data-injectcss"),e=e.getAttribute("data-disable-injectsvg");if(!e){var o,i,c,d,s,l=function(t,e){e.parentNode.insertBefore(t,e)};if(t&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}o=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4966438,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?l(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(o,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),o()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(c=o,d=n.document,s=!1,r(),d.onreadystatechange=function(){"complete"==d.readyState&&(d.onreadystatechange=null,a())})}function a(){s||(s=!0,c())}function r(){try{d.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}a()}})(window); \ No newline at end of file +window._iconfont_svg_string_5085063='',(a=>{var c=(t=(t=document.getElementsByTagName("script"))[t.length-1]).getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var h,l,e,s,i,o=function(c,t){t.parentNode.insertBefore(c,t)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}h=function(){var c,t=document.createElement("div");t.innerHTML=a._iconfont_svg_string_5085063,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(c=document.body).firstChild?o(t,c.firstChild):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),h()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(e=h,s=a.document,i=!1,d(),s.onreadystatechange=function(){"complete"==s.readyState&&(s.onreadystatechange=null,n())})}function n(){i||(i=!0,e())}function d(){try{s.documentElement.doScroll("left")}catch(c){return void setTimeout(d,50)}n()}})(window); \ No newline at end of file diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index 72a8648..1bb740b 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -1,16 +1,72 @@ { - "id": "4966438", - "name": "近山", + "id": "5085063", + "name": "GPU", "font_family": "iconfont", "css_prefix_text": "icon-", "description": "", "glyphs": [ { - "icon_id": "8765148", - "name": "公告", - "font_class": "gonggao", - "unicode": "e62a", - "unicode_decimal": 58922 + "icon_id": "201525", + "name": "礼物 活动", + "font_class": "liwuhuodong", + "unicode": "e600", + "unicode_decimal": 58880 + }, + { + "icon_id": "783687", + "name": "确认合同 确认 合同 确定", + "font_class": "querenhetongquerenhetongqueding", + "unicode": "e690", + "unicode_decimal": 59024 + }, + { + "icon_id": "848940", + "name": "退款", + "font_class": "icon", + "unicode": "e686", + "unicode_decimal": 59014 + }, + { + "icon_id": "3062429", + "name": "充值", + "font_class": "chongzhi", + "unicode": "e601", + "unicode_decimal": 58881 + }, + { + "icon_id": "9945079", + "name": "流水", + "font_class": "liushui", + "unicode": "e69b", + "unicode_decimal": 59035 + }, + { + "icon_id": "9945082", + "name": "开票", + "font_class": "kaipiao", + "unicode": "e69c", + "unicode_decimal": 59036 + }, + { + "icon_id": "10392609", + "name": "短信", + "font_class": "duanxin", + "unicode": "e603", + "unicode_decimal": 58883 + }, + { + "icon_id": "33987004", + "name": "支付订金", + "font_class": "zhifudingjin", + "unicode": "e61e", + "unicode_decimal": 58910 + }, + { + "icon_id": "6582353", + "name": "升级", + "font_class": "shengji", + "unicode": "e63c", + "unicode_decimal": 58940 } ] } diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index fe3c5a4..8af037c 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index 3a2562e..3de508f 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index 36fc3a1..15a5363 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js index 42d2e5b..203bd76 100644 --- a/src/locales/lang/zh-CN/menu.js +++ b/src/locales/lang/zh-CN/menu.js @@ -1,3 +1,5 @@ +import refund from "../../../router/routes/refund"; + export default { welcome: '欢迎', home: '首页', @@ -32,4 +34,21 @@ export default { account: '个人页', 'account.trigger': '触发报错', 'account.logout': '退出登录', + topUpOrder: '充值订单', + paddingOrder: '待支付订单', + paidOrder: '已支付订单', + canceledOrder: '已取消订单', + water: '流水账单管理', + userList: '用户流水列表', + refund: '退款管理', + toBeConfirmed: '待确认列表', + refunded: '已退款列表', + refundFailed: '退款失败列表', + payChannel: '支付渠道设置', + paySet:'支付设置(待开发)', + messageMgt: '短信管理(待开发)', + invoice: '开票管理(待开发)', + contractMgt: '合同管理(待开发)', + activityMgt: '活动管理(待开发)', + userUpgrade: '用户升级管理(待开发)', } diff --git a/src/router/routes/common.js b/src/router/routes/common.js new file mode 100644 index 0000000..0358ffc --- /dev/null +++ b/src/router/routes/common.js @@ -0,0 +1,64 @@ +import { SettingOutlined } from '@ant-design/icons-vue' + +export default [ + { + path: 'contractMgt', + name: 'contractMgt', + component: 'contractMgt/index.vue', + meta: { + icon: 'icon-querenhetongquerenhetongqueding', + title: '合同管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'invoice', + name: 'invoice', + component: 'invoice/index.vue', + meta: { + icon: 'icon-kaipiao', + title: '开票管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'activityMgt', + name: 'activityMgt', + component: 'activityMgt/index.vue', + meta: { + icon: 'icon-liwuhuodong', + title: '活动管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'userUpgrade', + name: 'userUpgrade', + component: 'userUpgrade/index.vue', + meta: { + icon: 'icon-shengji', + title: '用户升级管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'messageMgt', + name: 'messageMgt', + component: 'messageMgt/index.vue', + meta: { + icon: 'icon-duanxin', + title: '短信管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, +] diff --git a/src/router/routes/index.js b/src/router/routes/index.js index 5877eb6..e6c7669 100644 --- a/src/router/routes/index.js +++ b/src/router/routes/index.js @@ -9,7 +9,10 @@ import system from './system' import link from './link' import iframe from './iframe' import other from './other' - +import topUp from './topUp' +import water from './water' +import refund from './refund' +import common from './common' export default [ ...home, ...form, @@ -22,4 +25,8 @@ export default [ ...link, ...iframe, ...other, + ...topUp, + ...water, + ...refund, + ...common, ] diff --git a/src/router/routes/refund.js b/src/router/routes/refund.js new file mode 100644 index 0000000..f97bb34 --- /dev/null +++ b/src/router/routes/refund.js @@ -0,0 +1,76 @@ +import { SettingOutlined } from '@ant-design/icons-vue' + +export default [ + { + path: 'paySet', + name: 'paySet', + component: 'RouteViewLayout', + meta: { + icon: 'icon-zhifudingjin', + title: '支付设置', + isMenu: true, + keepAlive: true, + permission: '*', + }, + children: [ + { + path: 'payChannel', + name: 'payChannel', + component: 'paySet/payChannel/index.vue', + meta: { + title: '支付渠道设置', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + ], + }, + { + path: 'refund', + name: 'refund', + component: 'RouteViewLayout', + meta: { + icon: 'icon-icon', + title: '退款管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + children: [ + { + path: 'toBeConfirmed', + name: 'toBeConfirmed', + component: 'refund/toBeConfirmed/index.vue', + meta: { + title: '待确认列表', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'refunded', + name: 'refunded', + component: 'refund/refunded/index.vue', + meta: { + title: '已退款列表', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'refundFailed', + name: 'refundFailed', + component: 'refund/refundFailed/index.vue', + meta: { + title: '退款失败列表', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + ], + }, +] diff --git a/src/router/routes/topUp.js b/src/router/routes/topUp.js new file mode 100644 index 0000000..3b356a4 --- /dev/null +++ b/src/router/routes/topUp.js @@ -0,0 +1,51 @@ +import { SettingOutlined } from '@ant-design/icons-vue' + +export default [ + { + path: 'topUpOrder', + name: 'topUpOrder', + component: 'RouteViewLayout', + meta: { + icon: 'icon-chongzhi', + title: '充值订单', + isMenu: true, + keepAlive: true, + permission: '*', + }, + children: [ + { + path: 'paddingOrder', + name: 'paddingOrder', + component: 'topUpOrder/paddingOrder/index.vue', + meta: { + title: '待支付订单', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'paidOrder', + name: 'paidOrder', + component: 'topUpOrder/paidOrder/index.vue', + meta: { + title: '已支付订单', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'canceledOrder', + name: 'canceledOrder', + component: 'topUpOrder/canceledOrder/index.vue', + meta: { + title: '已取消订单', + isMenu: true, + keepAlive: true, + permission: '*', + }, + } + ], + }, +] diff --git a/src/router/routes/water.js b/src/router/routes/water.js new file mode 100644 index 0000000..d2a7c45 --- /dev/null +++ b/src/router/routes/water.js @@ -0,0 +1,30 @@ +import { SettingOutlined } from '@ant-design/icons-vue' + +export default [ + { + path: 'water', + name: 'water', + component: 'RouteViewLayout', + meta: { + icon: 'icon-liushui', + title: '流水账单管理', + isMenu: true, + keepAlive: true, + permission: '*', + }, + children: [ + { + path: 'userList', + name: 'userList', + component: 'water/userList/index.vue', + meta: { + title: '用户流水列表', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + + ], + }, +] diff --git a/src/views/activityMgt/index.vue b/src/views/activityMgt/index.vue new file mode 100644 index 0000000..815566f --- /dev/null +++ b/src/views/activityMgt/index.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/src/views/contractMgt/index.vue b/src/views/contractMgt/index.vue new file mode 100644 index 0000000..74d0052 --- /dev/null +++ b/src/views/contractMgt/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/invoice/index.vue b/src/views/invoice/index.vue new file mode 100644 index 0000000..16d35a8 --- /dev/null +++ b/src/views/invoice/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/messageMgt/index.vue b/src/views/messageMgt/index.vue new file mode 100644 index 0000000..7b28a01 --- /dev/null +++ b/src/views/messageMgt/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/paySet/payChannel/index.vue b/src/views/paySet/payChannel/index.vue new file mode 100644 index 0000000..9d39edd --- /dev/null +++ b/src/views/paySet/payChannel/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/refund/refundFaild/index.vue b/src/views/refund/refundFaild/index.vue new file mode 100644 index 0000000..e4659c7 --- /dev/null +++ b/src/views/refund/refundFaild/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/refund/refunded/index.vue b/src/views/refund/refunded/index.vue new file mode 100644 index 0000000..7284040 --- /dev/null +++ b/src/views/refund/refunded/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/refund/toBeConfirmed/index.vue b/src/views/refund/toBeConfirmed/index.vue new file mode 100644 index 0000000..c3968dc --- /dev/null +++ b/src/views/refund/toBeConfirmed/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/topUpOrder/canceledOrder/index.vue b/src/views/topUpOrder/canceledOrder/index.vue new file mode 100644 index 0000000..b78b78d --- /dev/null +++ b/src/views/topUpOrder/canceledOrder/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/topUpOrder/paddingOrder/index.vue b/src/views/topUpOrder/paddingOrder/index.vue new file mode 100644 index 0000000..9ce4190 --- /dev/null +++ b/src/views/topUpOrder/paddingOrder/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/topUpOrder/paidOrder/index.vue b/src/views/topUpOrder/paidOrder/index.vue new file mode 100644 index 0000000..fd09933 --- /dev/null +++ b/src/views/topUpOrder/paidOrder/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/userUpgrade/index.vue b/src/views/userUpgrade/index.vue new file mode 100644 index 0000000..8ba8bb8 --- /dev/null +++ b/src/views/userUpgrade/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/water/userList/index.vue b/src/views/water/userList/index.vue new file mode 100644 index 0000000..b87bf87 --- /dev/null +++ b/src/views/water/userList/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file