fix: 修复排序

src/views/asset-management/asset-information/components/BasicInfoCard.vue

@@ -81,17 +81,21 @@
       <template v-if="cardInfo?.asset_type === 'device'">
         <ElDescriptionsItem label="IMEI">{{ cardInfo?.imei || '-' }}</ElDescriptionsItem>
         <ElDescriptionsItem label="设备类型">{{ cardInfo?.device_type || '-' }}</ElDescriptionsItem>
+        <ElDescriptionsItem label="店铺">{{ cardInfo?.shop_name || '-' }}</ElDescriptionsItem>
+        <ElDescriptionsItem label="设备状态">
+          <ElTag :type="getAssetStatusType(cardInfo?.status)" size="small">
+            {{ getAssetStatusName(cardInfo?.status) }}
+          </ElTag>
+        </ElDescriptionsItem>
         <ElDescriptionsItem label="实名状态">
           <ElTag :type="getRealNameStatusType(currentCard?.real_name_status)" size="small">
             {{ getRealNameStatusName(currentCard?.real_name_status) }}
           </ElTag>
         </ElDescriptionsItem>
-
-        <ElDescriptionsItem label="店铺">{{ cardInfo?.shop_name || '-' }}</ElDescriptionsItem>
         <ElDescriptionsItem label="设备名称">{{ cardInfo?.device_name || '-' }}</ElDescriptionsItem>
-        <ElDescriptionsItem label="设备状态">
+        <ElDescriptionsItem label="在线状态">
-          <ElTag :type="getAssetStatusType(cardInfo?.status)" size="small">
+          <ElTag :type="getOnlineStatusType(cardInfo?.online_status)" size="small">
-            {{ getAssetStatusName(cardInfo?.status) }}
+            {{ getOnlineStatusName(cardInfo?.online_status) }}
           </ElTag>
         </ElDescriptionsItem>
 
@@ -121,11 +125,6 @@
           </ElTag>
         </ElDescriptionsItem>
 
-        <ElDescriptionsItem label="在线状态">
-          <ElTag :type="getOnlineStatusType(cardInfo?.online_status)" size="small">
-            {{ getOnlineStatusName(cardInfo?.online_status) }}
-          </ElTag>
-        </ElDescriptionsItem>
         <ElDescriptionsItem label="固件版本">{{
           cardInfo?.software_version || '-'
         }}</ElDescriptionsItem>

src/views/package-management/package-series/index.vue

@@ -96,11 +96,11 @@
             </ElFormItem>
 
             <template v-if="form.one_time_commission_config.enable">
-              <!-- 佣金类型 -->
+              <!-- 触发类型 -->
-              <ElFormItem label="佣金类型">
+              <ElFormItem label="触发类型">
-                <ElRadioGroup v-model="form.one_time_commission_config.commission_type">
+                <ElRadioGroup v-model="form.one_time_commission_config.trigger_type">
-                  <ElRadio value="fixed">固定佣金</ElRadio>
+                  <ElRadio value="first_recharge">首次充值</ElRadio>
-                  <ElRadio value="tiered">梯度佣金</ElRadio>
+                  <ElRadio value="accumulated_recharge">累计充值</ElRadio>
                 </ElRadioGroup>
               </ElFormItem>
 
@@ -119,14 +119,13 @@
                 >
               </ElFormItem>
 
-              <!-- 触发类型 -->
+              <!-- 佣金类型 -->
-              <ElFormItem label="触发类型">
+              <ElFormItem label="佣金类型">
-                <ElRadioGroup v-model="form.one_time_commission_config.trigger_type">
+                <ElRadioGroup v-model="form.one_time_commission_config.commission_type">
-                  <ElRadio value="first_recharge">首次充值</ElRadio>
+                  <ElRadio value="fixed">固定佣金</ElRadio>
-                  <ElRadio value="accumulated_recharge">累计充值</ElRadio>
+                  <ElRadio value="tiered">梯度佣金</ElRadio>
                 </ElRadioGroup>
               </ElFormItem>
-
               <!-- 固定佣金金额 -->
               <ElFormItem
                 v-if="form.one_time_commission_config.commission_type === 'fixed'"