//修改

app/Dicts.php

@@ -20,6 +20,7 @@ class Dicts extends Repository
         'weekIso' => ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
         'pay_channel' => ['银行转账' => ['bank'], '余额支付' => ['account'],  '微信支付' =>  ['wx', 'wx_pub', 'wx_pub_qr', 'wx_pub_scan', 'wx_wap', 'wx_lite'], '支付宝' => ['alipay', 'alipay_wap', 'alipay_qr', 'alipay_scan', 'alipay_pc_direct'], '天猫续费' => ['tmall']],
         'carrier_operator' => ['联通', '移动', '电信', '全网'],
+        'fType' => ['流量','硬件'],
         'service_type' => ['套餐开通', '套餐续费', '套餐更换', '套餐销售'],
         'card_status' => ['测试期', '沉默期', '服务期', '服务到期', '已注销'],
         'package_type' => ['基础套餐', '续费包', '加油包', '可选包', '附加包'],

app/Domains/Virtual/Http/Controllers/PackageController.php

@@ -29,6 +29,7 @@ class PackageController extends Controller
     public function index()
     {
         $conditions = $this->request->all();
+
         $conditions['limit'] = $this->request->get('limit', 20);
 
         $packages = $this->packageService->index($conditions);

app/Domains/Virtual/Services/PackageService.php

@@ -42,10 +42,15 @@ class PackageService extends Service
 
         $carrierOperators = app(Dicts::class)->get('carrier_operator');
 
-        $packages->map(function ($item) use ($carrierOperators) {
+        //流量套餐[0流量1硬件]
+        $fTypeName = app(Dicts::class)->get('fType');
+
+        $packages->map(function ($item) use ($carrierOperators,$fTypeName){
             $item->cost_price = sprintf('%.02f', $item->cost_price/100);
             $item->guide_price = sprintf('%.02f', $item->guide_price/100);
             $item->carrier_operator_name = $carrierOperators[$item->carrier_operator];
+            //显示对应的中文名称-流量套餐
+            $item->ftype = $fTypeName[$item->ftype];
             $item->status = $item->deleted_at ? 2 : $item->status;
             $item->created_at = Carbon::parse($item->created_at)->format('Y-m-d');
             $item->updated_at = Carbon::parse($item->updated_at)->format('Y-m-d');
@@ -77,6 +82,7 @@ class PackageService extends Service
             'sn' => ['required', 'between:2,32', Rule::unique($this->packageRepository->getTable(), 'sn')->ignore($attributes['id'])->whereNUll('deleted_at')],
             'name' => ['required', 'between:2,32', Rule::unique($this->packageRepository->getTable(), 'name')->ignore($attributes['id'])->whereNUll('deleted_at')],
             'type' => ['required', 'in:0,2,3'],
+            'fType' => ['required', 'in:0,1'],
             'carrier_operator' => ['required', 'in:0,1,2,3'],
             // 'package_type' => ['required', 'numeric'],
             'cost_price' => ['numeric', 'min:0'],
@@ -101,6 +107,7 @@ class PackageService extends Service
             'name.between' => '套餐名称长度不合法',
             'name.unique' => '套餐名称已经被其他用户所使用',
             'type.required' => '请选择套餐类型',
+            'fType.required' => '请选择流量套餐类型',
             'type.in' => '套餐类型不合法',
             'carrier_operator.required' => '请选择运营商',
             'carrier_operator.in' => '运营商不合法',

frontend/src/views/virtual/packages/js/index.js

@@ -138,6 +138,11 @@ export default {
           key: "carrier_operator_name",
           width: 100
         },
+        {
+          title: "流量套餐类型",
+          key: "fType",
+          width: 100
+        },
         {
           title: "流量值（M）",
           key: "flows",

public/css/chunk-1a1a22d5.6166dab5.css

@@ -1 +0,0 @@
-[data-v-c9ef48cc] .ivu-table-cell{word-break:keep-all}

public/css/chunk-4f69bb43.6166dab5.css

@@ -1 +0,0 @@
-[data-v-c9ef48cc] .ivu-table-cell{word-break:keep-all}

public/css/chunk-624487b2.53360862.css

@@ -0,0 +1 @@
+[data-v-71a6b20a] .ivu-table-cell{word-break:keep-all}

public/css/chunk-6ea47298.6166dab5.css

@@ -1 +0,0 @@
-[data-v-c9ef48cc] .ivu-table-cell{word-break:keep-all}

public/css/chunk-996b1e80.5cadf3d0.css

@@ -1 +0,0 @@
-[data-v-1fa7bfcd] .ivu-table-cell{word-break:keep-all}

public/css/chunk-9c85aab4.6166dab5.css

@@ -1 +0,0 @@
-[data-v-c9ef48cc] .ivu-table-cell{word-break:keep-all}