Merge branch 'develop' into 'test'

.env

@@ -6,6 +6,7 @@ VUE_APP_STATISTICS_MENU_CODE=0044
 VUE_APP_DEVICE_MENU_CODE=0048
 VUE_APP_DASHBOARD_CODE=0079
 VUE_APP_CUSTOMER_OPERATE_CODE=0077
+VUE_APP_SMAPRO_CODE=0069
 VUE_APP_WHITE_LIST=/login,/404,/401
 VUE_APP_SUBSYSTEM=http://ex-dev-dcxy-static.168cad.top
 VUE_APP_SYSTEM_SERVER_URL=http://ex-dev-dcxy-system-manage.168cad.top

public/index.html

@@ -16,6 +16,7 @@
   <script src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js"></script>
   <script src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
   <script src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js"></script>
+  <script src="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.umd.min.js"></script>
 
   <link rel="stylesheet" href="/lib/manageShell.css" />
   <title>多彩综合管理系统</title>

src/App.vue

@@ -78,12 +78,14 @@ export default {
     },
   },
   data() {
+    console.log(this.$route);
+
     return {
       title: '',
       selectedRoute: [],
       routerDone: false,
       isInnerPage: false,
-      showFastLink: true,
+      showFastLink: false,
       showSelected: false,
     };
   },

src/containers/layout/IconMenu/IconMenu.vue

@@ -85,6 +85,17 @@
         src="@/assets/images/layout/icon_yunying.png"
       />
       </MenuItem>
+      <MenuItem
+        v-if="smapreManage && smapreManage.length"
+        menuName="微信端"
+        :menuList="smapreManage[0].children"
+        :selectRouteMenu="selectRouteMenu"
+      >
+      <img
+        slot="icon"
+        src="@/assets/images/layout/icon_quanyetai@2x.png"
+      />
+      </MenuItem>
       <!-- <div @click="() => toggleFastLink(false)">
         <MenuItem menuName="全业态">
         <img
@@ -198,14 +209,12 @@ export default {
       );
       return item ? formatRouteLink([item]) : null;
     },
-    // collectRouteList() {
-    //   let list = this.collectList.map(item => {
-    //     let id = item.menuId;
-    //     return getFilterMenu(this.routers, id);
-    //   });
-    //   list = list.filter(item => !!item);
-    //   return list ? formatRouteLink(list) : null;
-    // },
+    smapreManage() {
+      let item = this.routers.find(
+        menu => menu.menuCode === process.env.VUE_APP_SMAPRO_CODE
+      );
+      return item ? formatRouteLink([item]) : null;
+    },
   },
   watch: {
     collectList(val) {

src/dev-local/develop.html

@@ -26,6 +26,7 @@
 <script src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js"></script>
 <script src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
 <script src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js"></script>
+<script src="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.umd.min.js"></script>
 
 <script src="https://webapi.amap.com/maps?v=1.4.12&key=dd6103c90f2f17310a8711f2d330a0a6"></script>
 <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>

src/dev-local/develop.js

@@ -11,6 +11,7 @@ setTimeout(() => {
     'operateManage',
     'statisticsManage',
     'deviceManage',
+    'smaproManage',
   ];
   routeNameList.map(name => {
     try {

src/main.js

@@ -6,6 +6,7 @@ let routeNameList = [
   'operateManage',
   'statisticsManage',
   'deviceManage',
+  'smaproManage',
 ];
 routeNameList.map(name => {
   try {