Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

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);

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

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,

template/admin/src/main.js

@@ -196,7 +196,6 @@ new Vue({
           }
         });
       }
-      console.log(to.name);
       if (
         [
           'product_productAdd',

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

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);

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>
@@ -439,6 +439,10 @@ export default {
           this.$Message.error(res.msg);
         });
     },
+    changeMenu() {
+      // this.getData(1);
+      this.getMenusUnique();
+    },
     getMenusUnique() {
       getMenusUnique().then((res) => {
         let data = res.data;
@@ -478,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;

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>