diff --git a/api/shop/shopCart/model/index.ts b/api/shop/shopCart/model/index.ts index 08ea69e..fdacfcd 100644 --- a/api/shop/shopCart/model/index.ts +++ b/api/shop/shopCart/model/index.ts @@ -57,6 +57,8 @@ export interface ShopCartParam extends PageParam { } export interface MyCart { + appName?: string, + domain?: string, num?: number, type?: number; payType?: number, diff --git a/api/system/company/model/index.ts b/api/system/company/model/index.ts index c804858..fc83b8d 100644 --- a/api/system/company/model/index.ts +++ b/api/system/company/model/index.ts @@ -10,6 +10,7 @@ export interface Company { companyId?: number; type?: number; menuId?: number; + appName?: string; shortName?: string; companyName?: string; companyType?: number; @@ -55,6 +56,7 @@ export interface Company { userId?: number; official?: boolean; price?: number; + deliveryMethod?: number; chargingMethod?: number; planId?: number; sortNumber?: number; diff --git a/components/CompanyList.vue b/components/CompanyList.vue index 4f0551e..7ce467c 100644 --- a/components/CompanyList.vue +++ b/components/CompanyList.vue @@ -32,22 +32,24 @@ {{ item.companyName }} - - + 立即开通 + + + + + + + + + + + + + + + + + diff --git a/composables/configState.ts b/composables/configState.ts index bee2c09..16ebd88 100644 --- a/composables/configState.ts +++ b/composables/configState.ts @@ -75,6 +75,8 @@ export const useShowLogin = () => useState('showLogin',() => false) // 购物车状态 export const useCart = () => useState('cart', () => { return { + appName: '', + domain: '', num: 1, type: 1, payType: 102, diff --git a/nuxt.config.ts b/nuxt.config.ts index 0c9cc42..9b8377c 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -33,10 +33,10 @@ export default defineNuxtConfig({ public: { // 开发环境配置 // tenantId: '5', - // apiServer: 'http://127.0.0.1:30000/api', + apiServer: 'http://127.0.0.1:30000/api', // 生产环境 - apiServer: 'https://common-api.websoft.top/api', + // apiServer: 'https://common-api.websoft.top/api', globalTitle: '网宿软件', domain: 'websoft.top' }, diff --git a/pages/components/Flash.vue b/pages/components/Flash.vue index 9aa2595..a98e9ca 100644 --- a/pages/components/Flash.vue +++ b/pages/components/Flash.vue @@ -98,8 +98,8 @@
- 立即开始 - 进入控制台 + 立即开始 + 源码下载 商业版演示
diff --git a/pages/item/components/PageBanner.vue b/pages/item/components/PageBanner.vue index 339c953..4fa10ae 100644 --- a/pages/item/components/PageBanner.vue +++ b/pages/item/components/PageBanner.vue @@ -63,32 +63,33 @@ - 进入控制台 - 产品文档 - + 立即开通 + 产品控制台 + 帮助文档 + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/pages/item/index.vue b/pages/item/index.vue index cb68c94..99b6d19 100644 --- a/pages/item/index.vue +++ b/pages/item/index.vue @@ -12,34 +12,30 @@ - {{form.tenantId}} - {{form.menuId || '-'}} - {{form.tenantName}} - {{form.domain}} + + + {{form.tenantName}} + {{ item.value }} - +
- - 完整应用 - 插件 + + + + + + + + + + - - - - @@ -67,13 +70,14 @@ - {{ form.menuId }} - {{ form.type == 1 ? '插件' : '完整应用' }} {{ form.shortName }} + {{ form.type == 1 ? '插件' : '完整应用' }} + {{ form.deliveryMethod == 1 ? 'SaaS交付' : '源码交付' }} + {{ cart.appName }} {{ cart.num }} 套 {{ cart.month }} 个月 @@ -167,6 +171,7 @@ const {form, assignFields} = useFormData({ companyId: undefined, menuId: undefined, type: undefined, + appName: undefined, shortName: undefined, companyName: undefined, companyType: undefined, @@ -209,6 +214,7 @@ const {form, assignFields} = useFormData({ status: undefined, userId: undefined, official: undefined, + deliveryMethod: undefined, chargingMethod: undefined, price: undefined, planId: undefined, @@ -376,10 +382,12 @@ const onDone = () => { body: cart.value }).then(res => { if(res.code == 0){ - ElMessage.success(res.message); + ElMessage.success('购买成功'); visible.value = !visible.value; + setTimeout(() => { + navigateTo(`/user/order`) + },500) } - if(res.code == 1){ ElMessage.error(res.message); } diff --git a/pages/templates/components/CardList.vue b/pages/templates/components/CardList.vue index 7c42a47..56f5311 100644 --- a/pages/templates/components/CardList.vue +++ b/pages/templates/components/CardList.vue @@ -3,7 +3,7 @@