Merge branch 'feature/停复机' into test

* feature/停复机: (46 commits)
  分享有礼 原即将过期提示删除
  update: dist
  update: dist
  Revert "update: dist"
  re
  Revert "update: dist"
  Revert "fix: 数据明细提示信息修改"
  修复
  Revert "update: dist"
  fix: 数据明细提示信息修改
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist
  update; dist
  update: build
  update: build
  ...

# Conflicts:
#	dist/index.html
#	dist/static/css/app.06aaddd0a0d5cd58132565d996a7f711.css
#	dist/static/css/app.73bfb2b7f09408ee8f1a91eb1df1f48a.css
#	dist/static/css/app.7bbb701cb4addc6ee824500e0f6db3ff.css
#	dist/static/js/5.33478b4d2e3e77d8002c.js
#	dist/static/js/5.386a89be6161eb60d005.js
#	dist/static/js/5.eae8d93053de7016ca72.js
#	dist/static/js/manifest.7d088c97fd765324130d.js
#	dist/static/js/manifest.7f10b84e60a0b3dc5c19.js
#	dist/static/js/manifest.c8586fe57e9fd5dc11a2.js

src/components/active-config/active-step.vue

@@ -127,13 +127,13 @@ export default {
     &.active-step {
       .active-step-cell_inner {
         .active-step-cell_line {
-          background: #2F54EB;
+          background: #1890ff;
         }
         .active-step-cell_title {
           .el-step__icon {
             color: #fff;
-            border-color: #2F54EB;
-            background: #2F54EB;
+            border-color: #1890ff;
+            background: #1890ff;
           }
           .active-step-cell_txt {
             color: #303133;
@@ -144,18 +144,18 @@ export default {
     &.active-hasset {
       .active-step-cell_inner {
         .active-step-cell_line {
-          background: #2F54EB;
+          background: #1890ff;
         }
         .active-step-cell_title {
           .el-step__icon {
             color: #fff;
-            border-color: #2F54EB;
-            background: #2F54EB;
+            border-color: #1890ff;
+            background: #1890ff;
           }
           .el-icon-check {
             width: 98%;
             height: 98%;
-            color: #2F54EB;
+            color: #1890ff;
             background: #fff;
             border-radius: 50%;
           }

src/components/active-config/center-config.vue

@@ -198,7 +198,7 @@ export default {
       loading: false,
       activeInfoData: {
         headUrl: '',
-        shareBackColor: '#2F54EB',
+        shareBackColor: '#1890ff',
         shareFontColor: '#ffffff',
         shareButtonFont: '立即分享赢福利',
         activityIntroduceMode: '1',

src/components/active-config/configs/competition-award.vue

@@ -933,7 +933,7 @@ export default {
             bottom: -6px;
             width: 32px;
             height: 20px;
-            background: #2F54EB;
+            background: #1890ff;
             text-align: center;
             -webkit-transform: rotate(-45deg);
             -moz-transform: rotate(-45deg);
@@ -983,7 +983,7 @@ export default {
         .common-cell-check {
           .common-cell-triangle {
             .common-cell-outer {
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 color: #fff;
               }

src/components/active-config/configs/consume-config.vue

@@ -455,7 +455,7 @@ export default {
             bottom: -6px;
             width: 32px;
             height: 20px;
-            background: #2F54EB;
+            background: #1890ff;
             text-align: center;
             -webkit-transform: rotate(-45deg);
             -moz-transform: rotate(-45deg);
@@ -505,7 +505,7 @@ export default {
         .common-cell-check {
           .common-cell-triangle {
             .common-cell-outer {
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 color: #fff;
               }
@@ -534,7 +534,7 @@ export default {
     background: rgba(245, 247, 250, 1);
     .store-title-name {
       padding-bottom: 3px;
-      border-bottom: 2px dotted #2F54EB;
+      border-bottom: 2px dotted #1890ff;
     }
     .store-select-body {
       margin-top: 20px;

src/components/active-config/configs/entry-award.vue

@@ -617,7 +617,7 @@ export default {
             bottom: -6px;
             width: 32px;
             height: 20px;
-            background: #2F54EB;
+            background: #1890ff;
             text-align: center;
             -webkit-transform: rotate(-45deg);
             -moz-transform: rotate(-45deg);
@@ -667,7 +667,7 @@ export default {
         .common-cell-check {
           .common-cell-triangle {
             .common-cell-outer {
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 color: #fff;
               }

src/components/active-config/configs/fraud-control.vue

@@ -417,7 +417,7 @@ export default {
             bottom: -6px;
             width: 32px;
             height: 20px;
-            background: #2F54EB;
+            background: #1890ff;
             text-align: center;
             -webkit-transform: rotate(-45deg);
             -moz-transform: rotate(-45deg);
@@ -467,7 +467,7 @@ export default {
         .common-cell-check {
           .common-cell-triangle {
             .common-cell-outer {
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 color: #fff;
               }

src/components/active-config/configs/spot-award.vue

@@ -689,7 +689,7 @@ export default {
             bottom: -6px;
             width: 32px;
             height: 20px;
-            background: #2F54EB;
+            background: #1890ff;
             text-align: center;
             -webkit-transform: rotate(-45deg);
             -moz-transform: rotate(-45deg);
@@ -739,7 +739,7 @@ export default {
         .common-cell-check {
           .common-cell-triangle {
             .common-cell-outer {
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 color: #fff;
               }

src/components/active-config/poster-config.vue

@@ -474,7 +474,7 @@ export default {
                 bottom: -6px;
                 width: 32px;
                 height: 20px;
-                background: #2F54EB;
+                background: #1890ff;
                 text-align: center;
                 -webkit-transform: rotate(-45deg);
                 -moz-transform: rotate(-45deg);

src/components/active-config/reward-config.vue

@@ -2028,7 +2028,7 @@ export default {
               top: 0px;
               left: 7px;
               font-size: 12px;
-              color: #2F54EB;
+              color: #1890ff;
               -webkit-transform: rotate(45deg);
               -moz-transform: rotate(45deg);
               transform: rotate(45deg);
@@ -2089,7 +2089,7 @@ export default {
         .common-cell-check {
           .common-cell-triangle {
             .common-cell-outer {
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 color: #fff;
               }

src/components/active/active-select.vue

@@ -997,7 +997,7 @@ export default {
         .common-cell-check {
           .common-cell-triangle {
             .common-cell-outer {
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 color: #fff;
               }
@@ -1067,7 +1067,7 @@ export default {
           .common-cell-triangle {
             .common-cell-outer {
               width: 50px;
-              background: #2F54EB;
+              background: #1890ff;
               i {
                 left: 20px;
                 color: #fff;

src/components/active/data-statistics.vue

@@ -91,7 +91,7 @@ export default {
     this.chartSettings = {
       //showLine: ['传播系数']
     };
-    this.colors = ['#2F54EB', '#5AD8A6', '#FF6383'];
+    this.colors = ['#1890ff', '#5AD8A6', '#FF6383'];
     return {};
   }
   /* methods() {

src/components/active/in-progress-active.vue

@@ -16,10 +16,6 @@ import inProgressActive from '@/components/active/in-progress-active.vue';
   <div v-if="inProgressData.length" style="margin-top:-9px;">
     <div class="flex-top-wrap" >
       <div class="separator-space">- 当前有计划中的活动，无法创建新的活动 -</div>
-      <div class="alert-wrap" v-if="dueData.dueDay<=90"
-        ><i class="el-icon-warning" ></i
-        ><template v-if="dueData.isOverdue===0">您的分享有礼功能将在 <span class="red">{{dueData.dueDay}}</span>  天后过期，为不影响使用，请及时联系达摩运营经理购买（<span class="red">过期截止时间{{dueData.endDate|dateFilter}}</span>）</template
-        ><template v-else-if="dueData.isOverdue===1">您的分享有礼功能<span class="red">已过期</span>，如需继续使用，请联系达摩运营经理购买使用。</template></div>
     </div>
     <div class="in-progress-active border-box">
       <ul>

src/components/nav/nav.vue

@@ -144,7 +144,7 @@ export default {
 }
 .navtipcolor {
   margin: 0 12px;
-  color: #2F54EB;
+  color: #1890ff;
 }
 
 .el-breadcrumb__item:last-child .el-breadcrumb__inner,

src/view/errorPage/403.vue

@@ -205,9 +205,9 @@ export default {
       padding: 0 15px;
       font-size: 14px;
       border-radius: 4px;
-      border: 1px solid #2F54EB;
+      border: 1px solid #1890ff;
       color: #fff;
-      background-color: #2F54EB;
+      background-color: #1890ff;
       text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.12);
       -webkit-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);
       box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);

src/view/errorPage/404.vue

@@ -209,9 +209,9 @@ export default {
       padding: 0 15px;
       font-size: 14px;
       border-radius: 4px;
-      border: 1px solid #2F54EB;
+      border: 1px solid #1890ff;
       color: #fff;
-      background-color: #2F54EB;
+      background-color: #1890ff;
       text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.12);
       -webkit-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);
       box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);

src/view/errorPage/500.vue

@@ -205,9 +205,9 @@ export default {
       padding: 0 15px;
       font-size: 14px;
       border-radius: 4px;
-      border: 1px solid #2F54EB;
+      border: 1px solid #1890ff;
       color: #fff;
-      background-color: #2F54EB;
+      background-color: #1890ff;
       text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.12);
       -webkit-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);
       box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);

src/view/errorPage/index.vue

@@ -219,9 +219,9 @@ export default {
       padding: 0 15px;
       font-size: 14px;
       border-radius: 4px;
-      border: 1px solid #2F54EB;
+      border: 1px solid #1890ff;
       color: #fff;
-      background-color: #2F54EB;
+      background-color: #1890ff;
       text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.12);
       -webkit-box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);
       box-shadow: 0 2px 0 rgba(0, 0, 0, 0.035);

src/view/shareIndex/index.vue

@@ -12,8 +12,6 @@
       <div v-if="canCreate">
         <div class="flex-top-wrap" v-if="dueData.isOverdue===0">
           <div class="separator-space">- 当前无进行中的活动，请创建活动，别让业绩白白流失！ -</div>
-          <div class="alert-wrap" v-if="dueData.dueDay<=90"
-            ><i class="el-icon-warning" ></i>您的分享有礼功能将在 <span class="red">{{dueData.dueDay}}</span>  天后过期，为不影响使用，请及时联系达摩运营经理购买（<span class="red">过期截止时间{{dueData.endDate|dateFilter}}</span>）</div>
         </div>
         <active-select :isOverdue="dueData.isOverdue"></active-select>
       </div>
@@ -52,6 +50,7 @@ export default {
   data() {
     return {
       canCreate: true,
+      expireStatus: 0,//0：未到期，1：即将到期，2：已到期
       dueData: {
         dueDay: 0, // 即将到期天数
         endDate: new Date().getTime(), // 到期时间

static/css/variable.less

 @base-color: #353944;
 @hover-color: #3c92eb;
 @hoverbg-color: #20242d;
-@main-color: #2F54EB;
+@main-color: #1890ff;
 @navbgcolor: #04143a;
 @sidebgcolor: #343c4c;
 @userinfobgcolor: #ecf5ff;

static/img/add-hover.svg

@@ -8,7 +8,7 @@
             <g id="Dialog-对话框/表单" transform="translate(395.000000, 435.000000)">
                 <g id="添加-加号-无边框" transform="translate(24.000000, 87.000000)">
                     <rect id="矩形" fill="#E9F4FF" x="0" y="0" width="40" height="40" rx="4"></rect>
-                    <path d="M26.5,20 L21,20 L21,14.5 C21,14.22 20.78,14 20.5,14 C20.22,14 20,14.22 20,14.5 L20,20 L14.5,20 C14.22,20 14,20.22 14,20.5 C14,20.78 14.22,21 14.5,21 L20,21 L20,26.5 C20,26.78 20.22,27 20.5,27 C20.78,27 21,26.78 21,26.5 L21,21 L26.5,21 C26.78,21 27,20.78 27,20.5 C27,20.22 26.78,20 26.5,20 Z" id="路径" fill="#2F54EB"></path>
+                    <path d="M26.5,20 L21,20 L21,14.5 C21,14.22 20.78,14 20.5,14 C20.22,14 20,14.22 20,14.5 L20,20 L14.5,20 C14.22,20 14,20.22 14,20.5 C14,20.78 14.22,21 14.5,21 L20,21 L20,26.5 C20,26.78 20.22,27 20.5,27 C20.78,27 21,26.78 21,26.5 L21,21 L26.5,21 C26.78,21 27,20.78 27,20.5 C27,20.22 26.78,20 26.5,20 Z" id="路径" fill="#1890ff"></path>
                 </g>
             </g>
         </g>

static/tinymce/skins/lightgray/skin.min.css

@@ -830,7 +830,7 @@ div.mce-fullscreen {
 }
 
 .mce-close:hover i {
-    color: #2F54EB;
+    color: #1890ff;
 }
 
 .mce-window-head .mce-title {
@@ -854,14 +854,14 @@ div.mce-fullscreen {
 }
 
 .mce-foot .mce-btn.mce-last:hover {
-    color: #2F54EB;
-    border-color: #2F54EB;
+    color: #1890ff;
+    border-color: #1890ff;
     background-color: #fff;
 }
 
 .mce-foot .mce-btn.mce-last:hover button .mce-txt {
-    color: #2F54EB;
-    border-color: #2F54EB;
+    color: #1890ff;
+    border-color: #1890ff;
     background-color: #fff;
 }
 
@@ -1275,25 +1275,25 @@ html .mce-abs-layout-item,
     /* background: white;
   color: #595959;
   border-color: #e2e4e7*/
-    color: #2F54EB;
+    color: #1890ff;
 }
 
 .mce-btn:hover button .mce-preview,
 .mce-btn:active button .mce-preview {
-    color: #2F54EB;
-    background: #2F54EB;
+    color: #1890ff;
+    background: #1890ff;
 }
 
 .mce-btn:focus button .mce-ico {
     /*background: white;
   color: #595959;
   border-color: #e2e4e7*/
-    color: #2F54EB;
+    color: #1890ff;
 }
 
 .mce-btn:focus button .mce-preview {
-    color: #2F54EB;
-    background: #2F54EB;
+    color: #1890ff;
+    background: #1890ff;
 }
 
 .mce-btn.mce-disabled button,
@@ -1321,7 +1321,7 @@ html .mce-abs-layout-item,
     -moz-box-shadow: none;
     box-shadow: none;
     background: #fff;
-    color: #2F54EB;
+    color: #1890ff;
     border-color: transparent
 }
 
@@ -1329,7 +1329,7 @@ html .mce-abs-layout-item,
 .mce-btn.mce-active:hover button,
 .mce-btn.mce-active i,
 .mce-btn.mce-active:hover i {
-    color: #2F54EB
+    color: #1890ff
 }
 
 .mce-btn:hover .mce-caret {
@@ -1338,7 +1338,7 @@ html .mce-abs-layout-item,
 
 .mce-btn.mce-active .mce-caret,
 .mce-btn.mce-active:hover .mce-caret {
-    border-top-color: #2F54EB
+    border-top-color: #1890ff
 }
 
 .mce-btn button {
@@ -1370,7 +1370,7 @@ html .mce-abs-layout-item,
     color: white;
     border: 1px solid transparent;
     border-color: transparent;
-    background-color: #2F54EB;
+    background-color: #1890ff;
 }
 
 .mce-primary:hover,
@@ -1394,7 +1394,7 @@ html .mce-abs-layout-item,
 .mce-primary.mce-active,
 .mce-primary.mce-active:hover,
 .mce-primary:not(.mce-disabled):active {
-    background-color: #2F54EB;
+    background-color: #1890ff;
     -webkit-box-shadow: none;
     -moz-box-shadow: none;
     box-shadow: none
@@ -2596,11 +2596,11 @@ i.mce-i-resize {
     border-bottom-color: transparent;
     margin-bottom: -1px;
     height: 14px;
-    color: #2F54EB;
+    color: #1890ff;
 }
 
 .mce-tab:focus {
-    /* color: #2F54EB; */
+    /* color: #1890ff; */
 }
 
 .mce-rtl .mce-tabs {
@@ -2632,7 +2632,7 @@ i.mce-i-resize {
 
 .mce-textbox:focus,
 .mce-textbox.mce-focus {
-    border-color: #2F54EB;
+    border-color: #1890ff;
     -webkit-box-shadow: none;
     -moz-box-shadow: none;
     box-shadow: none