Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

# Conflicts:
#	template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.less
#	template/admin/src/pages/index/index.vue

crmeb/app/services/system/UpgradeServices.php

@@ -30,7 +30,7 @@ use app\dao\system\upgrade\UpgradeLogDao;
  */
 class UpgradeServices extends BaseServices
 {
-    const LOGIN_URL = 'http:/upgrade.crmeb.net/api/login';
+    const LOGIN_URL = 'http://upgrade.crmeb.net/api/login';
     const UPGRADE_URL = 'http://upgrade.crmeb.net/api/upgrade/list';
     const UPGRADE_CURRENT_URL = 'http://upgrade.crmeb.net/api/upgrade/current_list';
     const AGREEMENT_URL = 'http://upgrade.crmeb.net/api/upgrade/agreement';

template/admin/package.json

@@ -4,6 +4,7 @@
   "author": "Lison<lison16new@163.com>",
   "private": false,
   "scripts": {
+    "dev": "vue-cli-service serve --open --mode=dev",
     "serve": "vue-cli-service serve --open --mode=dev",
     "build": "vue-cli-service build --mode=production",
     "eslint:comment": "使用 ESLint 检查并自动修复 src 目录下所有扩展名为 .js 和 .vue 的文件",

template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.less

@@ -1,11 +1,11 @@
 .trans {
   transition: transform 0.2s ease;
 }
-@size: 40px;
+@size: 64px;
 .sider-trigger-a {
-  padding: 6px;
-  width: @size;
   height: @size;
+  margin: 0 10px;
+  line-height: @size;
   display: inline-block;
   text-align: center;
   color: #5c6b77;

template/admin/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue

@@ -1,7 +1,7 @@
 <template>
-  <a @click="handleChange" type="text" :class="['sider-trigger-a', collapsed ? 'collapsed' : '']"
+  <span @click="handleChange" type="text" :class="['sider-trigger-a', collapsed ? 'collapsed' : '']"
     ><i class="iconfont" :class="collapsed ? 'iconcaidanzhankai' : 'iconcaidanshouqi'"></i
-  ></a>
+  ></span>
 </template>
 <script>
 export default {
@@ -25,12 +25,7 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-@import './sider-trigger.less';
-.sider-trigger-a {
-  padding: 14px 6px;
-  margin-left: 10px;
-  line-height: 16px;
-}
+@import 'sider-trigger.less';
 .iconcaidanshouqi {
   font-size: 16px;
 }

template/admin/src/components/main/main.vue

@@ -287,7 +287,7 @@ export default {
   height: 50px;
 }
 .main .tag-nav-wrapper {
-  // height: 10px;
+  height: 42px;
   background: unset;
 }
 .open-image {