Merge branch 'milestone-20251104-现金二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251104-现金二期

src/assets/SvgIcons/activityManagement.svg

@@ -0,0 +1,13 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31 31" class="design-iconfont">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9.74612 0.375959C11.6259 0.0545255 15.0739 -0.278254 20.0466 0.375959C25.0192 1.03017 28.1825 3.79754 29.2367 7.13376C30.2909 10.47 30.2144 16.9942 29.826 20.258C29.507 24.1645 27.2331 28.7886 21.7954 29.5942C16.3576 30.3997 9.67485 30.1849 6.99417 29.2304C4.3135 28.2758 0.763355 26.2434 0.299165 20.5505C-0.165026 14.8577 -0.471763 7.2173 2.42497 4.11929C4.43352 1.73288 7.86631 0.697393 9.74612 0.375959Z" fill="#FFECE2"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M20.1204 3.54492C20.7085 3.54492 21.1852 4.02166 21.1852 4.60974V5.24863H23.7407C25.1521 5.24863 26.2963 6.39279 26.2963 7.80418V23.9894C26.2963 25.4008 25.1521 26.5449 23.7407 26.5449H7.55556C6.14416 26.5449 5 25.4008 5 23.9894V7.80418C5 6.39279 6.14416 5.24863 7.55556 5.24863H10.1111V4.60974C10.1111 4.02166 10.5878 3.54492 11.1759 3.54492C11.764 3.54492 12.2407 4.02166 12.2407 4.60974V5.24863H19.0556V4.60974C19.0556 4.02166 19.5323 3.54492 20.1204 3.54492Z" fill="url(#j4z5di934__paint0_linear_878_31157)"/>
+  <path opacity=".8" fill-rule="evenodd" clip-rule="evenodd" d="M20.1175 3.54492C20.7056 3.54492 21.1824 4.02166 21.1824 4.60974V6.73937C21.1824 7.32745 20.7056 7.80418 20.1175 7.80418C19.5295 7.80418 19.0527 7.32745 19.0527 6.73937V4.60974C19.0527 4.02166 19.5295 3.54492 20.1175 3.54492ZM11.1703 3.54492C11.7584 3.54492 12.2351 4.02166 12.2351 4.60974V6.73937C12.2351 7.32745 11.7584 7.80418 11.1703 7.80418C10.5822 7.80418 10.1055 7.32745 10.1055 6.73937V4.60974C10.1055 4.02166 10.5822 3.54492 11.1703 3.54492Z" fill="#FF6C0A"/>
+  <path d="M20.708 9.44531C20.8125 9.44877 20.9138 9.48129 21.001 9.53906C21.1788 9.65694 21.2744 9.86476 21.249 10.0762C21.2438 10.1195 21.1226 11.1003 20.7812 12.1602C20.2925 13.6773 19.5947 14.6149 18.6836 14.8857C17.978 15.0956 17.6361 15.075 17.3096 15.0547C17.0313 15.0374 16.7448 15.0189 16.0234 15.1992C15.737 15.271 15.4406 15.5134 15.1748 15.8125C14.9268 16.0916 14.7166 16.4075 14.5791 16.6426L16.293 20.6318C16.4156 20.9181 16.2833 21.2501 15.9971 21.373C15.7109 21.4959 15.3789 21.3633 15.2559 21.0771L13.4658 16.9072L13.4316 16.8398L12.4902 14.6445L11.2227 11.6875C11.1395 11.4931 11.1724 11.2683 11.3076 11.1055C11.3412 11.0651 11.6034 10.7619 12.1494 10.4717C12.8538 10.0974 13.6974 9.90924 14.6533 9.90918C15.1544 9.90918 15.6336 10.1649 16.0684 10.3955C16.3039 10.5204 16.5366 10.644 16.7666 10.7305C16.9961 10.8168 17.2148 10.8631 17.4219 10.8408C17.5653 10.8253 17.7708 10.7669 18.0166 10.6768C18.2605 10.5873 18.538 10.4688 18.8232 10.3369C19.3939 10.0731 19.9923 9.75822 20.4092 9.51953C20.4999 9.46759 20.6035 9.44189 20.708 9.44531ZM14.6533 11.0381C13.7173 11.0382 13.0872 11.2601 12.7266 11.4434C12.6052 11.505 12.5053 11.5675 12.4248 11.623L14.0488 15.4053C14.0509 15.4025 14.0536 15.4002 14.0557 15.3975C14.5879 14.6951 15.1568 14.2528 15.75 14.1045C16.6344 13.8834 17.0483 13.9081 17.3799 13.9287C17.5152 13.9371 17.6292 13.9442 17.7744 13.9307C17.9198 13.9171 18.0999 13.8827 18.3623 13.8047C18.5975 13.7348 18.8391 13.5342 19.0713 13.1973C19.3024 12.8618 19.5174 12.4007 19.7031 11.8271C19.7885 11.5634 19.8566 11.3015 19.9141 11.0615C19.5675 11.2364 19.1743 11.4269 18.79 11.5859C18.335 11.7742 17.885 11.9259 17.5439 11.9629C17.4655 11.9714 17.3877 11.9756 17.3115 11.9756C16.6343 11.9756 16.0435 11.6601 15.5391 11.3926C15.3603 11.2978 15.1911 11.2087 15.0371 11.1426C14.8813 11.0756 14.7524 11.0381 14.6533 11.0381Z" fill="#fff" stroke="#fff" stroke-width=".2"/>
+  <path d="M16.0469 17.8027C17.7108 17.8027 19.2854 18.0034 20.4805 18.3711C21.0899 18.5586 21.5827 18.7848 21.9404 19.0449C22.5151 19.4633 22.6465 19.9109 22.6465 20.2236C22.6465 20.5365 22.5148 20.9848 21.9395 21.4033C21.582 21.6632 21.0896 21.8888 20.4805 22.0762C19.2855 22.4439 17.7108 22.6455 16.0469 22.6455C14.383 22.6455 12.8084 22.4439 11.6133 22.0762C11.004 21.8886 10.511 21.6634 10.1533 21.4033C9.57816 20.9848 9.44727 20.5365 9.44727 20.2236C9.44728 19.9835 9.52585 19.6297 9.87988 19.2764C10.1013 19.0554 10.4093 18.8552 10.791 18.6797C11.4928 18.3569 12.4553 18.109 13.5723 17.96C13.881 17.9187 14.1646 18.1356 14.2061 18.4443C14.2473 18.7533 14.0305 19.0368 13.7217 19.0781C12.7062 19.2137 11.8569 19.4319 11.2627 19.7051C10.9753 19.8372 10.7989 19.9592 10.6963 20.0557C10.645 20.1039 10.6137 20.1451 10.5957 20.1758C10.5869 20.1908 10.581 20.2023 10.5781 20.2109C10.5756 20.2186 10.5752 20.223 10.5752 20.2236C10.5752 20.2236 10.5755 20.2309 10.582 20.2461C10.5884 20.261 10.5997 20.2812 10.6182 20.3057C10.6554 20.3551 10.7188 20.4185 10.8174 20.4902C11.0633 20.6691 11.452 20.8463 11.9453 20.998C13.0298 21.3316 14.4866 21.5166 16.0469 21.5166C17.6073 21.5166 19.0638 21.3309 20.1484 20.9971C20.6417 20.8453 21.0303 20.6693 21.2764 20.4902C21.3749 20.4186 21.4374 20.3551 21.4746 20.3057C21.4931 20.2811 21.5043 20.2611 21.5107 20.2461C21.5173 20.2309 21.5176 20.2237 21.5176 20.2236C21.5175 20.2227 21.5168 20.2154 21.5107 20.2012C21.5043 20.1862 21.4931 20.1661 21.4746 20.1416C21.4374 20.0922 21.3749 20.0287 21.2764 19.957C21.0919 19.8229 20.8268 19.6904 20.498 19.5684L20.1484 19.4502C19.0639 19.1165 17.6073 18.9307 16.0469 18.9307C15.9722 18.9307 15.8961 18.9318 15.8213 18.9326C15.509 18.9361 15.2535 18.6857 15.25 18.374C15.2467 18.0628 15.4964 17.8076 15.8076 17.8037C15.8868 17.8028 15.9677 17.8027 16.0469 17.8027Z" fill="#fff" stroke="#fff" stroke-width=".2"/>
+  <defs>
+    <linearGradient id="j4z5di934__paint0_linear_878_31157" x1="36.9444" y1="15.0449" x2="14.0124" y2="-6.18846" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#F73"/>
+      <stop offset="1" stop-color="#FFB685"/>
+    </linearGradient>
+  </defs>
+</svg>

src/assets/SvgIcons/channelManagement.svg

@@ -0,0 +1,16 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31 31" class="design-iconfont">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9.74612 0.375959C11.6259 0.0545255 15.0739 -0.278254 20.0466 0.375959C25.0192 1.03017 28.1825 3.79754 29.2367 7.13376C30.2909 10.47 30.2144 16.9942 29.826 20.258C29.507 24.1645 27.2331 28.7886 21.7954 29.5942C16.3576 30.3997 9.67485 30.1849 6.99417 29.2303C4.3135 28.2758 0.763355 26.2434 0.299165 20.5505C-0.165026 14.8577 -0.471763 7.2173 2.42497 4.11929C4.43352 1.73288 7.86631 0.697392 9.74612 0.375959Z" fill="#D0DDFF"/>
+  <path fill="#14BFBF" d="M23.0781 22.6426H24.5981V24.5426H23.0781z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M23.0827 24.5449H8.26266C6.58371 24.5449 5.22266 23.1839 5.22266 21.5049V7.82492C5.22266 6.56571 6.24345 5.54492 7.50266 5.54492H20.8027C22.0619 5.54492 23.0827 6.56571 23.0827 7.82492V16.1849H24.6027C25.4421 16.1849 26.1227 16.8654 26.1227 17.7049V23.0249C26.1227 23.8644 25.4421 24.5449 24.6027 24.5449C23.7632 24.5449 23.0827 23.8644 23.0827 23.0249V24.5449Z" fill="url(#esrtm7nye__paint0_linear_973_39066)"/>
+  <path d="M23.0781 16.1855H26.1181V22.9379C26.1181 23.8258 25.3983 24.5455 24.5104 24.5455H23.0781V16.1855Z" fill="#7C9BFA"/>
+  <path d="M13.0531 10.0387C13.0531 9.49492 12.6031 9.04492 12.0594 9.04492H9.05937C8.49686 9.04492 8.04688 9.49492 8.04688 10.0387V13.0387C8.04688 13.5824 8.49687 14.0324 9.04061 14.0324H12.0406C12.5844 14.0324 13.0344 13.5824 13.0344 13.0387V10.0387H13.0531ZM12.0406 12.5512C12.0406 12.8324 11.8156 13.0574 11.5344 13.0574H9.54687C9.26561 13.0574 9.04061 12.8324 9.04061 12.5512V10.5449C9.04061 10.2637 9.26561 10.0387 9.54687 10.0387H11.5531C11.8344 10.0387 12.0594 10.2637 12.0594 10.5449V12.5512H12.0406Z" fill="#fff"/>
+  <rect opacity=".5" x="13.0469" y="14.0449" width="7" height="7" rx="1" fill="#fff"/>
+  <rect x="14.0469" y="9.04492" width="6" height="4" rx="1" fill="#fff"/>
+  <rect opacity=".5" x="8.04688" y="15.0449" width="4" height="6" rx="1" fill="#fff"/>
+  <defs>
+    <linearGradient id="esrtm7nye__paint0_linear_973_39066" x1="36.5727" y1="15.0449" x2="17.6586" y2="-5.76051" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#2C5CF7"/>
+      <stop offset="1" stop-color="#80A6FF"/>
+    </linearGradient>
+  </defs>
+</svg>

src/assets/SvgIcons/permissionManagement.svg

@@ -0,0 +1,12 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31 31" class="design-iconfont">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M9.74612 0.375959C11.6259 0.0545255 15.0739 -0.278254 20.0466 0.375959C25.0192 1.03017 28.1825 3.79754 29.2367 7.13376C30.2909 10.47 30.2144 16.9942 29.826 20.258C29.507 24.1645 27.2331 28.7886 21.7954 29.5942C16.3576 30.3997 9.67485 30.1849 6.99417 29.2303C4.3135 28.2758 0.763355 26.2434 0.299165 20.5505C-0.165026 14.8577 -0.471763 7.2173 2.42497 4.11929C4.43352 1.73288 7.86631 0.697392 9.74612 0.375959Z" fill="#FFEDEB"/>
+  <path d="M12.5367 4.41805C12.8534 4.42513 13.1633 4.5043 13.4442 4.65305C13.7084 4.78638 13.9502 4.96014 14.1608 5.16805L15.7883 7.16804C15.9604 7.40137 16.2142 7.5622 16.4996 7.6197H23.6925C23.878 7.61905 24.0618 7.65495 24.2334 7.72536C24.405 7.79578 24.561 7.89932 24.6926 8.03007C24.8241 8.16083 24.9286 8.31623 25.0001 8.48739C25.0716 8.65856 25.1086 8.84213 25.1091 9.02762V21.5521C25.109 22.2753 24.8355 22.9716 24.3436 23.5017C23.8518 24.0317 23.1777 24.3563 22.4566 24.4105L22.2412 24.418H15.0288L7.28671 24.4151C6.98594 24.4121 6.68907 24.3467 6.41488 24.223C6.14069 24.0994 5.89515 23.9202 5.6938 23.6967C5.27515 23.2454 5.04034 22.6539 5.03547 22.0384V6.79054C5.02538 6.15882 5.26147 5.54795 5.6938 5.08722C5.90014 4.87325 6.14791 4.70357 6.42199 4.58852C6.69607 4.47348 6.99072 4.41547 7.28796 4.41805H12.5367ZM12.0579 7.51387H7.30129C7.11122 7.51387 6.92893 7.58938 6.79453 7.72378C6.66013 7.85818 6.58463 8.04046 6.58463 8.23053V8.34553C6.58463 8.53561 6.66013 8.71789 6.79453 8.85229C6.92893 8.98669 7.11122 9.0622 7.30129 9.0622H12.0584C12.2484 9.06209 12.4306 8.98655 12.565 8.85217C12.6994 8.71779 12.7749 8.53557 12.775 8.34553V8.23053C12.775 8.04046 12.6995 7.85818 12.5651 7.72378C12.4307 7.58938 12.248 7.51387 12.0579 7.51387Z" fill="url(#sa2pn03i9__paint0_linear_878_31198)"/>
+  <path d="M12.0632 7.51367H7.30651C7.11644 7.51367 6.93415 7.58918 6.79975 7.72358C6.66535 7.85798 6.58984 8.04026 6.58984 8.23034V8.34533C6.58984 8.53541 6.66535 8.71769 6.79975 8.85209C6.93415 8.98649 7.11644 9.062 7.30651 9.062H12.0636C12.2536 9.06189 12.4358 8.98635 12.5702 8.85197C12.7046 8.71759 12.7801 8.53537 12.7802 8.34533V8.23034C12.7802 8.04026 12.7047 7.85798 12.5703 7.72358C12.4359 7.58918 12.2536 7.51367 12.0636 7.51367H12.0632Z" fill="#FFD0D0"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M18.2879 11.8531L16.5597 13.5744C16.231 13.9016 16.2137 14.4216 16.5076 14.7692L16.5596 14.8255L17.1876 15.4511C17.5344 15.7966 18.0967 15.7966 18.4435 15.4511L20.1561 13.7451C20.6892 15.0279 20.4324 16.5598 19.3855 17.6027C18.3387 18.6455 16.8011 18.9015 15.5134 18.3705L12.5698 21.3026C12.223 21.6481 11.6607 21.6481 11.3139 21.3026L10.6859 20.677C10.3391 20.3315 10.3391 19.7713 10.6859 19.4258L13.6138 16.5089C13.051 15.2154 13.3004 13.6554 14.3617 12.598C15.4233 11.5405 16.9894 11.2922 18.2879 11.8531Z" fill="#fff"/>
+  <defs>
+    <linearGradient id="sa2pn03i9__paint0_linear_878_31198" x1="35.1461" y1="14.418" x2="15.1463" y2="-5.65587" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF4040"/>
+      <stop offset="1" stop-color="#FF9991"/>
+    </linearGradient>
+  </defs>
+</svg>

src/views/consume/gold/coinConsumeDetail.vue

@@ -183,7 +183,7 @@ const getAdminData = async function () {
 
 const ConsumeSelectBy = async function (val) {
 
-  if (!hasrechargeWaitShow) {
+  if (!selectPermission) {
     ElMessage.error('暂无权限')
     return
   }
@@ -437,6 +437,7 @@ const handleCurrentChange = function (val) {
 // 计算总金币数
 const sumGold = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value)
 onMounted(async function () {
+  await initPermissions()
   await getAdminData()
   await ConsumeSelectBy()
   // getActivity();

src/views/home.vue

@@ -13,14 +13,31 @@ import SettingsIcon from '@/assets/blue.png';
 // 使用import.meta.glob导入所有SVG图标（修复版本）
 const icons = import.meta.glob('@/assets/SvgIcons/*.svg', { eager: true })
 
+// import from '@/assets/SvgIcons/workbench.svg'
+// import from '@/assets/SvgIcons/activity.png'
+// import from '@/assets/SvgIcons/activity.png'
+// import from '@/assets/SvgIcons/activity.png'
+// import from '@/assets/SvgIcons/activity.png'
+
+
+const menuNameMap = {
+  '工作台': 'workbench',
+  '金币管理': 'goldManagement',
+  '现金管理': 'cashManagement',
+  '活动管理': 'activityManagement',
+  '频道管理': 'channelManagement',
+  '权限管理': 'permissionManagement',
+}
+
 // 创建获取图标路径的函数（修复版本）
 const getIconPath = (menuName) => {
-  
+  const englishName = menuNameMap[menuName] || menuName;
+
   // 构建可能的key格式
   const possibleKeys = [
-    `@/assets/SvgIcons/${menuName}.svg`,
-    `./SvgIcons/${menuName}.svg`,
-    `/src/assets/SvgIcons/${menuName}.svg`
+    `@/assets/SvgIcons/${englishName}.svg`,
+    `./SvgIcons/${englishName}.svg`,
+    `/src/assets/SvgIcons/${englishName}.svg`
   ]
   
   // 在icons对象中查找对应的图标
@@ -68,11 +85,6 @@ const refreshData = async () => {
 
 // ---------------------------------------
 
-
-
-
-
-
 // 存储接口返回的菜单数据
 const menuList = ref([])
 
@@ -110,9 +122,6 @@ function findBestMatch(menuList, path) {
   return bestMatch || path // fallback 到当前路径
 }
 
-
-
-
 // 响应式高亮菜单
 const activeMenu = computed(() => {
   return findBestMatch(menuList.value, route.path)