diff --git a/src/views/activity/GroupBuyActivity.vue b/src/views/activity/GroupBuyActivity.vue index be5a7a0..6839a8a 100644 --- a/src/views/activity/GroupBuyActivity.vue +++ b/src/views/activity/GroupBuyActivity.vue @@ -119,7 +119,12 @@ - + + + {{ row.userId }} + - + + @@ -156,6 +161,7 @@ diff --git a/src/views/product/ProductGroup.vue b/src/views/product/ProductGroup.vue index e37afb6..84cd6e7 100644 --- a/src/views/product/ProductGroup.vue +++ b/src/views/product/ProductGroup.vue @@ -634,6 +634,25 @@ inactive-text="禁止" /> + + + + + + + + + + 启用后,用户购买/续费/升级此商品前须完成实名认证 + @@ -686,18 +705,6 @@ style="width: 100%" /> - - - - - - - all: 所有参数 / plan: 套餐 / customize: 自定义 - @@ -865,7 +872,8 @@ const productForm = reactive({ recommend: false, recommend_rebate: 0, arg_type: 'all', - can_renew: true + can_renew: true, + require_real_name: false }) const productRules = { @@ -1514,7 +1522,8 @@ const handleAddProduct = () => { expire_time: 0, recommend: false, recommend_rebate: 0, - arg_type: 'all' + arg_type: 'all', + require_real_name: false }) selectedProductGroup.value = null @@ -1547,7 +1556,8 @@ const handleEditProduct = (product, parentGroupId) => { recommend: product.recommend, recommend_rebate: product.recommendRebate, arg_type: product.argType || 'all', - can_renew: product.canRenew !== undefined ? product.canRenew : (product.can_renew !== undefined ? product.can_renew : true) + can_renew: product.canRenew !== undefined ? product.canRenew : (product.can_renew !== undefined ? product.can_renew : true), + require_real_name: product.requireRealName ?? product.require_real_name ?? false }) productDialogVisible.value = true @@ -1572,7 +1582,8 @@ const submitProductForm = () => { recommend: productForm.recommend, recommend_rebate: Number(productForm.recommend_rebate) || 0, arg_type: productForm.arg_type, - can_renew: productForm.can_renew + can_renew: productForm.can_renew, + require_real_name: productForm.require_real_name } let res diff --git a/src/views/product/UserGoodsList.vue b/src/views/product/UserGoodsList.vue index ddb4e8f..02fad65 100644 --- a/src/views/product/UserGoodsList.vue +++ b/src/views/product/UserGoodsList.vue @@ -68,13 +68,18 @@ - {{ row.user?.UserName || row.user?.username || '-' }} + {{ row.user?.UserName || row.user?.username || '-' }} + - ({{ row.userId || row.user_id || '-' }}) - {{ row.good?.name || '-' }} (ID:{{ row.good?.id || row.goodId || '-' }}) + + {{ row.good.name }} + - + (ID:{{ row.good?.id || row.goodId || '-' }}) + @@ -86,7 +91,10 @@ {{ row.goodPlanId || row.good_plan_id || '-' }} - {{ row.order?.name || (row.orderId ? `订单 #${row.orderId}` : '-') }} + + {{ row.order?.name || `订单 #${row.orderId}` }} + - + diff --git a/src/views/product/components/ProductParameterManager.vue b/src/views/product/components/ProductParameterManager.vue index 09d9e52..231f658 100644 --- a/src/views/product/components/ProductParameterManager.vue +++ b/src/views/product/components/ProductParameterManager.vue @@ -608,7 +608,7 @@ const reorderAttrs = async (param, src, dst) => { attr_id: item.id, attr_name: item.name, attr_value: item.value || '', - attr_price: Number(item.price) || 0, + attr_price: Number(item.price) / 100 || 0, index: newIndex } if (param?.type === 'number') { diff --git a/src/views/ticket/TicketList.vue b/src/views/ticket/TicketList.vue index 50e2d09..5709cb7 100644 --- a/src/views/ticket/TicketList.vue +++ b/src/views/ticket/TicketList.vue @@ -76,7 +76,8 @@ {{ row.username?.charAt(0) }} - {{ row.username }} + {{ row.username }} + {{ row.username }} diff --git a/src/views/user-vm/UserVmList.vue b/src/views/user-vm/UserVmList.vue index f0b7c17..bd4807a 100644 --- a/src/views/user-vm/UserVmList.vue +++ b/src/views/user-vm/UserVmList.vue @@ -55,11 +55,16 @@ - {{ row.good?.name ? `${row.good.name}(ID:${row.good.id})` : '-' }} + {{ row.good.name }}(ID:{{ row.good.id }}) + {{ row.good?.name ? `${row.good.name}(ID:${row.good.id})` : '-' }} - {{ row.user?.UserName || '-' }} (ID:{{ row.userId || row.user_id || '-' }}) + + {{ row.user?.UserName || '-' }} + - + (ID:{{ row.userId || row.user_id || '-' }}) + diff --git a/src/views/user/UserBalance.vue b/src/views/user/UserBalance.vue index 01d6981..d72e3d0 100644 --- a/src/views/user/UserBalance.vue +++ b/src/views/user/UserBalance.vue @@ -81,9 +81,10 @@ - + - {{ row.PaymentOrderId || '-' }} + {{ row.PaymentOrderId }} + -