订单列表修改

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -180,14 +180,14 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'value' => function ($row) {
                         switch ($row['PAY_TYPE']) {
                             case 'cash':
-                                return '充值账户支付';
+                                return '充值账户';
                             case 'exchange':
-                                return '复消积分支付';
+                                return '复消积分';
                             default:
-                                return '无业绩兑换点数支付';
+                                return '兑换点数';
                         }
                     },
-                    'headerOther' => ['width' => '190'],
+                    'headerOther' => ['width' => '120'],
                 ],
                 'IS_AUTO' => [
                     'header' => 'Is Auto', // 是否自动

frontendApi/modules/v1/controllers/ShopController.php

@@ -175,7 +175,7 @@ class ShopController extends BaseController {
            //$data['list'][$key]['CITY_NAME'] = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
             //$data['list'][$key]['COUNTY_NAME'] = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
             $data['list'][$key]['PAY_AT'] = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
-            $data['list'][$key]['PAY_TYPE'] = $value['PAY_TYPE'] == 'cash' ? '消费点数支付' : ($value['PAY_TYPE'] == 'exchange' ? '复消点数支付' : '业绩兑换点数支付');
+            $data['list'][$key]['PAY_TYPE'] = $value['PAY_TYPE'] == 'cash' ? '消费点数' : ($value['PAY_TYPE'] == 'exchange' ? '复消点数' : '兑换点数');
         }
         return static::notice($data);
     }

frontendEle/src/views/shop/order-list.vue

@@ -69,15 +69,7 @@
   //
       objectSpanMethod(obj) {
 
-        if (
-          obj.columnIndex === 5 ||
-          obj.columnIndex === 6 ||
-          obj.columnIndex === 7 ||
-          obj.columnIndex === 8 ||
-          obj.columnIndex === 9 ||
-          obj.columnIndex === 10 ||
-          obj.columnIndex === 11
-        ) {
+        if (obj.columnIndex >= 5) {
           // ⼆维数组存储的数据取出
           var _row = this.spanArr[obj.rowIndex];
           var _col = _row > 0 ? 1 : 0;