Merge branch 'dev' of http://gogs.ainets.net/mirendemianbaona/nc-admin into dev

src/views/admin/tariffManagement/SetMeal/addSetMeal.vue

@@ -172,9 +172,9 @@ const processData = (data) => {
             typeName: item.type == 1 ? '服务时长' : "购买流量",
             profitPrice: item.billingMethod == 1 ? '---' : item.profitPrice + item.currency,
             billingMethod: filterDict(billingMethodList.value, item.billingMethod),
-            costPrice: item.billingMethod == 1 ? item.flow + item.flowUnit + '/' + item.price + item.currency : item.costPrice + item.trafficCurrency,
-            oldPrice: item.billingMethod == 1 ? '---' : item.oldPrice + item.trafficCurrency,
-
+            costPrice: item.billingMethod == 1? item.trafficBilling+item.trafficBillingType+'/'+ item.trafficBillingAmount +item.trafficCurrency  : item.costPrice + item.trafficCurrency,
+            oldPrice: item.billingMethod == 1 ? item.oldTrafficBilling+item.oldTrafficBillingType+'/'+ item.oldTrafficBillingAmount +item.trafficCurrency : item.oldPrice + item.trafficCurrency,
+            
         }
     })
 }

src/views/admin/tariffManagement/config.js

@@ -35,14 +35,14 @@ export let columns = [
     ellipsis: true,
   },
   {
-    title: window.$t("tariffManagement.billingCycle"),
+    title: window.$t("tariffManagement.billingCycleUser"),
     dataIndex: "billingCycleName",
     align: "center",
     width: 200,
     ellipsis: true,
   },
   {
-    title: window.$t("tariffManagement.BillingMode"),
+    title: window.$t("tariffManagement.pricingUser"),
     dataIndex: "billingMethodName",
     align: "center",
     width: 200,
@@ -375,7 +375,7 @@ export const trafficSearchFrom = [
   },
   {
     type: "select",
-    label: "流量方式",
+    label: "流量结算方式",
     field: "billingMethod",
     options: [], // 默认空，后面会通过字典加载
     dict: "billingMethod",

src/views/lotCard/cardList/config.js

@@ -275,7 +275,7 @@ export const columnsTopup = [
   },
   {
     title: window.$t('lotCard.PurchasePackage'),
-    dataIndex: 'trafficName',
+    dataIndex: 'productName',
     ellipsis: true,
     align: 'center',
   },