update: dist

3f58c2ec · crushh · a5027aa6 · 8ad0a12c · 3f58c2ec · 3f58c2ec
Commit 3f58c2ec authored Mar 15, 2022 by crushh
67 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.8017426595e80dca18b6b9bb643798e7.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script>(function() {
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.38c97ebc61f3182341e3e98800965902.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script>(function() {
      var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
      var host = window.location.host;
      host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
      document.write('<script src="//' + host + src + '"><\/script>');
-    })();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.5135d30b4872c48ac22a.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.0262011a72bced6138ff.js></script></body></html>
+    })();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.5f4a591cec2b90a2a84e.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.bd48d51e91c858251146.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.38c97ebc61f3182341e3e98800965902.css
+++ b/dist/static/css/app.38c97ebc61f3182341e3e98800965902.css
--- a/dist/static/css/app.8017426595e80dca18b6b9bb643798e7.css
+++ b/dist/static/css/app.8017426595e80dca18b6b9bb643798e7.css
--- a/dist/static/css/index.less
+++ b/dist/static/css/index.less
@@ -95,3 +95,26 @@
 .el-dialog__footer {
  border-top: none;
 }
+.content {
+  padding-top: 64px;
+  min-width: 1200px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.common-wrap {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  background: #f7f8fa;
+}
+.right-content {
+  padding-top: 12px;
+  min-height: calc(100vh - 256px);
+}
+.right-box {
+  padding: 20px;
+  min-height: calc(100vh - 296px);
+  background: #fff;
+}
\ No newline at end of file
--- a/dist/static/font/iconfont.js
+++ b/dist/static/font/iconfont.js
--- a/dist/static/img/add-hover.svg
+++ b/dist/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="#1890FF"></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>

--- a/dist/static/js/0.52434b6018a48a00a6c5.js
+++ b/dist/static/js/0.52434b6018a48a00a6c5.js
--- a/dist/static/js/0.bf96fc58011cd8184532.js
+++ b/dist/static/js/0.bf96fc58011cd8184532.js
--- a/dist/static/js/1.0b4debf702276a81a576.js
+++ b/dist/static/js/1.0b4debf702276a81a576.js
--- a/dist/static/js/1.8e7177331f9ab05d8abc.js
+++ b/dist/static/js/1.8e7177331f9ab05d8abc.js
--- a/dist/static/js/11.072a6555545d896cf4e3.js
+++ b/dist/static/js/11.072a6555545d896cf4e3.js
-webpackJsonp([11],{MzTu:function(e,t){},hGAT:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n("Ch4/"),a=n("P9l9"),s={name:"share-index-leaflets",components:{},data:function(){return{canCreate:!0}},methods:{judgeCreate:function(){var e=this;Object(a.a)("/sharing-core-web/can-create",{}).then(function(t){var n=t.data;if(1==n.errorCode)return e.canCreate=n.result,!1;r.a.errorMsg(n)}).catch(function(t){e.$message.error({duration:1e3,message:t.message})})}},mounted:function(){this.judgeCreate()}},c={render:function(){this.$createElement;this._self._c;return this._m(0)},staticRenderFns:[function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"share-index common-wrap"},[t("div",{staticClass:"right-content border-box"},[t("div",{staticClass:"bg-index"})])])}]};var i=n("VU/8")(s,c,!1,function(e){n("MzTu")},"data-v-9e9c4eb4",null);t.default=i.exports}});
\ No newline at end of file
--- a/dist/static/js/11.1f49b7c85e8c4a024197.js
+++ b/dist/static/js/11.1f49b7c85e8c4a024197.js
+webpackJsonp([11],{M4H5:function(t,e){},dStO:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=a("3Xzz"),r=a("P9l9"),n=a("Ch4/"),s={name:"invited-log",components:{navCrumb:i.a},data:function(){return{navpath:[{name:"分享有礼",path:"/shareIndex"},{name:"受邀人日志"}],invitedData:{headUrl:"",realName:""},tableData:[],currentPage:1,pageSize:20,total:0}},methods:{handleSizeChange:function(t){this.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.currentPage=t,this.getTableList()},getInvitedData:function(){var t=this,e={activityId:t.$route.query.activityId,openId:t.$route.query.invitedId};Object(r.a)("/sharing-core-web/get-activity-invited",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.invitedData=a.result||{headUrl:"",realName:""},!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:2500,message:e.message})})},getTableList:function(){var t=this,e={openId:t.$route.query.invitedId,activityId:t.$route.query.activityId};Object(r.a)("/sharing-core-web/list-activity-invited-trans",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.tableData=a.result||[],!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:2500,message:e.message})})}},mounted:function(){this.getInvitedData(),this.getTableList()}},o={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"invited-log 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:"invited-data"},[a("div",{staticClass:"invited-data-img flex flex-align-center flex-pack-center"},[a("img",{attrs:{src:t.invitedData.headUrl,alt:""}})]),t._v(" "),a("div",{staticClass:"invited-data-name text-center font-14 color-606266"},[t._v("-"+t._s(t.invitedData.nickName)+"/"+t._s(t.invitedData.realName)+"-")])]),t._v(" "),a("div",{staticClass:"invited-log-table"},[a("el-table",{ref:"multipleTable",staticClass:"select-table",style:{width:"100%"},attrs:{data:t.tableData,"tooltip-effect":"dark"}},[a("el-table-column",{attrs:{prop:"",label:"操作时间","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell"},[a("div",[t._v(t._s(t._f("timeStampToYmd")(e.row.transTime)))]),t._v(" "),a("div",[t._v(t._s(t._f("timeStampToHms")(e.row.transTime)))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"转化进度","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.transName||"--"))]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"详情","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.orderNo?"订单编号：":"")+t._s(e.row.orderNo||"--"))]}}])})],1)],1)])])],1)},staticRenderFns:[]};var l=a("VU/8")(s,o,!1,function(t){a("M4H5")},"data-v-fe5b8a3e",null);e.default=l.exports}});
\ No newline at end of file
--- a/dist/static/js/12.575eeea6a9bac3246a72.js
+++ b/dist/static/js/12.575eeea6a9bac3246a72.js
+webpackJsonp([12],{"3N0T":function(e,t){},hGAT:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n("Ch4/"),a=n("P9l9"),s={name:"share-index-leaflets",components:{},data:function(){return{canCreate:!0}},methods:{judgeCreate:function(){var e=this;Object(a.a)("/sharing-core-web/can-create",{}).then(function(t){var n=t.data;if(1==n.errorCode)return e.canCreate=n.result,!1;r.a.errorMsg(n)}).catch(function(t){e.$message.error({duration:2500,message:t.message})})}},mounted:function(){this.judgeCreate()}},i={render:function(){this.$createElement;this._self._c;return this._m(0)},staticRenderFns:[function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"share-index common-wrap"},[t("div",{staticClass:"right-content border-box"},[t("div",{staticClass:"bg-index"})])])}]};var c=n("VU/8")(s,i,!1,function(e){n("3N0T")},"data-v-1a14b902",null);t.default=c.exports}});
\ No newline at end of file
--- a/dist/static/js/12.6ac264f4e414d4ac927d.js
+++ b/dist/static/js/12.6ac264f4e414d4ac927d.js
-webpackJsonp([12],{BmBv:function(t,e){},dStO:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=a("3Xzz"),r=a("P9l9"),n=a("Ch4/"),s={name:"invited-log",components:{navCrumb:i.a},data:function(){return{navpath:[{name:"分享有礼",path:"/shareIndex"},{name:"受邀人日志"}],invitedData:{headUrl:"",realName:""},tableData:[],currentPage:1,pageSize:20,total:0}},methods:{handleSizeChange:function(t){this.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.currentPage=t,this.getTableList()},getInvitedData:function(){var t=this,e={activityId:t.$route.query.activityId,openId:t.$route.query.invitedId};Object(r.a)("/sharing-core-web/get-activity-invited",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.invitedData=a.result||{headUrl:"",realName:""},!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})},getTableList:function(){var t=this,e={openId:t.$route.query.invitedId,activityId:t.$route.query.activityId};Object(r.a)("/sharing-core-web/list-activity-invited-trans",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.tableData=a.result||[],!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})}},mounted:function(){this.getInvitedData(),this.getTableList()}},o={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"invited-log 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:"invited-data"},[a("div",{staticClass:"invited-data-img flex flex-align-center flex-pack-center"},[a("img",{attrs:{src:t.invitedData.headUrl,alt:""}})]),t._v(" "),a("div",{staticClass:"invited-data-name text-center font-14 color-606266"},[t._v("-"+t._s(t.invitedData.nickName)+"/"+t._s(t.invitedData.realName)+"-")])]),t._v(" "),a("div",{staticClass:"invited-log-table"},[a("el-table",{ref:"multipleTable",staticClass:"select-table",style:{width:"100%"},attrs:{data:t.tableData,"tooltip-effect":"dark"}},[a("el-table-column",{attrs:{prop:"",label:"操作时间","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell"},[a("div",[t._v(t._s(t._f("timeStampToYmd")(e.row.transTime)))]),t._v(" "),a("div",[t._v(t._s(t._f("timeStampToHms")(e.row.transTime)))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"转化进度","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.transName||"--"))]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"详情","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.orderNo?"订单编号：":"")+t._s(e.row.orderNo||"--"))]}}])})],1)],1)])])],1)},staticRenderFns:[]};var l=a("VU/8")(s,o,!1,function(t){a("BmBv")},"data-v-702f3e61",null);e.default=l.exports}});
\ No newline at end of file
--- a/dist/static/js/13.aeb90cbe1d34b1aa3a33.js
+++ b/dist/static/js/13.aeb90cbe1d34b1aa3a33.js
-webpackJsonp([13],{YPWR:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=n("5reh"),i={name:"App",data:function(){return{projectName:"share-config",contentHeight:"0px",collapseFlag:!1,leftModulesName:""}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},watch:{},mounted:function(){this.$store.commit(o.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},s={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{attrs:{id:"index"}},[e("vue-gic-header",{attrs:{projectName:this.projectName,collapseFlag:this.collapseFlag},on:{collapseTag:this.collapseTag,toRouterView:this.toRouterView}}),this._v(" "),e("div",{staticClass:"content",attrs:{id:"content"}},[e("div",{staticClass:"content-body",style:{minHeight:this.contentHeight}},[e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)])],1)},staticRenderFns:[]};var a=n("VU/8")(i,s,!1,function(t){n("eHJ1")},null,null);e.default=a.exports},eHJ1:function(t,e){}});
\ No newline at end of file
--- a/dist/static/js/13.c56e738cf2686e837bd8.js
+++ b/dist/static/js/13.c56e738cf2686e837bd8.js
+webpackJsonp([13],{FNcP:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={render:function(){var e=this.$createElement,t=this._self._c||e;return t("dm-layout",{attrs:{"project-name":"report"}},[t("router-view",{key:this.$route.fullPath})],1)},staticRenderFns:[]},l=r("VU/8")({name:"layout"},n,!1,null,null,null);t.default=l.exports}});
\ No newline at end of file
--- a/dist/static/js/2.0dda4c31a3f19aff45e8.js
+++ b/dist/static/js/2.0dda4c31a3f19aff45e8.js
--- a/dist/static/js/3.2daa4635d87aca90edd6.js
+++ b/dist/static/js/3.2daa4635d87aca90edd6.js
--- a/dist/static/js/4.9c8e43a774331d1dc651.js
+++ b/dist/static/js/4.9c8e43a774331d1dc651.js
--- a/dist/static/js/4.c3474ff8af7fc61f719b.js
+++ b/dist/static/js/4.c3474ff8af7fc61f719b.js
--- a/dist/static/js/5.3de056ec56ce7824fad8.js
+++ b/dist/static/js/5.3de056ec56ce7824fad8.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-1890ff",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-1890ff",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-1890ff",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-1890ff",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/dist/static/js/app.0262011a72bced6138ff.js
+++ b/dist/static/js/app.0262011a72bced6138ff.js
--- a/dist/static/js/app.bd48d51e91c858251146.js
+++ b/dist/static/js/app.bd48d51e91c858251146.js
--- a/dist/static/js/manifest.5135d30b4872c48ac22a.js
+++ b/dist/static/js/manifest.5135d30b4872c48ac22a.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var d,f,i,u=0,s=[];u<r.length;u++)f=r[u],t[f]&&s.push(t[f][0]),t[f]=0;for(d in o)Object.prototype.hasOwnProperty.call(o,d)&&(e[d]=o[d]);for(n&&n(r,o,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)i=a(a.s=c[u]);return i};var r={},t={16:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+e+"."+{0:"52434b6018a48a00a6c5",1:"0b4debf702276a81a576",2:"0dda4c31a3f19aff45e8",3:"2daa4635d87aca90edd6",4:"9c8e43a774331d1dc651",5:"d2cd73362ae570615556",6:"a9a3a59e4faf13a1b326",7:"77854ed7bad11f815191",8:"99e63d6938e3e2cc698c",9:"2f6f9c5ddfdec55bd7ad",10:"b13e3a0e48cb424eddfe",11:"072a6555545d896cf4e3",12:"6ac264f4e414d4ac927d",13:"aeb90cbe1d34b1aa3a33"}[e]+".js";var d=setTimeout(f,12e4);function f(){c.onerror=c.onload=null,clearTimeout(d);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=f,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/js/manifest.5f4a591cec2b90a2a84e.js
+++ b/dist/static/js/manifest.5f4a591cec2b90a2a84e.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={16:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"bf96fc58011cd8184532",1:"8e7177331f9ab05d8abc",2:"3ebb71afe13684f007c1",3:"db651f55b1c80075a033",4:"c3474ff8af7fc61f719b",5:"3de056ec56ce7824fad8",6:"a9a3a59e4faf13a1b326",7:"77854ed7bad11f815191",8:"99e63d6938e3e2cc698c",9:"2f6f9c5ddfdec55bd7ad",10:"b13e3a0e48cb424eddfe",11:"1f49b7c85e8c4a024197",12:"575eeea6a9bac3246a72",13:"c56e738cf2686e837bd8"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/tinymce/skins/lightgray/skin.min.css
+++ b/dist/static/tinymce/skins/lightgray/skin.min.css
@@ -1375,8 +1375,8 @@ html .mce-abs-layout-item,
 .mce-primary:hover,
 .mce-primary:focus {
-    background: #40a9ff;
+    background: #597EF7;
-    border-color: #40a9ff;
+    border-color: #597EF7;
    color: #fff;
 }

--- a/src/assets/data1.svg
+++ b/src/assets/data1.svg
--- a/src/assets/images/data1.svg
+++ b/src/assets/images/data1.svg
--- a/src/common/js/error.js
+++ b/src/common/js/error.js
@@ -22,7 +22,7 @@ export default {
    if (response.errorCode != 1) {
      if (response.errorCode == 4) {
        Message.error({
-          duration: 3000,
+          duration: 2500,
          message: response.message
        });
        setTimeout(() => {
@@ -31,7 +31,7 @@ export default {
        return false;
      }
      Message.error({
-        duration: 3000,
+        duration: 2500,
        message: response.message
      });
    }

--- a/src/common/js/showmsg.js
+++ b/src/common/js/showmsg.js
@@ -4,7 +4,7 @@ import { Message } from 'element-ui';
 export default {
  showmsg: function(msg, type) {
    Message({
-      duration: 1000,
+      duration: 2500,
      message: msg,
      type: type
    });

--- a/src/components/active-config/base-config.vue
+++ b/src/components/active-config/base-config.vue
@@ -250,7 +250,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -330,7 +330,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -366,7 +366,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active-config/card-config.vue
+++ b/src/components/active-config/card-config.vue
@@ -167,7 +167,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -194,7 +194,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active-config/center-config.vue
+++ b/src/components/active-config/center-config.vue
@@ -266,7 +266,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -296,7 +296,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -351,7 +351,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -381,7 +381,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active-config/configs/select-card.vue
+++ b/src/components/active-config/configs/select-card.vue
@@ -89,7 +89,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active-config/poster-config.vue
+++ b/src/components/active-config/poster-config.vue
@@ -307,7 +307,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -342,7 +342,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active-config/reward-config.vue
+++ b/src/components/active-config/reward-config.vue
@@ -1756,7 +1756,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -1861,7 +1861,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active/active-select.vue
+++ b/src/components/active/active-select.vue
@@ -409,7 +409,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -684,7 +684,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -706,7 +706,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -728,7 +728,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -750,7 +750,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -772,7 +772,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -795,7 +795,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active/data-statistics.vue
+++ b/src/components/active/data-statistics.vue
@@ -91,7 +91,7 @@ export default {
    this.chartSettings = {
      //showLine: ['传播系数']
    };
-    this.colors = ['#1890FF', '#5AD8A6', '#FF6383'];
+    this.colors = ['#1890ff', '#5AD8A6', '#FF6383'];
    return {};
  }
  /* methods() {

--- a/src/components/active/finished-active.vue
+++ b/src/components/active/finished-active.vue
@@ -118,7 +118,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -179,7 +179,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active/game-select.vue
+++ b/src/components/active/game-select.vue
@@ -124,7 +124,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active/in-progress-active.vue
+++ b/src/components/active/in-progress-active.vue
@@ -234,7 +234,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -309,7 +309,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -343,7 +343,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/active/will-start-active.vue
+++ b/src/components/active/will-start-active.vue
@@ -116,7 +116,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -180,7 +180,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -207,7 +207,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/components/data-details/card-log.vue
+++ b/src/components/data-details/card-log.vue
@@ -16,6 +16,7 @@ import cardLog from '@/components/data-details/card-log.vue';
    <el-table
      class="select-table"
      ref="multipleTable"
+      v-loading="loading"
      :data="tableData"
      tooltip-effect="dark"
      :style="{ width: '100%', minHeight: tableH }"
@@ -108,6 +109,7 @@ export default {
        '5': '卡券领取',
        '6': '消费'
      },
+      loading: false
    };
  },
@@ -142,6 +144,7 @@ export default {
        pageSize: that.pageSize,
        awardType: 2
      };
+      this.loading=true;
      getRequest('/sharing-core-web/page-activity-invited-log', para)
        .then(res => {
          let resData = res.data;
@@ -154,10 +157,12 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
-        });
+        }).finally(()=>{
+          this.loading=false;
+        })
    }
  },
  mounted() {

--- a/src/components/data-details/invite-log.vue
+++ b/src/components/data-details/invite-log.vue
@@ -17,6 +17,7 @@ import inviteLog from '@/components/data-details/invite-log.vue';
      class="select-table"
      ref="multipleTable"
      :data="tableData"
+      v-loading="loading"
      tooltip-effect="dark"
      :style="{ width: '100%', minHeight: tableH }"
      @sort-change='sortColumn'
@@ -94,6 +95,7 @@ export default {
      total: 0,
      createTimeSort: '',
      transNameSort: '',
+      loading: false
    };
  },
  methods: {
@@ -151,6 +153,7 @@ export default {
        createTimeSort: that.createTimeSort,
        transNameSort: that.transNameSort
      };
+      this.loading=true;
      getRequest('/sharing-core-web/page-activity-invited', para)
        .then(res => {
          let resData = res.data;
@@ -163,10 +166,12 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
-        });
+        }).finally(()=>{
+          this.loading=false;
+        })
    }
  },
  mounted() {

--- a/src/components/data-details/invite-table.vue
+++ b/src/components/data-details/invite-table.vue
@@ -17,6 +17,7 @@ import inviteTable from '@/components/data-details/invite-table.vue';
      class="select-table"
      ref="multipleTable"
      :data="tableData"
+       v-loading="loading"
      tooltip-effect="dark"
      :style="{ width: '100%' }"
      @sort-change='sortColumn'
@@ -119,7 +120,8 @@ export default {
      createTimeSort: '1',
      totalTransPersonNumSort: '',
      sumPointsSort: '',
-      sumCardNumSort: ''
+      sumCardNumSort: '',
+      loading: false
    };
  },
  methods: {
@@ -196,6 +198,7 @@ export default {
        sumPointsSort: that.sumPointsSort,
        sumCardNumSort: that.sumCardNumSort
      };
+      this.loading=true;
      getRequest('/sharing-core-web/page-activity-invite', para)
        .then(res => {
          let resData = res.data;
@@ -208,10 +211,12 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
-        });
+        }).finally(()=>{
+          this.loading=false
+        })
    }
  },
  mounted() {

--- a/src/components/data-details/invited-table.vue
+++ b/src/components/data-details/invited-table.vue
@@ -16,6 +16,7 @@ import invitedTable from '@/components/data-details/invited-table.vue';
    <el-table
      class="select-table"
      ref="multipleTable"
+      v-loading="loading"
      :data="tableData"
      tooltip-effect="dark"
      :style="{ width: '100%' }"
@@ -105,7 +106,8 @@ export default {
      currentPage: 1,
      pageSize: 20,
      total: 0,
-      createTimeSort: '1'
+      createTimeSort: '1',
+      loading: false
    };
  },
  methods: {
@@ -155,6 +157,7 @@ export default {
        pageSize: that.pageSize,
        createTimeSort: that.createTimeSort
      };
+      this.loading=true;
      getRequest('/sharing-core-web/page-activity-invited', para)
        .then(res => {
          let resData = res.data;
@@ -167,10 +170,12 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
-        });
+        }).finally(()=>{
+          this.loading=false
+        })
    }
  },
  mounted() {

--- a/src/components/data-details/point-log.vue
+++ b/src/components/data-details/point-log.vue
@@ -17,6 +17,7 @@ import pointLog from '@/components/data-details/point-log.vue';
      class="select-table"
      ref="multipleTable"
      :data="tableData"
+      v-loading="loading"
      tooltip-effect="dark"
      :style="{ width: '100%', minHeight: tableH }"
    >
@@ -107,6 +108,7 @@ export default {
        '5': '卡券领取',
        '6': '消费'
      },
+      loading: false
    };
  },
  methods: {
@@ -140,6 +142,7 @@ export default {
        pageSize: that.pageSize,
        awardType: 1
      };
+      this.loading=true;
      getRequest('/sharing-core-web/page-activity-invited-log', para)
        .then(res => {
          let resData = res.data;
@@ -152,10 +155,12 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
-        });
+        }).finally(()=>{
+          this.loading=false;
+        })
    }
  },
  mounted() {

--- a/src/components/export-excel.vue
+++ b/src/components/export-excel.vue
@@ -318,7 +318,7 @@ export default {
            } else {
              reject([]);
              this.$message.error({
-                duration: 1000,
+                duration: 2500,
                message: resData.message
              });
            }

--- a/src/components/nav/nav.vue
+++ b/src/components/nav/nav.vue
 <template>
  <div class="navwrap boxbttom">
-    <el-breadcrumb separator="/">
+    <el-breadcrumb separator-class="el-icon-arrow-right">
      <template v-for="(item, index) in navpath">
        <template v-if="!!item.path">
-          <!-- <el-breadcrumb-item :data-v="item.path" :to="{ path: item.path }">{{ item.name }}</el-breadcrumb-item> -->
          <el-breadcrumb-item :key="item.name + index" :to="{ path: item.path }" @click="changeRoute(item.path, item.relocation)"
            ><span class="el-breadcrumb__inner is-link" @click="changeRoute(item.path, item.relocation)">{{ item.name }}</span></el-breadcrumb-item
          >
@@ -12,10 +11,7 @@
          <el-breadcrumb-item :key="item.name + index">{{ item.name }}</el-breadcrumb-item>
        </template>
      </template>
-      <!-- :to="{ path: item.path}"-->
    </el-breadcrumb>
-    <h1 class="navtitle">{{ navpath[navpath.length - 1].name }}</h1>
    <div class="navtip navmTop" v-if="navtip == true">
      <i class="el-icon-info navtipcolor"></i>变更导航个数，移动顺序，更换页面链接均需提交小程序审核后重新发布生效，其他变更立即生效。小程序审核请联系品牌项目经理。
    </div>
@@ -116,7 +112,7 @@ export default {
        .catch(function(error) {
          // that.toLogin()
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -131,23 +127,8 @@ export default {
 <style scoped>
 .navwrap {
-  min-width: 1400px;
+  background: #F7F8FA;
-  padding: 20px 24px;
+  padding:12px;
-  box-sizing: content-box;
-  background-color: #fff;
-}
-.boxbttom {
-  border-bottom: 1px solid #e4e7ed;
-}
-.boxshow {
-  border-bottom: 1px solid #e4e7ed;
-  box-shadow: 5px -1px 5px #dfdfdf;
-}
-.navtitle {
-  margin: 24px 0 0 0;
-  font-size: 20px;
-  color: #303133;
-  font-weight: 500;
 }
 .navtip {
  width: 100%;

--- a/src/components/uploadExcel/index.vue
+++ b/src/components/uploadExcel/index.vue
@@ -125,7 +125,7 @@ export default {
        const worksheet = workbook.Sheets[firstSheetName];
        if (Object.keys(worksheet).indexOf('!ref') == -1) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: '文档内容为空'
          });
          return false;
@@ -134,7 +134,7 @@ export default {
        const results = XLSX.utils.sheet_to_json(worksheet);
        if (results.length > 5000) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: '上传数据大于 5000 条,请重新上传文件'
          });
          return false;
@@ -184,7 +184,7 @@ export default {
              that.exportExcel(header, resData.result);
            } else {
              that.$message.error({
-                duration: 1000,
+                duration: 2500,
                message: '暂无失败数据'
              });
            }
@@ -195,7 +195,7 @@ export default {
        .catch(function(error) {
          console.log(error);
          // that.$message.error({
-          //   duration: 1000,
+          //   duration: 2500,
          //   message: error.message
          // });
        });
@@ -214,7 +214,7 @@ export default {
        const list = currentExcelData;
        if (!list.length) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: '数据为空'
          });
          return false;

--- a/src/main.js
+++ b/src/main.js
@@ -28,11 +28,12 @@ import VeLine from 'v-charts/lib/line.common';
 import VeHistogram from 'v-charts/lib/histogram.common';
 Vue.component(VeLine.name, VeLine);
 Vue.component(VeHistogram.name, VeHistogram);
+window.ELEMENT.Dialog.props.closeOnClickModal.default = false; // 全局设置点击蒙层不关闭
 Vue.config.devtools = true;
 Vue.use(VueAxios, axios);
 Vue.axios.defaults.withCredentials = true; // cookie访问
 Object.keys(filters).forEach(key => Vue.filter(key, filters[key])); // 全局注册过滤器
 Vue.axios.interceptors.request.use(
  config => {
    return config;

--- a/src/request/index.js
+++ b/src/request/index.js
@@ -31,7 +31,7 @@ server.interceptors.response.use(
      Message({
        message: data.message,
        type: 'warning',
-        duration: 3000
+        duration: 2500
      });
      return Promise.reject('error');
    }

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,23 +9,7 @@
 // import Vue from 'vue';
 import Router from 'vue-router';
 import _import from './_import.js';
-// Vue.use(Router);
-/* const error403 = r => {
-  import('view/errorPage/403.vue').then(module => {
-    r(module);
-  });
-};
-const error404 = r => {
-  import('view/errorPage/404.vue').then(module => {
-    r(module);
-  });
-};
-const error500 = r => {
-  import('view/errorPage/500.vue').then(module => {
-    r(module);
-  });
-}; */
 const errorPage = r => {
  import('view/errorPage/index.vue').then(module => {
    r(module);
@@ -36,7 +20,7 @@ export const constantRouterMap = [{
  path: '/',
  name: 'index',
  redirect: 'shareIndex',
-  component: _import('index', 'index'),
+  component: _import('layout', 'layout'),
  children: [
    // 宣传页
    {

--- a/src/view/activeConfig/index.vue
+++ b/src/view/activeConfig/index.vue
@@ -131,9 +131,6 @@ export default {
      that.activeStep--;
      that.stepData[that.activeStep - 1 ].hasSet = false;
    }
-  },
-  mounted(){
-    this.judgeDue()
  }
 }
 </script>

--- a/src/view/dataDetails/invitedLog.vue
+++ b/src/view/dataDetails/invitedLog.vue
@@ -151,7 +151,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -176,7 +176,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/view/dataDetails/inviterLog.vue
+++ b/src/view/dataDetails/inviterLog.vue
@@ -204,7 +204,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/view/errorPage/index.vue
+++ b/src/view/errorPage/index.vue
@@ -232,8 +232,8 @@ export default {
      animation-fill-mode: forwards;*/
      &:hover {
        color: #fff;
-        background-color: #40a9ff;
+        background-color: #597EF7;
-        border-color: #40a9ff;
+        border-color: #597EF7;
      }
      &:active {
        background: #096dd9;

--- a/src/view/index/index.vue
+++ b/src/view/index/index.vue
-<template>
-  <div id="index">
-    <vue-gic-header :projectName="projectName" :collapseFlag="collapseFlag" @collapseTag="collapseTag" @toRouterView="toRouterView"></vue-gic-header>
-    <div id="content" class="content">
-      <div class="content-body" :style="{ minHeight: contentHeight }">
-        <!-- <div class="left-menu" :style="{ height: contentHeight }">
-          <vue-gic-aside-menu ref="asideMenu" :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag="collapseFlag"></vue-gic-aside-menu>
-        </div> -->
-        <transition name="fade" mode="out-in">
-          <!-- 缓存已经填好内容的页面 -->
-          <!-- <keep-alive include="editGroupGrade"> -->
-          <router-view></router-view>
-          <!-- </keep-alive > -->
-        </transition>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import * as types from '@/store/types';
-export default {
-  name: 'App',
-  data() {
-    return {
-      projectName: 'share-config',
-      contentHeight: '0px', //页面内容高度
-      // 左侧
-      collapseFlag: false, // 折叠参数
-      // 模块名
-      leftModulesName: ''
-    };
-  },
-  methods: {
-    // 处理路由跳转
-    toRouterView(val) {
-      let that = this;
-      // 模拟检查数据
-      // //有两个参数
-      //{
-      //  name:,
-      //  path:
-      //}
-      that.$router.push({
-        path: val.path
-      });
-    },
-    // 折叠事件
-    collapseTag(val) {
-      let that = this;
-      that.collapseFlag = val;
-    }
-  },
-  watch: {
-    // $route: {
-    //   handler: function(val, oldVal) {
-    //     this.$refs.asideMenu.refreshRoute();
-    //   },
-    //   // 深度观察监听
-    //   deep: true
-    // }
-  },
-  mounted() {
-    let that = this;
-    that.$store.commit(types.TITLE, '达摩GIC');
-    document.title = this.$store.state.title;
-    //获取项目名 pathname (路由的hash)
-    that.pathName = window.location.hash.split('/')[1];
-    that.contentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 64 + 'px';
-  },
-  components: {}
-};
-</script>
-<style type="text/less" lang="less">
-.icon-colors {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-#index {
-  .content {
-    padding-top: 64px;
-    /* height: calc(100% - 64px);
-    overflow-y: auto;*/
-    min-width: 1400px;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    .content-body {
-      display: flex;
-      overflow: hidden;
-      .right-wrap {
-        flex: 1;
-        overflow: auto;
-        width: 100%;
-        .right-content {
-          width: 100%;
-          padding: 20px;
-          min-height: 615px;
-        }
-        /deep/ .el-tabs__nav {
-          z-index: 1;
-        }
-      }
-      .common-wrap {
-        position: relative;
-        width: 100%;
-        height: 100%;
-        // overflow-y: auto;
-        .right-content {
-          /*width: 100%;*/
-          padding: 20px;
-          min-height: calc(100vh - 256px);
-          .right-box {
-            padding: 20px;
-            min-height: calc(100vh - 296px);
-            background: #fff;
-          }
-        }
-      }
-    }
-  }
-  /deep/ .el-submenu__title {
-    height: 40px;
-    line-height: 40px;
-  }
-  /* 表格为空 */
-  /deep/ .el-table__empty-block {
-    height: 256px;
-    padding: 80px;
-  }
-}
-.el-table__empty-block {
-  height: 256px;
-}
-.el-table__empty-text {
-  width: auto;
-  margin-bottom: 0px;
-  &::before {
-    content: ' ';
-    display: block;
-    width: 60px;
-    height: 60px;
-    background: url(../../assets/no-data_icon.png) no-repeat center;
-    margin: 0px auto 22px auto;
-  }
-}
-.el-submenu__title {
-  height: 40px;
-  line-height: 40px;
-}
-.user-header-pop {
-  min-width: 95px;
-}
-.el-popover.user-header-pop {
-  min-width: 95px;
-  box-sizing: content-box;
-}
-.left-aside-contain {
-  /deep/ .el-submenu__title:hover {
-    background-color: #020b21;
-  }
-}
-.el-menu.el-menu--popup {
-  background: #020b21;
-  border-radius: 4px;
-}
-/* 输入框 focus*/
-.el-form-item.is-success .el-input__inner,
-.el-form-item.is-success .el-input__inner:focus,
-.el-form-item.is-success .el-textarea__inner,
-.el-form-item.is-success .el-textarea__inner:focus {
-  border-color: #dcdfe6;
-}
-/* 箭头*/
-.icon-to-pre {
-  cursor: pointer;
-  font-size: 18px;
-  -webkit-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-.icon-to-next {
-  cursor: pointer;
-  font-size: 18px;
-  -webkit-transform: rotate(-90deg);
-  -ms-transform: rotate(-90deg);
-  -o-transform: rotate(-90deg);
-  transform: rotate(-90deg);
-}
-/*树形*/
-.vue-treeselect /deep/ {
-  /deep/ .vue-treeselect__control {
-    height: 36px;
-    /*line-height: 36px;*/
-    cursor: pointer;
-  }
-  .vue-treeselect__placeholder {
-    line-height: 36px;
-    font-size: 12px;
-  }
-  .vue-treeselect__multi-value-item-container,
-  .vue-treeselect__multi-value {
-    line-height: 1;
-  }
-  span.vue-treeselect__multi-value-label {
-    line-height: 1;
-  }
-  .vue-treeselect__multi-value-item {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    background-color: #f0f2f5;
-    color: #909399;
-  }
-  .vue-treeselect__value-remove {
-    color: #909399;
-  }
-  &:not(.vue-treeselect--disabled) .vue-treeselect__multi-value-item:not(.vue-treeselect__multi-value-item-disabled):hover {
-    background-color: #f0f2f5;
-    color: #909399;
-  }
-  .vue-treeselect--searchable:not(.vue-treeselect--disabled) .vue-treeselect__value-container {
-    cursor: pointer;
-  }
-  .vue-treeselect__control-arrow {
-    display: none;
-  }
-  .vue-treeselect__control-arrow-container {
-    position: relative;
-  }
-  /deep/.vue-treeselect__control-arrow-container:after,
-  .vue-treeselect__control-arrow-container:before {
-    border: 6px solid transparent;
-    border-left: 6px solid #fff;
-    width: 0;
-    height: 0;
-    position: absolute;
-    top: 49%;
-    left: 50%;
-    margin-left: -6px;
-    content: ' ';
-    margin-top: -3px;
-    -webkit-transform: rotate(90deg);
-    -moz-transform: rotate(90deg);
-    -o-transform: rotate(90deg);
-    transform: rotate(90deg);
-    -webkit-transition: -webkit-transform 0.3s;
-    transition: -webkit-transform 0.3s;
-    transition: transform 0.3s;
-    transition: transform 0.3s, -webkit-transform 0.3s;
-    transition: transform 0.3s, -webkit-transform 0.3s;
-  }
-  /deep/ .vue-treeselect__control-arrow-container:before {
-    border-left-color: #c0c4cc;
-    top: 52%;
-  }
-  &.vue-treeselect--focused .vue-treeselect__control-arrow-container:after,
-  &.vue-treeselect--focused .vue-treeselect__control-arrow-container:before {
-    margin-top: -6px;
-    -webkit-transform: rotateZ(-90deg);
-    -moz-transform: rotateZ(-90deg);
-    -o-transform: rotateZ(-90deg);
-    transform: rotateZ(-90deg);
-    -webkit-transition: -webkit-transform 0.3s;
-    transition: -webkit-transform 0.3s;
-    transition: transform 0.3s;
-    transition: transform 0.3s, -webkit-transform 0.3s;
-    transition: transform 0.3s, -webkit-transform 0.3s;
-  }
-  &.vue-treeselect--focused .vue-treeselect__control-arrow-container:before {
-    border-left-color: #c0c4cc;
-    top: 47%;
-  }
-  .vue-treeselect--has-value .vue-treeselect__multi-value {
-    margin-bottom: 0;
-  }
-}
-/* 富文本编辑器 */
-.mce-tinymce {
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-.channelicon {
-  width: 20px;
-  height: 20px;
-  display: inline-block;
-}
-/* 已使用小程序 */
-.xcxicon {
-  background: url('../../assets/group/status@xcx.png') no-repeat 50%;
-}
-/* 未使用小程序 */
-.xcxicongray {
-  background: url('../../assets/group/status@xcxgray.png') no-repeat 50%;
-}
-/* 已关注公众号 */
-.gzhicon {
-  background: url('../../assets/group/status@gzh.png') no-repeat 50%;
-}
-/* 取消关注公众号 */
-.gzhiconcanclegray {
-  background: url('../../assets/group/status@gzhcanclegray.png') no-repeat 50%;
-}
-/* 未关注 */
-.gzhicongray {
-  background: url('../../assets/group/status@gzhgray.png') no-repeat 50%;
-}
-/* 淘宝 */
-.taobaoicon {
-  background: url('../../assets/group/channel@taobao.png') no-repeat 50%;
-}
-.taobaoicongray {
-  background: url('../../assets/group/channel@taobaogray.png') no-repeat 50%;
-}
-/* 京东 */
-.jdicon {
-  background: url('../../assets/group/channel@jd.png') no-repeat 50%;
-}
-.jdicongray {
-  background: url('../../assets/group/channel@jdgray.png') no-repeat 50%;
-}
-/* 唯品会 */
-.vipicon {
-  background: url('../../assets/group/channel@vip.png') no-repeat 50%;
-}
-.vipicongray {
-  background: url('../../assets/group/channel@vipgray.png') no-repeat 50%;
-}
-</style>
--- a/src/view/layout/layout.vue
+++ b/src/view/layout/layout.vue
+<template>
+  <dm-layout project-name="report">
+            <router-view :key="$route.fullPath"></router-view>
+  </dm-layout>
+</template>
+<script>
+export default {
+  name: 'layout'
+}
+</script>
--- a/src/view/shareIndex/index.vue
+++ b/src/view/shareIndex/index.vue
@@ -79,7 +79,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });
@@ -101,7 +101,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/src/view/shareIndex/leaflets.vue
+++ b/src/view/shareIndex/leaflets.vue
@@ -43,7 +43,7 @@ export default {
        })
        .catch(function(error) {
          that.$message.error({
-            duration: 1000,
+            duration: 2500,
            message: error.message
          });
        });

--- a/static/css/index.less
+++ b/static/css/index.less
@@ -95,3 +95,26 @@
 .el-dialog__footer {
  border-top: none;
 }
+.content {
+  padding-top: 64px;
+  min-width: 1200px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.common-wrap {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  background: #f7f8fa;
+}
+.right-content {
+  padding-top: 12px;
+  min-height: calc(100vh - 256px);
+}
+.right-box {
+  padding: 20px;
+  min-height: calc(100vh - 296px);
+  background: #fff;
+}
\ No newline at end of file
--- a/static/font/iconfont.js
+++ b/static/font/iconfont.js
--- a/static/img/add-hover.svg
+++ b/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="#1890FF"></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>

--- a/static/tinymce/skins/lightgray/skin.min.css
+++ b/static/tinymce/skins/lightgray/skin.min.css
@@ -1375,8 +1375,8 @@ html .mce-abs-layout-item,
 .mce-primary:hover,
 .mce-primary:focus {
-    background: #40a9ff;
+    background: #597EF7;
-    border-color: #40a9ff;
+    border-color: #597EF7;
    color: #fff;
 }

--- a/theme/index.css
+++ b/theme/index.css
@@ -67367,7 +67367,7 @@
 }
 .el-message .el-icon-info {
-  color: #1890FF;
+  color: #1890ff;
 }
 .el-message .el-icon-warning {
@@ -77850,8 +77850,8 @@
 .el-button--primary:hover,
 .el-button--primary:focus {
-  background: #40A9FF;
+  background: #597EF7;
-  border-color: #40A9FF;
+  border-color: #597EF7;
  color: #fff;
 }
@@ -81725,7 +81725,7 @@
 /* 进行中 无闪动 */
 .dm-status--primary::before {
-  background-color: #1890FF;
+  background-color: #1890ff;
 }
@@ -81736,7 +81736,7 @@
  display: inline-block;
  vertical-align: middle;
  border-radius: 50%;
-  background: #1890FF;
+  background: #1890ff;
  width: 6px;
  height: 6px;
  margin-right: 7px;
@@ -81753,7 +81753,7 @@
  background: none;
  vertical-align: middle;
  border-radius: 50%;
-  border: 1px solid #1890FF;
+  border: 1px solid #1890ff;
  -webkit-animation: antStatusProcessing 1.2s ease-in-out infinite;
  animation: antStatusProcessing 1.2s ease-in-out infinite;
 }