From e4cc54600d22aed6f324e1aad97f57ec2cf6e78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Wed, 22 Feb 2023 09:32:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=97=A0=E7=94=A8=E6=8F=90=E9=86=92=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E7=94=B3=E8=AF=B7=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E6=9C=AA=E5=A1=AB=E5=86=99=E9=82=80=E8=AF=B7=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/user/DivisionController.php | 1 + crmeb/public/install/crmeb.sql | 12 +++++++++++- template/uni-app/pages/admin/orderList/index.vue | 3 --- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/crmeb/app/api/controller/v1/user/DivisionController.php b/crmeb/app/api/controller/v1/user/DivisionController.php index 4eaaab666..eedd753a2 100644 --- a/crmeb/app/api/controller/v1/user/DivisionController.php +++ b/crmeb/app/api/controller/v1/user/DivisionController.php @@ -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); } diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index e83098739..33b1e2d0a 100755 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -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); -- -------------------------------------------------------- diff --git a/template/uni-app/pages/admin/orderList/index.vue b/template/uni-app/pages/admin/orderList/index.vue index 8f8ec9e5c..fb3d83fd1 100644 --- a/template/uni-app/pages/admin/orderList/index.vue +++ b/template/uni-app/pages/admin/orderList/index.vue @@ -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;