fix: 修改各个组件

src/api/contact.js

+/*
+ * @Descripttion: 当前组件信息
+ * @version: 1.0.0
+ * @Author: 无尘
+ * @Date: 2020-07-24 12:19:48
+ * @LastEditors: 无尘
+ * @LastEditTime: 2020-07-24 13:51:38
+ */
+import getFetch from './getFetch.js';
+
+let api = {
+  getSyncCheck: '/department-sync-check', // 获取同步状态
+  refreshWx: '/sync-qywx', // 刷新企业微信
+  getDepartmentList: '/department-list-level', // 获取搜索部门
+  getSearchList: '/department-list-cache', // 获取企业部门列表树形
+  getStaffDetail: '/staff-sel', // 获取成员详情
+  getStaffRelation: '/staff-clerk-relation', // 获取关联详情
+  delStaffRelation: {
+    url: 'del-clerk-relation', // 解绑关联
+    method: 'post'
+  },
+  addStaffRelation: {
+    url: 'add-clerk-relation', // 添加绑定关联
+    method: 'post'
+  },
+  getClerkRelation: 'search-clerk-relation',  // 获取关联导购
+}
+
+api = getFetch(api, '/haoban-manage4-web');
+
+export default api;

src/components/company/auth-commit.vue

@@ -3,7 +3,7 @@
  * @Author       : 无尘
  * @Date         : 2020-02-13 14:02:40
  * @LastEditors: 无尘
- * @LastEditTime: 2020-07-24 10:51:01
+ * @LastEditTime: 2020-07-24 12:21:44
  * @FilePath     : j:\公司\haoban-4\src\components\company\auth-commit-success.vue
  -->
 <!--
@@ -73,7 +73,6 @@ export default {
      */
     submitForm(form) {
       const that = this;
-
       that.$refs[form].validate(valid => {
         if (valid) {
           that.toCommitPost();

src/components/company/store-auth-detail.vue

@@ -13,7 +13,7 @@
      <div class="store-change-body">
        <div class="flex ">
          <div class="change-stores flex-1">
-           <div class="font-14 color-303133 text-center">变更前</div>
+           <div class="font-14 color-303133 text-center m-b-20">变更前</div>
            <ul class="store-cell-ul bg-f5f7fa">
              <li class="text-center">
                <el-tag type="info">标签三</el-tag>
@@ -21,11 +21,14 @@
            </ul>
          </div>
          <div class="change-stores flex-1 m-l-10">
-           <div class="font-14 color-303133">变更后</div>
+           <div class="font-14 color-303133 text-center m-b-20">变更后</div>
            <ul class="store-cell-ul bg-f5f7fa">
              <li class="text-center">
                <el-tag type="info">标签三</el-tag>
              </li>
+             <li class="text-center">
+               <el-tag type="info">标签三</el-tag>
+             </li>
            </ul>
          </div>
        </div>
@@ -134,5 +137,8 @@ export default {
 .store-cell-ul {
   height: 289px;
   overflow-y: auto;
+  li {
+    margin-top: 10px;
+  }
 }
 </style>

src/components/company/store-auth-group.vue

@@ -4,17 +4,16 @@
  * @Author: 无尘
  * @Date: 2020-07-21 10:10:57
  * @LastEditors: 无尘
- * @LastEditTime: 2020-07-21 17:19:53
+ * @LastEditTime: 2020-07-24 14:29:59
  -->
 <!--
-  设置成员所在部门（回收站）
+  门店绑定-选择分组
   <store-auth-group @checkGroupIds="checkGroupIds"></store-auth-group>
   import storeAuthGroup from '@/components/company/store-auth-group.vue';
   -->
 <template>
   <div class="bind-store-body">
     <div class="select-search">
-      <!-- 树形也自带有过滤搜索的方法 -->
       <el-input placeholder="请输入内容" clearable v-model="searchSelect" style="width: 296px;" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
     </div>
     <div class="select-tree-wrap m-t-20">
@@ -68,7 +67,6 @@
        * 加载更多
        */
       async loadNode(node, resolve) {
-        // console.log(node, resolve);
         const that = this;
         if (node.level === 0) {
           return resolve(that.getGroup());

src/components/company/store-auth-store.vue

@@ -4,10 +4,10 @@
  * @Author: 无尘
  * @Date: 2020-07-21 10:10:57
  * @LastEditors: 无尘
- * @LastEditTime: 2020-07-21 14:15:30
+ * @LastEditTime: 2020-07-24 14:28:04
  -->
 <!--
-  设置成员所在部门（回收站）
+  门店绑定-选择门店
   <store-auth-store @checkStoreIds="checkStoreIds"></store-auth-store>
   import storeAuthStore from '@/components/company/store-auth-store.vue';
   -->

src/views/business/auditLog.vue

@@ -4,14 +4,14 @@
  * @Author: 无尘
  * @Date: 2019-03-20 14:36:37
  * @LastEditors: 无尘
- * @LastEditTime: 2020-07-22 14:22:21
+ * @LastEditTime: 2020-07-24 14:21:21
  -->
 <template>
   <div class="my-customer-wrap common-set-wrap">
     <nav-crumb :navpath="navpath"> </nav-crumb>
     <div class="right-content">
-      <div class="right-box" :style="{ 'min-height': bgHeight }">
-        <div class="apps-content flex" :style="{ 'min-height': bgHeight }">
+      <div class="right-box" style="min-height: calc(100vh - 126px)">
+        <div class="apps-content flex" style="min-height: calc(100vh - 126px)">
           <div class="apps-content-right">
             <div class="flex flex-space-between">
               <div class="flex ">
@@ -24,16 +24,8 @@
                   </div>
                 </div>
               </div>
-              <div class="overstore-tip" style="width:643px;">
-                <div role="alert" class="el-alert el-alert--info flex flex-align-start">
-                  <i class="el-alert__icon el-icon-info font-12 color-2f54eb"></i>
-                  <div class="el-alert__content">
-                    <span class="el-alert__title color-606266 font-14">仅保存近一年失败日志</span>
-                  </div>
-                </div>
-              </div>
+              <common-alert-tip :width="'284px'" :tipContent="tipContent"></common-alert-tip>
             </div>
-
             <div class="m-t-20">
               <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
                 <el-table-column label="申请事项" show-overflow-tooltip>
@@ -56,7 +48,7 @@
                 </el-table-column>
                 <el-table-column prop="" label="提交人" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    <span class="font-14 color-606266">{{ scope.row.statusFlag == 4 ? '成功' : scope.row.statusFlag == 5 ? '完成有错误' : scope.row.statusFlag == 6 ? '有错误关闭' : '' }}</span>
+                    {{ scope.row.taskDesc | '--' }}
                   </template>
                 </el-table-column>
                 <el-table-column prop="" label="审核人" show-overflow-tooltip>
@@ -93,13 +85,14 @@
 <script>
 import navCrumb from '@/components/nav/nav.vue';
 import storeAuthDetail from '@/components/company/store-auth-detail.vue';
+import commonAlertTip from '@/components/common/common-alert-tip.vue';
 import { getRequest, postRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
 export default {
   name: 'auditLog',
   data() {
     return {
-      bgHeight: window.screen.availHeight - 288 + 'px',
+      tipContent: '仅保存近一年失败日志',
       // 面包屑参数
       navpath: [
         {
@@ -126,13 +119,20 @@ export default {
       total: 0,
       tableData: [],
       // 绑定详情
-      logShow: false,
+      logShow: true,
       taskId: ''
     };
   },
   computed: {},
   methods: {
     /**
+     * 取消审核
+     */
+    toCancleAudit(index, item) {
+      const that = this;
+      that.cancel = '';
+    },
+    /**
      * 查看失败日志
      */
     toShowLog(index, item) {
@@ -235,7 +235,8 @@ export default {
   },
   components: {
     navCrumb,
-    storeAuthDetail
+    storeAuthDetail,
+    commonAlertTip
   }
 };
 </script>

src/views/business/authMerchant.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2019-03-20 14:36:37
  * @LastEditors: 无尘
- * @LastEditTime: 2020-07-22 14:30:42
+ * @LastEditTime: 2020-07-24 14:11:52
  -->
 <template>
   <div class="my-customer-wrap common-set-wrap">
@@ -15,7 +15,7 @@
           <div class="apps-content-right">
             <div class="flex flex-space-between">
               <div class="" style="width:643px;">
-                <div role="alert" class="el-alert el-alert--info flex flex-align-start">
+                <div role="alert" class="el-alert el-alert--info flex flex-align-start" style="width:643px;">
                   <i class="el-alert__icon el-icon-info font-12 color-2f54eb"></i>
                   <div class="el-alert__content">
                     <span class="el-alert__title color-606266 font-14">提示：授权的商户，需在同一个微信开放平台主体下；最多授权10个商户。  </span><el-button type="text" @click="openUrl">主体查询方法</el-button>
@@ -41,15 +41,53 @@
                     </div>
                   </template>
                 </el-table-column>
+                <el-table-column prop="" label="绑定门店" show-overflow-tooltip>
+                  <template slot="header" >
+                    <el-tooltip class="item" effect="light" placement="right">
+                      <div slot="content">
+                        绑定门店拥有门店资源管理权限。能查看数据，绑定导购账号，管理门店等
+                      </div>
+                      <span class="common-bottom-border">绑定门店</span>
+                    </el-tooltip>
+                  </template>
+                  <template slot-scope="scope">
+                    {{ scope.row.staffName || '--' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="" label="共享门店" show-overflow-tooltip>
+                  <template slot="header" >
+                    <el-tooltip class="item" effect="light" placement="right">
+                      <div slot="content">
+                        共享门店拥有门店资源查看权限。仅能授权查看数据，<br/>如会员数据，任务数据等，但无法操作及进行导购账号绑定
+                      </div>
+                      <span class="common-bottom-border">共享门店</span>
+                    </el-tooltip>
+                  </template>
+                  <template slot-scope="scope">
+                    {{ scope.row.staffName || '--' }}
+                  </template>
+                </el-table-column>
                 <el-table-column prop="" label="提交人" show-overflow-tooltip>
                   <template slot-scope="scope">{{ scope.row.staffName || '--' }}</template>
                 </el-table-column>
-                <el-table-column prop="" label="完成时间" show-overflow-tooltip>
+                <el-table-column prop="" label="授权时间" show-overflow-tooltip>
                   <template slot-scope="scope">
                     <div class="line-18">{{ scope.row.createTime | timeStampToYmd }}</div>
                     <div class="line-18">{{ scope.row.createTime | timeStampToHms }}</div>
                   </template>
                 </el-table-column>
+                <el-table-column prop="" label="更新时间" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <div class="line-18">{{ scope.row.createTime | timeStampToYmd }}</div>
+                    <div class="line-18">{{ scope.row.createTime | timeStampToHms }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="" label="操作" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <el-button type="text" @click="toEdit(scope.$index, scope.row)">编辑授权设置</el-button>
+                    <el-button type="text" @click="toAuditLog(scope.$index, scope.row)">审核日志</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
               <!-- <div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
                 <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
@@ -96,6 +134,20 @@ export default {
   computed: {},
   methods: {
     /**
+     * 编辑授权
+     */
+    toEdit(index, row) {
+      const that = this;
+      that.changeRoute(`/newAuthMerchant?enterpriseId=${row.enterpriseId}`);
+    },
+    /**
+     * 审核日志
+     */
+    toAuditLog(index, row) {
+      const that = this;
+      that.changeRoute(`/auditLog?enterpriseId=${row.enterpriseId}`);
+    },
+    /**
      * url 跳转
      */
     openUrl() {
@@ -203,18 +255,10 @@ export default {
 .w-191 {
   width: 191px;
 }
-.el-alert--info {
-  background: rgba(240, 245, 255, 1);
-  border-radius: 2px;
-  border: 1px solid rgba(133, 165, 255, 1);
-  -webkit-box-align: flex-start;
-  -webkit-align-items: flex-start;
-  -ms-flex-align: flex-start;
-  align-items: flex-start;
-  .el-alert__icon {
-    font-size: 12px;
-    padding-top: 3px;
-  }
+.common-bottom-border {
+  cursor: pointer;
+  padding-bottom: 2px;
+  border-bottom: 1px dashed #2f54eb;
 }
 .my-customer-wrap {
   height: 100%;
@@ -232,17 +276,6 @@ export default {
         width: 100%;
         padding: 20px;
         background: #fff;
-        .overstore-body {
-          background: #fff;
-        }
-        .daily-set-wrap {
-          height: 100%;
-          background: #fff;
-        }
-        .app-detail-wrap {
-          height: 100%;
-          background: #fff;
-        }
         .common-set-wrap {
           height: 100%;
           background: #fff;