From 335a675f53e8c282d5cdd061e7e59741183f4776 Mon Sep 17 00:00:00 2001 From: wangxinglong <2371974647@qq.com> Date: Thu, 26 May 2022 18:26:05 +0800 Subject: [PATCH] setter --- app/controller/api/Index.php | 43 +++++++ app/controller/manager/Config.php | 15 +-- app/controller/manager/account/Index.php | 2 +- app/controller/manager/mall/Order.php | 117 ++++++++++++++++-- config/cert/apiclient_cert.p12 | Bin 2718 -> 0 bytes config/cert/apiclient_cert.pem | 24 ---- config/cert/apiclient_key.pem | 28 ----- config/cert/证书使用说明.txt | 18 --- public/static/manager/css/config.css | 4 +- public/static/manager/js/account/account.js | 14 +-- public/static/manager/js/mall/order.js | 2 +- view/manager/account/index/index.html | 31 +++-- view/manager/config/about.html | 22 ++++ view/manager/config/addwechat.html | 45 +++++++ view/manager/config/mini_program.html | 33 +++-- view/manager/config/purchaseinstructions.html | 21 ++++ view/manager/config/wechat.html | 8 +- view/manager/mall/order/edit_status.html | 29 +++++ view/manager/mall/order/index.html | 11 +- 19 files changed, 340 insertions(+), 127 deletions(-) delete mode 100644 config/cert/apiclient_cert.p12 delete mode 100644 config/cert/apiclient_cert.pem delete mode 100644 config/cert/apiclient_key.pem delete mode 100644 config/cert/证书使用说明.txt create mode 100644 view/manager/config/addwechat.html create mode 100644 view/manager/config/purchaseinstructions.html create mode 100644 view/manager/mall/order/edit_status.html diff --git a/app/controller/api/Index.php b/app/controller/api/Index.php index 40e1aa1..b9ef1be 100644 --- a/app/controller/api/Index.php +++ b/app/controller/api/Index.php @@ -15,6 +15,8 @@ class Index extends Base 'miniProgramSetting', 'clearFootmarks', 'baseConfig', + 'purchaseinstructions', + 'addWechat', 'work', 'kf', 'hotKeywords', @@ -91,12 +93,50 @@ class Index extends Base try { CConfig::load('extra/statement', 'statement'); $content = config('statement')['content'] ?? ''; + $pregRule = "/<[img|IMG].*?src=[\'|\"][\/storage]{1}(.*?(?:[\.jpg|\.jpeg|\.png|\.gif|\.bmp]))[\'|\"].*?[\/]?>/"; + $content = preg_replace($pregRule, '', (string)$content ); + return $this->json(0, 'success', ['content' => $content]); } catch (Exception $e) { return $this->json(5000, '获取免责声明失败'); } } + /** + * 购买须知 + * + * @return Json + */ + public function purchaseinstructions(): Json + { + try { + CConfig::load('extra/purchaseinstructions', 'purchaseinstructions'); + $content = config('purchaseinstructions')['content'] ?? ''; + $pregRule = "/<[img|IMG].*?src=[\'|\"][\/storage]{1}(.*?(?:[\.jpg|\.jpeg|\.png|\.gif|\.bmp]))[\'|\"].*?[\/]?>/"; + $content = preg_replace($pregRule, '', (string)$content ); + return $this->json(0, 'success', ['content' => $content]); + } catch (Exception $e) { + return $this->json(5000, '获取失败'); + } + } + /** + * 添加微信 + * + * @return Json + */ + public function addWechat(): Json + { + try { + CConfig::load('extra/addwechat', 'addwechat'); + $res = config('addwechat')?? []; + $pregRule = "/<[img|IMG].*?src=[\'|\"][\/storage]{1}(.*?(?:[\.jpg|\.jpeg|\.png|\.gif|\.bmp]))[\'|\"].*?[\/]?>/"; + $res["content"] = preg_replace($pregRule, '', (string)$res["content"] ); + + return $this->json(0, 'success', $res); + } catch (Exception $e) { + return $this->json(5000, '获取添加微信失败'); + } + } /** * 关于我们 * @@ -107,6 +147,9 @@ class Index extends Base try { CConfig::load('extra/about', 'about'); $res = config('about')?? []; + $pregRule = "/<[img|IMG].*?src=[\'|\"][\/storage]{1}(.*?(?:[\.jpg|\.jpeg|\.png|\.gif|\.bmp]))[\'|\"].*?[\/]?>/"; + $res["content"] = preg_replace($pregRule, '', (string)$res["content"] ); + return $this->json(0, 'success', $res); } catch (Exception $e) { return $this->json(5000, '获取关于我们失败'); diff --git a/app/controller/manager/Config.php b/app/controller/manager/Config.php index ea89647..86a01e3 100644 --- a/app/controller/manager/Config.php +++ b/app/controller/manager/Config.php @@ -119,13 +119,14 @@ class Config extends Base unset($item); $data['footBar'] = $footBarList; } - // 底部默认导航 - $data['footBarIcons'] = [ - ['key' => 'home', 'name' => '首页', 'aux' => '图标大小为 40 * 40； 第1图为默认图，第2图为高亮图', 'multi' => 1], - ['key' => 'category', 'name' => '分类', 'aux' => '图标大小为 40 * 40； 第1图为默认图，第2图为高亮图', 'multi' => 1], - ['key' => 'my', 'name' => '我的', 'aux' => '图标大小为 40 * 40； 第1图为默认图，第2图为高亮图', 'multi' => 1], - ['key' => 'cart', 'name' => '购物车', 'aux' => '图标大小为 120 * 120', 'multi' => 0], - ]; +// // 底部默认导航 +// $data['footBarIcons'] = [ +// ['key' => 'home', 'name' => '首页', 'aux' => '图标大小为 40 * 40； 第1图为默认图，第2图为高亮图', 'multi' => 1], +// ['key' => 'category', 'name' => '分类', 'aux' => '图标大小为 40 * 40； 第1图为默认图，第2图为高亮图', 'multi' => 1], +// ['key' => 'my', 'name' => '我的', 'aux' => '图标大小为 40 * 40； 第1图为默认图，第2图为高亮图', 'multi' => 1], +// ['key' => 'my', 'name' => '我的', 'multi' => 1], +// ['key' => 'cart', 'name' => '购物车', 'aux' => '图标大小为 120 * 120', 'multi' => 0], +// ]; $this->data = array_merge($this->data, $data); return $this->view(); } diff --git a/app/controller/manager/account/Index.php b/app/controller/manager/account/Index.php index 1b68e1a..d20be97 100644 --- a/app/controller/manager/account/Index.php +++ b/app/controller/manager/account/Index.php @@ -43,7 +43,7 @@ class Index extends Base $item = AccountRepository::getInstance()->findById($id); $statusList = [ - Order::STATUS_SHIPPED, Order::STATUS_PAID, Order::STATUS_COMPLETED + Order::STATUS_SHIPPED, Order::STATUS_ORDER_PLACED, Order::STATUS_COMPLETED ]; $consumption = OrderRepository::getInstance()->userOrderList($id, [], 1, 0, $statusList); $orderNum = 0; diff --git a/app/controller/manager/mall/Order.php b/app/controller/manager/mall/Order.php index 8b850d3..9cad401 100644 --- a/app/controller/manager/mall/Order.php +++ b/app/controller/manager/mall/Order.php @@ -14,6 +14,7 @@ use PhpOffice\PhpSpreadsheet\IOFactory; use \PhpOffice\PhpSpreadsheet\Shared\Date as PDate; use PhpOffice\PhpSpreadsheet\Style\Alignment; //设置对齐方式 use PhpOffice\PhpSpreadsheet\Spreadsheet; +use PhpOffice\PhpSpreadsheet\Style\Color; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use think\db\exception\DataNotFoundException; use think\db\exception\DbException; @@ -541,6 +542,35 @@ class Order extends Base } return $this->json(4000, '非法请求'); } + /** + * 修改订单里面的sku信息 + * + * @return Json + * @throws Exception + */ + public function editStatus() + { + $id = input('id/d'); + + if(!$order = OrderModel::findById($id)){ + return $this->json(4001,"订单不存在"); + } + if ($this->request->isPost()) { + $status = input("status/s"); + Db::startTrans(); + try { + $order->save(["status"=>$status]); + Db::commit(); + return $this->json(); + } catch (Exception $e) { + return $this->json(4001, $e->getError()); + } + } + $this->data['statusList'] = OrderModel::statusTextList(); + $this->data['status'] = $order["status"]; + $this->data['id'] = $id; + return $this->view(); + } /** * 导出订单信息 @@ -567,11 +597,16 @@ class Order extends Base $spreadsheet->getActiveSheet()->setTitle('订单信息'); //设置默认行高。 - $sheet->getDefaultRowDimension()->setRowHeight(25); - //设置A1单元格 - $sheet->getStyle('A1')->applyFromArray($styleArray); + $sheet->getDefaultRowDimension()->setRowHeight(30); + + + //需要设置单元格 上下 水平居中的单元格 + $needSetapplyFromArray = [ + "A1","C1","D1","A2","B2","C2","D2","E2", + ]; + // 需要设置的单元格宽度 $setColWidth = [ - "A"=>"30", + "A"=>"45", "B"=>"30", "C"=>"30", "D"=>"30", @@ -582,10 +617,76 @@ class Order extends Base } + //合并单元格 $spreadsheet->getActiveSheet()->mergeCells('A1:B1'); - $sheet->setCellValue('A1', "日期:".$order->created_at); + + $sheet->setCellValue('A1', "日 期 : ".$order->created_at); + $sheet->setCellValue('C1', "订单号 : "); + $sheet->setCellValue('D1', " " . $order->coding); + + $sheet->setCellValue('A2', "商 品 名称"); + $sheet->setCellValue('B2', "单 位"); + $sheet->setCellValue('C2', "数 量"); + $sheet->setCellValue('D2', "单 价"); + $sheet->setCellValue('E2', "小 计"); + + //开始写入订单商品数据 + $startRow = 3;//从第四行开始写入 + $skusCount = count($order->skus->toArray()); + foreach ($order->skus as $key => $item){ + $sheet->setCellValue('A'.($startRow+$key), $item["spu_name"]); + $sheet->setCellValue('B'.($startRow+$key), $item["sku_unit"]); + $sheet->setCellValue('C'.($startRow+$key), $item["num"]); + $sheet->setCellValue('D'.($startRow+$key), $item["price"]); + $sheet->setCellValue('E'.($startRow+$key), $item["subtotal"]); + $needSetapplyFromArray[]='A'.($startRow+$key); + $needSetapplyFromArray[]='B'.($startRow+$key); + $needSetapplyFromArray[]='C'.($startRow+$key); + $needSetapplyFromArray[]='D'.($startRow+$key); + $needSetapplyFromArray[]='E'.($startRow+$key); + } + + $needSetapplyFromArray[] = 'D' . ($startRow + $skusCount); + $needSetapplyFromArray[] = 'E' . ($startRow + $skusCount); + + + + $sheet->setCellValue('D' . ($startRow + $skusCount), "合 计"); + $sheet->setCellValue('E' . ($startRow + $skusCount), $order->original_price); + + //单元格文字样式设置 + // getStyle 获取单元格样式 + // getFont 获取单元格文字样式 + // setBold 设置文字粗细 + // setName 设置文字字体 + // setSize 设置文字大小 + $sheet->getStyle('D' . ($startRow + $skusCount))->getFont()->setBold(true)->setSize(18); + $sheet->getStyle('E' . ($startRow + $skusCount))->getFont()->setBold(true)->setSize(18); + $sheet->getStyle('D1')->getFont()->setBold(true); + $sheet->getStyle('A2:E2')->getFont()->setBold(true); + $sheet->getStyle('C3:E' . ($startRow + $skusCount - 1))->getFont()->setBold(true); + $sheet->getStyle('A1:E' . ($startRow + $skusCount - 1))->getFont()->setSize(12); + $sheet->getStyle('A' . (($startRow + $skusCount + 1)))->getFont()->setSize(12); + //设置字体颜色 + $sheet->getStyle('D' . ($startRow + $skusCount))->getFont()->getColor()->setARGB(Color::COLOR_RED); + $sheet->getStyle('E' . ($startRow + $skusCount))->getFont()->getColor()->setARGB(Color::COLOR_RED); + + $spreadsheet->getActiveSheet()->mergeCells('A' . ($startRow + $skusCount + 1) . ":" . 'E'.($startRow + $skusCount + 2)); + $sheet->setCellValue('A' . (($startRow + $skusCount + 1)), + "婚 期:" . $order->wedding_date + . " ,希望到货时间:" . $order->expected_delivery_date + . " ,收 货 地 址:" . $order->address + . " ,联 系 人 :" . $order->contacts + . " ,联 系 人 电 话:" . $order->phone + ); + $needSetapplyFromArray[] = 'A' . (($startRow + $skusCount + 1)); + + //设置单元格 上下 水平居中 + foreach ($needSetapplyFromArray as $key => $item) { + $sheet->getStyle($item)->applyFromArray($styleArray); + } @@ -600,10 +701,10 @@ class Order extends Base if(!is_dir($path)){ mkdir($path); } - $fileName = $order->contacts . "_" . $order->phone . "_" . $order->coding . ".xlsx"; + $downloadFileName = $order->contacts . "_" . $order->phone . "_" . $order->coding ; + $fileName = $downloadFileName . ".xlsx"; $filepath = $path. $fileName; $writer->save($filepath); - - + return download($filepath,$downloadFileName ); } } \ No newline at end of file diff --git a/config/cert/apiclient_cert.p12 b/config/cert/apiclient_cert.p12 deleted file mode 100644 index 50e25357f31fb5376b6697cdc8f389d9eaeb8fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2718 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 Iv&Y_l0gF`ZV*mgE diff --git a/config/cert/apiclient_cert.pem b/config/cert/apiclient_cert.pem deleted file mode 100644 index 1a5071e..0000000 --- a/config/cert/apiclient_cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUZUkH4c7FU29Hq2ArHG5O6V18jmgwDQYJKoZIhvcNAQEL -BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT -FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg -Q0EwHhcNMjEwNzE0MDIwNTEyWhcNMjYwNzEzMDIwNTEyWjCBgTETMBEGA1UEAwwK -MTYwNTA5MDExMTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL -DCTlm5vlt53lpKflkJHlpKnor5rnp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYM -AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAM7Hs28z9lIdDimJ/4rVqhy3Q5nOKDNaOOoMjlFkIWTJ1DFt5VtMPb4u -vHI7l2OqZBzh4p3equG0BrRzNKkRol3CggRDMC/PP/zqui/3h73eAXPyS6trWX5M -M7Mhy71ycW0lzhMWvuv0rB512iBBK3KX9BR3XbxrDlt8EhiuBCSEa0FuVN7rpudf -fKsmSmUiPlvbgRjT74CsVEJW6EOmuvEa3IcOH/pjbdok2g5KMEJ9wyKvzDW1ZvSn -HZO7Ey0ILkeFoTuXA7o8FU5NvvREy73S0ALD2XSHkZz+2VGZObhETvb6A13Jzmnq -3Mnt3h7LNwtROso6BXBX599hVJcn/qsCAwEAAaOBgTB/MAkGA1UdEwQCMAAwCwYD -VR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVzLmNv -bS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1 -NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEALrCZJlVuoxU+v5Ld -YojgFIuBNTurNHk+s71UtJvbLYTMwxNtU/C9i7hHI7iErHfNTi7D+UmWf0NGClv7 -naE/aN7w3zDu1jhMpl+r0ldqOtwKtuYv5VjOG6BcXfeXhDMBsR+Ip3AarT87wkTF -bhlggQVdYeVQnRpNNEdWPhJ66H+7l7ahou4iw1ofLrYswstVCh0lyV7HdLz5VS29 -N9j6NdFJQ1j4+En0/PKrQRuuF8Ld0/Do+vsTgyOT8SuPY2AJ7Dj6UTHkiUk77unK -p+zs0n9ftgARIx0ACXrkaZBwr3LdP5wOEZrEJYAhTVHK5KGhhRt77JAG6sa6rmeA -JA0BaQ== ------END CERTIFICATE----- diff --git a/config/cert/apiclient_key.pem b/config/cert/apiclient_key.pem deleted file mode 100644 index a3f7d90..0000000 --- a/config/cert/apiclient_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOx7NvM/ZSHQ4p -if+K1aoct0OZzigzWjjqDI5RZCFkydQxbeVbTD2+LrxyO5djqmQc4eKd3qrhtAa0 -czSpEaJdwoIEQzAvzz/86rov94e93gFz8kura1l+TDOzIcu9cnFtJc4TFr7r9Kwe -ddogQStyl/QUd128aw5bfBIYrgQkhGtBblTe66bnX3yrJkplIj5b24EY0++ArFRC -VuhDprrxGtyHDh/6Y23aJNoOSjBCfcMir8w1tWb0px2TuxMtCC5HhaE7lwO6PBVO -Tb70RMu90tACw9l0h5Gc/tlRmTm4RE72+gNdyc5p6tzJ7d4eyzcLUTrKOgVwV+ff -YVSXJ/6rAgMBAAECggEAInhd7CLAZC3dx4TuqYk2w3S1ezVHtE/M/w86xkyn2HJg -wiCsxExwWnzWA0D12rJz3/Cz41dUKy3klD5EQA7lfzXGkMlWhhHJe/LxOL/NzBPv -MBHrFVde4tP3Jlxy51DloalUsg/vocv2yVkiFJBomsDD+olvgdJi4VNMfPq9TAzN -8UAu4oZjkEEL9+6tm5/Ds1Y8znaXMJvfiYBMaxOgxb5cpijK3T3yzHLn8DrKVO7k -ypTuwaf4F6rtgIdKBJSH634Y+O20PewMTeciD7VpDOnr/XU9P0Bf0tN51YS0/OiD -XdSngSln07hS+GjVaayaan2cc9pDZIxu6a8KnypHoQKBgQD+MtcAmcD4O1aLOFng -/OuK5+H8BXk1dNnkI4wNrLCGHKe4K6V5Y6PD2OaqmKVRw0sCQmQg1O5TnHrnnP7x -tvLnmx3iApTaxUiIYb8YgDuD7kCy6/ks6dVotKb0xNFu0hOUDJvGx3HWcfDpFggb -pP5ZPw4eVKU/CXdTG6LNDtWAOwKBgQDQPtXwCGZc4KZngHfIyy8N7GtN/imA0cE8 -L2LuwZuYsMJJrD2UzYPLCQ2Hy//GKDAoq8Qywddp9Z16wDxdK5oOaVdPVPiSdWzI -75HcfgfnVOb9BkQzqlyzIZT3P8rBswCF5zRI3saL/SDDcCKkNmh0v3GmQUNXYhPj -MMDXkrSEUQKBgDoaXNKiUl1rEskXxFOM/Dnv7tOwXJg/cV6YUXb+tgqxmhSaxWQN -xm0Jsw/jfEZIIWkOy9xFT4SFDALM++k8LCGMbzQt6uBmn8GstgVfqjrpxpgfIAGI -IWOhh1gDdOuj0R3SE/lHtVmTCcH9azUGbazwoMWGC49xFnlEo93DOkHpAoGAPK2S -eNZ5vSZYVmBAhultVIlG2vrr7PUxcO/9y8PuKpeWhREDAJDBji+dGax/YqXjInaq -PH/u3JkMwe+xpxRFV12qaxs/Mq20fPgRcEXo16cNhzyEMum5CRkH5uNXmQknZdzw -hysifzfKjCfocCDKXvpJi0AI9zVExjY2epnsr4ECgYEA+PLEEgSiTrsCZzHtMNbY -x6BD4lpnkTcdpWuxzvp/3ABQTqnu9EVBWiuuYEq7IrdrtMHEvyz0SETwEZlH3/Bo -s0dPKVqTXkDgheCs/yduoO2X+6F0Y3yrQOliBYabLbsnDAUTxWcxhzNTE0o9DSYA -n346GwplxOSB2KyUh48JIPg= ------END PRIVATE KEY----- diff --git a/config/cert/证书使用说明.txt b/config/cert/证书使用说明.txt deleted file mode 100644 index 041befb..0000000 --- a/config/cert/证书使用说明.txt +++ /dev/null @@ -1,18 +0,0 @@ -欢迎使用微信支付！ -附件中的三份文件（证书pkcs12格式、证书pem格式、证书密钥pem格式）,为接口中强制要求时需携带的证书文件。 -证书属于敏感信息，请妥善保管不要泄露和被他人复制。 -不同开发语言下的证书格式不同，以下为说明指引： - 证书pkcs12格式（apiclient_cert.p12） - 包含了私钥信息的证书文件，为p12(pfx)格式，由微信支付签发给您用来标识和界定您的身份 - 部分安全性要求较高的API需要使用该证书来确认您的调用身份 - windows上可以直接双击导入系统，导入过程中会提示输入证书密码，证书密码默认为您的商户号（如：1900006031） - 证书pem格式（apiclient_cert.pem） - 从apiclient_cert.p12中导出证书部分的文件，为pem格式，请妥善保管不要泄漏和被他人复制 - 部分开发语言和环境，不能直接使用p12文件，而需要使用pem，所以为了方便您使用，已为您直接提供 - 您也可以使用openssl命令来自己导出：openssl pkcs12 -clcerts -nokeys -in apiclient_cert.p12 -out apiclient_cert.pem - 证书密钥pem格式（apiclient_key.pem） - 从apiclient_cert.p12中导出密钥部分的文件，为pem格式 - 部分开发语言和环境，不能直接使用p12文件，而需要使用pem，所以为了方便您使用，已为您直接提供 - 您也可以使用openssl命令来自己导出：openssl pkcs12 -nocerts -in apiclient_cert.p12 -out apiclient_key.pem -备注说明： - 由于绝大部分操作系统已内置了微信支付服务器证书的根CA证书, 2018年3月6日后, 不再提供CA证书文件（rootca.pem）下载 \ No newline at end of file diff --git a/public/static/manager/css/config.css b/public/static/manager/css/config.css index 01526da..2898b0e 100644 --- a/public/static/manager/css/config.css +++ b/public/static/manager/css/config.css @@ -10,10 +10,10 @@ .layui-form-item-lg .layui-input-block{margin-left: 190px;} .footBar-item {float: left; width: 47%;margin-top: 10px;margin-right:10px;border-bottom: 1px dashed #f5f5f5;} -.footBar-item .footBar-img{ min-width: 140px;height: 140px; float: left;} +.footBar-item .footBar-img{ min-width: 140px;height: 140px; float: left; margin-bottom: 15px} .footBar-item .footBar-img .preview-list{min-width: 100px;height: 100%;display: inline-block;float: left; border:1px solid #f2f2f2;} .footBar-item .footBar-img .preview-list .preview-li{ width: auto;height: 100%;display: inline-block;vertical-align:top;margin-right: 10px;} -.footBar-item .footBar-img .preview-list .preview-li img{width: 90px; height: 90px;} +.footBar-item .footBar-img .preview-list .preview-li img{width: 90px; height: 90px;background: rgba(0,0,0,0.5)} .footBar-item .img-change-operate{margin-top: 5px;} .footBar-item .img-change-operate button{margin-top:8px;} .footBar-item .footBar-content{min-width: 200px; float: left; margin-left: 10px;} diff --git a/public/static/manager/js/account/account.js b/public/static/manager/js/account/account.js index 18d4975..c7a88ba 100644 --- a/public/static/manager/js/account/account.js +++ b/public/static/manager/js/account/account.js @@ -46,13 +46,13 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect', 'laydate' cols: [[ {type: 'checkbox'}, {field: 'id', width: 80, title: '编号'}, - {field: 'nickname', width: 150, title: '昵称'}, - {field: 'real_name', width: 100, title: '真实姓名'}, - {field: 'mobile', width: 120, title: '电话'}, - {field: 'tag', minWidth: 100, title: '客户标签'}, - {field: 'created_at', minWidth: 180, title: '注册时间'}, - {field: 'gender_text', minWidth: 80, title: '性别'}, - {templet: '#row-operate', fixed: "right", minWidth: 250, title: '操作'}, + {field: 'nickname', title: '昵称'}, + {field: 'real_name',title: '真实姓名'}, + {field: 'mobile', title: '电话'}, + // {field: 'tag', minWidth: 100, title: '客户标签'}, + {field: 'created_at', title: '注册时间'}, + {field: 'gender_text', title: '性别'}, + {templet: '#row-operate', fixed: "right", title: '操作'}, ]], done: function () { Tools.setInsTb(insTb); diff --git a/public/static/manager/js/mall/order.js b/public/static/manager/js/mall/order.js index 128f409..5d30672 100644 --- a/public/static/manager/js/mall/order.js +++ b/public/static/manager/js/mall/order.js @@ -148,7 +148,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect', 'laydate' // {field: 'express_code', title: '快递公司代号', minWidth: 150, hide: true}, // {field: 'express_name', title: '快递公司名称', minWidth: 150, hide: true}, // {field: 'accepted_at', title: '确认收货时间', width: 160, hide: true}, - { fixed: 'right', title: '操作', templet: '#row-operate'} + { fixed: 'right', title: '操作', minWidth:220,templet: '#row-operate'} ]], done: function () { Tools.setInsTb(insTb); diff --git a/view/manager/account/index/index.html b/view/manager/account/index/index.html index 17fc35c..1695310 100644 --- a/view/manager/account/index/index.html +++ b/view/manager/account/index/index.html @@ -34,17 +34,17 @@ -
- -
- -
-
+ + + + + + + + + + +
@@ -61,15 +61,20 @@
+ + + + \ No newline at end of file diff --git a/view/manager/config/about.html b/view/manager/config/about.html index dc90c23..ec02b8b 100644 --- a/view/manager/config/about.html +++ b/view/manager/config/about.html @@ -4,6 +4,28 @@
关于我们
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
diff --git a/view/manager/config/addwechat.html b/view/manager/config/addwechat.html new file mode 100644 index 0000000..96ca633 --- /dev/null +++ b/view/manager/config/addwechat.html @@ -0,0 +1,45 @@ +{layout name="manager/layout" /} +
+
+ + 添加微信 +
+ + + +
+ +
+
+
+ +
+ 图片尺寸：500*500 +
+
+
+ + + +
+
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    diff --git a/view/manager/config/mini_program.html b/view/manager/config/mini_program.html index 43641c2..2ad1e0a 100644 --- a/view/manager/config/mini_program.html +++ b/view/manager/config/mini_program.html @@ -20,21 +20,28 @@
    - {foreach $footBarIcons as $i => $icon} + {foreach $footBar as $i => $icon}
    -
    -
      - -
      -
      - - -
      - + +
      +
      +
        + +
        +
        + +
        +
        + + + +
        + +
        +

        图标大小为 40 * 40； 第1图为默认图，第2图为高亮图

        -

        {$icon['aux']}

        {/foreach} diff --git a/view/manager/config/purchaseinstructions.html b/view/manager/config/purchaseinstructions.html new file mode 100644 index 0000000..511d8b4 --- /dev/null +++ b/view/manager/config/purchaseinstructions.html @@ -0,0 +1,21 @@ +{layout name="manager/layout" /} +
        +
        +
        + 免责声明 +
        +
        + +
        +
        + +
        +
        +
        +
        + +
        +
        +
        +
        +
        \ No newline at end of file diff --git a/view/manager/config/wechat.html b/view/manager/config/wechat.html index 3a1cd35..ce7bb13 100644 --- a/view/manager/config/wechat.html +++ b/view/manager/config/wechat.html @@ -18,11 +18,11 @@
        - +
        -
        +
        @@ -55,7 +55,7 @@
        -
        +
        微信支付
        @@ -106,7 +106,7 @@
        -
        +
        企业微信
        diff --git a/view/manager/mall/order/edit_status.html b/view/manager/mall/order/edit_status.html new file mode 100644 index 0000000..9153c22 --- /dev/null +++ b/view/manager/mall/order/edit_status.html @@ -0,0 +1,29 @@ +{layout name="manager/layout" /} +
        +
        +
        + + +
        + +
        + + {foreach $statusList as $key =>$item} + + {/foreach} +
        +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        diff --git a/view/manager/mall/order/index.html b/view/manager/mall/order/index.html index 6cf2374..cada2a8 100644 --- a/view/manager/mall/order/index.html +++ b/view/manager/mall/order/index.html @@ -73,7 +73,16 @@