From ecf1f3d67cf01cf4bf515f8f0756799711a372a8 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 12 May 2023 14:08:35 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/install/crmeb.sql | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index 72c6fdf7d..783cad547 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -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), From 1b6a583dac15980454e544b04e77d7e979a246cf Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 12 May 2023 14:12:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=AE=B6=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/other/export/ExportServices.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/other/export/ExportServices.php b/crmeb/app/services/other/export/ExportServices.php index 86da2fa75..dbc60b908 100644 --- a/crmeb/app/services/other/export/ExportServices.php +++ b/crmeb/app/services/other/export/ExportServices.php @@ -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; From 7e9b6cc805312e45083ad89f787345406d0f2ab4 Mon Sep 17 00:00:00 2001 From: Gosowong <1329847115@qq.com> Date: Fri, 12 May 2023 17:26:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/easywechat/orderShipping/ServiceProvider.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php b/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php index 989b02c02..8307dbc71 100644 --- a/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php +++ b/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php @@ -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); }; } } From 7370f85719ea288c2bb444a716861465b845df5a Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 12 May 2023 17:47:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E4=BC=A0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/config/upload.php | 1 + .../services/easywechat/orderShipping/ServiceProvider.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crmeb/config/upload.php b/crmeb/config/upload.php index e7ecb3f12..782ec145c 100644 --- a/crmeb/config/upload.php +++ b/crmeb/config/upload.php @@ -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', diff --git a/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php b/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php index 989b02c02..29ef425f8 100644 --- a/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php +++ b/crmeb/crmeb/services/easywechat/orderShipping/ServiceProvider.php @@ -31,8 +31,8 @@ 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'] ); }; From 806cf4df1a28c92f446b16d98ca66b1e2d31eff4 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sat, 13 May 2023 12:30:27 +0800 Subject: [PATCH 5/8] =?UTF-8?q?improve:=20=E6=95=B0=E6=8D=AE=E4=BF=9D?= =?UTF-8?q?=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uni-app/pages/users/user_vip/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/template/uni-app/pages/users/user_vip/index.vue b/template/uni-app/pages/users/user_vip/index.vue index c71385f8e..5d56424aa 100644 --- a/template/uni-app/pages/users/user_vip/index.vue +++ b/template/uni-app/pages/users/user_vip/index.vue @@ -11,7 +11,7 @@ - {{$t(userInfo.nickname)}} + {{$t(userInfo.nickname || '')}} {{$t(`商城购物可享`)}}{{item.discount}}{{$t(`折`)}} @@ -22,15 +22,15 @@