github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

取消订单搜索无用提醒，修复定时任务问题，处理申请代理商未填写邀请码提示文字

Browse Source
This commit is contained in:
吴昊天 2023-02-22 09:32:32 +08:00
parent bf98ee013c
commit e4cc54600d
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crmeb/app/api/controller/v1/user/DivisionController.php
View File

@ -42,6 +42,7 @@ class DivisionController
]);
$verifyCode = CacheService::get('code_' . $data['phone']);
if ($verifyCode != $data['code']) return app('json')->fail(410010);
if ($data['division_invite'] == 0) return app('json')->fail(500028);
$this->services->applyAgent($data, $id);
return app('json')->success(100017);
}

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

@ -26510,7 +26510,17 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`,
(24967, 7, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', '미결제 주문이 있습니다. 주문 번호: {:order_id}, 상품 수량이 제한되어 있습니다. 제시간에 결제하세요.', 1),
(24968, 8, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'Танд төлөгдөөгүй захиалга байна, захиалгын дугаар: {:order_id}, барааны тоо хязгаартай тул цаг тухайд нь төлнө үү.', 1),
(24969, 9, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'คุณมีคำสั่งซื้อที่ยังไม่ได้ชำระเงิน หมายเลขคำสั่งซื้อคือ: {:order_id} สินค้ามีจำนวนจำกัด โปรดชำระเงินให้ตรงเวลา', 1),
(24970, 10, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'Bạn có đơn hàng chưa thanh toán, số đơn hàng là: {:order_id}, số lượng hàng có hạn, vui lòng thanh toán kịp thời.', 1);
(24970, 10, '500027', '您有未付款订单,订单号为:{:order_id}，商品数量有限，请及时付款。', 'Bạn có đơn hàng chưa thanh toán, số đơn hàng là: {:order_id}, số lượng hàng có hạn, vui lòng thanh toán kịp thời.', 1),
(24971, 1, '500028', '请填写邀请码', '请填写邀请码', 1),
(24972, 2, '500028', '请填写邀请码', 'Please fill in the invitation code', 1),
(24973, 3, '500028', '请填写邀请码', '請填寫邀請碼', 1),
(24974, 4, '500028', '请填写邀请码', 'Merci de remplir le code dinvitation', 1),
(24975, 5, '500028', '请填写邀请码', 'Si prega di compilare il codice di invito', 1),
(24976, 6, '500028', '请填写邀请码', '招待状を記入してください', 1),
(24977, 7, '500028', '请填写邀请码', '초대 코드를 입력하십시오.', 1),
(24978, 8, '500028', '请填写邀请码', 'Урилгын кодыг бөглөнө үү', 1),
(24979, 9, '500028', '请填写邀请码', 'กรุณากรอกรหัสเชิญ', 1),
(24980, 10, '500028', '请填写邀请码', 'Vui lòng điền mã mời', 1);
-- --------------------------------------------------------

3
template/uni-app/pages/admin/orderList/index.vue
View File

@ -177,9 +177,6 @@
},
searchBut() {
let that = this;
if (!that.where.keywords.trim()) return this.$util.Tips({
title: that.$t(`请输入要搜索的商品`)
});
that.focus = false;
that.where.page = 1;
that.loading = false;