update: dist

src/components/common/selectShop.vue

@@ -42,7 +42,6 @@ export default {
   data() {
     return {
       departmentVisible: false,
-
       props: {
         key: 'storeId',
         label: 'storeName',

src/views/salesleads/actCodeManage/attractFlowLink/detail.vue

@@ -29,8 +29,8 @@
         <dm-sub-title type="line">分配规则</dm-sub-title>
         <p class="tips-info">
           客户点击此引流链接，系统所分配的企微员工活码将根据下方层级配置区分优先级进行展示：<br />
-          <span class="dot"></span> <span style="color:#FA8C16">优先级判断规则是“从上到下、从左到右”。</span>如：当上一层级匹配到结果后，则不会再执行下个层级的判断；同一层级内，当左边的勾选项匹配到结果，则不会再执行层级内右边的勾选项<br />
-          <span class="dot"></span>按照优先级匹配到的结果的大前提是该员工“可生成活码”且“并未达到当天添加好友上限”，否则则继续进行后续优先级的判断； <br />
+          <span class="dot"></span> <span style="color:#FA8C16">优先级判断规则是“从上到下、从左到右”。</span>如：当上一层级匹配到结果后，则不会再执行下个层级的判断；同一层级内，当左边的勾选项匹配到结果，则不会再执行层级内右边的勾选项；<br />
+          <span class="dot"></span>按照优先级匹配到的结果的大前提是该员工在【活码管理-员工活码】中具备有效的“单人活码”且“并未达到当天添加好友上限”，否则则继续进行后续优先级的判断； <br />
           <span class="dot"></span>若按照优先级所匹配到的结果已经与该客户是好友关系了，不会继续进行后续优先级的判断，直接展示该员工的活码。<br />
         </p>
         <div class="section">

src/views/salesleads/actCodeManage/attractFlowLink/index.vue

@@ -15,7 +15,7 @@
         <el-select class="m-l-10 w-160" v-model="form.linkType" placeholder="全部类型" @change="getList" clearable @clear="clear">
           <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.key"> </el-option>
         </el-select>
-        <el-date-picker class="m-l-10 w-256" v-model="form.dateRange" @change="getList" type="daterange" :value-format="'yyyy-MM-dd'" clearable @clear="getList" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期"> </el-date-picker>
+        <el-date-picker class="m-l-10 w-256" v-model="form.dateRange" @change="getList" type="daterange" :picker-options="pickerOptions" :value-format="'yyyy-MM-dd'" clearable @clear="getList" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期"> </el-date-picker>
       </div>
       <div>
         <el-button @click="goLanding">落地页模板</el-button>
@@ -160,6 +160,12 @@ export default {
           key: 2
         }
       ],
+      pickerOptions: {
+        disabledDate: time => {
+          const end = new Date();
+          return time.getTime() > end.getTime();
+        }
+      },
       btnArr: [
         {
           text: '数据',

src/views/salesleads/actCodeManage/attractFlowLink/info.vue

@@ -285,15 +285,6 @@ export default {
   }
 }
 
-.fixed-tab {
-  position: absolute;
-  top: 110px;
-  z-index: 1;
-  padding-bottom: 0;
-  height: 40px;
-  background: white;
-  width: calc(100% - 180px);
-}
 .welcome-left-view {
   width: 639px;
 }

src/views/salesleads/actCodeManage/attractFlowLink/landingPage/detail.vue

@@ -125,7 +125,7 @@ export default {
       this.btnLoading = true;
       guidePageEdit(this.form)
         .then(_ => {
-          this.$router.push('ladingPageList');
+          this.$router.push('/ladingPageList');
           this.$message.success('保存成功');
         })
         .finally(_ => {
@@ -136,7 +136,7 @@ export default {
       this.btnLoading = true;
       guidePageSave(this.form)
         .then(_ => {
-          this.$router.push('ladingPageList');
+          this.$router.push('/ladingPageList');
           this.$route.meta.refresh = true;
           this.$message.success('保存成功');
         })

src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue

@@ -197,17 +197,7 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.fixed-tab {
-  position: absolute;
-  top: 110px;
-  z-index: 20;
-  padding-bottom: 0;
-  height: 40px;
-  background: white;
-  width: calc(100% - 180px);
-  padding-top: 20px;
-  // left: 50px;
-}
+
 .button-discard {
   width: 98px;
   margin-left: 20px;

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -221,7 +221,7 @@ export default {
       pickerOptions: {
         disabledDate: time => {
           const end = new Date();
-          return time.getTime() < end.getTime() - 3600 * 1000 * 24 * 365 || time.getTime() > end.getTime();
+          return time.getTime() > end.getTime();
         }
       },
       operateBtnArr: [

static/css/public.css

@@ -1459,3 +1459,13 @@ ui调整
   .el-button--text+.el-dropdown{
     margin-left: 20px !important;
   }
+  .fixed-tab {
+    position: absolute;
+    top: 110px;
+    z-index: 20;
+    padding-bottom: 0;
+    height: 40px;
+    background: white;
+    width: calc(100% - 180px);
+    padding-top: 20px;
+  }
\ No newline at end of file