pf

app/admin/controller/RetailDescribe.php

@@ -20,7 +20,10 @@ class RetailDescribe extends Controller
     {
         $model = new retDescribeModel;
         $where = $this->request->get();
-        $list = $model->getList($where);
+        $list = $model->getList($where)->toArray();
+        foreach($list['data'] as &$item){
+            $item['plate_name'] = RetailDescribeEnum::$version[$item['plate_id']]??'';
+        }
         return $this->renderSuccess(compact('list'));
     }
 
@@ -49,7 +52,11 @@ class RetailDescribe extends Controller
     }
 
     public function getPlate(){
-        $list = RetailDescribeEnum::$version; 
+        $list1 = RetailDescribeEnum::$version; 
+        $list = [];
+        foreach($list1 as $key => $value){
+            $list[] = ['id' => $key, 'name' => $value];
+        };
         return  $this->renderSuccess(compact('list'));
     }
 

app/api/controller/Retail.php

@@ -100,39 +100,18 @@ class Retail extends Controller
 <p>
     10-促进本地商家联盟数字化平台化发展
 </p>';
-        $list['wholesale'] = '<p>
+        $list['wholesale'] = '<div style="text-align: left;">
-    1-采购代发商家实名注册认证，在线直接下单
+                                <p>1-采购代发商家实名注册认证，在线直接下单</p>
-</p>
+                                <p>2-认证商家、服务商数字化管理</p>
-<p>
+                                <p>3-所有订单，发货记录，物流状态实时查询</p>
-    2-认证商家、服务商数字化管理
+                                <p>4-所有调货记录在线实时查看</p>
-</p>
+                                <p>5-审单实时做电话、地址校验比对，避免平台单</p>
-<p>
+                                <p>6-供应链资源快速对接</p>
-    3-所有订单，发货记录，物流状态实时查询
+                                <p>7-商品数据快速上架，商城之间商品数据实时传输</p>
-</p>
+                                <p>8-商品市场价实时自动更新</p>
-<p>
+                                <p>9-货款到账时间支持当天或隔天，支付费率低 至千分之 2.x</p>
-    4-所有调货记录在线实时查看
+                                <p>10-供应商、服务商入驻，销售和推广效益提升</p>
-</p>
+                                </div>';
-<p>
-    5-审单实时做电话、地址校验比对，避免平台单
-</p>
-<p>
-    6-供应链资源快速对接
-</p>
-<p>
-    7-商品数据快速上架，商城之间商品数据实时传输
-</p>
-<p>
-    8-商品市场价实时自动更新
-</p>
-<p>
-    9-货款到账时间支持当天或隔天，支付费率低&nbsp; &nbsp;&nbsp;
-</p>
-<p>
-    &nbsp; &nbsp;至千分之2.x
-</p>
-<p>
-    10-供应商、服务商入驻，销售和推广效益提升
-</p>';
         return $this->renderSuccess(compact('list'));
     }
 
@@ -164,7 +143,8 @@ class Retail extends Controller
     public function describe()
     {   
         $type = $this->request->get('type')??10;
-        $list = RetailDescribeModel::withoutGlobalScope()->where(['description_status' =>10,'type' => $type])->select();
+        $list = RetailDescribeModel::withoutGlobalScope()->where(['description_status' =>10,'type' => $type])
+                                                         ->order(['sort' => 'asc','create_time' => 'asc'])->select();
         $group = [];
         foreach($list as $item){
             

app/store/model/RetailDescribe.php

@@ -23,7 +23,7 @@ class RetailDescribe extends RetDescribeModel
         $filter = $this->getFilter($param);
         $list = $this->field('*')
         ->where($filter)
-        ->order(['create_time' => 'asc','sort' => 'asc'])
+        ->order(['sort' => 'asc','create_time' => 'asc'])
         ->paginate($param['pageSize'] ?? 15);
         return $list;
     }