refactor: update Subscription Period sort

tapdata · Dec 20, 2023 · b88b170 · b88b170
1 parent 41cef46
commit b88b170
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/apps/dfs/src/components/guide/Spec.vue b/apps/dfs/src/components/guide/Spec.vue
@@ -290,9 +290,16 @@ export default {
         .sort((a, b) => {
           const aType = a.type === 'recurring' ? 1 : 2
           const bType = b.type === 'recurring' ? 1 : 2
-          const aOrder = a.order
-          const bOrder = b.order
-          return aType + aOrder - (bType + bOrder)
+          const aOrder = a.periodUnit === 'month' ? 1 : 2
+          const bOrder = b.periodUnit === 'month' ? 1 : 2
+
+          if (aType < bType) {
+            return -1
+          } else if (aType > bType) {
+            return 1
+          } else {
+            return aOrder - bOrder
+          }
         })
       //不显示订购一年
       if (specification?.chargeProvider !== 'FreeTier') {

diff --git a/apps/dfs/src/views/order/Change.vue b/apps/dfs/src/views/order/Change.vue
@@ -293,9 +293,16 @@ export default {
         .sort((a, b) => {
           const aType = a.type === 'recurring' ? 1 : 2
           const bType = b.type === 'recurring' ? 1 : 2
-          const aOrder = a.order
-          const bOrder = b.order
-          return aType + aOrder - (bType + bOrder)
+          const aOrder = a.periodUnit === 'month' ? 1 : 2
+          const bOrder = b.periodUnit === 'month' ? 1 : 2
+
+          if (aType < bType) {
+            return -1
+          } else if (aType > bType) {
+            return 1
+          } else {
+            return aOrder - bOrder
+          }
         })
     },
     //切换规格

diff --git a/packages/business/src/views/order/Change.vue b/packages/business/src/views/order/Change.vue
@@ -292,9 +292,16 @@ export default {
         .sort((a, b) => {
           const aType = a.type === 'recurring' ? 1 : 2
           const bType = b.type === 'recurring' ? 1 : 2
-          const aOrder = a.order
-          const bOrder = b.order
-          return aType + aOrder - (bType + bOrder)
+          const aOrder = a.periodUnit === 'month' ? 1 : 2
+          const bOrder = b.periodUnit === 'month' ? 1 : 2
+
+          if (aType < bType) {
+            return -1
+          } else if (aType > bType) {
+            return 1
+          } else {
+            return aOrder - bOrder
+          }
         })
     },
     //切换规格