修复样式问题

application/admin/controller/Produceorder.php

@@ -54,6 +54,11 @@ class Produceorder extends Backend
             $this->proxy = 1;
             $this->assign('status',\app\common\model\MobileOrder::$GongYSStatus);
         }
+        $platformSourceList = [
+            '1' => '自动生产',
+            '0' => '手动生产',
+        ];
+        $this->assign('platformSourceList', $platformSourceList);
     }
 
     public function import()
@@ -171,6 +176,7 @@ class Produceorder extends Backend
                     if (!isset($val['admin_id']) || empty($val['admin_id'])) {
                         $val['admin_id'] = $auth->isLogin() ? $auth->id : 0;
                     }
+                    $val['is_auto'] = 0;
                 }
             }
             (new MobileOrder)->insertAll($insert);

application/admin/view/produceorder/index.html

@@ -17,7 +17,16 @@
     .label-daifukuan {background-color: #e46005;}
 </style>
 <div class="panel panel-default panel-intro">
-    {:build_heading()}
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="is_auto">
+            <li class="{:$Think.get.is_auto === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="platformSourceList" item="vo"}
+            <li class="{:$Think.get.is_auto === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
     <!--<div class="panel-heading">-->
     <!--    {:build_heading(null,FALSE)}-->
     <!--<ul class="nav nav-tabs" data-field="status">

application/api/controller/Test.php

@@ -3,6 +3,8 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
+use app\common\model\Area;
+use app\common\model\AreaApi;
 use app\common\service\ZopOrderService;
 
 /**
@@ -20,25 +22,135 @@ class Test extends Api
      */
     public function index()
     {
-        common_log('aaa');
+        // common_log('aaa');
 
-        $data = array("key1", "key2", "key3", "key4", "key5", "key6", "key7", "key8", "key9", "key10", "key11", "key12", "key13", "key14", "key15", "key16");
+        // $data = array("key1", "key2", "key3", "key4", "key5", "key6", "key7", "key8", "key9", "key10", "key11", "key12", "key13", "key14", "key15", "key16");
 
-        dd(array_chunk($data, 5), array_column(array_chunk($data, 5), 0));
+        // dd(array_chunk($data, 5), array_column(array_chunk($data, 5), 0));
 
-        $params = [
-            'channel' => '08-2278-ae1q-9999',
-            'goodsId' => '982012220836',
-            'resourceContents' => [
-                [
-                    'content' => 'aaa',
-                    'sort' => 1
-                ]
-            ]
-        ];
+        // $params = [
+        //     'channel' => '08-2278-ae1q-9999',
+        //     'goodsId' => '982012220836',
+        //     'resourceContents' => [
+        //         [
+        //             'content' => 'aaa',
+        //             'sort' => 1
+        //         ]
+        //     ]
+        // ];
 
-        $result = ZopOrderService::resourceUpload($params);
+        // $result = ZopOrderService::resourceUpload($params);
 
-        dd($result);
+        // dd($result);
+        // $sum = 0;
+        // $codes = ZopOrderService::PROVINCE_CODE;
+        // // $code = 17;
+        // foreach ($codes as $code => $name) {
+        //     $params = [
+        //         'provinceCode' => $code
+        //     ];
+    
+        //     $result = ZopOrderService::postInfo($params);
+    
+        //     if ($result['code'] == 0) {
+        //         $data = $result['data'];
+        //         foreach ($data as $val) {
+        //             $val['code'] = $code;
+
+        //             AreaApi::create($val);
+        //         }
+        //     }
+        // }
+
+        // $provinces = Area::where('level', 1)->select();
+
+        // $failIds = [];
+        // foreach ($provinces as $province) {
+        //     $shortName = $province->shortname ?? '';
+        //     if (empty($shortName)) {
+        //         $failIds[] = $province->id;
+        //         continue;
+        //     }
+
+        //     // 查询省份对应的code
+        //     $areaApi = AreaApi::where('postProvinceName', $shortName)->find();
+        //     if (empty($areaApi)) {
+        //         $failIds[] = $province->id;
+        //         continue;
+        //     }
+
+        //     $province->post_code = $areaApi->postProvinceCode;
+        //     $province->num_code = $areaApi->numProvinceCode;
+        //     $province->save();
+        // }
+
+        // dd($failIds);
+
+        // $cities = Area::where('level', 2)->select();
+        // $failIds = [];
+
+        // foreach ($cities as $city) {
+        //     $shortName = $city->shortname ?? '';
+        //     $pid = $city->pid ?? 0;
+        //     if (empty($shortName)) {
+        //         $failIds[] = $city->id;
+        //         continue;
+        //     }
+        //     $province = Area::where('id', $pid)->find();
+        //     if (empty($province)) {
+        //         $failIds[] = $city->id;
+        //         continue;
+        //     }
+        //     $postProvinceCode = $province->post_code ?? '';
+
+        //     // 查询省份对应的code
+        //     $areaApi = AreaApi::where([
+        //         'postProvinceCode' => $postProvinceCode,
+        //         'postCityName' => ['like', $shortName . '%']
+        //     ])->find();
+
+        //     if (empty($areaApi)) {
+        //         $failIds[] = $city->id;
+        //         continue;
+        //     }
+
+        //     $city->post_code = $areaApi->postCityCode;
+        //     $city->num_code = $areaApi->numCityCode;
+        //     $city->save();
+        // }
+
+        // $districts = Area::where('level', 3)->select();
+        // $failIds = [];
+
+        // foreach ($districts as $district) {
+        //     $shortName = $district->shortname ?? '';
+        //     $pid = $district->pid ?? 0;
+        //     if (empty($shortName)) {
+        //         $failIds[] = $district->id;
+        //         continue;
+        //     }
+        //     $city = Area::where('id', $pid)->find();
+        //     if (empty($city)) {
+        //         $failIds[] = $district->id;
+        //         continue;
+        //     }
+        //     $postCityCode = $city->post_code ?? '';
+
+        //     // 查询省份对应的code
+        //     $areaApi = AreaApi::where([
+        //         'postCityCode' => $postCityCode,
+        //         'postDistrictName' => ['like', $shortName . '%']
+        //     ])->find();
+
+        //     if (empty($areaApi)) {
+        //         $failIds[] = $district->id;
+        //         continue;
+        //     }
+
+        //     $district->post_code = $areaApi->postDistrictCode;
+        //     $district->save();
+        // }
+
+        // dd($failIds);
     }
 }

application/database.php

@@ -16,13 +16,21 @@ return [
     // 数据库类型
     'type'            => Env::get('database.type', 'mysql'),
     // 服务器地址
-    'hostname'        => Env::get('database.hostname', '47.111.246.47'),
+    // 'hostname'        => Env::get('database.hostname', '47.111.246.47'),
+    // // 数据库名
+    // 'database'        => Env::get('database.database', 'lh_hdlkeji_com'),
+    // // 用户名
+    // 'username'        => Env::get('database.username', 'lh_hdlkeji_com'),
+    // // 密码
+    // 'password'        => Env::get('database.password', '123456'),
+    // 服务器地址
+    'hostname'        => Env::get('database.hostname', '192.168.56.11'),
     // 数据库名
-    'database'        => Env::get('database.database', 'lh_hdlkeji_com'),
+    'database'        => Env::get('database.database', 'beauty'),
     // 用户名
-    'username'        => Env::get('database.username', 'lh_hdlkeji_com'),
+    'username'        => Env::get('database.username', 'root'),
     // 密码
-    'password'        => Env::get('database.password', '123456'),
+    'password'        => Env::get('database.password', 'root'),
     // 端口
     'hostport'        => Env::get('database.hostport', '3306'),
     // 连接dsn

public/assets/js/backend/produceorder.js

@@ -106,19 +106,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
 
                 let columns=[
                     {checkbox: true},
-                    {field: 'id', title: __('ID'),operate:false,},
+                    // {field: 'id', title: __('ID'),operate:false,},
                     {field: 'order_no', title: __('订单号'),visible:false,operate: 'like'},
-                    {field: 'pay_no', title: __('支付单号'),visible: false,operate: '='},
-
+                    {field: 'logistics_numbers', title: __('支付单号'),visible: false,operate: '='},
                     {field: 'pay_type', title: __('支付方式'),searchList: payType,visible: false, operate: is_proxy_operate},
                     {field: 'no', title: __('手机号'),visible: false,operate: 'LIKE'},
                     {field: 'phone', title: __('收货人手机'),visible: false,operate: 'LIKE'},
                     {field: 'name', title: __('收货人'),visible: false,operate: 'LIKE'},
                     {field: 'id_no', title: __('收货人身份证'),visible: false,operate: "like"},
-                    {field: 'pay_mid_wechat', title: __('微信商户号'),visible: false, operate: is_proxy_operate},
-                    {field: 'pay_mid_alipay', title: __('支付宝商户号'),visible: false,operate: is_proxy_operate},
-                    {field: 'pay_mid_dy', title: __('抖音商户号'),visible: false,operate: is_proxy_operate},
-                    {field: 'pay_mid_ks', title: __('快手商户号'),visible: false,operate: is_proxy_operate},
+                    {field: 'is_auto', title: __('是否是自动订单'),visible: false},
+                    {field: 'no', title: __('订单来源'),visible: false,operate: 'LIKE'},
+                    {field: 'produce_is_recharge', title: __('是否首充'),visible: false,operate: 'LIKE'},
+                    {field: 'produce_activation', title: __('激活状态'),visible: false,operate: 'LIKE'},
+                    {field: 'no', title: __('外部订单号'),visible: false,operate: 'LIKE'},
+                    {field: 'no', title: __('商品编码'),visible: false,operate: 'LIKE'},
+                    {field: 'no', title: __('订单生成时间'),visible: false,operate: 'LIKE'},
+                    {field: 'no', title: __('订单更新时间'),visible: false,operate: 'LIKE'},
                     {field: 'order_no', title: __('订单信息'),operate: false,formatter(_,order){
                             let a=[]
                             a.push(`<div>订单号:<b class="btn-order_link" data-link="${order.order_no}">${order.order_no}</b></div>`)
@@ -144,7 +147,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                             // a.push(`<div>备注:${order.info?order.info.mobile.remark:''}</div>`)
                             // a.push(`<a class="btn btn-success btn-sm btn-order_link" data-link="${a.join('')}">点击复制</a>`)
                             return `<div style="max-width: 250px;word-wrap: break-word;word-break: break-all;white-space: normal;text-align: left;">${a.join('')}</div>`
-                        },width:250,valign:'top',align:'left'},
+                        },width:'20%',valign:'top',align:'left'},
                     {field: 'order_no', title: __('收货人'),operate: false,formatter(_,order){
                             let a=[]
                             a.push(`<div class="btn-order_link" data-link="${order.name}">收货人:${order.name}</div>`)
@@ -162,7 +165,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                             a.push(`<div>快递单号:${order.trans_no}</div>`)
                             a.push(`<a class="btn btn-link btn-click-show-open" style="color: #00a2ff;" data-id="${order.id}" data-open="${order.open_uploaded}">查看资料</a>`)
                             return `<div style="max-width: 200px;text-align: left;" class="break-words">${a.join('')}</div>`
-                        },width:200,valign:'top',align:'left'},
+                        },width:'20%',valign:'top',align:'left'},
                     {field: 'create_time', title: __('订单状态'),operate: false,formatter(_,order){
                             let a=[]
                             a.push(`<div class="btn-order_link" data-link="${order.name}">订单状态:</div>`)
@@ -173,7 +176,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                             a.push(`<div>更新时间:${order.update_time}</div>`)
                             // a.push(`<a class="btn btn-link btn-click-show-open" style="color: #00a2ff;" data-id="${order.id}" data-open="${order.open_uploaded}">查看资料</a>`)
                             return `<div style="max-width: 200px;text-align: left;" class="break-words">${a.join('')}</div>`
-                        },width:200,valign:'top',align:'left'},
+                        },width:'15%',valign:'top',align:'left'},
                     {field: 'create_time', title: __('生产信息'),operate: false,formatter(_,order){
                             let a=[]
                             a.push(`<div class="btn-order_link" data-link="${order.name}">生产号码:</div>`)
@@ -183,7 +186,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                             a.push(`<div>物流状态:</div>`)
                             // a.push(`<a class="btn btn-link btn-click-show-open" style="color: #00a2ff;" data-id="${order.id}" data-open="${order.open_uploaded}">查看资料</a>`)
                             return `<div style="max-width: 200px;text-align: left;" class="break-words">${a.join('')}</div>`
-                        },width:200,valign:'top',align:'left'},
+                        },width:'15%',valign:'top',align:'left'},
                     {field: 'remark', title: '失败原因&备注',operate: 'range'},
                     // {field: 'remark', title: '失败原因&备注',formatter: Table.api.formatter.datetime,addClass:'datetimerange',operate: 'range'},
                     {field: 'trans_no', title: __('Trans_no'),visible: false,operate: "like"},
@@ -191,6 +194,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                         field: 'operate',
                         title: __('Operate'),
                         table: table,
+                        width: '5%',
                         events: Table.api.events.buttons,
                         formatter: Table.api.formatter.buttons,
                         buttons:[
@@ -206,30 +210,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                                     return $('#table').data('add_operation');
                                 }
                             },
-                            // {
-                            //     name: 'detail',
-                            //     text: __('退款'),
-                            //     title: __('退款'),
-                            //     classname: 'btn btn-xs btn-danger btn-dialog period',
-                            //     url: 'mobile_order/refund?a=1',
-                            //     callback: function (data) {
-                            //     },
-                            //     visible: function (row) {
-                            //         return $('#table').data('mobile_order_refund') && row.status>0 && row.status!=90;
-                            //     }
-                            // },
-                            // {
-                            //     name: 'detail',
-                            //     text: __('发货'),
-                            //     title: __('发货'),
-                            //     classname: 'btn btn-xs btn-info btn-dialog period',
-                            //     url: 'mobile_order/send?a=1',
-                            //     callback: function (data) {
-                            //     },
-                            //     visible: function (row) {
-                            //         return $('#table').data('mobile_order_send') && row.status>0;
-                            //     }
-                            // },
                             {
                                 name:'detail',
                                 title:'查看物流',
@@ -240,69 +220,36 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','clipboard'],
                                     return $('#table').data('see_logistics') && row.trans_id>0 && row.trans_no
                                 }
                             },
-                            // {
-                            //     name: 'detail',
-                            //     text: __('上架'),
-                            //     title: __('上架'),
-                            //     classname: 'btn btn-xs btn-success btn-dialog period',
-                            //     url: 'mobile_order/mobile_up?a=1',
-                            //     callback: function (data) {
-                            //         if(data && data.say){
-                            //             parent.layer.alert(data.say)
-                            //         }
-                            //     },
-                            //     visible: function (row) {
-                            //         return $('#table').data('auth-mobile_up') && [90].indexOf(row.status)>-1;
-                            //     },
-                            //     disable(row){
-                            //         return row.mobile_can_up
-                            //     }
-                            // },
-                            // {
-                            //     name: 'detail',
-                            //     text: __('抖音结算'),
-                            //     title: __('抖音结算'),
-                            //     classname: 'btn btn-xs btn-success btn-ajax',
-                            //     url: 'mobile_order/dy_settle',
-                            //     confirm:'确认结算吗？',
-                            //     callback: function (data) {
-                            //     },
-                            //     visible: function (row) {
-                            //         return $('#table').data('auth-dy_settle') && row.pay_type===4 && row.pay_time>0 && row.payment && row.payment.settle_status===0;
-                            //     },
-                            //     disable(row){
-                            //     }
-                            // },
-                                {
-                                    name: 'detail',
-                                    title: __('复制上传资料链接'),
-                                    text: __('复制上传资料链接'),
-                                    classname: 'btn btn-xs btn-info btn-copy-obj',
-                                    click: function (data,row) {
+                            {
+                                name: 'detail',
+                                title: __('复制上传资料链接'),
+                                text: __('复制上传资料链接'),
+                                classname: 'btn btn-xs btn-info btn-copy-obj',
+                                click: function (data,row) {
 
-                                    },
-                                    visible: function (row) {
-                                        return true;
-                                    }
                                 },
-                                {
-                                    name: 'resubmit',
-                                    title: __('重新提交'),
-                                    text: __('重新提交'),
-                                    classname: 'btn btn-xs btn-success btn-magic btn-ajax',
-                                    confirm: '确认重新提交吗？',
-                                    url: 'produceorder/resubmit',
-                                    success: function (data, ret) {
-                                        Layer.alert('操作成功');
-                                        //如果需要阻止成功提示，则必须使用return false;
-                                        //return false;
-                                    },
-                                    error: function (data, ret) {
-                                        console.log(data, ret);
-                                        Layer.alert(ret.msg);
-                                        return false;
-                                    }
+                                visible: function (row) {
+                                    return true;
+                                }
+                            },
+                            {
+                                name: 'resubmit',
+                                title: __('再次提交'),
+                                text: __('再次提交'),
+                                classname: 'btn btn-xs btn-success btn-magic btn-ajax',
+                                confirm: '确认再次提交吗？',
+                                url: 'produceorder/resubmit',
+                                success: function (data, ret) {
+                                    Layer.alert('操作成功');
+                                    //如果需要阻止成功提示，则必须使用return false;
+                                    //return false;
                                 },
+                                error: function (data, ret) {
+                                    console.log(data, ret);
+                                    Layer.alert(ret.msg);
+                                    return false;
+                                }
+                            },
                         ]
                     }
                 ]