diff --git a/crmeb/app/adminapi/controller/Login.php b/crmeb/app/adminapi/controller/Login.php
index 4ad5aa78a..2155c1206 100644
--- a/crmeb/app/adminapi/controller/Login.php
+++ b/crmeb/app/adminapi/controller/Login.php
@@ -93,7 +93,6 @@ class Login extends AuthController
['captchaType', '']
], true);
-
if ($captchaVerification != '') {
try {
aj_captcha_check_two($captchaType, $captchaVerification);
@@ -107,8 +106,6 @@ class Login extends AuthController
}
$this->validate(['account' => $account, 'pwd' => $password], \app\adminapi\validate\setting\SystemAdminValidata::class, 'get');
-
-
$result = $this->services->login($account, $password, 'admin', $key);
if (!$result) {
$num = CacheService::get('login_captcha', 1);
diff --git a/crmeb/app/adminapi/controller/Test.php b/crmeb/app/adminapi/controller/Test.php
index 217fe65eb..9d0b051e4 100644
--- a/crmeb/app/adminapi/controller/Test.php
+++ b/crmeb/app/adminapi/controller/Test.php
@@ -6,18 +6,11 @@
namespace app\adminapi\controller;
-use crmeb\services\easywechat\orderShipping\MiniOrderService;
-
class Test
{
public function index()
{
- $ship_list = [
- [
- 'item_desc' => '蓝牙音乐手表 | Jeep智能表蓝牙'
- ]
- ];
- MiniOrderService::shippingByTradeNo('cp179280225803173888', 3, $ship_list, 'oZEAhsy60rrq96hE86LmBb9v_Kes');
+
}
}
diff --git a/crmeb/app/adminapi/controller/UpgradeController.php b/crmeb/app/adminapi/controller/UpgradeController.php
index c3a9d31b7..6cb9891e7 100644
--- a/crmeb/app/adminapi/controller/UpgradeController.php
+++ b/crmeb/app/adminapi/controller/UpgradeController.php
@@ -14295,7 +14295,41 @@ SQL
'code' => 500,
'type' => -1,
'table' => "system_menus",
- 'sql' => "truncate table `@table`"
+ 'sql' => "DROP TABLE `@table`"
+ ],
+ [
+ 'code' => 500,
+ 'type' => 1,
+ 'table' => "system_menus",
+ 'findSql' => "select * from information_schema.tables where table_name ='@table'",
+ 'sql' => "CREATE TABLE `@table` (
+ `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT COMMENT '菜单ID',
+ `pid` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT '父级id',
+ `icon` varchar(16) NOT NULL DEFAULT '' COMMENT '图标',
+ `menu_name` varchar(32) NOT NULL DEFAULT '' COMMENT '按钮名',
+ `module` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '模块名',
+ `controller` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '控制器',
+ `action` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '方法名',
+ `api_url` varchar(100) NOT NULL DEFAULT '' COMMENT 'api接口地址',
+ `methods` varchar(10) NOT NULL DEFAULT '' COMMENT '提交方式POST GET PUT DELETE',
+ `params` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '[]' COMMENT '参数',
+ `sort` tinyint(3) NOT NULL DEFAULT '1' COMMENT '排序',
+ `is_show` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '是否为隐藏菜单0=隐藏菜单,1=显示菜单',
+ `is_show_path` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否为隐藏菜单供前台使用',
+ `access` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '子管理员是否可用',
+ `menu_path` varchar(128) NOT NULL DEFAULT '' COMMENT '路由名称 前端使用',
+ `path` varchar(255) NOT NULL DEFAULT '' COMMENT '路径',
+ `auth_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否为菜单 1菜单 2功能',
+ `header` varchar(50) NOT NULL DEFAULT '' COMMENT '顶部菜单标示',
+ `is_header` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否顶部菜单1是0否',
+ `unique_auth` varchar(150) NOT NULL DEFAULT '' COMMENT '前台唯一标识',
+ `is_del` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
+ `mark` varchar(500) NOT NULL DEFAULT '' COMMENT '备注',
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `pid` (`pid`) USING BTREE,
+ KEY `is_show` (`is_show`) USING BTREE,
+ KEY `access` (`access`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2473 DEFAULT CHARSET=utf8 COMMENT='菜单表'"
],
[
'code' => 500,
diff --git a/template/admin/src/main.js b/template/admin/src/main.js
index 6d1370a9f..1a2ab3dac 100644
--- a/template/admin/src/main.js
+++ b/template/admin/src/main.js
@@ -196,7 +196,6 @@ new Vue({
}
});
}
- console.log(to.name);
if (
[
'product_productAdd',
diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue
index d62b1ff9e..4ab6816dd 100644
--- a/template/admin/src/pages/account/login/index.vue
+++ b/template/admin/src/pages/account/login/index.vue
@@ -75,7 +75,6 @@ import '@/assets/js/canvas-nest.min';
import Verify from '@/components/verifition/Verify';
import { PrevLoading } from '@/utils/loading.js';
import { formatFlatteningRoutes, findFirstNonNullChildren } from '@/libs/system';
-import { encryptWithKey } from '@/utils/ase.js';
export default {
components: {
@@ -108,7 +107,6 @@ export default {
key: '',
copyright: '',
version: '',
- publicKey: '',
};
},
created() {
@@ -172,7 +170,6 @@ export default {
this.swiperList = data.slide.length ? data.slide : [{ slide: this.defaultSwiperList }];
this.key = data.key;
this.copyright = data.copyright;
- this.publicKey = data.publicKey;
this.version = data.version;
this.login_captcha = data.login_captcha;
})
@@ -196,7 +193,7 @@ export default {
this.loading = true;
AccountLogin({
account: this.formInline.username,
- pwd: encryptWithKey(this.formInline.password, this.publicKey),
+ pwd: this.formInline.password,
key: this.key,
captchaType: 'blockPuzzle',
captchaVerification: params ? params.captchaVerification : '',
diff --git a/template/admin/src/pages/kefu/mobile/orderList/orderDetail.vue b/template/admin/src/pages/kefu/mobile/orderList/orderDetail.vue
index c639bee22..681c08579 100644
--- a/template/admin/src/pages/kefu/mobile/orderList/orderDetail.vue
+++ b/template/admin/src/pages/kefu/mobile/orderList/orderDetail.vue
@@ -59,7 +59,7 @@
订单编号：
{{ orderInfo.order_id }}
- 复制
+ 复制
@@ -115,8 +115,7 @@
快递单号：
送货人电话：
- {{ orderInfo.delivery_id
- }}复制
+ {{ orderInfo.delivery_id }}复制