Skip to content

M
member
Commit 51d6c8e6 by huaying
Options

Merge branch 'feature/9月基础迭代' into test 

# Conflicts:
#	dist/css/app.5f76f7c0f9c1f9b8a1052c7cbcdee7df.css
#	dist/css/app.762f3b4bbaf0f954d47ff1408aeb3106.css
#	dist/css/app.d30b3be0ce282975dbeaf93943712da6.css
#	dist/index.html
#	dist/js/15.ee806b049a3fb549c32c.js
#	dist/js/20.fafa862d15e4ce3319d6.js
#	src/components/allCustomers/order-list/order-table.vue
parents acccef7e 527549b6
Showing with 153 additions and 36 deletions
config/authCode.js
......@@ -24,6 +24,14 @@ const authCode = {
memberInteractionSwitch: 'memberInteractionSwitch', // 会员成就互动类-开关
memberInteractionSetAmount: 'memberInteractionSetAmount', // 会员成就互动类-配置额度
memberInteractionSetAward: 'memberInteractionSetAward', // 会员成就互动类-配置奖励
//客户列表页面 批量导入中的下拉框数据
importMember: 'importMember', //会员导入
importIncreaseOfPoints: 'importIncreaseOfPoints', //积分增加
importPointDeduction: 'importPointDeduction', //积分扣除
importGradeAdjustment: 'importGradeAdjustment', //等级调整
importServiceStore: 'importServiceStore', //服务门店/专属导购调整
importMappingFreeze: 'importMappingFreeze', //批量冻结会员
importMappingUnfreeze: 'importMappingUnfreeze', //批量解冻会员
};
export default authCode;
dist/css/app.5f76f7c0f9c1f9b8a1052c7cbcdee7df.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/app.762f3b4bbaf0f954d47ff1408aeb3106.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><style href=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css></style><script src=//at.alicdn.com/t/font_2859043_ckil7xvsqi.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./css/app.5f76f7c0f9c1f9b8a1052c7cbcdee7df.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><style href=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css></style><script src=//at.alicdn.com/t/font_2859043_ckil7xvsqi.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./css/app.762f3b4bbaf0f954d47ff1408aeb3106.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> feature/9月基础迭代
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 ? 'www.gicdev.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./js/manifest.4ca4a8a366b2b58b598a.js></script><script type=text/javascript src=./js/vendor.c657d67da16c1802184d.js></script><script type=text/javascript src=./js/app.00fa53cc50ffc1b70800.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./js/manifest.4ca4a8a366b2b58b598a.js></script><script type=text/javascript src=./js/vendor.c657d67da16c1802184d.js></script><script type=text/javascript src=./js/app.00fa53cc50ffc1b70800.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./js/manifest.4c1c425cab61ccf1ef0b.js></script><script type=text/javascript src=./js/vendor.c657d67da16c1802184d.js></script><script type=text/javascript src=./js/app.07dec559fc8f5e736ea7.js></script></body></html>
>>>>>>> feature/9月基础迭代
dist/js/1.293aad8df812d35a4cf8.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/14.5a8a206c1678391e139c.js 0 → 100644
webpackJsonp([14],{Mkss:function(e,t){},"X/BT":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=a("Xxa5"),n=a.n(i),r=a("exGp"),o=a.n(r),s=a("AKaA"),l=a("NTL1"),c=a("8V46"),m=a("JMoU"),d=a("DBQu"),u=a.n(d),f=a("lJ8c"),h=a("oAV5"),p=a("EOvX"),b={name:"frozenMemberWhiteList",components:{FreezeDialog:a("/9pL").default,ImportDialog:f.default},mixins:[m.a],filters:{formatBirth:function(e){return-1==e?"--":Object(h.d)(e)||"--"},formatLongTimeDate:function(e,t){if(!e||-1==e)return"hms"==t?"":"--";var a=Object(h.b)(e,1),i=a.split(" ");return"ymd"==t?i[0]:"hms"==t?i[1]||"":a},formatDate:function(e,t){return e&&-1!=e?"ymd"==t?Object(p.a)(new Date(e),"yyyy-MM-dd"):"hms"==t?Object(p.a)(new Date(e),"hh:mm:ss"):Object(p.a)(new Date(e),"yyyy-MM-dd hh:mm:ss"):"hms"==t?"":"--"},formateTime:function(e){return e&&-1!=e?Object(p.a)(e,"yyyy-MM-dd hh:mm:ss"):"--"}},data:function(){return{load:!1,freezeDialogOptions:{count:1,isBatchFreeze:0,visible:!1},whiteImportList:[{importType:17,importValue:"移入白名单"}],dialogImportVisible:!1,defaultImg:u.a,searchData:{pageSize:20,currentPage:1,cardNo:""},total:0,list:[],multipleList:[],formData:{frozenType:"",remark:""}}},created:function(){this.loadData()},activated:function(){this.loadData()},methods:{loadData:function(){var e=this;this.load=!0,Object(s.b)(l.a.getFrozenWhiteList,this.searchData).then(function(t){var a=t.data,i=a.errorCode,n=a.result;if(0===i){var r=n.result,o=n.totalCount;e.list=r||[],e.total=o||0}else Object(c.a)(t.data.message)}).finally(function(){return e.load=!1})},handleSizeChange:function(e){this.searchData.pageSize=e,(this.searchData.currentPage-1)*this.searchData.pageSize>this.total&&(this.searchData.currentPage=1),this.loadData()},handleCurrentChange:function(e){this.searchData.currentPage=e,this.loadData()},batchUpload:function(){this.dialogImportVisible=!0},clickRemoveItem:function(e){var t=this;this.load=!0,Object(s.b)(l.a.removeFrozenWhiteMember,{removeType:1,memberId:e.memberId}).then(function(e){0==e.data.errorCode&&(t.$message({message:"移出成功",type:"success"}),t.loadData())}).finally(function(){return t.load=!1})},clickRemoveAndFreeze:function(e){var t,a=this;this.freezeDialogOptions={count:1,isBatchFreeze:0,visible:!0,title:"移出并冻结会员",submit:(t=o()(n.a.mark(function t(i,r){return n.a.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:Object(s.b)(l.a.removeFrozenWhiteMember,{removeType:2,status:1,memberId:e.memberId,frozenType:i.frozenType,remark:i.remark||""}).then(function(e){0===e.data.errorCode&&(Object(c.c)(),a.freezeDialogOptions={visible:!1},a.loadData())}).finally(function(){return r&&r()});case 1:case"end":return t.stop()}},t,a)})),function(e,a){return t.apply(this,arguments)})}},linkDetail:function(e){this.$router.push({path:"/customerDetail",query:{memberId:e}})},handleToTaskCenter:function(e){var t=this;this.$confirm("请去【系统】-【操作任务】-【任务中心】查看处理结果和执行进度","任务发起成功",{type:"success",customClass:"import-link-confirm-content",confirmButtonText:"去任务中心",cancelButtonText:"取消",showClose:!1}).then(function(){t.loadData(),window.open("/gic-web/#/taskDetail/"+e)}).catch(function(){t.loadData()})}}},v={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"container frozen-white-list"},[a("div",{staticClass:"top-header"},[a("h2",[e._v("白名单会员 "+e._s(e.total)+"人")])]),e._v(" "),a("el-row",{staticClass:"search-box",attrs:{type:"flex",align:"middle",justify:"space-between"}},[a("el-row",{attrs:{type:"flex",align:"middle"}},[a("el-input",{staticStyle:{width:"260px"},attrs:{placeholder:"输入会员卡号",clearable:""},on:{change:e.loadData},model:{value:e.searchData.cardNo,callback:function(t){e.$set(e.searchData,"cardNo",t)},expression:"searchData.cardNo"}},[a("i",{staticClass:"el-input__icon el-icon-search",attrs:{slot:"prefix"},slot:"prefix"})]),e._v(" "),a("div",{staticClass:"tips-box"},[a("i",{staticClass:"el-icon-info"}),e._v(" "),a("span",[e._v("处于白名单列表中的会员不会被冻结（外部接口冻结除外）")])])],1),e._v(" "),e.getCodeAuth("memberFrozenWhiteListImport")?a("el-button",{attrs:{plain:"","limit-code":e.getCode("memberFrozenWhiteListImport")},on:{click:e.batchUpload}},[a("i",{staticClass:"icon iconfont icon-shangchuan"}),e._v(" 批量导入")]):e._e()],1),e._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.load,expression:"load"}],ref:"multipleTable",staticClass:"member-table",attrs:{data:e.list,"tooltip-effect":"dark"}},[a("el-table-column",{attrs:{label:"会员信息","min-width":210,fixed:"left","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[a("el-row",{staticClass:"basic-info-table",attrs:{type:"flex",align:"middle"},nativeOn:{click:function(t){return e.linkDetail(i.memberId)}}},[a("img",{staticClass:"basic-img",attrs:{src:i.thirdImgUrl||e.defaultImg}}),e._v(" "),a("div",[a("div",{staticClass:"member-name"},[i.memberName?a("span",[e._v(e._s(i.memberName))]):e._e(),e._v(" "),i.nickName?a("span",{staticClass:"nick-name"},[e._v("("+e._s(i.nickName)+")")]):e._e()]),e._v(" "),i.phoneNumber?a("div",[e._v("\n "+e._s(i.phoneNumber)+"\n ")]):e._e()])])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"会员等级",prop:"gradeName","min-width":140}}),e._v(" "),a("el-table-column",{attrs:{label:"会员生日",prop:"birthdayMD","min-width":140},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(e._f("formatBirth")(a.birthdayMD))+"\n ")]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"会员卡号",prop:"cardNo","min-width":140}}),e._v(" "),a("el-table-column",{attrs:{label:"最近消费时间","min-width":140},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[a("div",[a("div",[e._v(e._s(e._f("formatLongTimeDate")(i.lastCostTime,"ymd")))]),e._v(" "),a("div",[e._v(e._s(e._f("formatLongTimeDate")(i.lastCostTime,"hms")))])])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"移入原因",prop:"remark","label-class-name":"reason-label","min-width":140}}),e._v(" "),a("el-table-column",{attrs:{label:"移入时间","min-width":140},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[a("div",[a("div",[e._v(e._s(e._f("formatDate")(i.createTime,"ymd")))]),e._v(" "),a("div",[e._v(e._s(e._f("formatDate")(i.createTime,"hms")))])])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"操作",fixed:"right",width:"220"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[a("el-button",{attrs:{type:"text"},on:{click:function(t){return e.linkDetail(i.memberId)}}},[e._v("查看")]),e._v(" "),e.getCodeAuth("memberFrozenWhiteListRemove")?a("dm-delete",{attrs:{tips:"确认移出白名单吗？",placement:"top-start"},on:{confirm:function(t){return e.clickRemoveItem(i)}}},[a("el-button",{attrs:{type:"text","limit-code":e.getCode("memberFrozenWhiteListRemove")}},[e._v("仅移出")])],1):e._e(),e._v(" "),1!=i.frozenStatus&&e.getCodeAuth("memberFrozenWhiteListRemoveAndFrozen")?a("el-button",{attrs:{type:"text","limit-code":e.getCode("memberFrozenWhiteListRemoveAndFrozen")},on:{click:function(t){return e.clickRemoveAndFreeze(i)}}},[e._v("移出并冻结")]):e._e()]}}])})],1),e._v(" "),e.total>0?a("div",{staticClass:"pager"},[a("dm-pagination",{attrs:{background:"","page-size":e.searchData.pageSize,currentPage:e.searchData.currentPage,"page-sizes":[20,50,75,100],layout:"total,sizes,prev, pager, next",total:e.total},on:{"current-change":e.handleCurrentChange,"size-change":e.handleSizeChange}})],1):e._e(),e._v(" "),a("import-dialog",{attrs:{importList:e.whiteImportList,dialogVisible:e.dialogImportVisible},on:{"update:dialogVisible":function(t){e.dialogImportVisible=t},"update:dialog-visible":function(t){e.dialogImportVisible=t},successImport:function(t){return e.handleToTaskCenter(t)}}}),e._v(" "),e.freezeDialogOptions.visible?a("freeze-dialog",e._b({},"freeze-dialog",e.freezeDialogOptions,!1,!0)):e._e()],1)},staticRenderFns:[]};var _=a("VU/8")(b,v,!1,function(e){a("Mkss"),a("sqet")},null,null);t.default=_.exports},sqet:function(e,t){}});
\ No newline at end of file
dist/js/18.b08113713bb5a21ddb87.js 0 → 100644
webpackJsonp([18],{CkW6:function(M,L){M.exports="data:image/svg+xml;base64,<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="图层_1" xmlns="http:www.w3.org/2000/svg" xmlns:xlink="http:www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 400 335" style="enable-background:new 0 0 400 335;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#FAFCFF;}
	.st1{fill:#DBE5F1;}
	.st2{fill:#DEE7F4;}
	.st3{fill:#B9C7DB;}
	.st4{fill:#FFFFFF;}
	.st5{fill:none;stroke:#B9C7DB;stroke-width:4;stroke-miterlimit:10;}
	.st6{fill:none;stroke:#B6C7D8;stroke-miterlimit:10;}
</style>
<path class="st5" d="M274.5,241.3c-5.3-5.3-4.4,4.4-6.7,6.7c-3.1,3.1-6.3,6-9.7,8.6H125.2c-3.4-2.7-6.6-5.6-9.7-8.7
	c-28.4-28.5-38.6-70.5-26.6-109l-10.5-10.6c-5.3-5.3-5.3-13.8,0-19.2c5.2-5.3,13.7-5.3,19-0.1c0,0,0,0,0.1,0.1l6.6,6.8
	c3.1,3.2,8.2,3.2,11.4,0l0,0c3.2-3.2,3.2-8.3,0-11.5L103.1,92c-3.2-3.2-3.2-8.3,0-11.5c3.1-3.2,8.2-3.2,11.4,0l0,0l17.2,17.2
	c-0.9,3.7,0.9,7.6,4.4,9.3c3.5,1.7,7.7,0.6,9.9-2.5c2.3-3.1,2.1-7.4-0.5-10.3c-3.3-3.8-6.5-7.2-6.5-7.2l-7.3-7.4
	c34.8-21.3,82.6-21.7,117.2,0c34.5,21.7,53.9,61.2,50,101.9l15.4,15.6c3.2,3.2,3.2,8.3,0,11.5c-3.1,3.2-8.2,3.2-11.4,0l0,0
	l-15.1-15.3c-3.1-3.2-8.2-3.2-11.4,0l0,0c-3.2,3.2-3.2,8.3,0,11.5l17.1,17.2c5.2,5.3,5.2,13.8,0,19.1
	C288.4,246.6,279.9,246.6,274.5,241.3C274.6,241.3,274.6,241.3,274.5,241.3L274.5,241.3z"/>
<path class="st3" d="M86.6,71.4c0,4.7,3.8,8.5,8.5,8.5c1.5,0,3-0.4,4.3-1.1c4.1-2.3,5.5-7.5,3.1-11.6c-1.5-2.6-4.3-4.3-7.4-4.3
	C90.4,62.9,86.6,66.7,86.6,71.4"/>
<path class="st3" d="M216.4,145.4h24.3l-7.4,17.9c2.6,1.8,4.5,3.8,5.8,6c1.2,2.2,1.9,4.8,1.9,7.8c0,4.6-1.6,8.4-4.8,11.2
	c-3.2,2.9-7.3,4.3-12.3,4.3c-2.5,0-5.1-0.4-7.5-1.1v-13.1c2,0.9,3.9,1.4,5.5,1.4s2.9-0.5,3.7-1.4c0.9-1,1.3-2.3,1.3-4.1
	c0-1.9-0.8-3.4-2.4-4.6c-1.6-1.2-3.7-1.7-6.4-1.7l3.4-9.1h-5.1V145.4L216.4,145.4z M207.5,181.6c0,1.5-0.3,3-0.8,4.3
	s-1.3,2.5-2.3,3.5s-2.2,1.8-3.4,2.3c-1.3,0.6-2.8,0.9-4.3,0.9h-9.6c-1.5,0-2.9-0.3-4.3-0.9c-1.3-0.6-2.5-1.3-3.4-2.3
	c-0.4-0.4-0.8-0.9-1.2-1.4l11.7-17.3v6c0,0.6,0.2,1.1,0.6,1.4c0.4,0.4,0.8,0.6,1.4,0.6c1.1,0,2-0.8,2-1.9v-0.1v-11.9l10.9-16.1
	c1.8,2,2.8,4.6,2.7,7.3L207.5,181.6L207.5,181.6L207.5,181.6z M177.1,185.9c-0.6-1.4-0.9-2.8-0.8-4.3V156c0-1.5,0.3-3,0.8-4.3
	s1.3-2.5,2.3-3.5s2.2-1.8,3.4-2.3c1.3-0.6,2.8-0.9,4.3-0.9h9.6c1.5,0,2.9,0.3,4.3,0.9c1.3,0.5,2.4,1.3,3.4,2.3l-10.5,15.4v-2.7
	c0-0.5-0.2-1.1-0.6-1.4c-0.4-0.4-0.9-0.6-1.4-0.6c-1.1,0-2,0.8-2,1.9v0.1v8.6l-12.1,17.9C177.5,186.9,177.3,186.4,177.1,185.9
	L177.1,185.9z M243.8,192.7c3.5-7.4,5.3-15.5,5.3-23.7c0-30.5-24.4-55.2-54.6-55.2s-54.6,24.7-54.6,55.2c0,0.4,0,0.8,0,1.1
	l19.6-24.6h11.4L154,171.3h5.5v-6.5l11.7-18.5v46.8h-11.7v-9.8h-17.8c5.1,19.2,20.1,34.3,39.2,39.2c-1.2,3.1-4.8,10.7-10.7,12
	c-7.3,1.7,19.9,0.4,39.4-12.5c14.9-4.4,27.2-15,33.9-28.9L243.8,192.7L243.8,192.7z"/>
<path class="st4" d="M238.9,154.3l-24.4,35.4l0.5,0.3l24.4-35.4L238.9,154.3z"/>
<path class="st3" d="M266.2,66.6h8c0.7,0,1.3,0.6,1.3,1.3l0,0c0,0.4-0.1,0.7-0.4,1c-0.2,0.3-0.6,0.4-0.9,0.4h-8
	c-0.4,0-0.7-0.1-0.9-0.4c-0.5-0.5-0.5-1.4,0-1.9C265.5,66.7,265.8,66.6,266.2,66.6 M116.5,201.9c-4.4,0-8,3.6-8,8.1s3.6,8.1,8,8.1
	s8-3.6,8-8.1S120.9,201.9,116.5,201.9L116.5,201.9z M121.4,212.1c-0.8,2-2.8,3.3-4.9,3.3c-3,0-5.3-2.4-5.3-5.4c0-2.2,1.3-4.1,3.3-5
	c2-0.8,4.3-0.4,5.8,1.2C121.8,207.7,122.2,210,121.4,212.1L121.4,212.1z M191.3,78.7c-4.4,0-8,3.6-8,8.1s3.6,8.1,8,8.1
	c2.1,0,4.2-0.9,5.7-2.4s2.3-3.6,2.3-5.7C199.3,82.4,195.7,78.7,191.3,78.7z M196.3,88.9c-0.8,2-2.8,3.3-4.9,3.3
	c-3,0-5.3-2.4-5.3-5.4c0-2.2,1.3-4.2,3.3-5s4.3-0.4,5.8,1.2C196.6,84.6,197.1,86.9,196.3,88.9L196.3,88.9z M270.2,162.6
	c-4.4,0-8,3.6-8,8.1s3.6,8.1,8,8.1s8-3.6,8-8.1C278.2,166.3,274.6,162.6,270.2,162.6z M275.1,172.8c-0.8,2-2.8,3.3-4.9,3.3
	c-3,0-5.3-2.4-5.3-5.4c0-2.2,1.3-4.2,3.3-5s4.3-0.4,5.8,1.2S275.9,170.8,275.1,172.8z M230.1,31.4c-4.4,0-8,3.6-8,8.1s3.6,8.1,8,8.1
	c2.1,0,4.2-0.9,5.7-2.4s2.3-3.6,2.3-5.7C238.1,35,234.5,31.4,230.1,31.4z M235,41.6c-0.8,2-2.8,3.3-4.9,3.3c-3,0-5.3-2.4-5.3-5.4
	c0-2.2,1.3-4.2,3.3-5s4.3-0.4,5.8,1.2C235.4,37.2,235.8,39.5,235,41.6z"/>
<path class="st3" d="M163.2,45.9h8.2c0.4,0,0.7,0.1,1,0.4c0.5,0.5,0.5,1.3,0,1.9l0,0c-0.3,0.3-0.6,0.4-1,0.4h-8.2
	c-0.4,0-0.7-0.1-1-0.4c-0.5-0.5-0.5-1.3,0-1.9l0,0C162.4,46.1,162.8,45.9,163.2,45.9 M271.7,63.5v8c0,0.4-0.1,0.7-0.4,0.9
	c-0.3,0.3-0.6,0.4-1,0.4c-0.7,0-1.4-0.6-1.4-1.3l0,0v-8c0-0.4,0.1-0.7,0.4-0.9c0.5-0.5,1.4-0.5,1.9,0
	C271.6,62.8,271.7,63.2,271.7,63.5"/>
<path class="st3" d="M107.4,154.8h8.2c0.4,0,0.7,0.1,1,0.4c0.3,0.2,0.4,0.6,0.4,0.9c0,0.7-0.6,1.3-1.4,1.3h-8.2
	c-0.5,0-0.9-0.3-1.2-0.7c-0.2-0.4-0.2-0.9,0-1.3C106.4,155.1,106.9,154.8,107.4,154.8 M169,42.7v8c0,0.4-0.1,0.7-0.4,0.9
	c-0.5,0.5-1.4,0.5-2,0c-0.2-0.2-0.4-0.6-0.4-0.9v-8c0-0.4,0.1-0.7,0.4-0.9c0.5-0.5,1.4-0.5,1.9,0C168.8,42,169,42.3,169,42.7"/>
<path class="st3" d="M230.9,110.3h8.1c0.7,0,1.3,0.6,1.3,1.4c0,0.7-0.6,1.3-1.3,1.4h-8.1c-0.8,0-1.4-0.6-1.4-1.4
	c0-0.4,0.1-0.7,0.4-1C230.2,110.4,230.6,110.3,230.9,110.3"/>
<path class="st3" d="M114.6,163.8v8.2c0,0.4-0.1,0.7-0.4,1c-0.5,0.5-1.4,0.5-1.9,0c-0.3-0.3-0.4-0.6-0.4-1v-8.2c0-0.4,0.1-0.7,0.4-1
	c0.5-0.5,1.4-0.5,1.9,0l0,0C114.4,163.1,114.6,163.4,114.6,163.8"/>
<path class="st1" d="M126,272.7h60.4c0.7,0,1.3,0.6,1.3,1.3l0,0c0,0.7-0.6,1.3-1.3,1.4H126c-0.7,0-1.3-0.6-1.3-1.3
	C124.7,273.3,125.3,272.7,126,272.7"/>
<path class="st1" d="M218.6,272.7h34.9c0.7,0,1.3,0.6,1.3,1.3c0,0.7-0.6,1.3-1.3,1.3h-34.9c-0.7,0-1.3-0.6-1.4-1.3
	c0-0.4,0.1-0.7,0.4-1C217.9,272.9,218.2,272.7,218.6,272.7"/>
<path class="st1" d="M158.2,282.2h131.5c0.7,0,1.3,0.6,1.4,1.3c0,0.4-0.1,0.7-0.4,1c-0.3,0.3-0.6,0.4-1,0.4H158.2
	c-0.7,0-1.3-0.6-1.3-1.3l0,0C156.9,282.8,157.5,282.2,158.2,282.2"/>
<path class="st1" d="M93.8,282.2h34.9c0.7,0,1.3,0.6,1.3,1.3l0,0c0,0.7-0.6,1.3-1.3,1.4l0,0H93.8c-0.7,0-1.3-0.6-1.4-1.3
	c0-0.4,0.1-0.7,0.4-1C93.1,282.3,93.5,282.2,93.8,282.2"/>
<path class="st1" d="M197.1,272.7h8.1c0.7,0,1.3,0.6,1.3,1.3c0,0.7-0.6,1.3-1.3,1.3h-8.1c-0.7,0.1-1.4-0.5-1.4-1.3
	c-0.1-0.7,0.5-1.4,1.3-1.4C197,272.7,197.1,272.7,197.1,272.7"/>
<path class="st1" d="M284.4,264.6h8.1c0.7,0,1.3,0.6,1.3,1.3l0,0c0,0.7-0.6,1.3-1.3,1.3h-8.1c-0.7,0-1.3-0.6-1.3-1.3
	C283,265.3,283.6,264.6,284.4,264.6"/>
<path class="st1" d="M99.2,264.6h171.7c0.4,0,0.7,0.1,0.9,0.4c0.4,0.4,0.5,1,0.3,1.5c-0.2,0.5-0.7,0.8-1.2,0.8H99.1
	c-0.7,0-1.3-0.6-1.3-1.3C97.8,265.3,98.4,264.6,99.2,264.6"/>
<path class="st3" d="M235,95.8v8.1c0,0.7-0.6,1.3-1.3,1.3s-1.3-0.6-1.3-1.3v-8.1c0-0.7,0.6-1.3,1.3-1.4C234.4,94.4,235,95,235,95.8"
	/>
</svg>
"},Jetm:function(M,L){},"aM+6":function(M,L,j){"use strict";Object.defineProperty(L,"__esModule",{value:!0});var w=j("CkW6"),N=j.n(w),u={name:"page403",data:function(){return{img_403:N.a}},computed:{message:function(){return"抱歉，你无权访问该页面"}}},C={render:function(){var M=this.$createElement,L=this._self._c||M;return L("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[L("div",{staticClass:"wscn-http404"},[L("div",{staticClass:"pic-404"},[L("img",{staticClass:"pic-404__parent",attrs:{src:this.img_403,alt:"403"}})]),this._v(" "),L("div",{staticClass:"bullshit"},[L("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),L("a",{staticClass:"bullshit__return-home",attrs:{href:"member/#/memberSummary"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var s=j("VU/8")(u,C,!1,function(M){j("Jetm")},"data-v-617db9a4",null);L.default=s.exports}});
\ No newline at end of file
dist/js/20.2bf41420445815e79d31.js 0 → 100644
webpackJsonp([20],{auXb:function(e,t){},eGF7:function(e,t){},pCxR:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("Dd8w"),n=a.n(r),o=a("3ayk"),i={data:function(){return{dateDefault:[],pickerOptions:function(){return{onPick:function(e){},disabledDate:function(e){var t=new Date;t.setFullYear(t.getFullYear()-1),t.setDate(t.getDate()+1),t=new Date(t.getFullYear()+"-"+(t.getMonth()+1)+"-"+t.getDate());var a=new Date;return a=new Date(a.getFullYear()+"-"+(a.getMonth()+1)+"-"+a.getDate()+" 23:59:59"),e.getTime()<t.getTime()||e.getTime()>a}}}}},methods:{setDefalutTime:function(){var e=new Date;e.setFullYear(e.getFullYear()-1),e.setDate(e.getDate()+1),e=e.getFullYear()+"-"+(e.getMonth()+1)+"-"+e.getDate();var t=new Date;t=t.getFullYear()+"-"+(t.getMonth()+1)+"-"+t.getDate(),this.dateDefault=[Object(o.formatYMD)(new Date(e).getTime()),Object(o.formatYMD)(new Date(t).getTime())]}},filters:{formatDate:function(e,t){if(!e)return"--";var a=(e=new Date(e)).getFullYear(),r=(e.getMonth()+1).toString().padStart(2,"0"),n=e.getDate().toString().padStart(2,"0"),o=e.getHours().toString().padStart(2,"0"),i=e.getMinutes().toString().padStart(2,"0"),l=e.getSeconds().toString().padStart(2,"0");return"ymd"==t?a+"-"+r+"-"+n:"hms"==t?o+":"+i+":"+l:a+"-"+r+"-"+n+"   "+o+":"+i+":"+l}}},l=a("NTL1"),g=a("AKaA"),s={name:"customerLog",mixins:[i],props:{memberId:{type:String,default:""}},data:function(){return{tableLoading:!1,tableData:[],logPageParam:{pageSize:20,currentPage:1,operReason:null,operType:null,beginTime:"",endTime:""},totalCount:0,options:[]}},created:function(){this.setDefalutTime(),this.getLogPage(),this.getLogTypeData()},methods:{filterMethod:function(e){this.$refs.CascaderRef.dropDownVisible=!1,e&&e.length>0?(this.logPageParam.operType=e[0],this.logPageParam.operReason=e[1]):(this.logPageParam.operType=null,this.logPageParam.operReason=null),this.logPageParam.currentPage=1,this.getLogPage()},getLogTypeData:function(){var e=this;Object(g.b)(l.a.getMemberLogType,{}).then(function(t){0==t.data.errorCode&&(e.options=t.data.result||[],console.log(e.options,"999"))})},getLogPage:function(){var e=this;this.tableLoading=!0,this.logPageParam.beginTime=this.dateDefault[0],this.logPageParam.endTime=this.dateDefault[1],Object(g.a)(l.a.logPage,n()({},this.logPageParam,{memberId:this.memberId||this.$route.query.memberId})).then(function(t){if(e.tableLoading=!1,0!==t.data.errorCode)return checkFalse(t.data.message),!1;e.tableData=t.data.result.page.result||[],e.tableData=e.tableData.map(function(e){return"string"==typeof e.operRemark&&(e.operRemark=e.operRemark.replace(/\n/g," <br />")),e}),e.totalCount=t.data.result.page.totalCount,e.$nextTick(function(){var t=e.$refs.operRemark.clientWidth,a=document.createElement("div");a.style.position="fixed",a.style.zIndex=-1,a.style.opacity=0,document.body.appendChild(a),e.tableData=e.tableData.map(function(e){return a.innerHTML=e.operRemark,e.hideTip=a.clientWidth/t<.8,e}),document.body.removeChild(a)})}).catch(function(t){e.tableLoading=!1,checkStatus(t)}).finally(function(t){return e.count++})},handleSizeChange:function(e){this.logPageParam.pageSize=e,this.logPageParam.currentPage=1,this.getLogPage()},handleCurrentChange:function(e){this.logPageParam.currentPage=e,this.getLogPage()},handleSearch:function(){this.dateDefault||this.setDefalutTime(),this.logPageParam.currentPage=1,this.getLogPage()},goLink:function(e,t){console.log(this.memberId,"this.memberId"),e&&this.$router.push({path:e,query:{memberId:t}})}},watch:{dateDefault:{handler:function(e){if(!e){var t=new Date;t.setFullYear(t.getFullYear()-1),t.setDate(t.getDate()+1),t=t.getFullYear()+"-"+(t.getMonth()+1)+"-"+t.getDate();var a=new Date;a=a.getFullYear()+"-"+(a.getMonth()+1)+"-"+a.getDate(),e=[Object(o.formatYMD)(new Date(t).getTime()),Object(o.formatYMD)(new Date(a).getTime())],this.dateDefault=[Object(o.formatYMD)(new Date(t).getTime()),Object(o.formatYMD)(new Date(a).getTime())]}},immediate:!0}}},u={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticStyle:{padding:"20px"}},[a("div",{staticClass:"logTop"},[a("el-cascader",{ref:"CascaderRef",staticStyle:{width:"260px",height:"32px","margin-bottom":"3px"},attrs:{placeholder:"全部类型/全部事由",options:e.options,filterable:"",clearable:"",props:{checkStrictly:!0}},on:{change:e.filterMethod}}),e._v(" "),a("el-date-picker",{staticStyle:{width:"256px","margin-left":"10px"},attrs:{type:"daterange","range-separator":"~","start-placeholder":"创建开始日期","end-placeholder":"创建结束日期","default-time":["00:00:00","23:59:59"],"picker-options":e.pickerOptions(),"value-format":"yyyy-MM-dd",clearable:!1},on:{change:e.handleSearch},model:{value:e.dateDefault,callback:function(t){e.dateDefault=t},expression:"dateDefault"}}),e._v(" "),e.memberId?e._e():a("p",{staticClass:"font14 tip-p"},[e._v("展示近一年的日志")])],1),e._v(" "),a("el-table",{staticStyle:{width:"100%","min-height":"210px"},attrs:{data:e.tableData}},[a("el-table-column",{attrs:{prop:"createTime",label:"时间","min-width":"138px"},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(e._f("formatDate")(t.row.createTime,"ymd"))+" "),a("br"),e._v(" "+e._s(e._f("formatDate")(t.row.createTime,"hms"))+"\n ")]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"operType",label:"日志类型","min-width":"166px",formatter:function(e,t,a){return a||"--"}}}),e._v(" "),a("el-table-column",{attrs:{prop:"operReason",label:"事由","min-width":"138px",formatter:function(e,t,a){return a||"--"}}}),e._v(" "),a("el-table-column",{attrs:{prop:"operContent",label:"日志详情","min-width":"301px","show-overflow-tooltip":"",formatter:function(e,t,a){return a||"--"}}}),e._v(" "),a("el-table-column",{attrs:{prop:"operRemark",label:"备注","min-width":"290px"},scopedSlots:e._u([{key:"default",fn:function(t){var r=t.row;return[r.operRemark?a("div",{ref:"operRemark",staticStyle:{width:"100%"}},[a("el-tooltip",{attrs:{placement:"top",disabled:r.hideTip}},[a("div",{staticStyle:{"max-width":"400px"},attrs:{slot:"content"},domProps:{innerHTML:e._s(r.operRemark)},slot:"content"}),e._v(" "),a("span",{staticStyle:{display:"block","max-width":"90%",overflow:"hidden","text-overflow":"ellipsis","white-space":"nowrap","vertical-align":"middle"},domProps:{innerHTML:e._s(r.operRemark)}})]),e._v(" "),e.memberId&&"客户合并"==r.operType&&r.referLogId&&-1!=r.referLogId&&""!=r.referLogId?a("el-button",{attrs:{type:"text"},on:{click:function(t){return e.goLink("/customerLog",r.referLogId)}}},[e._v("查看")]):e._e()],1):a("span",[e._v("--")])]}}])})],1),e._v(" "),e.totalCount>0?a("div",{staticClass:"page mTop20"},[e.memberId?a("dm-pagination",{attrs:{background:"","current-page":e.logPageParam.currentPage,"page-size":e.logPageParam.pageSize,layout:"prev, pager, next",total:e.totalCount},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}}):a("dm-pagination",{attrs:{background:"","current-page":e.logPageParam.currentPage,"page-sizes":[20,40,60,80],"page-size":e.logPageParam.pageSize,layout:"total, sizes, prev, pager, next",total:e.totalCount},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e()],1)},staticRenderFns:[]};var c=a("VU/8")(s,u,!1,function(e){a("eGF7"),a("auXb")},"data-v-570c63ae",null);t.default=c.exports}});
\ No newline at end of file
dist/js/app.07dec559fc8f5e736ea7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/manifest.4c1c425cab61ccf1ef0b.js 0 → 100644
!function(e){var d=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,u=0,i=[];u<a.length;u++)t=a[u],c[t]&&i.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(d&&d(a,b,n);i.length;)i.shift()();if(n)for(u=0;u<n.length;u++)o=f(f.s=n[u]);return o};var a={},c={77:0};function f(d){if(a[d])return a[d].exports;var c=a[d]={i:d,l:!1,exports:{}};return e[d].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var d=c[e];if(0===d)return new Promise(function(e){e()});if(d)return d[2];var a=new Promise(function(a,f){d=c[e]=[a,f]});d[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"js/"+e+"."+{0:"be1de94f77da2de53a8e",1:"293aad8df812d35a4cf8",2:"55e364d4dce81cbf3886",3:"e517c4670f752d2049c9",4:"05853d6d29681342a3d8",5:"c04e2d1875638f762aab",6:"2bb8a1447899510868c2",7:"19e8b084340b52369f4c",8:"dbd9df36ecf9d2c3bd4f",9:"7fba38b9f516a52ad577",10:"ee9b5530520a9311232a",11:"94f03db489d75fec7945",12:"22898c946ca9f377d437",13:"de420df1c2b9a8046b73",14:"5a8a206c1678391e139c",15:"ee806b049a3fb549c32c",16:"4be539a0edfddc9ecd63",17:"4e5eac2c993d26f5d0d3",18:"b08113713bb5a21ddb87",19:"b6b0e98c789fb11b5665",20:"2bf41420445815e79d31",21:"aad3e0dea43a68a7c24b",22:"c2cee029932b962edad7",23:"49c5f70aa2df001ce96a",24:"cf16e476b19922ec1d66",25:"4194b0ce3512b3f90a0b",26:"f5d3c024e9c181e5f6f3",27:"6fe85fbd4f3992c58c0a",28:"da42eaf139d4d76e749d",29:"e875def2e1dea51eaa6d",30:"5f90c696de8128d60b0c",31:"1cf3627d20c9983203be",32:"301f085c1f3f56350a36",33:"90e7995f9acb85bf6a78",34:"6ac7f3e10f4178056197",35:"1e34e7535d7b65751d7c",36:"02fd2eb2381b2716abab",37:"2c65468340b62d80c531",38:"ca0d1c71f2684c00bab7",39:"dc34a7975f628007b449",40:"f79cf717bc2cf1ed3676",41:"ada46ccba09bb2833ab5",42:"24f846da5a615ad03932",43:"33da891afabbb8027c09",44:"116c855829dadb726059",45:"b982df3d51c78dc898d5",46:"c8012342892d41b713a5",47:"3d5bc75156091e718207",48:"93aa558e44d710df4f91",49:"89105a4ec7ba94789015",50:"77f3352c2c75708f6e8f",51:"7cf96ad2793415cf2387",52:"5593490f0502bda69324",53:"2f2de0c278e80b3db043",54:"a964d919cd1043441e5b",55:"c167452aa4127822480d",56:"27de620403f9d0d1363f",57:"de9cea7e014e484ea98f",58:"4ced35b64936f0147996",59:"1928ea2a1d254982e538",60:"f58b2745b7b3d40913f4",61:"bd732b46da067ee67672",62:"e97122171e8f7ad71fd5",63:"5ddb8eea7eabae4389f1",64:"4d65d5cf62d48a17425b",65:"8d9c5eee685da964ec92",66:"da48bb2b2e79132bba88",67:"166da148fe61e9ccc3a0",68:"a97c7b2e6948734d4422",69:"afec6dcdc80dabe9fc9b",70:"0246afa2c3ab9bce434e",71:"ddaf262f26209f50bdc3",72:"fe3cd350bf66f971d7bb",73:"f0f7e229e47738da672a",74:"e179b4ff2bebfbd3e493"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var d=c[e];0!==d&&(d&&d[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,d,a){f.o(e,d)||Object.defineProperty(e,d,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var d=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(d,"a",d),d},f.o=function(e,d){return Object.prototype.hasOwnProperty.call(e,d)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/common/filters/custom.js
......@@ -55,9 +55,17 @@ let fomatFloat = val => {
}
}
let fomatFloatN = val => {
if (val || val == 0) {
return parseFloat(val).toFixed(2)
} else {
return '';
}
}
let defaultImg = val => {
if(!val) {
return './static/img/default.png'
}
}
export { formatTime,fomatNumber,fomatText,formatYMD,fomatFloat,defaultImg,formatHMS }
export { formatTime,fomatNumber,fomatText,formatYMD,fomatFloat,fomatFloatN,defaultImg,formatHMS }
src/components/allCustomers/allCustomersList.vue
......@@ -35,8 +35,7 @@
<el-form-item>
<vue-gic-select-tree :options="selectTreeOptions" @change="onSelectTreeChange" style="display: inline-block;margin:0 10px; height: 32px" />
</el-form-item>
<!-- 8.23上线时，隐藏关联渠道 -->
<el-form-item style="margin-right:10px;" v-if="false">
<el-form-item style="margin-right:10px;">
<vue-gic-select-tree :options="selectChannelList" @change="onSelectChannelChange" style="display: inline-block;height: 32px;" />
</el-form-item>
<el-form-item>
......@@ -65,7 +64,7 @@
/>
</template>
</el-select>
<el-button v-if="getCodeAuth('memberBatchImport')" :limit-code="getCode('memberBatchImport')" type="primary" @click="batchImport" style="margin-right:5px">批量导入修改</el-button>
<el-button v-if="getCodeAuth('memberBatchImport')" :limit-code="getCode('memberBatchImport')" type="primary" @click="batchImport" style="margin-right:5px">批量导入</el-button>
</el-form-item>
</el-form>
<!-- <div class="action-wrap">
......@@ -138,6 +137,7 @@
</div>
<div class="list-section-table">
<el-table
:max-height="maxHeight"
v-loading="loading"
:data="tableData"
tooltip-effect="dark"
......@@ -154,7 +154,7 @@
:label="memberFieldsName[colum]"
:prop="colum"
show-overflow-tooltip
:min-width="colum==='name' ? 210 : colum == 'status' ? 170 : 150"
:min-width="colum==='name' ? 200 : (colum == 'status' || colum == 'lastCostPaid') ? 170 : (colum == 'lastCostTime' || colum == 'allChannelLastCostTime' || colum == 'costFeePaid' || colum == 'lastCost' || colum == 'allChannelDiscountRate') ? 180 : colum == 'allChannelCostTimes' ? 160 : (colum == 'costAll' || colum == 'allChannelCostAllPaid' || colum == 'allChannelHighCostPaid' || colum == 'highCost' || colum == 'highCostPaid') ? 190 : 150"
:fixed="colum==='name'"
:sortable="['name','grade','status','channel','createCardStoreName','cardNo','forzenStatus','mainStoreName'].includes(colum)?false:isExist[colum]?'custom':false"
>
......@@ -254,6 +254,11 @@
<div>{{ row.createTime.split(' ')[0] }}</div>
<div>{{ row.createTime.split(' ')[1] }}</div>
</div>
<!-- 最近消费时间(全渠道) -->
<!-- <div v-else-if="colum == 'allChannelLastCostTime'">
<div>{{ row.allChannelLastCostTime.split(' ')[0] }}</div>
<div>{{ row.allChannelLastCostTime.split(' ')[1] }}</div>
</div> -->
<!-- 关注时间 -->
<div v-else-if="colum == 'attentionDate'">
<div>{{ row.attentionTime.split(' ')[0] }}</div>
......
src/components/allCustomers/components/importDialog.vue
......@@ -18,17 +18,22 @@
>
<el-form-item label="导入类型" prop="importValue">
<el-select
style="width: 460px"
v-model="formByImport.importValue"
placeholder="请选择导入类型"
@change="handleChangeType"
:disabled="importList.length < 2"
>
<template v-for="item in importList">
<el-option
:label="item.importValue"
:value="item.importType"
v-for="item in importList"
:key="item"
></el-option>
v-if="getCodeAuth(item.btnCode)"
:limit-code="getCode(item.btnCode)"
:key="item">
</el-option>
</template>
</el-select>
</el-form-item>
<el-form-item label="选择文件" prop="file" required>
......@@ -39,21 +44,10 @@
<div class="dialogTips">
<h3><i class="el-icon-info"></i><span>导入规则</span></h3>
<p>
1. 通过导入Excel表格的形式变更GIC已存在的会员信息；不支持导入新会员数据
</p>
<p>
2. 仅支持.xlsx 文件的导入；每次导入数据量最多为10000条；文件大小不超过1M
</p>
<p>
3.
导入类型不同，文件模板也不同，请严格按照模板内容填入会员数据，否则将会报错
</p>
<p>
4. 请仔细核对需要变更的会员数据是否准确，否则GIC校验不通过将无法执行成功
</p>
<p>
5.
超管账号支持导入变更全部会员信息，已分权商户的子管理员账号仅可修改管辖范围内的会员信息
1. 不同的导入类型，请下载对应的导入模板，按照模板要求填充内容进行导入。<br/>
2. 每次导入数据最多10000条，文件大小不超过1M。<br/>
3. 请仔细核对需要导入/变更的会员数据是否准确，否则GIC校验不通过将无法执行成功。<br/>
4. 超管账号支持导入/变更全部会员信息，已分权商户的子管理员账号仅可导入/变更管辖范围内的会员信息。
</p>
</div>
<span slot="footer" class="dialog-footer">
......@@ -68,8 +62,10 @@
import url from "@/components/axios/url";
import { checkFalse } from "../../../../static/js/checkStatus";
import { doFetch } from "@/components/axios/api";
import authMethods from "@/mixins/auth";
export default {
mixins: [authMethods],
props: {
dialogVisible: {
type: Boolean,
......@@ -82,11 +78,13 @@ export default {
{
importType: 15,
importValue: "批量冻结会员",
btnCode: 'memberBatchImport'
},
{
importType: 16,
importValue: "批量解冻会员",
},
btnCode: 'memberBatchImport'
}
],
},
},
......@@ -130,6 +128,7 @@ export default {
watch: {
importList:{
handler(n){
n = n.filter(item=> item.btnCode);
let value = '';
if(n && n.length){
value = n[0].importType;
......@@ -169,7 +168,7 @@ export default {
importTable() {
this.$refs.formByImport.validateField("importValue", (err) => {
if (!err) {
// console.log(this.formByImport.fileList);
console.log(this.formByImport.fileList);
let {fileList,importValue} = this.formByImport;
if (fileList.length) {
this.load = true;
......@@ -206,8 +205,8 @@ export default {
border: none;
}
.dialogTips {
padding-bottom: 8px;
padding-top: 22px;
padding-bottom: 24px;
padding-top: 20px;
border-top: 1px dashed #DCDFE6;
color: #909399;
h3 {
......@@ -225,6 +224,10 @@ export default {
}
p {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
line-height: 20px;
}
}
.success_icon {
......
src/components/allCustomers/index.js
......@@ -21,6 +21,7 @@ export default {
name: "allCustomersList",
data() {
return {
maxHeight: '',
selectChannelValue: '',
selectChannelList: {
selectOptions: {
......@@ -37,6 +38,7 @@ export default {
// disabled: false
// },
],
showExpandIcon: false,
props: {
label: 'label',
children: 'children',
......@@ -46,30 +48,42 @@ export default {
searchAble: false,
multipleAble: true
},
isShowClique: '',
importList:[
{
importType: 18,
importValue: "会员导入",
btnCode: 'importMember'
},
{
importType: 11,
importValue: "积分增加",
btnCode: 'importIncreaseOfPoints'
},
{
importType: 12,
importValue: "积分扣除",
btnCode: 'importPointDeduction'
},
{
importType: 13,
importValue: "等级调整",
btnCode: 'importGradeAdjustment'
},
{
importType: 14,
importValue: "服务门店/专属导购调整",
btnCode: 'importServiceStore'
},
{
importType: 15,
importValue: "批量冻结会员",
btnCode: 'importMappingFreeze'
},
{
importType: 16,
importValue: "批量解冻会员",
btnCode: 'importMappingUnfreeze'
},
],
sceneValue: "member", // 人群筛选器场景值
......@@ -237,22 +251,55 @@ export default {
}
},
created() {
this.getcliqueMemberRelation();
this.$store.commit("mutations-slide", true);
this.initialize();
this.getGradeList();
this.getCliqueGradeList();
this.getMemberSourceList();
let screenHeight = document.documentElement.clientHeight - 293 + 'px';
this.$nextTick(() => {
this.maxHeight = screenHeight;
});
},
mounted() {
this.importList = this.importList.map((item, index)=>{
if(this.getCodeAuth(item.btnCode)){
console.log(typeof this.isShowClique, 'this.isShowClique');
if(item.btnCode == 'importMember' && this.isShowClique == 1) {
return {};
}else {
return item;
}
}else{
return {};
}
})
this.getFindMemberFields();
this.getAjaxMembers();
this.getEnterpriseInfo();
const that = this;
window.onresize = () => {
return (() => {
let screenHeight = document.documentElement.clientHeight - 293 + 'px';
that.maxHeight = screenHeight;
})();
};
},
activated(){
this.getAjaxMembers();
},
beforUpdate() {},
methods: {
getcliqueMemberRelation() {
doFetchGet(url.cliqueMemberRelation, {}).then((res)=>{
console.log(res, 'res');
let {errorCode,result} = res.data;
if(errorCode == 0){
this.isShowClique = result;
}
})
},
onSelectTreeChange(data) {
this.customerType = data;
},
......@@ -336,10 +383,14 @@ export default {
tableData = resultData.map(ele => ({
...ele,
avgNumber: ele.avgNumber.toFixed(2),
allChannelLastCostTime:
ele.allChannelLastCostTime != -1
? formatLongTime(ele.allChannelLastCostTime, 2)
: "--", // 最近消费时间(全渠道)
lastCostTime:
ele.lastCostTime != -1
? formatLongTime(ele.lastCostTime, 2)
: "--", // 最近消费时间
: "--", // 最近消费时间(线下)
createTime:
ele.createTime != -1
? formatLongTime(ele.createTime, 1)
......@@ -361,7 +412,7 @@ export default {
? formatLongTime(ele.crateCardDateString, 1)
: "--", // 开卡
birthdayMD:
ele.birthdayMD != 0 ? paddingBorth(ele.birthdayMD) : "--", // 生日补全
(ele.birthdayMD != 0 && ele.birthdayMD != -1) ? paddingBorth(ele.birthdayMD) : "--", // 生日补全
sex: ele.sex == 0 ? "--" : ele.sex == 1 ? "男" : "女",
age: ele.age ? ele.age : "--",
cardNo: ele.cardNo ? ele.cardNo : "--",
......
src/components/axios/url.js
......@@ -123,6 +123,8 @@ const urlConfig = {
getFrozenWhiteList: '/api-member/white-member-list',//获取冻结白名单列表
removeFrozenWhiteMember:'/api-member//white-member-remove',// 移出白名单
frozenMemberExportExcel: '/api-admin/frozen-member-export-excel',// 异常会员搜索结果导出
cliqueMemberRelation: '/api-member/clique-member-relation',//判断是否有展示会员导入的权限 1不可，2，null可
}
const defaultUrl = Object.assign({}, urlConfig);
......
src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.js
......@@ -22,6 +22,9 @@ export default {
mixins: [authMethods],
filters: {
formatBirth(value){
if(value == -1){
return '--'
}
return paddingBorth(value) || '--'
},
formatDate(val, format) {
......
src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.vue
......@@ -227,6 +227,10 @@
<div v-else-if="colum.code == 'lastCostTime'">
<div>{{ row.lastCostTime | formatDate("ymd") }}</div>
</div>
<!-- 最近消费时间（全渠道） -->
<div v-else-if="colum.code == 'allChannelLastCostTime'">
<div>{{ row.allChannelLastCostTime | formatDate("ymd") }}</div>
</div>
<!-- 生日 -->
<div v-else-if="colum.code == 'birthday'">
<div>{{ row.birthdayMD | formatBirth() }}</div>
......
src/components/wechatmembers/cardMixin.js
......@@ -26,7 +26,7 @@ export default {
},
methods: {
setDefalutTime(){
return
// return
let start = new Date();
start.setFullYear(start.getFullYear() - 1);
start.setDate(start.getDate()+1);
......
src/components/wechatmembers/frozen-member/frozen-list/frozen-list.js
......@@ -20,6 +20,9 @@ export default {
mixins: [authMethods],
filters: {
formatBirth(value){
if(value == -1){
return '--'
}
return paddingBorth(value) || '--'
},
formatDate(val, format) {
......
src/components/wechatmembers/frozen-member/frozen-list/frozen-list.vue
......@@ -222,9 +222,13 @@
<div v-else-if="colum.code == 'lastCostTime'">
<div>{{ row.lastCostTime | formatDate("ymd") }}</div>
</div>
<!-- 最近消费时间（全渠道） -->
<div v-else-if="colum.code == 'allChannelLastCostTime'">
<div>{{ row.allChannelLastCostTime | formatDate("ymd") }}</div>
</div>
<!-- 生日 -->
<div v-else-if="colum.code == 'birthday'">
<div>{{ row.birthdayMD | formatBirth() }}</div>
<div>{{ row.birthdayMD | formatBirth }}</div>
</div>
<!-- 开卡门店 -->
<div v-else-if="colum.code == 'createCardStoreName'">
......@@ -265,9 +269,10 @@
<el-row type="flex" align="middle">
<span style="margin-right: 3px;">{{ row.forzenType || '--' }}</span>
<el-popover placement="top" trigger="hover"
:ref="`frozen-popover-${ row.memberId }`"
:disabled="!row.frozenRemark" popper-class="frozen-custom-popper">
<span>{{ row.frozenRemark }}</span>
<div slot="reference" class="reason-icon-box" v-if="row.frozenRemark">
<div slot="reference" class="reason-icon-box" v-show="row.frozenRemark">
<i class="iconfont icon-yuanyin" hover-class=""></i>
</div>
</el-popover>
......
src/components/wechatmembers/frozen-member/white-list/white-list.js
......@@ -7,7 +7,7 @@ import {
import authMethods from "@/mixins/auth";
import defaultImg from "../../../../../static/img/default.png";
import ImportDialog from "@/components/allCustomers/components/importDialog.vue";
import { formatLongTime } from "@/utils/utils";
import { formatLongTime, paddingBorth } from "@/utils/utils";
import {dateformat} from '@/utils/formatTime';
import FreezeDialog from '../../components/dialog/freeze.vue';
export default {
......@@ -18,6 +18,12 @@ export default {
},
mixins: [authMethods],
filters: {
formatBirth(value){
if(value == -1){
return '--'
}
return paddingBorth(value) || '--'
},
formatLongTimeDate(val, format) {
if (!val || val == -1) return format == "hms" ? "" : "--";
let str = formatLongTime(val, 1);
......
src/components/wechatmembers/frozen-member/white-list/white-list.vue
......@@ -64,7 +64,11 @@
</template>
</el-table-column>
<el-table-column label="会员等级" prop="gradeName" :min-width="140"></el-table-column>
<el-table-column label="会员生日" prop="birthdayMD" :min-width="140"></el-table-column>
<el-table-column label="会员生日" prop="birthdayMD" :min-width="140">
<template slot-scope="{ row }">
{{ row.birthdayMD | formatBirth }}
</template>
</el-table-column>
<el-table-column label="会员卡号" prop="cardNo" :min-width="140"></el-table-column>
<el-table-column label="最近消费时间" :min-width="140">
<template slot-scope="{ row }">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment