支付提交

package.json

@@ -28,11 +28,13 @@
     "jsencrypt": "3.3.2",
     "jsencrypt": "3.3.2",
     "nprogress": "0.2.0",
     "nprogress": "0.2.0",
     "pinia": "2.1.7",
     "pinia": "2.1.7",
+    "qrcode": "^1.5.3",
     "vue": "3.3.9",
     "vue": "3.3.9",
     "vue-cropper": "1.1.1",
     "vue-cropper": "1.1.1",
     "vue-router": "4.2.5"
     "vue-router": "4.2.5"
   },
   },
   "devDependencies": {
   "devDependencies": {
+    "@types/qrcode": "^1.5.5",
     "@vitejs/plugin-vue": "4.5.0",
     "@vitejs/plugin-vue": "4.5.0",
     "@vue/compiler-sfc": "3.3.9",
     "@vue/compiler-sfc": "3.3.9",
     "sass": "1.69.5",
     "sass": "1.69.5",

src/api/computingResource.js

@@ -9,11 +9,20 @@ export function computilityMenu (query) {
   })
   })
 }
 }
 
 
+// 获取计算资源菜单
+export function categoryMenuNew (query) {
+  return request({
+    url: '/product/category/list-computility',
+    method: 'get',
+    params: query
+  })
+}
+
 
 
 // 根据应用类别返回对应计算机资源列表
 // 根据应用类别返回对应计算机资源列表
 export function getRListByCategory (query) {
 export function getRListByCategory (query) {
   return request({
   return request({
-    url: '/api/v1/getRListByCategory',
+    url: '/product/sku/page',
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
@@ -23,7 +32,7 @@ export function getRListByCategory (query) {
 // 计算资源详情
 // 计算资源详情
 export function getRDetail (query) {
 export function getRDetail (query) {
   return request({
   return request({
-    url: '/api/v1/getRDetail',
+    url: '/product/sku/get-detail',
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
@@ -47,6 +56,33 @@ export function orderBuy (query) {
   })
   })
 }
 }
 
 
+export function createOrderSubmit(query){
+  return request({
+    url: '/trade/order/create',
+    method: 'post',
+    data: query
+  })
+}
+
+export function createPay(query){
+  return request({
+    url: '/pay/order/submit',
+    method: 'post',
+    data: query
+  })
+}
+
+// export async function getOrder(id, sync){
+//   return await request({
+//     url: '/pay/order/get',
+//     method: 'get',
+//     params: {
+//       id,
+//       sync
+//     }
+//   })
+// }
+
 export function bizOrderSubmit(query){
 export function bizOrderSubmit(query){
   return request({
   return request({
     url: '/api/v1/bizOrderSubmit',
     url: '/api/v1/bizOrderSubmit',

src/layout/user-layout.vue

@@ -20,7 +20,7 @@
                 <template #title>计算资源</template>
                 <template #title>计算资源</template>
                 <el-menu-item
                 <el-menu-item
                     v-for="item in computilityMenuData"
                     v-for="item in computilityMenuData"
-                    :index="'/computingResource/resourceList?type='+item.value">
+                    :index="'/computingResource/resourceList?type='+item.id">
                   {{ item.name }}
                   {{ item.name }}
                 </el-menu-item>
                 </el-menu-item>
               </el-sub-menu>
               </el-sub-menu>
@@ -76,7 +76,7 @@
 import {computed} from 'vue'
 import {computed} from 'vue'
 import {useRoute, useRouter} from 'vue-router'
 import {useRoute, useRouter} from 'vue-router'
 import AppMain from '@/layout/components/AppMain.vue'
 import AppMain from '@/layout/components/AppMain.vue'
-import {computilityMenu} from '@/api/computingResource.js'
+import {categoryMenuNew} from '@/api/computingResource.js'
 import {industryMenu} from '@/api/industry.js'
 import {industryMenu} from '@/api/industry.js'
 import useUserStore from '@/store/modules/user.js'
 import useUserStore from '@/store/modules/user.js'
 import {ElMessageBox} from 'element-plus'
 import {ElMessageBox} from 'element-plus'
@@ -102,7 +102,8 @@ const computilityMenuData = ref([])
 const industryMenuData = ref([])
 const industryMenuData = ref([])
 
 
 function getComputilityMenu() {
 function getComputilityMenu() {
-  computilityMenu().then(res => {
+  categoryMenuNew().then(res => {
+    console.log(res, 'res')
     computilityMenuData.value = res.data
     computilityMenuData.value = res.data
   })
   })
 }
 }

src/utils/constants.js

+/**
+ * 支付订单状态
+ */
+export const PayOrderStatusEnum = {
+    WAITING: {
+        status: 0,
+        name: '未支付'
+    },
+    SUCCESS: {
+        status: 10,
+        name: '已支付'
+    },
+    CLOSED: {
+        status: 20,
+        name: '未支付'
+    }
+}
+