From 18e66bd22b18e074efcb75a40171d399ce63d59c Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 17 May 2023 17:04:28 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/setting/systemMenus/index.vue | 3 ++-
 template/admin/src/pages/system/systemMenus/index.vue  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index 5c7b9d13a..b31390a80 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -58,6 +58,7 @@
               :false-value="0"
               @on-change="onchangeIsShow(row)"
               size="large"
+              v-if="row.auth_type == 1"
             >
               <span slot="open">显示</span>
               <span slot="close">隐藏</span>
@@ -176,7 +177,7 @@ export default {
       roleData: {
         is_show: 1,
         keyword: '',
-        auth_type: 1,
+        // auth_type: 1,
       },
       defaultProps: {
         children: 'children',
diff --git a/template/admin/src/pages/system/systemMenus/index.vue b/template/admin/src/pages/system/systemMenus/index.vue
index ccffbc0d5..c2555c5b1 100644
--- a/template/admin/src/pages/system/systemMenus/index.vue
+++ b/template/admin/src/pages/system/systemMenus/index.vue
@@ -64,6 +64,7 @@
             </i-switch>
           </template>
         </vxe-table-column>
+        <vxe-table-column field="mark" title="备注" min-width="120"></vxe-table-column>
         <vxe-table-column field="date" title="操作" align="right" width="250" fixed="right">
           <template v-slot="{ row }">
             <span>

From 3f402b8d1991d03279c3b7e9701df973a0435fa1 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 17 May 2023 17:04:48 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/Login.php       |  3 --
 .../adminapi/controller/UpgradeController.php | 36 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/adminapi/controller/Login.php b/crmeb/app/adminapi/controller/Login.php
index e3e9d877a..ca0846102 100644
--- a/crmeb/app/adminapi/controller/Login.php
+++ b/crmeb/app/adminapi/controller/Login.php
@@ -95,7 +95,6 @@ class Login extends AuthController
             ['captchaType', '']
         ], true);
 
-
         if ($captchaVerification != '') {
             try {
                 aj_captcha_check_two($captchaType, $captchaVerification);
@@ -118,8 +117,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/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,

From 79d490d0b73482a53f903826e1f7a79d0feb2af6 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 17 May 2023 17:05:16 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/Test.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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');
+
     }
 }
 

From ec098d1d6c9508918f95d98672d324df9faa72f2 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 17 May 2023 17:07:53 +0800
Subject: [PATCH 4/8] init

---
 .../src/pages/setting/systemMenus/index.vue     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index 5c7b9d13a..9ed9d4cdc 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -75,7 +75,7 @@
       :formValidate="formValidate"
       :titleFrom="titleFrom"
       @getList="getList"
-      @changeMenu="getMenusUnique"
+      @changeMenu="changeMenu"
       ref="menusFrom"
       @clearFrom="clearFrom"
     ></menus-from>
@@ -198,6 +198,7 @@ export default {
       seletRouteIds: [], // 选中id
       menusId: 0, // 选中分类id
       nodeKey: 0, // 选中节点
+      openId: '',
     };
   },
   components: { menusFrom, formCreate: formCreate.$form() },
@@ -397,6 +398,7 @@ export default {
     },
     // 编辑
     edit(row, title, index) {
+      this.openId = row.id;
       this.formValidate = {};
       this.menusDetails(row.id);
       this.titleFrom = title;
@@ -439,6 +441,19 @@ export default {
           this.$Message.error(res.msg);
         });
     },
+
+    openMenuList(arr, id) {
+      arr.map((e) => {
+        if (e.id === id) {
+          e._expanded = true;
+        } else if (e.children) {
+        }
+      });
+    },
+    changeMenu() {
+      this.getData(1);
+      this.getMenusUnique();
+    },
     getMenusUnique() {
       getMenusUnique().then((res) => {
         let data = res.data;

From 81c7c4e8d2fd1c5966bb9d60db1b0689114996a4 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 17 May 2023 18:08:39 +0800
Subject: [PATCH 5/8] =?UTF-8?q?improve:=20=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kefu/mobile/orderList/orderDetail.vue     | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

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 @@
         <div>订单编号：</div>
         <div class="conter acea-row row-middle row-right">
           {{ orderInfo.order_id }}
-          <span class="copy copy-data" :data-clipboard-text="orderInfo.order_id">复制</span>
+          <span class="copy copy-data" @click="copyText(orderInfo.order_id)">复制</span>
         </div>
       </div>
       <div class="item acea-row row-between">
@@ -115,8 +115,7 @@
         <div v-if="orderInfo.delivery_type === 'express'">快递单号：</div>
         <div v-if="orderInfo.delivery_type === 'send'">送货人电话：</div>
         <div class="conter">
-          {{ orderInfo.delivery_id
-          }}<span class="copy copy-data" :data-clipboard-text="orderInfo.delivery_id">复制</span>
+          {{ orderInfo.delivery_id }}<span class="copy copy-data" @click="copyText(orderInfo.delivery_id)">复制</span>
         </div>
       </div>
     </div>
@@ -147,7 +146,6 @@
 </template>
 <script>
 import PriceChange from '../../components/PriceChange';
-import ClipboardJS from 'clipboard';
 import { orderInfo } from '@/api/kefu';
 import { required, num } from '@/utils/validate';
 import { validatorDefaultCatch } from '@/libs/dialog';
@@ -182,13 +180,6 @@ export default {
   mounted: function () {
     // this.orderId = this.$route.params.id;
     this.getIndex();
-    this.$nextTick(function () {
-      var copybtn = document.getElementsByClassName('copy-data');
-      const clipboard = new ClipboardJS(copybtn);
-      clipboard.on('success', () => {
-        this.$dialog.success('复制成功');
-      });
-    });
   },
   methods: {
     more: function () {
@@ -205,6 +196,15 @@ export default {
     closeChange(msg) {
       this.change = msg;
     },
+    copyText(text) {
+      this.$copyText(text)
+        .then((message) => {
+          this.$Message.success('复制成功');
+        })
+        .catch((err) => {
+          this.$Message.error('复制失败');
+        });
+    },
     getIndex: function () {
       let that = this;
       orderInfo(this.$route.params.id).then(
@@ -212,13 +212,6 @@ export default {
           that.orderInfo = res.data.orderInfo;
           that.types = res.data.orderInfo._status._type;
           that.title = res.data.orderInfo._status._title;
-          this.$nextTick(function () {
-            let copybtn = document.getElementsByClassName('copy-data');
-            const clipboard = new ClipboardJS(copybtn);
-            clipboard.on('success', () => {
-              this.$dialog.success('复制成功');
-            });
-          });
         },
         (err) => {
           that.$dialog.error(err.msg);

From 78bc166b78c7fa589f9dffa8deb1d36d3c557c10 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 17 May 2023 18:08:55 +0800
Subject: [PATCH 6/8] =?UTF-8?q?improve:=20=E8=8F=9C=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/setting/systemMenus/index.vue      | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index 73431f63a..8f069c541 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -58,7 +58,6 @@
               :false-value="0"
               @on-change="onchangeIsShow(row)"
               size="large"
-              v-if="row.auth_type == 1"
             >
               <span slot="open">显示</span>
               <span slot="close">隐藏</span>
@@ -177,7 +176,7 @@ export default {
       roleData: {
         is_show: 1,
         keyword: '',
-        // auth_type: 1,
+        auth_type: 1,
       },
       defaultProps: {
         children: 'children',
@@ -199,7 +198,6 @@ export default {
       seletRouteIds: [], // 选中id
       menusId: 0, // 选中分类id
       nodeKey: 0, // 选中节点
-      openId: '',
     };
   },
   components: { menusFrom, formCreate: formCreate.$form() },
@@ -399,7 +397,6 @@ export default {
     },
     // 编辑
     edit(row, title, index) {
-      this.openId = row.id;
       this.formValidate = {};
       this.menusDetails(row.id);
       this.titleFrom = title;
@@ -442,17 +439,8 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-
-    openMenuList(arr, id) {
-      arr.map((e) => {
-        if (e.id === id) {
-          e._expanded = true;
-        } else if (e.children) {
-        }
-      });
-    },
     changeMenu() {
-      this.getData(1);
+      // this.getData(1);
       this.getMenusUnique();
     },
     getMenusUnique() {

From 4bc92d49a14b648818228684bd5a77f3c2c3e7c1 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 17 May 2023 18:32:18 +0800
Subject: [PATCH 7/8] =?UTF-8?q?style:=20border=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/setting/systemMenus/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index 8f069c541..9a108fa5f 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -482,11 +482,14 @@ export default {
   > .vxe-table--header-wrapper {
     background: #fff !important;
   }
+
   .icon {
     font-size: 20px;
   }
 }
-
+/deep/ .vxe-table--render-default .vxe-table--border-line {
+  z-index: 2 !important;
+}
 .rule {
   display: flex;
   flex-wrap: wrap;

From e7b144d15dd6b7c5f99b496bd6bcb8470e4c8f61 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 18 May 2023 09:03:39 +0800
Subject: [PATCH 8/8] =?UTF-8?q?improve:=20=E5=8F=96=E6=B6=88=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/main.js                       | 1 -
 template/admin/src/pages/account/login/index.vue | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

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 : '',