Merge remote-tracking branch 'origin/feature/九月迭代' into dev

* origin/feature/九月迭代:
  add: 新版企微关联弹窗
  fix: 修改底部固定层级
  fix: 客户分组设置到期时间展示逻辑修改
  fix: 组件名称修改
  update: 页面文件名修改

src/components/company/related-table.vue

@@ -57,10 +57,13 @@
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="submitForm('form')">确定</el-button>
     </div>-->
-    <add-relate v-if="addShow" :departObj="relateRow" @refreshData="refreshData"></add-relate>
+    <!-- <add-relate v-if="addShow" :departObj="relateRow" @refreshData="refreshData"></add-relate> -->
+    <!-- 新版关联 -->
+    <add-relate-new v-if="addShow" :departObj="relateRow" @refreshData="refreshData"></add-relate-new>
   </el-dialog>
 </template>
 <script>
+import addRelateNew from '@/components/company/add-relate-new.vue';
 import addRelate from '@/components/company/add-relate.vue';
 import { getRequest, postRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
@@ -254,7 +257,7 @@ export default {
   destroyed() {
     document.documentElement.style.backgroundColor = '#fff';
   },
-  components: { addRelate }
+  components: { addRelate, addRelateNew }
 };
 </script>
 <style type="text/scss" lang="scss" scoped>

src/router/index.js

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2018-10-10 14:44:45
  * @LastEditors: Drama
- * @LastEditTime: 2022-09-20 15:03:02
+ * @LastEditTime: 2022-09-22 15:51:16
  */
 import Vue from 'vue';
 import Router from 'vue-router';
@@ -120,7 +120,7 @@ export const constantRouterMap = [
                 path: '/guide-setting',
                 name: '导购设置',
                 // component: _import('enterprise', 'guide-setting')
-                component: _import('enterprise', 'guide-setting-copy')
+                component: _import('enterprise', 'guide-setting-new')
             },
             {
                 path: '/setting',

src/views/apps/customerApp/memberGroupList.vue

@@ -4,7 +4,7 @@
  * @Author: 无尘
  * @Date: 2019-03-20 14:36:37
  * @LastEditors: Drama
- * @LastEditTime: 2022-09-19 10:09:46
+ * @LastEditTime: 2022-09-23 10:38:14
  -->
 
 <!--
@@ -15,7 +15,7 @@
   <div class="app-detail-pane border-box p-lbr-20">
     <div class="condition-wrap flex flex-space-between">
       <div>
-        <el-input placeholder="请输入分组名称" maxlength="50" v-model="conditionObj.searchInput" class="w-264" style="width: 217px;" prefix-icon="el-icon-search" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"></el-input
+        <el-input placeholder="请输入分组名称" maxlength="50" v-model="conditionObj.searchInput" class="w-264" style="width: 217px" prefix-icon="el-icon-search" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"></el-input
         ><el-select class="w-168 m-l-10" v-model="conditionObj.classifyName" placeholder="全部分类" @change="changeCondition">
           <el-option label="全部分类" value=""></el-option>
           <el-option v-for="item in classifyList" :key="item" :label="item" :value="item"> </el-option> </el-select
@@ -27,7 +27,7 @@
       </div>
       <div>
         <el-checkbox v-if="$getButtonLimit($buttonCode.groupExpire)" :limit-code="$buttonCode.groupExpire" v-model="overTimeSeeFlag" @change="saveGroupSet" :disabled="$store.state.wxEnterpriseType">
-          <el-tooltip class="item" effect="dark" content="勾选后，失效的分组不在好办小程序端展示" placement="top-start"> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;margin-left:-4px;" class="font-14 color-606266 m-r-20">会员分组失效后不展示</span></el-tooltip>
+          <el-tooltip class="item" effect="dark" content="勾选后，失效的分组不在好办小程序端展示" placement="top-start"> <span style="cursor: pointer; padding-bottom: 2px; border-bottom: 1px dashed #2f54eb; margin-left: -4px" class="font-14 color-606266 m-r-20">会员分组失效后不展示</span></el-tooltip>
         </el-checkbox>
         <el-button v-if="$getButtonLimit($buttonCode.syncGroup)" :limit-code="$buttonCode.syncGroup" type="primary" :loading="loadingBtn" @click="toSync" :disabled="$store.state.wxEnterpriseType">立即同步</el-button>
         <span v-if="syncDate" class="font-14 color-606266 p-r-10">最近一次同步时间：{{ syncDate | formatTimeStamp }}</span>
@@ -58,8 +58,14 @@
         </el-table-column> -->
         <el-table-column prop="" label="到期时间" show-overflow-tooltip>
           <template slot-scope="scope">
-            <div class="line-18">{{ scope.row.effectiveDate | timeStampToYmd }}</div>
-            <div class="line-18">{{ scope.row.effectiveDate | timeStampToHms }}</div>
+            <div v-if="scope.row.isRealTime == 1">
+              <div class="line-18">--</div>
+              <div class="line-18">--</div>
+            </div>
+            <div v-else>
+              <div class="line-18">{{ scope.row.effectiveDate | timeStampToYmd }}</div>
+              <div class="line-18">{{ scope.row.effectiveDate | timeStampToHms }}</div>
+            </div>
           </template>
         </el-table-column>
       </el-table>

src/views/enterprise/guide-setting-copy.vue → src/views/enterprise/guide-setting-new.vue

@@ -4,14 +4,14 @@
  * @Author: Drama
  * @Date: 2022-09-14 11:09:43
  * @LastEditors: Drama
- * @LastEditTime: 2022-09-22 15:01:27
- * @FilePath: /haoban-3/src/views/enterprise/guide-setting-copy.vue
+ * @LastEditTime: 2022-09-23 13:51:20
+ * @FilePath: /haoban-3/src/views/enterprise/guide-setting-new.vue
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <template>
   <div class="app-detail-wrap">
     <div class="border-box p-t-30 p-l-26 p-r-211">
-      <el-form ref="ruleForm" v-model="roleForm" label-width="100px">
+      <el-form class="rule-form" ref="ruleForm" v-model="roleForm" label-width="100px">
         <el-form-item label="应用权限" required>
           <div class="dis-f">
             <div class="title-wrap border-box border-radio-2">
@@ -224,6 +224,9 @@ export default {
 }
 </style>
 <style lang="less" scoped>
+.rule-form {
+  padding-bottom: 60px;
+}
 .el-icon-warning {
   width: 12px;
   font-size: 12px;
@@ -388,5 +391,6 @@ export default {
   height: 56px;
   background: #ffffff;
   box-shadow: 1px -2px 8px 0px rgba(220, 223, 230, 0.6);
+  z-index: 100;
 }
 </style>