xxxrrrdddd 3 years ago
parent
commit
9f3ebf43f8

+ 1 - 1
application/admin/controller/MobileOrder.php

@@ -54,7 +54,7 @@ class MobileOrder extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    
+                    ->with(['info'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);

+ 11 - 0
application/common/model/MobileOrder.php

@@ -42,6 +42,9 @@ class MobileOrder extends Model
     public function mobile(){
         return $this->belongsTo(Mobile::class);
     }
+    public function info(){
+        return $this->hasOne(MobileOrderInfo::class);
+    }
     public function proxy(){
         $columns=Admin::getTableInfo()['fields'];
         unset($columns['password']);
@@ -59,7 +62,15 @@ class MobileOrder extends Model
             $mobileOrder['order_no']=order_no();
             $mobileOrder['expire_time']=time()+86400;
             $mobileOrder['s_id']=$mobileOrder['mobile']['s_id'];
+            $mobileOrder['brand']=$mobileOrder['mobile']['brand'];
+        });
+        self::afterInsert(function (self $mobileOrder){
+            $mobileOrder->info()->save([
+                'mobile'=>$mobileOrder['mobile'],
+                'info'=>$mobileOrder['mobile']['info'],
+            ]);
         });
+
         self::beforeUpdate(function (self $mobileOrder){
             $data=$mobileOrder->getChangedData();
             #已支付

+ 17 - 0
application/common/model/MobileOrderInfo.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+use Yansongda\Supports\Str;
+
+/**
+ * 配置模型
+ */
+class MobileOrderInfo extends Model
+{
+    protected $type=[
+        'mobile'=>'json',
+        'info'=>'json',
+    ];
+}

+ 26 - 12
public/assets/js/backend/mobile_order.js

@@ -31,18 +31,33 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         //{checkbox: true},
                         {field: 'id', title: __('ID'),operate:false,},
                         {field: 'order_no', title: __('订单号'),visible:false,operate: 'like'},
-                        {field: 'order_no', title: __('订单号'),visible:false,operate: '='},
                         {field: 's_id', title: __('来源渠道')},
-                        {field: 'order_no', title: __('订单信息'),operate: false,},
-                        //{field: 'mobile_id', title: __('Mobile_id')},
-                        //{field: 'admin_id', title: __('Admin_id')},
-                        {field: 'name', title: __('Name')},
-                        {field: 'phone', title: __('Phone')},
-                        {field: 'id_no', title: __('Id_no')},
-                        {field: 'city', title: __('City')},
-                        {field: 'address', title: __('Address')},
-                        {field: 'remark', title: __('Remark')},
-                        {field: 'pay_type', title: __('Pay_type'),formatter: Table.api.formatter.label,searchList:payType},
+                        {field: 'order_no', title: __('订单信息'),operate: false,formatter(_,order){
+                            let a=[]
+                                a.push(`<div>订单号:${order.order_no}</div>`)
+                                a.push(`<div>商品信息:${order.no}</div>`)
+                                a.push(`<div>卡品牌:${order.brand}</div>`)
+                                a.push(`<div>底价:${order.amount_di}</div>`)
+                                a.push(`<div>预存:${order.amount_charge}</div>`)
+                                a.push(`<div>单价:${order.amount}</div>`)
+                                a.push(`<div>订单价格:${order.amount}</div>`)
+                                a.push(`<div>套餐:${order.info?order.info.info.describe:''}</div>`)
+                                a.push(`<div>备注:${order.info?order.info.mobile.remark:''}</div>`)
+                                return `<div style="max-width: 200px;word-wrap: break-word;word-break: break-all;white-space: normal;text-align: left;">${a.join('')}</div>`
+                            },width:200},
+                        {field: 'order_no', title: __('收货人'),operate: false,formatter(_,order){
+                                let a=[]
+                                a.push(`<div>收货人:${order.name}</div>`)
+                                a.push(`<div>手机号:${order.phone}</div>`)
+                                a.push(`<div>地址:${order.address}</div>`)
+                                a.push(`<div>支付方式:${payType[order.pay_type]}</div>`)
+                                a.push(`<div>备注:${order.remark}</div>`)
+                                a.push(`<div>快递名称:${order.trans_name}</div>`)
+                                a.push(`<div>快递单号:${order.trans_no}</div>`)
+                                return `<div style="max-width: 200px;word-wrap: break-word;word-break: break-all;white-space: normal;text-align: left;">${a.join('')}</div>`
+                            },width:200},
+                        {field: 'status', title: __('Status'),formatter: Table.api.formatter.label,searchList:status},
+                        {field: 'remark_backend', title: __('备注'),formatter: Table.api.formatter.content,operate:false},
                         {field: 'create_time', title: __('Create_time'),formatter: Table.api.formatter.datetime,addClass:'datetimerange',operate: 'range'},
                         {field: 'pay_time', title: __('Pay_time'),formatter: Table.api.formatter.datetime,addClass:'datetimerange',operate: 'range'},
                         {field: 'trans_name', title: __('Trans_name')},
@@ -51,7 +66,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'amount_hd', title: __('Amount_hd'), operate: 'BETWEEN'},
                         {field: 'amount_charge', title: __('Amount_charge'), operate: 'BETWEEN'},
                         {field: 'amount', title: __('Amount'), operate: 'BETWEEN'},
-                        {field: 'status', title: __('Status'),formatter: Table.api.formatter.label,searchList:status},
                         {field: 'open_idcard_face_img', title: __('开卡身份证正面照'),formatter: Table.api.formatter.image,events: Table.api.events.image,opera: false},
                         {field: 'open_idcard_back_img', title: __('开卡身份证背面照'),formatter: Table.api.formatter.image,events: Table.api.events.image,operate:false},
                         {field: 'open_face_img', title: __('开卡人头像'),formatter: Table.api.formatter.image,events: Table.api.events.image,operate:false},