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

template/admin/src/layout/navBars/tagsView/tagsView.vue

@@ -99,18 +99,14 @@ export default {
     if (!this.$store.state.app.tagNavList.length) {
       this.getTagsViewRoutes();
     }
-    // this.$nextTick((e) => {
-    //   console.log(this.$refs.tagsView.offsetWidth);
-    //   console.log(this.$refs.tagsUlRef.offsetWidth);
-    // });
     if (this.$refs.tagsView.offsetWidth < this.$refs.scrollbarRef.$refs.wrap.scrollWidth) {
       this.scrollTagIcon = true;
     }
     window.addEventListener('resize', () => {
-      console.log(this.$refs.tagsView.offsetWidth);
-      console.log(this.$refs.scrollbarRef.$refs.wrap.scrollWidth);
       if (this.$refs.tagsView.offsetWidth < this.$refs.scrollbarRef.$refs.wrap.scrollWidth) {
         this.scrollTagIcon = true;
+      } else {
+        this.scrollTagIcon = false;
       }
     });
   },
@@ -305,6 +301,15 @@ export default {
           break;
       }
     },
+    refreshIcon() {
+      this.$nextTick((e) => {
+        if (this.$refs.tagsView.offsetWidth < this.$refs.scrollbarRef.$refs.wrap.scrollWidth) {
+          this.scrollTagIcon = true;
+        } else {
+          this.scrollTagIcon = false;
+        }
+      });
+    },
     // 1、刷新当前 tagsView：
     refreshCurrentTagsView(path) {
       this.bus.$emit('onTagsViewRefreshRouterView', path);
@@ -361,6 +366,7 @@ export default {
         this.addTagsView(to.path, to);
         this.getTagsRefsIndex(to.path);
         this.tagsViewmoveToCurrentTag();
+        this.refreshIcon();
       },
       deep: true,
     },

template/admin/src/pages/setting/notification/index.vue

@@ -7,7 +7,7 @@
         </Tabs>
       </div>
       <Row type="flex" class="mb20" v-if="currentTab == 1">
-        <Col v-bind="grid">
+        <Col>
           <Button
             v-auth="['app-wechat-template-sync']"
             icon="md-list"
@@ -26,7 +26,7 @@
           >
         </Col>
       </Row>
-      <Alert v-if="currentTab == 1" closable="true">
+      <Alert v-if="currentTab == 1" :closable="true">
         <template slot="desc">
           1、公众号：登录微信公众号后台，选择模版消息，将模版消息的所在行业修改副行业为《其他/其他》<br />
           2、小程序：登录微信小程序后台，基本设置，服务类目增加《生活服务> 百货/超市/便利店》

template/admin/src/pages/setting/systemMenus/index.vue

@@ -44,18 +44,8 @@
         row-id="id"
       >
         <vxe-table-column field="id" title="ID" tooltip min-width="70"></vxe-table-column>
-        <vxe-table-column field="menu_name" tree-node title="按钮名称" min-width="200"></vxe-table-column>
-        <vxe-table-column field="icon" title="图标" min-width="200" align="center">
-          <template v-slot="{ row }">
-            <Icon class="icon" :type="row.icon" />
-          </template>
-        </vxe-table-column>
-        <vxe-table-column field="api_url" title="接口路径" min-width="150">
-          <template v-slot="{ row }">
-            <span>{{ row.methods ? '[' + row.methods + ']  ' + row.api_url : row.api_url }}</span>
-          </template>
-        </vxe-table-column>
-        <vxe-table-column field="unique_auth" title="前端权限" min-width="300"></vxe-table-column>
+        <vxe-table-column field="menu_name" tree-node title="按钮名称" min-width="100"></vxe-table-column>
+        <vxe-table-column field="unique_auth" title="前端权限" min-width="200"></vxe-table-column>
         <vxe-table-column field="menu_path" title="页面路由" min-width="240" tooltip="true"></vxe-table-column>
         <vxe-table-column field="flag" title="规则状态" min-width="120">
           <template v-slot="{ row }">