Merge branch 'feature/4月-菜单和权限' into dev

menu-data/button-code.js

@@ -57,11 +57,9 @@ module.exports = {
     // 2.领取记录 （按钮，控制“领取记录”弹窗内所有操作权限）
     getCardLog: ['领取记录', 1, 2]
   },
-  // TODO 评价回访设置
-  // TODO 1.新增评价回访设置 （按钮，控制“新增评价回访设置”页面内所有操作权限）
-  // TODO 2.查看 （按钮，控制“查看评价回访设置”页面内所有操作权限）
-  // TODO 3.编辑 （按钮，控制“修改评价回访设置”页面内所有操作权限）
-  // TODO 4.删除 （按钮）
+  'evaluate-set': {
+    saveEvaluateSet: ['保存', 1, 1]
+  },
   material: {
     // 1.新建文本 （按钮，控制“新建文本”弹窗内所有操作权限）；
     addText: ['文本-新建文本', 1, 1],
@@ -273,20 +271,11 @@ module.exports = {
     // 4.详情（按钮，控制“成员详情”弹窗内所有操作权限）；
     checkContactMemberDetail: ['详情', 1, 2]
   },
-  // TODO 导购设置-导购操作权限设置
-  // TODO 1.保存（按钮）
-  // TODO 导购设置-导购应用权限设置
-  // TODO 1.我的客户
-  // TODO 2.云日报
-  // TODO 3.月指标
-  // TODO 4.商品中心
-  // TODO 5.看数据
-  // TODO 6.订单评价
-  // TODO 7.扫码核销
-  // TODO 8.e袋洗
-  // TODO 9.佣金结算
-  // TODO 10.营销任务
-  // TODO 11.保存（按钮）
+  // 导购设置-导购操作权限设置
+  // 保存（按钮）
+  'guide-setting': {
+    saveGuideSetting: ['保存', 1, 1]
+  },
   enterpriseSet: {
     // 1.同步刷新（按钮）
     refreshStoreInfo: ['同步刷新', 1, 2],

menu-data/button-code.json

-{"multipleAssign":"multipleAssign","assign":"assign","syncTagLog":"syncTagLog","willSyncTag":"willSyncTag","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","textUsedStore":"textUsedStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","imageUsedStore":"imageUsedStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","webUsedStore":"webUsedStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","videoUsedStore":"videoUsedStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","fileUsedStore":"fileUsedStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","appsUsedStore":"appsUsedStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","bindStoreList":"bindStoreList","refreshAdminList":"refreshAdminList"}
+{"multipleAssign":"multipleAssign","assign":"assign","syncTagLog":"syncTagLog","willSyncTag":"willSyncTag","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","textUsedStore":"textUsedStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","imageUsedStore":"imageUsedStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","webUsedStore":"webUsedStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","videoUsedStore":"videoUsedStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","fileUsedStore":"fileUsedStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","appsUsedStore":"appsUsedStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","saveGuideSetting":"saveGuideSetting","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","bindStoreList":"bindStoreList","refreshAdminList":"refreshAdminList"}
\ No newline at end of file

menu-data/menu-data.js

@@ -73,14 +73,9 @@ module.exports = [
       {
         menu: ['评价回访', '', 1, 'iconpingjiahuifang'],
         children: [
-          // {
-          //   menu: ['评价回访设置', '', 1], // TODO 本次新增页面
-          //   children: [
-          //     { menu: ['新增规则策略', '', 1] }, // TODO 本次新增页面
-          //     { menu: ['编辑规则策略', '', 1] }, // TODO 本次新增页面
-          //     { menu: ['查看规则策略', '', 1] }, // TODO 本次新增页面
-          //   ]
-          // }
+          {
+            menu: ['评价回访设置', 'evaluate-set', 1],
+          }
         ]
       },
       {
@@ -225,9 +220,9 @@ module.exports = [
       },
       {
         menu: ['导购设置', '', 1, 'icondaogoushezhi'],
-        // children: [
-        //   { menu: ['导购设置', '', 1] } // update 本次新增页面
-        // ]
+        children: [
+          { menu: ['导购设置', 'guide-setting', 1] }
+        ]
       },
       {
         menu: ['应用接入', '', 1, 'iconyingyongjieru'],

src/components/layout/components/change-store.vue

@@ -10,7 +10,7 @@
           <el-dropdown-item v-for="el in storeList" :key="el.enterpriseId" :class="['store-item', { actived: el.enterpriseId == activedStoreId }]" :command="el.enterpriseId">
             <div>
               <div class="store-name">{{ el.brandName }}</div>
-              <div class="default-store-tag" v-if="el.enterpriseId == defaultStoreId">默认商户</div>
+              <div class="default-store-tag" v-if="el.defaultFlag == 1">默认商户</div>
             </div>
             <i class="el-icon-check checked" v-if="el.enterpriseId == activedStoreId"></i>
           </el-dropdown-item>
@@ -35,7 +35,6 @@
 </template>
 
 <script>
-// 更改默认商户 接口联调
 import { getRequest } from '@/api/api.js';
 import errorMsg from '@/common/js/error.js';
 import expiredDialog from '@/components/company/expired-dialog.vue';
@@ -51,7 +50,6 @@ export default {
       },
       storeList: [],
       activedStoreId: '',
-      defaultStoreId: '',
       isExpired: false
     };
   },
@@ -85,10 +83,9 @@ export default {
       this.$emit('changeStore', true);
       getRequest('/haoban-manage3-web/enterprise-is-over', { enterpriseId })
         .then(res => {
-          let resData = res.data;
           const { errorCode, result } = res.data || {};
           if (errorCode != 1) {
-            errorMsg.errorMsg(resData);
+            errorMsg.errorMsg(res.data);
             return;
           }
           this.isExpired = result;
@@ -104,9 +101,22 @@ export default {
     // onClosed() {},
     onSave() {
       this.changeStore.loading = true;
-      setTimeout(() => {
-        this.changeStore.loading = false;
-      }, 1000);
+      getRequest('/haoban-manage3-web/set-default-gicenterprise', { enterpriseId: this.changeStore.storeId })
+        .then(res => {
+          const { errorCode } = res.data || {};
+          if (errorCode != 1) {
+            errorMsg.errorMsg(res.data);
+            return;
+          }
+          this.getStoreList();
+          this.changeStore.show = false;
+          this.$message.succes('设置成功');
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.changeStore.loading = false;
+          }, 100);
+        });
     }
   }
 };

src/components/layout/hb-form-bottom.vue

+<template>
+  <div class="hb-form-bottom" :style="{ width: width, 'justify-content': horizontal == 'left' ? 'flex-start' : horizontal == 'right' ? 'flex-end' : 'center' }">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HbFormBottom',
+  inject: ['layoutVm'],
+  props: {
+    horizontal: {
+      type: String,
+      // 可选值： left：居左 right：居右
+      default: 'center'
+    }
+  },
+  data() {
+    return {
+      width: '0px'
+    };
+  },
+  mounted() {
+    this.width = this.$parent.$el.offsetWidth + 'px';
+    this.layoutVm.pagePaddingBottom = this.$el.offsetHeight + 'px';
+  },
+  beforeDestroy() {
+    this.layoutVm.pagePaddingBottom = null;
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.hb-form-bottom {
+  display: flex;
+  align-items: center;
+  position: fixed;
+  right: 0;
+  bottom: 0;
+  z-index: 100;
+  width: calc(100% - 12px);
+  height: 56px;
+  background: #ffffff;
+  box-shadow: 1px -2px 8px 0px rgba(220, 223, 230, 0.6);
+}
+</style>

src/components/layout/index.vue

 <template>
   <div class="hb-layout" v-loading="fullLoading.visible">
     <main-menu ref="mainMenu" :menu-list="menuList" :actived-code="activedMenu.length > 0 ? activedMenu[0].menuCode : ''" @showLoading="onShowLoading"></main-menu>
-    <aside-menu :menu-list="activedMenu.length > 0 ? activedMenu[0].childList : []" :actived-code="activedMenu.length > 2 ? activedMenu[2].menuCode : ''"></aside-menu>
+    <aside-menu v-show="showAside" :menu-list="activedMenu.length > 0 ? activedMenu[0].childList : []" :actived-code="activedMenu.length > 2 ? activedMenu[2].menuCode : ''"></aside-menu>
     <div class="hb-layout-content">
       <bread-menu v-if="activedMenu.length > 3" :menu-list="activedMenu.slice(2)"></bread-menu>
-      <div class="hb-layout-pager" :style="{ height: activedMenu.length > 3 ? `calc(100% - 30px)` : '100%' }">
+      <div class="hb-layout-pager" :style="{ height: activedMenu.length > 3 ? `calc(100% - 30px)` : '100%', 'padding-bottom': pagePaddingBottom }">
         <!-- 页面内容 -->
         <!-- <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view> -->
         <keep-alive v-if="$route.meta.keepAlive">
@@ -36,7 +36,8 @@ export default {
   },
   data() {
     return {
-      breadShow: true,
+      showAside: true,
+      pagePaddingBottom: null,
       enterpriseId: '',
       // 菜单平铺数据
       flatMenuList: [],
@@ -126,7 +127,9 @@ export default {
     },
     onCommand(command) {
       const methods = {
-        updateApplyCount: () => this.$refs.mainMenu.updateAplyCount()
+        updateApplyCount: () => this.$refs.mainMenu.updateAplyCount(),
+        showAside: () => (this.showAside = true),
+        hideAside: () => (this.showAside = false)
       };
       if (typeof methods[command] == 'function') {
         methods[command]();

src/main.js

@@ -31,6 +31,7 @@ import htmlToPdf from '@/components/utils/htmlToPdf';
 import VueAMap from 'vue-amap';
 import Vue from 'vue';
 import buttonCode from '../menu-data/button-code.json';
+import HbFormBottom from '@/components/layout/hb-form-bottom.vue';
 
 // Vue.use(contentmenu);
 Vue.use(VueAMap);
@@ -46,6 +47,7 @@ Vue.use(vueOfficeUploadImage);
 Vue.use(vueOfficeArea);
 Vue.use(vueOfficeAside);
 Vue.use(vueOfficeHeader);
+Vue.component('hb-form-bottom', HbFormBottom);
 
 Vue.config.productionTip = false;
 // Vue.use(ElementUI, { size: 'large' });

src/router/index.js

@@ -107,6 +107,11 @@ export const constantRouterMap = [
                 component: _import('enterprise', 'salutatorySet')
             },
             {
+                path: '/guide-setting',
+                name: '导购设置',
+                component: _import('enterprise', 'guide-setting')
+            },
+            {
                 path: '/setting',
                 name: '操作设置',
                 component: _import('setting', 'index')
@@ -412,13 +417,7 @@ export const constantRouterMap = [
                     path: '/evaluate-set',
                     name: '订单评价',
                     component: _import('apps/order-evaluate', 'evaluate-set')
-                },{
-                    path: '/bad-evaluate',
-                    name: '不良评价回访设置',
-                    component: _import('apps/order-evaluate', 'bad-evaluate-set')
-            }
-        ]
-    },
+                },
 
     {
         path: '/gic-error',
@@ -440,6 +439,8 @@ export const constantRouterMap = [
         name: 'error500',
         component: errorPage
     }
+    ]
+  }
 ];
 export default new Router({
     // mode:'history',

src/views/apps/card/cardList.vue

@@ -14,28 +14,48 @@
         <el-button v-if="$getButtonLimit($buttonCode.addCard)" :limit-code="$buttonCode.addCard" type="primary" @click="toNewCard" :disabled="$store.state.wxEnterpriseType">新增卡券</el-button>
       </div>
       <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: calc(100% - 3px);">
-        <el-table-column prop="" label="卡券名称" show-overflow-tooltip>
+        <el-table-column prop="" label="卡券名称" show-overflow-tooltip min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.cardName }}
           </template>
         </el-table-column>
 
-        <el-table-column prop="" label="卡券类型">
+        <el-table-column prop="" label="卡券类型" min-width="80px">
           <template slot-scope="scope">
             <span v-if="scope.row.cardType == 0">抵金券</span>
             <span v-if="scope.row.cardType == 1">折扣券</span>
             <span v-if="scope.row.cardType == 2">兑换券</span>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="有效期" show-overflow-tooltip>
+        <el-table-column prop="" label="卡券模板有效期" show-overflow-tooltip min-width="260px">
           <template slot-scope="scope">{{ scope.row.effectDateString || '--' }}</template>
         </el-table-column>
-        <el-table-column prop="" label="库存">
+        <el-table-column prop="" label="库存" min-width="100px">
           <template slot-scope="scope">
             <div>{{ scope.row.couponStock }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="操作" show-overflow-tooltip v-if="$getButtonLimit($buttonCode.editCard) || $getButtonLimit($buttonCode.delCard)">
+        <el-table-column label="卡券状态" prop="cardStatus" min-width="90px">
+          <template slot-scope="{ row }">
+            <!-- 0删除1有效 2已过期 3未开始 -->
+            <span class="state-point state-point-error" v-if="row.cardStatus == 0">已删除</span>
+            <span class="state-point state-point-success" v-if="row.cardStatus == 1">正常</span>
+            <span class="state-point state-point-error" v-if="row.cardStatus == 2">已过期</span>
+            <span class="state-point state-point-default" v-if="row.cardStatus == 3">未生效</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" prop="creatorName" show-overflow-tooltip min-width="120px"></el-table-column>
+        <el-table-column label="编辑人" prop="modifierName" show-overflow-tooltip min-width="120px"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" min-width="120px">
+          <div slot-scope="{ row }" style="line-height: normal">
+            <template v-if="row.createTime">
+              <p>{{ row.createTime | timeStampToYmd }}</p>
+              <p>{{ row.createTime | timeStampToHms }}</p>
+            </template>
+            <template v-else>--</template>
+          </div>
+        </el-table-column>
+        <el-table-column prop="" label="操作" show-overflow-tooltip v-if="$getButtonLimit($buttonCode.editCard) || $getButtonLimit($buttonCode.delCard)" min-width="150px">
           <template slot-scope="scope">
             <el-button v-if="$getButtonLimit($buttonCode.editCard)" :limit-code="$buttonCode.editCard" type="text" @click="toEdit(scope.$index, scope.row)" :disabled="$store.state.wxEnterpriseType">编辑</el-button>
             <el-button v-if="$getButtonLimit($buttonCode.delCard)" :limit-code="$buttonCode.delCard" type="text" @click="toDel(scope.$index, scope.row)" :disabled="$store.state.wxEnterpriseType">删除</el-button>

src/views/apps/card/cardRecord.vue

@@ -72,10 +72,12 @@
             {{ scope.row.sendMemberCount }}
           </template>
         </el-table-column>
+        <el-table-column label="创建人" prop="creatorName" width="120"></el-table-column>
         <el-table-column width="150" label="创建时间">
-          <template slot-scope="scope">
-            {{ scope.row.createTime | formatTimeStamp }}
-          </template>
+          <div slot-scope="scope" style="line-height: normal">
+            <p>{{ scope.row.createTime | timeStampToYmd }}</p>
+            <p>{{ scope.row.createTime | timeStampToHms }}</p>
+          </div>
         </el-table-column>
         <el-table-column width="200" label="卡券模板有效期">
           <template slot-scope="scope">
@@ -137,7 +139,7 @@ export default {
       cardName: '',
       options: [
         { label: '全部', value: '' },
-        { label: '已过期', value: 2 },
+        { label: '已删除', value: 2 },
         { label: '正常', value: 1 }
       ]
     };
@@ -153,7 +155,7 @@ export default {
           val = '正常';
           break;
         case 2:
-          val = '已过期';
+          val = '已删除';
           break;
       }
       return val;

src/views/apps/customerApp/memberGroupSet.vue

@@ -14,7 +14,7 @@
 <template>
   <div class="app-detail-wrap">
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="会员分组列表" name="first">
+      <el-tab-pane label="客户分组列表" name="first">
         <div class="app-detail-pane border-box p-lbr-20">
           <div class="condition-wrap flex flex-space-between">
             <div>

src/views/enterprise/guide-setting.vue

+<template>
+  <div class="guide-setting">
+    <dm-sub-title class="guide-setting-title">导购操作权限设置</dm-sub-title>
+    <div class="guide-auth-list">
+      <div class="guide-auth-item">
+        <span class="auth-item-label">允许编辑导购信息</span>
+        <el-switch v-model="settingData.editClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+      </div>
+      <div class="guide-auth-item">
+        <span class="auth-item-label">允许店长添加导购</span>
+        <el-switch v-model="settingData.addClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+      </div>
+      <div class="guide-auth-item">
+        <span class="auth-item-label">允许店长删除导购</span>
+        <el-switch v-model="settingData.delClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+      </div>
+    </div>
+    <dm-sub-title class="guide-setting-title">应用可见权限设置</dm-sub-title>
+    <p class="app-auth-tip">设置导购可见应用</p>
+    <el-row>
+      <el-checkbox-group v-model="settingData.checked">
+        <el-col :span="3" v-for="el in allApps" :key="el.applicationId" style="margin-bottom: 12px">
+          <el-checkbox :label="el.applicationId">{{ el.applicationName }}</el-checkbox>
+        </el-col>
+      </el-checkbox-group>
+    </el-row>
+    <hb-form-bottom v-if="$getButtonLimit($buttonCode.saveGuideSetting)">
+      <el-button :limit-code="$buttonCode.saveGuideSetting" :loading="loading" type="primary" @click="onSave">保存</el-button>
+    </hb-form-bottom>
+  </div>
+</template>
+
+<script>
+import { getRequest, postRequest } from '@/api/api.js';
+import errorMsg from '@/common/js/error.js';
+export default {
+  name: 'GuideSetting',
+  data() {
+    return {
+      loading: false,
+      settingData: {
+        editClerkFlag: 0,
+        addClerkFlag: 0,
+        delClerkFlag: 0,
+        checked: []
+      },
+      allApps: []
+    };
+  },
+  created() {
+    this.getSetting();
+  },
+  methods: {
+    getSetting() {
+      getRequest('/haoban-manage3-web/application-open-close-list', {}).then(res => {
+        const { errorCode, result } = res.data || {};
+        if (errorCode != 1) {
+          return errorMsg.errorMsg(res.data);
+        }
+        let { open, close, clerkEditInfo } = result || {};
+        open = Array.isArray(open) ? open : [];
+        close = Array.isArray(close) ? close : [];
+        this.allApps = open.concat(close);
+        this.settingData.checked = open.map(el => el.applicationId);
+        Object.assign(this.settingData, clerkEditInfo);
+      });
+    },
+    onSave() {
+      this.loading = true;
+      const { editClerkFlag, addClerkFlag, delClerkFlag, checked } = this.settingData;
+      const params = { editClerkFlag, addClerkFlag, delClerkFlag, dataJson: '' };
+      params.dataJson = this.allApps.map(el => {
+        return { applicationId: el.applicationId, openFlag: checked.includes(el.applicationId) ? 1 : 0 };
+      });
+      params.dataJson = JSON.stringify(params.dataJson);
+
+      postRequest('/haoban-manage3-web/open-or-close', params)
+        .then(res => {
+          const { errorCode } = res.data || {};
+          if (errorCode != 1) {
+            return errorMsg.errorMsg(res.data);
+          }
+          this.$message.success('保存成功');
+        })
+        .finally(() => {
+          setTimeout(() => (this.loading = false), 100);
+        });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.guide-setting {
+  padding: 20px;
+  .guide-setting-title {
+    margin-bottom: 22px;
+  }
+  .guide-auth-list {
+    margin-bottom: 44px;
+    border-radius: 4px;
+    border: 1px solid #dcdfe6;
+    .guide-auth-item {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      padding: 0 20px;
+      height: 67px;
+      + .guide-auth-item {
+        border-top: 1px solid #dcdfe6;
+      }
+      .auth-item-label {
+        margin-right: 60px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #303133;
+      }
+    }
+  }
+  .app-auth-tip {
+    margin-bottom: 16px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #303133;
+    line-height: 20px;
+  }
+}
+</style>

src/views/errorPage/gic-error.vue

@@ -26,6 +26,7 @@ import img_404 from '@/assets/gic-error.png';
 
 export default {
   name: 'page404',
+  inject: ['layoutVm'],
   data() {
     return {
       img_404
@@ -36,9 +37,12 @@ export default {
       return '登录遇到错误啦！请确认您是否是好办小程序管理员。如不是，请联系管理员在<企业微信-我的企业-权限管理>添加好办管理员。';
     }
   },
+  destroyed() {
+    this.layoutVm.$emit('command', 'showAside');
+  },
   /* eslint-disable */
   mounted() {
-
+    this.layoutVm.$emit('command', 'hideAside');
   }
 };
 </script>

src/views/errorPage/index.vue

@@ -28,6 +28,7 @@ import img_500 from '@/assets/500_images/error_500.svg';
 
 export default {
   name: 'errpage',
+  inject: ['layoutVm'],
   data() {
     return {
       imgSrc: '',
@@ -44,11 +45,15 @@ export default {
       }
     };
   },
+  destroyed() {
+    this.layoutVm.$emit('command', 'showAside');
+  },
   mounted() {
     var that = this;
     var path = that.$route.path.split('/')[1];
     that.imgSrc = that.srcList[path];
     that.message = that.msgList[path];
+    this.layoutVm.$emit('command', 'hideAside');
   }
 };
 </script>