github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-11-03 08:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

Browse Source
This commit is contained in:
From-wh 2023-05-13 12:30:35 +08:00
commit 27b5e6961e
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crmeb/app/services/other/export/ExportServices.php
View File

@ -74,7 +74,7 @@ class ExportServices extends BaseServices
*/
public function exportOrderList($where)
{
$header = ['订单号', '收货人姓名', '收货人电话', '收货地址', '商品信息', '总价格', '实际支付', '支付状态', '支付时间', '订单状态', '下单时间', '用户备注', '表单信息'];
$header = ['订单号', '收货人姓名', '收货人电话', '收货地址', '商品信息', '总价格', '实际支付', '支付状态', '支付时间', '订单状态', '下单时间', '用户备注', '商家备注', '表单信息'];
$filename = '订单列表_' . date('YmdHis', time());
$export = $fileKey = [];
/** @var StoreOrderServices $orderServices */
@ -162,6 +162,7 @@ class ExportServices extends BaseServices
'status_name' => $item['status_name'] ?? '未知状态',
'add_time' => $item['add_time'],
'mark' => $item['mark'],
'remark' => $item['remark'],
'custom_form' => $custom_form,
];
$export[] = $one_data;

1
crmeb/config/upload.php
View File

@ -18,6 +18,7 @@ return [
'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4', 'key', 'xlsx', 'xls', 'txt', 'ico'],
//上传文件类型
'fileMime' => [
'image/jpg',
'image/jpeg',
'image/gif',
'image/png',

7
crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php
View File

@ -31,14 +31,13 @@ class ServiceProvider implements ServiceProviderInterface
{
$pimple['mini_program.access_token'] = function ($pimple) {
return new AccessToken(
$pimple['config']['order_shipping']['app_id'],
$pimple['config']['order_shipping']['secret'],
$pimple['config']['mini_program']['app_id'],
$pimple['config']['mini_program']['secret'],
$pimple['cache']
);
};
$pimple['order_ship'] = function ($pimple) {
return new OrderClient($pimple['access_token'], $pimple);
return new OrderClient($pimple['mini_program.access_token'], $pimple);
};
}
}

20
crmeb/public/install/crmeb.sql
View File

@ -26685,16 +26685,16 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`,
(25148, 8, '500045', '不存在的资源路由类型', 'Байхгүй байгаа нөөцийн чиглүүлэлтийн төрөл', 1),
(25149, 9, '500045', '不存在的资源路由类型', 'ชนิดของการกำหนดเส้นทางทรัพยากรที่ไม่มีอยู่', 1),
(25150, 10, '500045', '不存在的资源路由类型', 'Loại định tuyến tài nguyên không tồn tại', 1),
(25151, 1, '500046', '表单数据生成失败', '表单数据生成失败', 1),
(25152, 2, '500046', '表单数据生成失败', 'Form data generation failed', 1),
(25153, 3, '500046', '表单数据生成失败', '表單數據生成失敗', 1),
(25154, 4, '500046', '表单数据生成失败', 'Échec de la génération des données du formulaire', 1),
(25155, 5, '500046', '表单数据生成失败', 'Generazione dei dati del modulo non riuscita', 1),
(25156, 6, '500046', '表单数据生成失败', 'フォームデータの生成に失敗しました', 1),
(25157, 7, '500046', '表单数据生成失败', '양식 데이터 생성 실패', 1),
(25158, 8, '500046', '表单数据生成失败', 'Маягт өгөгдөл үүсгэх бүтэлгүйтсэн', 1),
(25159, 9, '500046', '表单数据生成失败', 'การสร้างข้อมูลแบบฟอร์มล้มเหลว', 1),
(25160, 10, '500046', '表单数据生成失败', 'Tạo dữ liệu biểu mẫu không thành công', 1),
(25151, 1, '500046', '表单类型至少选择一项', '表单类型至少选择一项', 1),
(25152, 2, '500046', '表单类型至少选择一项', ' at least one form type', 1),
(25153, 3, '500046', '表单类型至少选择一项', '表單類型至少選擇一項', 1),
(25154, 4, '500046', '表单类型至少选择一项', 'Sélectionnez au moins un type de formulaire', 1),
(25155, 5, '500046', '表单类型至少选择一项', 'Selezionare almeno un tipo di modulo', 1),
(25156, 6, '500046', '表单类型至少选择一项', 'フォームタイプ1つ以上を選択', 1),
(25157, 7, '500046', '表单类型至少选择一项', '하나 이상의 양식 유형 선택', 1),
(25158, 8, '500046', '表单类型至少选择一项', 'Ядаж нэг маягтын төрлийг сонгох', 1),
(25159, 9, '500046', '表单类型至少选择一项', 'เลือกประเภทของแบบฟอร์มอย่างน้อยหนึ่งรายการ', 1),
(25160, 10, '500046', '表单类型至少选择一项', 'Chọn ít nhất một loại biểu mẫu', 1),
(25161, 1, '500047', '列表展示数据生成失败', '列表展示数据生成失败', 1),
(25162, 2, '500047', '列表展示数据生成失败', 'List display data generation failed', 1),
(25163, 3, '500047', '列表展示数据生成失败', '列表展示數據生成失敗', 1),