Merge branch 'feature/3月迭代-主题色' into dev

# Conflicts: # dist/static/css/app.c242d5d374a1f3d6bf63117ba03c9646.css # dist/static/css/public.css # dist/static/js/2.52cf7ff21e4069fecb00.js # dist/static/js/4.9c8e43a774331d1dc651.js # dist/static/js/5.d2cd73362ae570615556.js # src/components/post-upload.vue # src/components/single-upload-center.vue # src/components/single-upload.vue # static/css/public.css

Merge branch 'feature/3月迭代-主题色' into dev
# Conflicts: # dist/static/css/app.c242d5d374a1f3d6bf63117ba03c9646.css # dist/static/css/public.css # dist/static/js/2.52cf7ff21e4069fecb00.js # dist/static/js/4.9c8e43a774331d1dc651.js # dist/static/js/5.d2cd73362ae570615556.js # src/components/post-upload.vue # src/components/single-upload-center.vue # src/components/single-upload.vue # static/css/public.css
82e2f780 · caoyanzhi · 2525b76f · e3fdfe39 · 82e2f780 · 82e2f780
Commit 82e2f780 authored Mar 24, 2022 by caoyanzhi
29 changed files
--- a/dist/static/css/app.c242d5d374a1f3d6bf63117ba03c9646.css
+++ b/dist/static/css/app.c242d5d374a1f3d6bf63117ba03c9646.css
--- a/dist/static/css/public.css
+++ b/dist/static/css/public.css
@@ -148,7 +148,7 @@ a.a-href {
 }

 a.a-href:hover {
-  color: #1890ff;
+  color: #2F54EB;
 }

 li {
@@ -727,8 +727,8 @@ i {
 }

 /* 颜色 */
-.color-1890ff {
-  color: #1890ff;
+.color-2F54EB {
+  color: #2F54EB;
 }

 .color-303133 {

--- a/dist/static/js/2.52cf7ff21e4069fecb00.js
+++ b/dist/static/js/2.52cf7ff21e4069fecb00.js
--- a/dist/static/js/4.9c8e43a774331d1dc651.js
+++ b/dist/static/js/4.9c8e43a774331d1dc651.js
--- a/dist/static/js/5.d2cd73362ae570615556.js
+++ b/dist/static/js/5.d2cd73362ae570615556.js
+webpackJsonp([5],{"5rEX":function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=a("3Xzz"),r=a("P9l9"),o=a("Ch4/"),s={name:"invite-table",data:function(){return{tableData:[],currentPage:1,pageSize:20,total:0,createTimeSort:"1",totalTransPersonNumSort:"",sumPointsSort:"",sumCardNumSort:""}},methods:{toLog:function(t,e){this.$router.push("/inviterLog?activityId="+this.$route.query.activityId+"&inviteOpenId="+e.openId+"&tabName="+t)},sortColumn:function(t){"createTime"==t.prop&&(this.createTimeSort="descending"==t.order?1:0,this.totalTransPersonNumSort="",this.sumPointsSort="",this.sumCardNumSort="",this.getTableList()),"totalTransPersonNum"==t.prop&&(this.createTimeSort="",this.totalTransPersonNumSort="descending"==t.order?1:0,this.sumPointsSort="",this.sumCardNumSort="",this.getTableList()),"sumPoints"==t.prop&&(this.createTimeSort="",this.totalTransPersonNumSort="",this.sumPointsSort="descending"==t.order?1:0,this.sumCardNumSort="",this.getTableList()),"sumCardNum"==t.prop&&(this.createTimeSort="",this.totalTransPersonNumSort="",this.sumPointsSort="",this.sumCardNumSort="descending"==t.order?1:0,this.getTableList())},handleSizeChange:function(t){this.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.currentPage=t,this.getTableList()},getTableList:function(){var t=this,e={activityId:t.$route.query.activityId,pageNum:t.currentPage,pageSize:t.pageSize,createTimeSort:t.createTimeSort,totalTransPersonNumSort:t.totalTransPersonNumSort,sumPointsSort:t.sumPointsSort,sumCardNumSort:t.sumCardNumSort};Object(r.a)("/sharing-core-web/page-activity-invite",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.tableData=a.result.result||[],t.total=a.result.totalCount,!1;o.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})}},mounted:function(){this.getTableList()}},n={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"invite-table"},[a("el-table",{ref:"multipleTable",staticClass:"select-table",style:{width:"100%"},attrs:{data:t.tableData,"tooltip-effect":"dark"},on:{"sort-change":t.sortColumn}},[a("el-table-column",{attrs:{label:"邀请人信息","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell flex flex-align-center"},[a("img",{attrs:{src:e.row.headUrl,alt:""}}),a("span",{staticClass:"font-14 color-606266 p-l-10"},[t._v(t._s(e.row.nickName||"--")+"/"+t._s(e.row.realName||"--"))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"createTime",label:"参与时间","show-overflow-tooltip":"",sortable:"custom"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell"},[a("div",[t._v(t._s(t._f("timeStampToYmd")(e.row.createTime)))]),t._v(" "),a("div",[t._v(t._s(t._f("timeStampToHms")(e.row.createTime)))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"totalTransPersonNum",label:"邀请人数","show-overflow-tooltip":"",sortable:"custom"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell cursor-pointer color-2F54EB",on:{click:function(a){return t.toLog("invite",e.row)}}},[t._v(t._s(e.row.totalTransPersonNum||"--"))])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"sumPoints",label:"积分收益","show-overflow-tooltip":"",sortable:"custom"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell cursor-pointer color-2F54EB",on:{click:function(a){return t.toLog("point",e.row)}}},[t._v(t._s(e.row.sumPoints||"--"))])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"sumCardNum",label:"卡券收益","show-overflow-tooltip":"",sortable:"custom"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell cursor-pointer color-2F54EB",on:{click:function(a){return t.toLog("card",e.row)}}},[t._v(t._s(e.row.sumCardNum))])]}}])})],1),t._v(" "),0!=t.tableData.length?a("div",{staticClass:"block common-wrap__page text-right m-t-24"},[a("dm-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[20,40,60,80],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next, jumper",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}})],1):t._e()],1)},staticRenderFns:[]};var l=a("VU/8")(s,n,!1,function(t){a("f/0B")},"data-v-b9c45f4a",null).exports,c={name:"invited-table",data:function(){return{tableData:[],currentPage:1,pageSize:20,total:0,createTimeSort:"1"}},methods:{sortColumn:function(t){"createTime"==t.prop&&(this.createTimeSort="descending"==t.order?1:0,this.getTableList())},toLog:function(t){this.$router.push("/invitedLog?activityId="+this.$route.query.activityId+"&invitedId="+t.openId)},handleSizeChange:function(t){this.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.currentPage=t,this.getTableList()},getTableList:function(){var t=this,e={activityId:t.$route.query.activityId,pageNum:t.currentPage,pageSize:t.pageSize,createTimeSort:t.createTimeSort};Object(r.a)("/sharing-core-web/page-activity-invited",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.tableData=a.result.result||[],t.total=a.result.totalCount,!1;o.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})}},mounted:function(){this.getTableList()}},u={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"invited-table"},[a("el-table",{ref:"multipleTable",staticClass:"select-table",style:{width:"100%"},attrs:{data:t.tableData,"tooltip-effect":"dark"},on:{"sort-change":t.sortColumn}},[a("el-table-column",{attrs:{label:"受邀人信息","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell flex flex-align-center"},[a("img",{attrs:{src:e.row.headUrl,alt:""}}),a("span",{staticClass:"font-14 color-606266 p-l-10"},[t._v(t._s(e.row.nickName||"--")+"/"+t._s(e.row.realName||"--"))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"createTime",label:"创建时间","show-overflow-tooltip":"",sortable:"custom"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell"},[a("div",[t._v(t._s(t._f("timeStampToYmd")(e.row.createTime)))]),t._v(" "),a("div",[t._v(t._s(t._f("timeStampToHms")(e.row.createTime)))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"邀请人信息","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell flex flex-align-center"},[a("img",{attrs:{src:e.row.inviteOpenHeadUrl,alt:""}}),a("span",{staticClass:"font-14 color-606266 p-l-10"},[t._v(t._s(e.row.inviteOpenNickName||"--")+"/"+t._s(e.row.inviteOpenRealName||"--"))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"转化进度","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell cursor-pointer color-2F54EB",on:{click:function(a){return t.toLog(e.row)}}},[t._v("\n          "+t._s(e.row.transName||"--")+"\n        ")])]}}])})],1),t._v(" "),0!=t.tableData.length?a("div",{staticClass:"block common-wrap__page text-right m-t-24"},[a("dm-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[20,40,60,80],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next, jumper",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}})],1):t._e()],1)},staticRenderFns:[]};var d=a("VU/8")(c,u,!1,function(t){a("djEH")},"data-v-045fbfba",null).exports,m={name:"dataDetail",components:{navCrumb:i.a,inviteTable:l,invitedTable:d},data:function(){return{tabName:"invite",navpath:[{name:"分享有礼",path:"/shareIndex"},{name:"数据明细"}],tableData:[],dialogVisible:!1,excelUrl:"/sharing-core-web/export",params:{activityId:this.$route.query.activityId,isExportInvited:"invite"!=this.tabName,requestProject:"share-config"},projectName:"share-config"}},methods:{exportData:function(){this.dialogVisible=!0,this.tableData="invite"==this.tabName?this.$refs.inviteTable.tableData:this.$refs.invitedTable.tableData,this.params={activityId:this.$route.query.activityId,isExportInvited:"invite"!=this.tabName,requestProject:"share-config"}}}},p={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"data-detail common-wrap"},[a("nav-crumb",{attrs:{navpath:t.navpath}}),t._v(" "),a("div",{staticClass:"right-content border-box"},[a("div",{staticClass:"right-box border-box"},[a("div",{staticClass:"data-detail-tab flex flex-space-between"},[a("div",{staticClass:"data-detail-radios"},[a("el-radio-group",{staticStyle:{"margin-bottom":"30px"},model:{value:t.tabName,callback:function(e){t.tabName=e},expression:"tabName"}},[a("el-radio-button",{attrs:{label:"invite"}},[t._v("邀请人列表")]),t._v(" "),a("el-radio-button",{attrs:{label:"invited"}},[t._v("受邀人列表")])],1)],1),t._v(" "),a("div",{staticClass:"data-detail-export"},[a("el-tooltip",{attrs:{content:"邀请人列表和受邀人列表里面的会员信息每天更新一次",placement:"top"}},[a("i",{staticClass:"iconfont icon-xinxixianshi",staticStyle:{"margin-right":"10px",cursor:"pointer",color:"#909399"}})]),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:t.exportData}},[a("i",{staticClass:"iconfont icon-icon_yunxiazai"}),t._v(" 导出数据")])],1)]),t._v(" "),a("div",{staticClass:"data-detail-table"},["invite"==t.tabName?a("invite-table",{ref:"inviteTable"}):t._e(),t._v(" "),"invited"==t.tabName?a("invited-table",{ref:"invitedTable"}):t._e()],1)])]),t._v(" "),a("vue-gic-export-excel",{attrs:{dataArr:t.tableData,dialogVisible:t.dialogVisible,projectName:t.projectName,type:2,excelUrl:t.excelUrl,params:t.params},on:{"update:dialogVisible":function(e){t.dialogVisible=e},"update:dialog-visible":function(e){t.dialogVisible=e}}})],1)},staticRenderFns:[]};var v=a("VU/8")(m,p,!1,function(t){a("zxFs")},"data-v-5dad9bca",null);e.default=v.exports},djEH:function(t,e){},"f/0B":function(t,e){},zxFs:function(t,e){}});
\ No newline at end of file
--- a/src/components/active-config/active-step.vue
+++ b/src/components/active-config/active-step.vue
@@ -28,7 +28,7 @@ import activeStep from '@/components/active-config/active-step.vue';
          <div class="el-step__icon is-text inline-block text-center">
            <i
              v-if="item.hasSet"
-              class="el-icon-check font-14 color-1890ff flex flex-pack-center flex-align-center"
+              class="el-icon-check font-14 color-2F54EB flex flex-pack-center flex-align-center"
            ></i>
            <div
              v-else

--- a/src/components/active-config/card-config.vue
+++ b/src/components/active-config/card-config.vue
@@ -18,7 +18,7 @@ import cardConfig from '@/components/active-config/card-config.vue';
      role="alert"
      class="el-alert el-alert--info"
    >
-      <i class="el-alert__icon el-icon-info font-12 color-1890ff"></i>
+      <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 font-w-400">1. 邀请人可在活动中心一键转发【会员认证流程】的小程序卡片给微信好友，请对小程序卡片的样式进行设置。优秀的活动标题和封面图可以大幅提升受邀人的参与积极性！<br />
          2. 受邀人服务号关注后，系统将自动发送【会员认证流程】的小程序卡片，请对小程序卡片的样式进行设置。优秀的活动标题和封面图可以大幅提升受邀人的参与积极性！</span>

--- a/src/components/active-config/center-config.vue
+++ b/src/components/active-config/center-config.vue
@@ -18,7 +18,7 @@ import centerConfig from '@/components/active-config/center-config.vue';
      role="alert"
      class="el-alert el-alert--info"
    >
-      <i class="el-alert__icon el-icon-info font-12 color-1890ff"></i>
+      <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 font-w-400">1. 活动中心是邀请人访问的页面，用于介绍活动和奖励规则，展示受邀人清单和奖励信息。<br />
          2. 当前活动的转化路径以服务号作为受邀人入口，邀请人可在活动中心一键保存服务号的带二维码海报，以实现朋友圈转发。</span>

--- a/src/components/active-config/configs/competition-award.vue
+++ b/src/components/active-config/configs/competition-award.vue
@@ -248,7 +248,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
          <div
            class="add-line text-center cursor-pointer"
            @click="addPeopleItem"
-          ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+          ><i class="el-icon-plus color-2F54EB"></i><span class="color-2F54EB font-14 p-l-10">添加奖项</span></div>
        </div>
      </el-form-item>
      <el-form-item
@@ -427,7 +427,7 @@ import competitionAward from '@/components/active-config/configs/competition-awa
          <div
            class="add-line text-center cursor-pointer"
            @click="addMoneyItem"
-          ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+          ><i class="el-icon-plus color-2F54EB"></i><span class="color-2F54EB font-14 p-l-10">添加奖项</span></div>
        </div>
      </el-form-item>
    </el-form>
@@ -993,7 +993,7 @@ export default {
      }
      &.li-second-active {
        border-radius: 4px;
-        border: 2px solid rgba(24, 144, 255, 1);
+        border: 2px solid rgba(47, 84, 235, 1);
        box-shadow: 0px 6px 8px 0px rgba(166, 181, 199, 0.34);
        .common-cell-check {
          display: block;

--- a/src/components/active-config/configs/consume-config.vue
+++ b/src/components/active-config/configs/consume-config.vue
@@ -515,7 +515,7 @@ export default {
      }
      &.li-second-active {
        border-radius: 4px;
-        border: 2px solid rgba(24, 144, 255, 1);
+        border: 2px solid rgba(47, 84, 235, 1);
        box-shadow: 0px 6px 8px 0px rgba(166, 181, 199, 0.34);
        .common-cell-check {
          display: block;

--- a/src/components/active-config/configs/entry-award.vue
+++ b/src/components/active-config/configs/entry-award.vue
@@ -149,7 +149,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
        <div
          class="add-line text-center cursor-pointer"
          @click="addPeopleItem"
-        ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+        ><i class="el-icon-plus color-2F54EB"></i><span class="color-2F54EB font-14 p-l-10">添加奖项</span></div>
      </el-form-item>
      <el-form-item
        v-show="passAward.dealAmountFlag == 1"
@@ -228,7 +228,7 @@ import entryAward from '@/components/active-config/configs/entry-award.vue';
        <div
          class="add-line text-center cursor-pointer"
          @click="addMoneyItem"
-        ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+        ><i class="el-icon-plus color-2F54EB"></i><span class="color-2F54EB font-14 p-l-10">添加奖项</span></div>
      </el-form-item>
    </el-form>
  </div>
@@ -677,7 +677,7 @@ export default {
      }
      &.li-second-active {
        border-radius: 4px;
-        border: 2px solid rgba(24, 144, 255, 1);
+        border: 2px solid rgba(47, 84, 235, 1);
        box-shadow: 0px 6px 8px 0px rgba(166, 181, 199, 0.34);
        .common-cell-check {
          display: block;

--- a/src/components/active-config/configs/fraud-control.vue
+++ b/src/components/active-config/configs/fraud-control.vue
@@ -24,7 +24,7 @@ import fraudControl from '@/components/active-config/configs/fraud-control.vue';
        role="alert"
        class="el-alert el-alert--info"
      >
-        <i class="el-alert__icon el-icon-info font-12 color-1890ff"></i>
+        <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 font-w-400">为了获取邀请人奖励，可能会出现恶意盗刷的情况，因此系统支持对单个受邀人的成交额累计上限做控制。<br />
            这能有效的杜绝邀请人在闯关奖励、竞赛奖励中采用作弊手段（即时奖励有单独的限制控制，该成交额上限对即时奖励不起作用）。</span>
@@ -82,7 +82,7 @@ import fraudControl from '@/components/active-config/configs/fraud-control.vue';
        role="alert"
        class="el-alert el-alert--info m-t-20"
      >
-        <i class="el-alert__icon el-icon-info font-12 color-1890ff"></i>
+        <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 font-w-400">转化路径的一系列节点中，消费行为尤其特殊，因为可以申请退款，所以涉及到奖励回收的问题。请根据自身的活动政策，配置相关的风险控制策略。注意：仅针对即时奖励可进行控制，闯关奖励、竞赛奖励和受邀人奖励不作回收处理。由于即时奖励中没有卡券类奖励，因此没有卡券处理方案的配置。</span>
        </div>
@@ -477,7 +477,7 @@ export default {
      }
      &.li-second-active {
        border-radius: 4px;
-        border: 2px solid rgba(24, 144, 255, 1);
+        border: 2px solid rgba(47, 84, 235, 1);
        box-shadow: 0px 6px 8px 0px rgba(166, 181, 199, 0.34);
        .common-cell-check {
          display: block;

--- a/src/components/active-config/configs/invitee-reward.vue
+++ b/src/components/active-config/configs/invitee-reward.vue
@@ -18,7 +18,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
      role="alert"
      class="el-alert el-alert--info"
    >
-      <i class="el-alert__icon el-icon-info font-12 color-1890ff"></i>
+      <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 font-w-400">给邀请人的奖励往往是为了扩大活动影响力和辐射范围，而受邀人奖励则能提升活动响应率和行为转化能力。<br />
          您可以配置受邀人奖励，当完成相关行为后，受邀人将实时获取相关奖励。<br />
@@ -156,7 +156,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
                <div
                  class="add-line text-center cursor-pointer"
                  @click="addPointItem"
-                ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+                ><i class="el-icon-plus color-2F54EB"></i><span class="color-2F54EB font-14 p-l-10">添加奖项</span></div>
              </div>
            </div>
            <div
@@ -306,7 +306,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
              <div
                class="add-line text-center cursor-pointer"
                @click="addCardItem"
-              ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+              ><i class="el-icon-plus color-2F54EB"></i><span class="color-2F54EB font-14 p-l-10">添加奖项</span></div>
            </div>
          </div>
        </div>

--- a/src/components/active-config/configs/spot-award.vue
+++ b/src/components/active-config/configs/spot-award.vue
@@ -210,7 +210,7 @@ import spotAward from '@/components/active-config/configs/spot-award.vue';
            <div
              class="add-line text-center cursor-pointer"
              @click="toAddItem"
-            ><i class="el-icon-plus color-1890ff"></i><span class="color-1890ff font-14 p-l-10">添加奖项</span></div>
+            ><i class="el-icon-plus color-2F54EB"></i><span class="color-2F54EB font-14 p-l-10">添加奖项</span></div>
          </div>
        </div>
        <div
@@ -749,7 +749,7 @@ export default {
      }
      &.li-second-active {
        border-radius: 4px;
-        border: 2px solid rgba(24, 144, 255, 1);
+        border: 2px solid rgba(47, 84, 235, 1);
        box-shadow: 0px 6px 8px 0px rgba(166, 181, 199, 0.34);
        .common-cell-check {
          display: block;

--- a/src/components/active-config/poster-config.vue
+++ b/src/components/active-config/poster-config.vue
@@ -18,7 +18,7 @@ import posterConfig from '@/components/active-config/poster-config.vue';
      role="alert"
      class="el-alert el-alert--info"
    >
-      <i class="el-alert__icon el-icon-info font-12 color-1890ff"></i>
+      <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 font-w-400">1. 当前活动的转化路径以小程序作为受邀人入口，邀请人可在活动中心一键保存小程序带二维码海报以实现朋友圈转发。 <br />
          2. 请对分享海报进行配置，一张生动而有感染力的活动海报，是活动成败的关键！</span>
@@ -489,7 +489,7 @@ export default {
          }

          &.select-li {
-            border: 1px solid rgba(24, 144, 255, 1);
+            border: 1px solid rgba(47, 84, 235, 1);
            .common-cell-check {
              display: block;
              .common-cell-triangle {

--- a/src/components/active-config/reward-config.vue
+++ b/src/components/active-config/reward-config.vue
@@ -55,7 +55,7 @@ import rewardConfig from '@/components/active-config/reward-config.vue';
        </ul>
      </el-form-item>
      <el-form-item>
-        <div class="color-1890ff font-14">注意：活动过程中，会员在活动过程中的活动动态将通过模板消息的方式进行触达通知</div>
+        <div class="color-2F54EB font-14">注意：活动过程中，会员在活动过程中的活动动态将通过模板消息的方式进行触达通知</div>
      </el-form-item>
      <el-form-item
        v-if="activeInfoData.awardMode == 1"
@@ -2081,7 +2081,7 @@ export default {
      }
      &.li-second-active {
        border-radius: 4px;
-        border: 2px solid rgba(24, 144, 255, 1);
+        border: 2px solid rgba(47, 84, 235, 1);
        box-shadow: 0px 6px 8px 0px rgba(166, 181, 199, 0.34);
        .common-cell-check {
          display: block;

--- a/src/components/active/active-select.vue
+++ b/src/components/active/active-select.vue
@@ -1079,7 +1079,7 @@ export default {
      }
      &.li-third-active {
        border-radius: 4px;
-        border: 2px solid rgba(24, 144, 255, 1);
+        border: 2px solid rgba(47, 84, 235, 1);
        .common-cell-check {
          display: block;
          .common-cell-triangle {

--- a/src/components/active/data-statistics-child.vue
+++ b/src/components/active/data-statistics-child.vue
@@ -103,7 +103,7 @@ import dataStatisticsChild from '@/components/active/data-statistics-child.vue';
            >
              <template v-for="(child, key) in Math.floor(activeData.spread)">
                <i
-                  class="iconfont icon-xiaoren font-22 color-1890ff"
+                  class="iconfont icon-xiaoren font-22 color-2F54EB"
                  :key="key + 'xrbg'"
                ></i>
              </template>
@@ -128,7 +128,7 @@ import dataStatisticsChild from '@/components/active/data-statistics-child.vue';
            >
              <template v-for="(child, key) in 10">
                <i
-                  class="iconfont icon-xiaoren font-22 color-1890ff"
+                  class="iconfont icon-xiaoren font-22 color-2F54EB"
                  :key="key + 'xrbg'"
                ></i>
              </template>
@@ -276,7 +276,7 @@ export default {
        background: rgba(227, 242, 253, 1);
        .data-percentage-inner {
          height: 17px;
-          background: linear-gradient(90deg, rgba(53, 195, 255, 1) 0%, rgba(24, 144, 255, 1) 100%);
+          background: linear-gradient(90deg, rgba(53, 195, 255, 1) 0%, rgba(47, 84, 235, 1) 100%);
        }
      }
    }
@@ -299,7 +299,7 @@ export default {
          margin-left: -5px;
        }
        .icon-xiaoren-opacity {
-          color: rgba(24, 144, 255, 0.15);
+          color: rgba(47, 84, 235, 0.15);
        }
      }
      .spread-ul {

--- a/src/components/active/data-statistics.vue
+++ b/src/components/active/data-statistics.vue
@@ -140,7 +140,7 @@ export default {
        background: rgba(227, 242, 253, 1);
        .data-percentage-inner {
          height: 17px;
-          background: linear-gradient(90deg, rgba(53, 195, 255, 1) 0%, rgba(24, 144, 255, 1) 100%);
+          background: linear-gradient(90deg, rgba(53, 195, 255, 1) 0%, rgba(47, 84, 235, 1) 100%);
        }
      }
    }

--- a/src/components/active/funnel-chart.vue
+++ b/src/components/active/funnel-chart.vue
@@ -179,7 +179,7 @@ export default {
      position: relative;
      width: 216px;
      height: 269px;
-      background: linear-gradient(360deg, rgba(53, 195, 255, 1) 0%, rgba(24, 144, 255, 1) 100%);
+      background: linear-gradient(360deg, rgba(53, 195, 255, 1) 0%, rgba(47, 84, 235, 1) 100%);
      &::before {
        content: '';
        position: absolute;

--- a/src/components/data-details/invite-log.vue
+++ b/src/components/data-details/invite-log.vue
@@ -56,7 +56,7 @@ import inviteLog from '@/components/data-details/invite-log.vue';
      >
        <template slot-scope="scope">
          <div
-            class="cell cursor-pointer color-1890ff"
+            class="cell cursor-pointer color-2F54EB"
            @click="toLog(scope.row)"
          >
            {{ scope.row.transName || '--' }}

--- a/src/components/data-details/invite-table.vue
+++ b/src/components/data-details/invite-table.vue
@@ -56,7 +56,7 @@ import inviteTable from '@/components/data-details/invite-table.vue';
      >
        <template slot-scope="scope">
          <div
-            class="cell cursor-pointer color-1890ff"
+            class="cell cursor-pointer color-2F54EB"
            @click="toLog('invite',scope.row)"
          >{{ scope.row.totalTransPersonNum || '--' }}</div>
        </template>
@@ -69,7 +69,7 @@ import inviteTable from '@/components/data-details/invite-table.vue';
      >
        <template slot-scope="scope">
          <div
-            class="cell cursor-pointer color-1890ff"
+            class="cell cursor-pointer color-2F54EB"
            @click="toLog('point',scope.row)"
          >{{ scope.row.sumPoints || '--' }}</div>
        </template>
@@ -82,7 +82,7 @@ import inviteTable from '@/components/data-details/invite-table.vue';
      >
        <template slot-scope="scope">
          <div
-            class="cell cursor-pointer color-1890ff"
+            class="cell cursor-pointer color-2F54EB"
            @click="toLog('card',scope.row)"
          >{{ scope.row.sumCardNum }}</div>
        </template>

--- a/src/components/data-details/invited-table.vue
+++ b/src/components/data-details/invited-table.vue
@@ -69,7 +69,7 @@ import invitedTable from '@/components/data-details/invited-table.vue';
      >
        <template slot-scope="scope">
          <div
-            class="cell cursor-pointer color-1890ff"
+            class="cell cursor-pointer color-2F54EB"
            @click="toLog(scope.row)"
          >
            {{ scope.row.transName || '--' }}

--- a/src/components/post-upload.vue
+++ b/src/components/post-upload.vue
@@ -42,7 +42,7 @@
      图片规格630*800px，大小不超过{{uploadLimit}}M，仅限JPG格式。
    </p>
    <p class="upload-tip">为了确保二维码位置的准确，建议<a
-        class="color-1890ff"
+        class="color-2F54EB"
        href="https://report-1251519181.cos.ap-shanghai.myqcloud.com/haoban/20200102144544/模板.psd"
        download="post.psd"
      > 下载模板</a> 基于模板进行海报设计。</p>
@@ -286,7 +286,7 @@ export default {
  line-height: 20px;
 }

-.color-1890ff {
-  color: #1890ff;
+.color-2F54EB {
+  color: #2F54EB;
 }
 </style>
--- a/src/components/single-upload-center.vue
+++ b/src/components/single-upload-center.vue
@@ -294,7 +294,7 @@ export default {
    line-height: 20px;
  }

-  .color-1890ff {
-    color: #1890ff;
+  .color-2F54EB {
+    color: #2F54EB;
  }
 </style>
--- a/src/components/single-upload.vue
+++ b/src/components/single-upload.vue
@@ -294,7 +294,7 @@ export default {
    line-height: 20px;
  }

-  .color-1890ff {
-    color: #1890ff;
+  .color-2F54EB {
+    color: #2F54EB;
  }
 </style>
--- a/src/view/errorPage/index.vue
+++ b/src/view/errorPage/index.vue
@@ -236,8 +236,8 @@ export default {
        border-color: #597EF7;
      }
      &:active {
-        background: #096dd9;
-        border-color: #096dd9;
+        background: #1D39C4;
+        border-color: #1D39C4;
        color: #fff;
      }
    }

--- a/static/css/public.css
+++ b/static/css/public.css
@@ -148,7 +148,7 @@ a.a-href {
 }

 a.a-href:hover {
-  color: #1890ff;
+  color: #2F54EB;
 }

 li {
@@ -727,8 +727,8 @@ i {
 }

 /* 颜色 */
-.color-1890ff {
-  color: #1890ff;
+.color-2F54EB {
+  color: #2F54EB;
 }

 .color-303133 {

--- a/theme/index.css
+++ b/theme/index.css
@@ -4363,7 +4363,7 @@
 --------------------------*/

 .el-tag {
-  background-color: rgba(24, 144, 255, 0.1);
+  background-color: rgba(47, 84, 235, 0.1);
  display: inline-block;
  padding: 0 10px;
  height: 32px;
@@ -4373,7 +4373,7 @@
  border-radius: 4px;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
-  border: 1px solid rgba(24, 144, 255, 0.2);
+  border: 1px solid rgba(47, 84, 235, 0.2);
  white-space: nowrap;
 }

@@ -11267,8 +11267,8 @@
 }

 .el-button:active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
  outline: none;
 }

@@ -11289,14 +11289,14 @@

 .el-button.is-plain:active {
  background: #fff;
-  border-color: #1682e6;
-  color: #1682e6;
+  border-color: #1D39C4;
+  color: #1D39C4;
  outline: none;
 }

 .el-button.is-active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
 }

 .el-button.is-disabled,
@@ -11356,21 +11356,21 @@

 .el-button--primary:hover,
 .el-button--primary:focus {
-  background: #46a6ff;
-  border-color: #46a6ff;
+  background: #597EF7;
+  border-color: #597EF7;
  color: #fff;
 }

 .el-button--primary:active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }

 .el-button--primary.is-active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
 }

@@ -11397,8 +11397,8 @@
 }

 .el-button--primary.is-plain:active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }
@@ -11720,13 +11720,13 @@

 .el-button--text:hover,
 .el-button--text:focus {
-  color: #46a6ff;
+  color: #597EF7;
  border-color: transparent;
  background-color: transparent;
 }

 .el-button--text:active {
-  color: #1682e6;
+  color: #1D39C4;
  border-color: transparent;
  background-color: transparent;
 }
@@ -12527,7 +12527,7 @@
 .el-dropdown-menu__item:not(.is-disabled):hover,
 .el-dropdown-menu__item:focus {
  background-color: #e8f4ff;
-  color: #46a6ff;
+  color: #597EF7;
 }

 .el-dropdown-menu__item--divided {
@@ -23079,7 +23079,7 @@
 --------------------------*/

 .el-tag {
-  background-color: rgba(24, 144, 255, 0.1);
+  background-color: rgba(47, 84, 235, 0.1);
  display: inline-block;
  padding: 0 10px;
  height: 32px;
@@ -23089,7 +23089,7 @@
  border-radius: 4px;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
-  border: 1px solid rgba(24, 144, 255, 0.2);
+  border: 1px solid rgba(47, 84, 235, 0.2);
  white-space: nowrap;
 }

@@ -25704,8 +25704,8 @@
 }

 .el-button:active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
  outline: none;
 }

@@ -25726,14 +25726,14 @@

 .el-button.is-plain:active {
  background: #fff;
-  border-color: #1682e6;
-  color: #1682e6;
+  border-color: #1D39C4;
+  color: #1D39C4;
  outline: none;
 }

 .el-button.is-active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
 }

 .el-button.is-disabled,
@@ -25793,21 +25793,21 @@

 .el-button--primary:hover,
 .el-button--primary:focus {
-  background: #46a6ff;
-  border-color: #46a6ff;
+  background: #597EF7;
+  border-color: #597EF7;
  color: #fff;
 }

 .el-button--primary:active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }

 .el-button--primary.is-active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
 }

@@ -25834,8 +25834,8 @@
 }

 .el-button--primary.is-plain:active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }
@@ -26157,13 +26157,13 @@

 .el-button--text:hover,
 .el-button--text:focus {
-  color: #46a6ff;
+  color: #597EF7;
  border-color: transparent;
  background-color: transparent;
 }

 .el-button--text:active {
-  color: #1682e6;
+  color: #1D39C4;
  border-color: transparent;
  background-color: transparent;
 }
@@ -28130,7 +28130,7 @@
 --------------------------*/

 .el-tag {
-  background-color: rgba(24, 144, 255, 0.1);
+  background-color: rgba(47, 84, 235, 0.1);
  display: inline-block;
  padding: 0 10px;
  height: 32px;
@@ -28140,7 +28140,7 @@
  border-radius: 4px;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
-  border: 1px solid rgba(24, 144, 255, 0.2);
+  border: 1px solid rgba(47, 84, 235, 0.2);
  white-space: nowrap;
 }

@@ -31520,7 +31520,7 @@
 --------------------------*/

 .el-tag {
-  background-color: rgba(24, 144, 255, 0.1);
+  background-color: rgba(47, 84, 235, 0.1);
  display: inline-block;
  padding: 0 10px;
  height: 32px;
@@ -31530,7 +31530,7 @@
  border-radius: 4px;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
-  border: 1px solid rgba(24, 144, 255, 0.2);
+  border: 1px solid rgba(47, 84, 235, 0.2);
  white-space: nowrap;
 }

@@ -31930,7 +31930,7 @@

 .el-table-filter__list-item:hover {
  background-color: #e8f4ff;
-  color: #46a6ff;
+  color: #597EF7;
 }

 .el-table-filter__list-item.is-active {
@@ -49301,8 +49301,8 @@
 }

 .el-button:active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
  outline: none;
 }

@@ -49323,14 +49323,14 @@

 .el-button.is-plain:active {
  background: #fff;
-  border-color: #1682e6;
-  color: #1682e6;
+  border-color: #1D39C4;
+  color: #1D39C4;
  outline: none;
 }

 .el-button.is-active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
 }

 .el-button.is-disabled,
@@ -49390,21 +49390,21 @@

 .el-button--primary:hover,
 .el-button--primary:focus {
-  background: #46a6ff;
-  border-color: #46a6ff;
+  background: #597EF7;
+  border-color: #597EF7;
  color: #fff;
 }

 .el-button--primary:active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }

 .el-button--primary.is-active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
 }

@@ -49431,8 +49431,8 @@
 }

 .el-button--primary.is-plain:active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }
@@ -49754,13 +49754,13 @@

 .el-button--text:hover,
 .el-button--text:focus {
-  color: #46a6ff;
+  color: #597EF7;
  border-color: transparent;
  background-color: transparent;
 }

 .el-button--text:active {
-  color: #1682e6;
+  color: #1D39C4;
  border-color: transparent;
  background-color: transparent;
 }
@@ -53974,7 +53974,7 @@
 --------------------------*/

 .el-tag {
-  background-color: rgba(24, 144, 255, 0.1);
+  background-color: rgba(47, 84, 235, 0.1);
  display: inline-block;
  padding: 0 10px;
  height: 32px;
@@ -53984,7 +53984,7 @@
  border-radius: 4px;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
-  border: 1px solid rgba(24, 144, 255, 0.2);
+  border: 1px solid rgba(47, 84, 235, 0.2);
  white-space: nowrap;
 }

@@ -77761,8 +77761,8 @@
 }

 .el-button:active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
  outline: none;
 }

@@ -77783,14 +77783,14 @@

 .el-button.is-plain:active {
  background: #fff;
-  border-color: #096DD9;
-  color: #096DD9;
+  border-color: #1D39C4;
+  color: #1D39C4;
  outline: none;
 }

 .el-button.is-active {
-  color: #1682e6;
-  border-color: #1682e6;
+  color: #1D39C4;
+  border-color: #1D39C4;
 }

 .el-button.is-disabled,
@@ -77856,15 +77856,15 @@
 }

 .el-button--primary:active {
-  background: #096DD9;
-  border-color: #096DD9;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }

 .el-button--primary.is-active {
-  background: #096DD9;
-  border-color: #096DD9;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
 }

@@ -77888,8 +77888,8 @@
 }

 .el-button--primary.is-plain:active {
-  background: #1682e6;
-  border-color: #1682e6;
+  background: #1D39C4;
+  border-color: #1D39C4;
  color: #fff;
  outline: none;
 }
@@ -78203,13 +78203,13 @@

 .el-button--text:hover,
 .el-button--text:focus {
-  color: #46a6ff;
+  color: #597EF7;
  border-color: transparent;
  background-color: transparent;
 }

 .el-button--text:active {
-  color: #1682e6;
+  color: #1D39C4;
  border-color: transparent;
  background-color: transparent;
 }