Browse Source

refactor(create-order): 优化产品列表展示逻辑

- 移除了权限开通相关代码
- 优化了数据流量包和历史数据的展示格式
- 调整了子账号数量的展示逻辑
- 删除了未使用的组件和方法

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe 1 tháng trước cách đây
mục cha
commit
c732c74e0e

+ 9 - 31
src/views/create-order/components/order-detail-submodule/OrderDetailCardProductList.vue

@@ -7,9 +7,6 @@
         :title="setProductTitle(product, index)"
         :subtitle="product.auto !== 1 ? '该产品暂不支持系统自动开通权限,请联系运维开通': ''"
         >
-        <template #actions>
-          <button @click="openPermissionActivation(product)" class="order-detail-product-actions-btn" v-if="isShowPermission(product)">权限开通</button>
-        </template>
         <div class="order-detail-product-content">
           <div class="grouped-items">
             <div
@@ -33,6 +30,9 @@
                 <div v-else-if="item.key === 'mainAccountCount'">
                   <span v-html="getValidityPeriodHtml(product, item)"></span>
                 </div>
+                <div v-else-if="item.key ==='data_count'">
+                  <span v-html="getValidityPeriodHtml(product, item)"></span>
+                </div>
                 <div v-else-if="item.key ==='rate'">
                   {{ item.label }}:
                   <span :class="{'no_open_root': product.original_price === 0}">{{ getFilteredValue(product[item.key], item.filter) || '-' }}</span>
@@ -90,7 +90,6 @@
         </template>
       </ProductCard>
     </div>
-    <newDetailModel ref="newDetailModel" :data="orderDetail"></newDetailModel>
     <ServiceList v-show="false" :buySubject="orderData.buy_subject" ref="serviceListRef"></ServiceList>
   </div>
 </template>
@@ -98,7 +97,6 @@
 <script>
 import ProductCard from '../../ui/ProductCard.vue';
 import { div, calcDiscountRate, roundToTwoDecimals } from '@/utils/number/';
-import newDetailModel from '@/views/order/components/new-detailModel.vue';
 import ServiceList from '../product-info-submodule/ServiceList.vue';
 import { showActivityCardRateModule } from "@/views/create-order/hooks/utils"
 import ContractMoneyTotalDesc from '@/views/create-order/components/contractMoneyTotalDesc.vue'
@@ -112,7 +110,6 @@ export default {
   name: 'OrderDetailCardProduct',
   components: {
     ProductCard,
-    newDetailModel,
     ServiceList,
     RelatedOrderTable,
     ContractMoneyTotalDesc
@@ -343,16 +340,6 @@ export default {
     divided(a, b) {
       return div(a, b)
     },
-    // 权限开通
-    openPermissionActivation() {
-      this.$refs.newDetailModel.permissionActivationShow = true;
-    },
-    isShowPermission (product) {
-      const { auto, attribute } = product
-      const { return_status } = this.orderData?.return_status || 0
-      // 仅当该产品类型支持系统自动开通权限,且产品属性为会员服务或资源包,且“回款状态”为“全额回款”才展示,否则不展示;
-      return auto === 1 && (attribute === 1 || attribute === 2) && return_status === 1
-    },
     buildBigServiceNames(serviceIds, supServiceIds) {
       return new Promise((resolve) => {
         if (!serviceIds || serviceIds.length === 0) {
@@ -436,9 +423,9 @@ export default {
 
     // 构造子账号数量字符串。
     buildSubAccountCount(product, filter) {
-      if (product.product_type === 'VIP订阅' || product.product_type === '大会员') {
-        const buyCount = Number(filter?.buyAccountCount) || 0;
-        const giftCount = Number(filter?.giftAccountCount) || 0;
+      const buyCount = Number(filter?.buyAccountCount) || 0;
+      const giftCount = Number(filter?.giftAccountCount) || 0;
+      if (buyCount || giftCount) {
         const countTotal = buyCount + giftCount;
         return `付费${buyCount}个,赠送${giftCount}个,合计:<span class="color_main">${countTotal}</span>个`;
       }
@@ -471,7 +458,7 @@ export default {
       const { product_type } = product;
       const includeProductType = ['数据流量包', '历史数据', '结构化数据']
       if(includeProductType.includes(product_type)) {
-        return `${totalNums}条`; 
+        return `付费${pNum}条,赠送${give_cycle}条,合计<span class="color_main">${totalNums}</span>条`; 
       } else {
         return '';
       }
@@ -482,7 +469,8 @@ export default {
       const { product_type, returned_open } = product;
       const returned_opens = returned_open === 1 ? '(全额回款当日开通)' : '';
       if (product_type === '数据流量包') {
-        return `${validYear}年${returned_opens}`;
+        // 数据流量包默认2年
+        return `${validYear || 2}年${returned_opens}`;
       }
 
       const TIME_MAP = {
@@ -603,16 +591,6 @@ export default {
 
 <style lang="scss" scoped>
 .order-detail-card-product-list {
-  .order-detail-product-actions-btn {
-    padding: 4px 17px;
-    background: $color_main;
-    font-size: 14px;
-    line-height: 22px;
-    color: $white;
-    border-radius: 4px;
-    border: none;
-    cursor: pointer;
-  }
   .grouped-items {
     display: flex;
     flex-wrap: wrap;