Skip to content

M
member
Commit 3c41c4e6 by dingdang
Options

Merge branch 'bugfix/会员卡券列表' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/13.4d00de7f358c38c5a5aa.js
#	dist/js/14.f2c98b99c421be152edb.js
#	dist/js/16.4be539a0edfddc9ecd63.js
#	dist/js/16.9e63160ee1bbfe4e0df2.js
#	dist/js/17.4e5eac2c993d26f5d0d3.js
#	dist/js/17.a8702cc20df642a1c8a2.js
#	dist/js/18.917500e3b36e8be1a80c.js
#	dist/js/36.b9ea79092488f1214206.js
#	dist/js/38.2efcf9fa8462b2948e21.js
#	dist/js/39.7ff6c2ba1487d56fcef1.js
#	dist/js/4.05853d6d29681342a3d8.js
#	dist/js/4.206e80799afa87efd11d.js
#	dist/js/4.ea8bb341a660613445f6.js
#	dist/js/41.a5957e6864673c79afea.js
#	dist/js/42.24f846da5a615ad03932.js
#	dist/js/42.86483a2e1d0043a1b3b7.js
#	dist/js/43.adda8598ccbc30b77bff.js
#	dist/js/43.ce5a920e7f67a3d62932.js
#	dist/js/44.00461f28eabe1904c38c.js
#	dist/js/45.b00fc76a11c3251537cd.js
#	dist/js/45.b982df3d51c78dc898d5.js
#	dist/js/46.69b1cc682929609634f5.js
#	dist/js/46.a20dfbf554e9f89f86c7.js
#	dist/js/46.c8012342892d41b713a5.js
#	dist/js/47.3d5bc75156091e718207.js
#	dist/js/47.be831809812e0ecd90e2.js
#	dist/js/47.c366b68faef3f0b0552e.js
#	dist/js/48.45d9bd13ecef14139f13.js
#	dist/js/48.93aa558e44d710df4f91.js
#	dist/js/49.724a7e93a8f6c32e1af8.js
#	dist/js/49.89105a4ec7ba94789015.js
#	dist/js/5.c04e2d1875638f762aab.js
#	dist/js/50.b6aae173297058a469e1.js
#	dist/js/51.7cf96ad2793415cf2387.js
#	dist/js/52.5593490f0502bda69324.js
#	dist/js/52.867cc7f0a810c03e60bd.js
#	dist/js/53.2f2de0c278e80b3db043.js
#	dist/js/53.a5c0294dcd1f610ede44.js
#	dist/js/54.08fd719919cee3f28b8b.js
#	dist/js/54.4d9ffe228251ef31ee56.js
#	dist/js/55.c167452aa4127822480d.js
#	dist/js/56.e62493ebf392b7bc1d46.js
#	dist/js/57.ee00c18617b0bb3baca3.js
#	dist/js/58.d1fd02314e1d79b149ea.js
#	dist/js/6.13e1ac7366c55f444084.js
#	dist/js/6.2bb8a1447899510868c2.js
#	dist/js/6.402a317917905ea64433.js
#	dist/js/60.c8f9cd1054aa4ded0bd9.js
#	dist/js/62.7002c577dc154b360d70.js
#	dist/js/62.e97122171e8f7ad71fd5.js
#	dist/js/63.5ddb8eea7eabae4389f1.js
#	dist/js/63.a291eb9caa8a5c757321.js
#	dist/js/64.4d65d5cf62d48a17425b.js
#	dist/js/64.c990d68a129b5df93f50.js
#	dist/js/65.0fc055ad4717d8f1a4b3.js
#	dist/js/65.8d9c5eee685da964ec92.js
#	dist/js/66.da48bb2b2e79132bba88.js
#	dist/js/7.7fd10209e0c5d70e6904.js
#	dist/js/vendor.777d0e930a11c825db47.js
#	src/components/allCustomers/index.js
#	src/components/axios/url.js
#	src/components/wechatmembers/cardvoucher.vue
parents 8c024f89 9d817fcc
Showing with 86 additions and 39 deletions
dist/css/app.2fd1fed98e2e7189782da5f2c81ce8e0.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.2d52b970c28884d57600863018757f4d.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.2fd1fed98e2e7189782da5f2c81ce8e0.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() {
>>>>>>> bugfix/会员卡券列表
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.93498b42c94f092b72a8.js></script><script type=text/javascript src=./js/vendor.777d0e930a11c825db47.js></script><script type=text/javascript src=./js/app.860adbd47ae8a617a417.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.93498b42c94f092b72a8.js></script><script type=text/javascript src=./js/vendor.777d0e930a11c825db47.js></script><script type=text/javascript src=./js/app.860adbd47ae8a617a417.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.0155526c476f59b6fa9e.js></script><script type=text/javascript src=./js/vendor.c657d67da16c1802184d.js></script><script type=text/javascript src=./js/app.96ddd8bda1df7177945d.js></script></body></html>
>>>>>>> bugfix/会员卡券列表
dist/js/1.eb732c388ecb85c78d77.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/10.7ab742a58a02e0167515.js 0 → 100644
webpackJsonp([10,45],{"17Q/":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l=a("ooW1"),r=a("Olnt"),n={name:"enterpriseIntegralDataPage",components:{enterpriseIntegralDetial:l.default,enterpriseIntergralWithhold:r.default},props:{},data:function(){return{activeName:"first",memberId:this.$route.query.memberId||"",cliqueMemberId:this.$route.query.cliqueMemberId||""}},methods:{goback:function(){this.$router.push({path:"wechatmemberDetail",query:{memberId:this.memberId}})}},mounted:function(){},destroyed:function(){}},i={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"integral-tab"},[a("el-tabs",{model:{value:e.activeName,callback:function(t){e.activeName=t},expression:"activeName"}},[a("el-tab-pane",{attrs:{label:"集团积分明细",name:"first"}},[a("p",{staticClass:"font14 tip-p"},[e._v("展示近两年的积分明细")]),e._v(" "),a("enterprise-integral-detial",{attrs:{"member-id":e.memberId}})],1),e._v(" "),a("el-tab-pane",{attrs:{label:"集团预扣明细",name:"second"}},[a("p",{staticClass:"font14 tip-p"},[e._v("展示近两年的预扣明细")]),e._v(" "),a("enterprise-intergral-withhold",{attrs:{"member-id":e.cliqueMemberId,"is-enterprise":!0}})],1)],1)],1)},staticRenderFns:[]};var o=a("VU/8")(n,i,!1,function(e){a("B8KN")},"data-v-53d2f9c8",null);t.default=o.exports},B8KN:function(e,t){},ipjg:function(e,t){},ooW1:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l=a("IG5d"),r=a("WSiR"),n=a("AKaA"),i=a("NTL1"),o=a("8V46"),s={name:"enterpriseIntegralDetial",props:{memberId:{type:String,default:function(){return""}}},components:{"v-nav":r.a},data:function(){return{height:document.body.clientHeight-262,page:{currentPage:1,pageSize:20,totalCount:0},dictList:[],sourceTypeList:[{label:"GIC计算",value:1},{label:"ERP同步",value:2},{label:"API同步",value:3},{label:"批处理导入",value:4},{label:"天猫会员通",value:5},{label:"抖音",value:7}],frozenStatusList:[{label:"冻结积分",value:1},{label:"可用积分",value:0}],memberData:[],form:{intervalInOut:-1,dictCode:-1,sourceType:-1,frozenStatus:-1},loading:!1}},mixins:[l.a],methods:{formatSourceType:function(e,t,a){return(this.sourceTypeList.find(function(e){return e.value==a})||{}).label||"--"},linkRoute:function(e){this.$router.push({path:e,query:{memberId:this.memberId}})},handleSearch:function(){this.page.currentPage=1,this.getIntegralDataPage()},handleCurrentChange:function(e){this.page.currentPage=e,this.getIntegralDataPage()},handleSizeChange:function(e){this.page.pageSize=e,this.getIntegralDataPage()},getIntegralDataPage:function(){var e=this;this.loading=!0,console.log(this.dateDefault),this.dateDefault||(this.dateDefault=["",""]);var t=this.form;t.memberId=this.memberId,t.pageSize=this.page.pageSize,t.currentPage=this.page.currentPage,t.beginTime=this.dateDefault[0],t.endTime=this.dateDefault[1],Object(n.a)(i.a.enterpriseIntegralDetailData,t).then(function(t){0===t.data.errorCode?(e.memberData=t.data.result.page.result||[],e.page.currentPage=t.data.result.page.currentPage,e.page.totalCount=t.data.result.page.totalCount):Object(o.a)(t.data.message),e.loading=!1}).catch(function(t){e.loading=!1,Object(o.b)(t)})},getIntegralOperateType:function(){var e=this;Object(n.a)(i.a.integralOperateType,{businessType:"member_integral",dictStatus:0}).then(function(t){0===t.data.errorCode?(t.data.result.dictList.forEach(function(e){e.dictCode}),e.dictList=t.data.result.dictList):Object(o.a)()}).catch(function(e){Object(o.b)(e)})}},created:function(){this.setDefalutTime(),this.memberId&&(this.getIntegralDataPage(),this.getIntegralOperateType())}},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}]},[a("div",{staticClass:"search-top mBottom20"},[a("div",{staticClass:"left-search-wrap"},[a("el-select",{staticClass:"width160",attrs:{placeholder:"所有日志"},on:{change:e.handleSearch},model:{value:e.form.intervalInOut,callback:function(t){e.$set(e.form,"intervalInOut",t)},expression:"form.intervalInOut"}},[a("el-option",{key:-1,attrs:{label:"所有日志",value:-1}}),e._v(" "),a("el-option",{key:1,attrs:{label:"积分获取",value:1}}),e._v(" "),a("el-option",{key:2,attrs:{label:"积分扣除",value:2}})],1),e._v(" "),a("el-select",{staticClass:"width160",attrs:{placeholder:"所有事由"},on:{change:e.handleSearch},model:{value:e.form.dictCode,callback:function(t){e.$set(e.form,"dictCode",t)},expression:"form.dictCode"}},[a("el-option",{key:-1,attrs:{label:"所有事由",value:-1}}),e._v(" "),e._l(e.dictList,function(e){return a("el-option",{key:e.dictCode,attrs:{label:e.dictName,value:e.dictCode}})})],2),e._v(" "),a("el-select",{staticClass:"width160",attrs:{placeholder:"所有来源渠道"},on:{change:e.handleSearch},model:{value:e.form.sourceType,callback:function(t){e.$set(e.form,"sourceType",t)},expression:"form.sourceType"}},[a("el-option",{attrs:{label:"所有来源渠道",value:-1}}),e._v(" "),e._l(e.sourceTypeList,function(e){return a("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})],2),e._v(" "),a("el-select",{staticClass:"width160",attrs:{placeholder:"所有积分状态"},on:{change:e.handleSearch},model:{value:e.form.frozenStatus,callback:function(t){e.$set(e.form,"frozenStatus",t)},expression:"form.frozenStatus"}},[a("el-option",{attrs:{label:"所有积分状态",value:-1}}),e._v(" "),e._l(e.frozenStatusList,function(e){return a("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})],2),e._v(" "),a("el-date-picker",{staticStyle:{width:"256px"},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"}})],1),e._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.linkRoute("/integralDataPage")}}},[e._v("查看品牌积分")])],1),e._v(" "),a("div",{staticClass:"table-content"},[a("el-table",{ref:"multipleTable",attrs:{data:e.memberData,"tooltip-effect":"dark","max-height":e.height}},[a("el-table-column",{attrs:{prop:"createTime",label:"时间","min-width":"130px"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("div",{staticClass:"line-20"},[e._v(e._s(e._f("formatYMD")(t.row.createTime)))]),e._v(" "),a("div",{staticClass:"line-20"},[e._v(e._s(e._f("formatHMS")(t.row.createTime)))])]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"intervalInout",label:"日志类型","min-width":"90px"},scopedSlots:e._u([{key:"default",fn:function(t){return[1==t.row.intervalInout?a("span",[e._v("积分获取")]):e._e(),e._v(" "),0==t.row.intervalInout?a("span",[e._v("积分扣除")]):e._e()]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"memberIntegralName",label:"事由","min-width":"90px"}}),e._v(" "),a("el-table-column",{attrs:{prop:"intervalHistory",label:"日志详情","min-width":"90px"}}),e._v(" "),a("el-table-column",{attrs:{prop:"sourceType",label:"来源渠道","min-width":"90px",formatter:e.formatSourceType,"show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{prop:"brandName",label:"来源品牌","min-width":"150px","show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{prop:"remark",label:"备注","min-width":"160px","show-overflow-tooltip":""}})],1),e._v(" "),a("div",{staticClass:"page mTop20"},[a("dm-pagination",{attrs:{background:"","current-page":e.page.currentPage,"page-sizes":[20,40,60,80],"page-size":e.page.pageSize,layout:"total, sizes, prev, pager, next",total:e.page.totalCount},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1)],1)])},staticRenderFns:[]};var u=a("VU/8")(s,c,!1,function(e){a("ipjg")},"data-v-8b880b84",null);t.default=u.exports}});
\ No newline at end of file
dist/js/17.4e5eac2c993d26f5d0d3.js
webpackJsonp([17],{kdFU:function(t,e){},nvtf:function(t,e){},tDQY:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a={name:"BatchList",props:{dataList:{type:Array,default:function(){return[]}}},data:function(){return{}},watch:{},methods:{}},s={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"batch-list"},[t.dataList.length>0?t._l(t.dataList,function(e,a){return n("div",{key:a,staticClass:"batch-item"},[n("p",{staticClass:"batch-item-name"},[t._v("\n "+t._s(e.name)+"\n ")]),t._v(" "),n("div",{staticClass:"batch-item-progress"},[n("el-progress",{attrs:{percentage:0==e.taskCount?100:+(100*e.finishCount/e.taskCount).toFixed(2)}})],1)])}):n("div",{staticStyle:{"text-align":"center"}},[t._v("\n 暂无批量处理数据\n ")])],2)},staticRenderFns:[]};var i=n("VU/8")(a,s,!1,function(t){n("nvtf"),n("kdFU")},"data-v-7837e9e0",null);e.default=i.exports}});
\ No newline at end of file
<<<<<<<< HEAD:dist/js/17.4e5eac2c993d26f5d0d3.js
webpackJsonp([17],{kdFU:function(t,e){},nvtf:function(t,e){},tDQY:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a={name:"BatchList",props:{dataList:{type:Array,default:function(){return[]}}},data:function(){return{}},watch:{},methods:{}},s={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"batch-list"},[t.dataList.length>0?t._l(t.dataList,function(e,a){return n("div",{key:a,staticClass:"batch-item"},[n("p",{staticClass:"batch-item-name"},[t._v("\n "+t._s(e.name)+"\n ")]),t._v(" "),n("div",{staticClass:"batch-item-progress"},[n("el-progress",{attrs:{percentage:0==e.taskCount?100:+(100*e.finishCount/e.taskCount).toFixed(2)}})],1)])}):n("div",{staticStyle:{"text-align":"center"}},[t._v("\n 暂无批量处理数据\n ")])],2)},staticRenderFns:[]};var i=n("VU/8")(a,s,!1,function(t){n("nvtf"),n("kdFU")},"data-v-7837e9e0",null);e.default=i.exports}});
========
webpackJsonp([18],{kdFU:function(t,e){},nvtf:function(t,e){},tDQY:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a={name:"BatchList",props:{dataList:{type:Array,default:function(){return[]}}},data:function(){return{}},watch:{},methods:{}},s={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"batch-list"},[t.dataList.length>0?t._l(t.dataList,function(e,a){return n("div",{key:a,staticClass:"batch-item"},[n("p",{staticClass:"batch-item-name"},[t._v("\n "+t._s(e.name)+"\n ")]),t._v(" "),n("div",{staticClass:"batch-item-progress"},[n("el-progress",{attrs:{percentage:0==e.taskCount?100:+(100*e.finishCount/e.taskCount).toFixed(2)}})],1)])}):n("div",{staticStyle:{"text-align":"center"}},[t._v("\n 暂无批量处理数据\n ")])],2)},staticRenderFns:[]};var i=n("VU/8")(a,s,!1,function(t){n("nvtf"),n("kdFU")},"data-v-7837e9e0",null);e.default=i.exports}});
>>>>>>>> bugfix/会员卡券列表:dist/js/18.917500e3b36e8be1a80c.js
dist/js/18.917500e3b36e8be1a80c.js 0 → 100644
<<<<<<<< HEAD:dist/js/17.4e5eac2c993d26f5d0d3.js
webpackJsonp([17],{kdFU:function(t,e){},nvtf:function(t,e){},tDQY:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a={name:"BatchList",props:{dataList:{type:Array,default:function(){return[]}}},data:function(){return{}},watch:{},methods:{}},s={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"batch-list"},[t.dataList.length>0?t._l(t.dataList,function(e,a){return n("div",{key:a,staticClass:"batch-item"},[n("p",{staticClass:"batch-item-name"},[t._v("\n "+t._s(e.name)+"\n ")]),t._v(" "),n("div",{staticClass:"batch-item-progress"},[n("el-progress",{attrs:{percentage:0==e.taskCount?100:+(100*e.finishCount/e.taskCount).toFixed(2)}})],1)])}):n("div",{staticStyle:{"text-align":"center"}},[t._v("\n 暂无批量处理数据\n ")])],2)},staticRenderFns:[]};var i=n("VU/8")(a,s,!1,function(t){n("nvtf"),n("kdFU")},"data-v-7837e9e0",null);e.default=i.exports}});
========
webpackJsonp([18],{kdFU:function(t,e){},nvtf:function(t,e){},tDQY:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a={name:"BatchList",props:{dataList:{type:Array,default:function(){return[]}}},data:function(){return{}},watch:{},methods:{}},s={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"batch-list"},[t.dataList.length>0?t._l(t.dataList,function(e,a){return n("div",{key:a,staticClass:"batch-item"},[n("p",{staticClass:"batch-item-name"},[t._v("\n "+t._s(e.name)+"\n ")]),t._v(" "),n("div",{staticClass:"batch-item-progress"},[n("el-progress",{attrs:{percentage:0==e.taskCount?100:+(100*e.finishCount/e.taskCount).toFixed(2)}})],1)])}):n("div",{staticStyle:{"text-align":"center"}},[t._v("\n 暂无批量处理数据\n ")])],2)},staticRenderFns:[]};var i=n("VU/8")(a,s,!1,function(t){n("nvtf"),n("kdFU")},"data-v-7837e9e0",null);e.default=i.exports}});
>>>>>>>> bugfix/会员卡券列表:dist/js/18.917500e3b36e8be1a80c.js
dist/js/20.cb99532a4e545cad6aaa.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"),o=a.n(r),n=a("oxYm"),i=a("NTL1"),l=a("AKaA"),s=a("3ayk"),g={name:"customerLog",mixins:[n.a],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(l.b)(i.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(l.a)(i.a.logPage,o()({},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(s.formatYMD)(new Date(t).getTime()),Object(s.formatYMD)(new Date(a).getTime())],this.dateDefault=[Object(s.formatYMD)(new Date(t).getTime()),Object(s.formatYMD)(new Date(a).getTime())]}},immediate:!0}}},c={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 p=a("VU/8")(g,c,!1,function(e){a("eGF7"),a("auXb")},"data-v-570c63ae",null);t.default=p.exports}});
\ No newline at end of file
dist/js/42.24f846da5a615ad03932.js
webpackJsonp([42],{OQ6q:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={name:"memberlist",data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,defaultActive:this.$route.path}},mounted:function(){var e=this;window.onresize=function(){e.bodyHeight=document.body.clientHeight||document.documentElement.clientHeight}},components:{Navbar:i("+vdD").a}},o={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"achievementwrap",style:{height:this.bodyHeight-64+"px"}},[t("div",{staticClass:"achievementwrap-right"},[t("div",{style:{height:"100%"}},[t("keep-alive",[this.$route.meta.keepAlive?t("router-view"):this._e()],1),this._v(" "),this.$route.meta.keepAlive?this._e():t("router-view")],1)])])},staticRenderFns:[]};var a=i("VU/8")(n,o,!1,function(e){i("iqpy")},"data-v-9b641668",null);t.default=a.exports},iqpy:function(e,t){}});
\ No newline at end of file
<<<<<<<< HEAD:dist/js/42.24f846da5a615ad03932.js
webpackJsonp([42],{OQ6q:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={name:"memberlist",data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,defaultActive:this.$route.path}},mounted:function(){var e=this;window.onresize=function(){e.bodyHeight=document.body.clientHeight||document.documentElement.clientHeight}},components:{Navbar:i("+vdD").a}},o={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"achievementwrap",style:{height:this.bodyHeight-64+"px"}},[t("div",{staticClass:"achievementwrap-right"},[t("div",{style:{height:"100%"}},[t("keep-alive",[this.$route.meta.keepAlive?t("router-view"):this._e()],1),this._v(" "),this.$route.meta.keepAlive?this._e():t("router-view")],1)])])},staticRenderFns:[]};var a=i("VU/8")(n,o,!1,function(e){i("iqpy")},"data-v-9b641668",null);t.default=a.exports},iqpy:function(e,t){}});
========
webpackJsonp([43],{OQ6q:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={name:"memberlist",data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,defaultActive:this.$route.path}},mounted:function(){var e=this;window.onresize=function(){e.bodyHeight=document.body.clientHeight||document.documentElement.clientHeight}},components:{Navbar:i("+vdD").a}},o={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"achievementwrap",style:{height:this.bodyHeight-64+"px"}},[t("div",{staticClass:"achievementwrap-right"},[t("div",{style:{height:"100%"}},[t("keep-alive",[this.$route.meta.keepAlive?t("router-view"):this._e()],1),this._v(" "),this.$route.meta.keepAlive?this._e():t("router-view")],1)])])},staticRenderFns:[]};var a=i("VU/8")(n,o,!1,function(e){i("iqpy")},"data-v-9b641668",null);t.default=a.exports},iqpy:function(e,t){}});
>>>>>>>> bugfix/会员卡券列表:dist/js/43.ce5a920e7f67a3d62932.js
dist/js/43.ce5a920e7f67a3d62932.js 0 → 100644
<<<<<<<< HEAD:dist/js/42.24f846da5a615ad03932.js
webpackJsonp([42],{OQ6q:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={name:"memberlist",data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,defaultActive:this.$route.path}},mounted:function(){var e=this;window.onresize=function(){e.bodyHeight=document.body.clientHeight||document.documentElement.clientHeight}},components:{Navbar:i("+vdD").a}},o={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"achievementwrap",style:{height:this.bodyHeight-64+"px"}},[t("div",{staticClass:"achievementwrap-right"},[t("div",{style:{height:"100%"}},[t("keep-alive",[this.$route.meta.keepAlive?t("router-view"):this._e()],1),this._v(" "),this.$route.meta.keepAlive?this._e():t("router-view")],1)])])},staticRenderFns:[]};var a=i("VU/8")(n,o,!1,function(e){i("iqpy")},"data-v-9b641668",null);t.default=a.exports},iqpy:function(e,t){}});
========
webpackJsonp([43],{OQ6q:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n={name:"memberlist",data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,defaultActive:this.$route.path}},mounted:function(){var e=this;window.onresize=function(){e.bodyHeight=document.body.clientHeight||document.documentElement.clientHeight}},components:{Navbar:i("+vdD").a}},o={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"achievementwrap",style:{height:this.bodyHeight-64+"px"}},[t("div",{staticClass:"achievementwrap-right"},[t("div",{style:{height:"100%"}},[t("keep-alive",[this.$route.meta.keepAlive?t("router-view"):this._e()],1),this._v(" "),this.$route.meta.keepAlive?this._e():t("router-view")],1)])])},staticRenderFns:[]};var a=i("VU/8")(n,o,!1,function(e){i("iqpy")},"data-v-9b641668",null);t.default=a.exports},iqpy:function(e,t){}});
>>>>>>>> bugfix/会员卡券列表:dist/js/43.ce5a920e7f67a3d62932.js
dist/js/45.9dc1fa1473b9558e53cc.js 0 → 100644
webpackJsonp([45],{ipjg:function(e,t){},ooW1:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l=a("IG5d"),r=a("WSiR"),n=a("AKaA"),o=a("NTL1"),i=a("8V46"),s={name:"enterpriseIntegralDetial",props:{memberId:{type:String,default:function(){return""}}},components:{"v-nav":r.a},data:function(){return{height:document.body.clientHeight-262,page:{currentPage:1,pageSize:20,totalCount:0},dictList:[],sourceTypeList:[{label:"GIC计算",value:1},{label:"ERP同步",value:2},{label:"API同步",value:3},{label:"批处理导入",value:4},{label:"天猫会员通",value:5},{label:"抖音",value:7}],frozenStatusList:[{label:"冻结积分",value:1},{label:"可用积分",value:0}],memberData:[],form:{intervalInOut:-1,dictCode:-1,sourceType:-1,frozenStatus:-1},loading:!1}},mixins:[l.a],methods:{formatSourceType:function(e,t,a){return(this.sourceTypeList.find(function(e){return e.value==a})||{}).label||"--"},linkRoute:function(e){this.$router.push({path:e,query:{memberId:this.memberId}})},handleSearch:function(){this.page.currentPage=1,this.getIntegralDataPage()},handleCurrentChange:function(e){this.page.currentPage=e,this.getIntegralDataPage()},handleSizeChange:function(e){this.page.pageSize=e,this.getIntegralDataPage()},getIntegralDataPage:function(){var e=this;this.loading=!0,console.log(this.dateDefault),this.dateDefault||(this.dateDefault=["",""]);var t=this.form;t.memberId=this.memberId,t.pageSize=this.page.pageSize,t.currentPage=this.page.currentPage,t.beginTime=this.dateDefault[0],t.endTime=this.dateDefault[1],Object(n.a)(o.a.enterpriseIntegralDetailData,t).then(function(t){0===t.data.errorCode?(e.memberData=t.data.result.page.result||[],e.page.currentPage=t.data.result.page.currentPage,e.page.totalCount=t.data.result.page.totalCount):Object(i.a)(t.data.message),e.loading=!1}).catch(function(t){e.loading=!1,Object(i.b)(t)})},getIntegralOperateType:function(){var e=this;Object(n.a)(o.a.integralOperateType,{businessType:"member_integral",dictStatus:0}).then(function(t){0===t.data.errorCode?(t.data.result.dictList.forEach(function(e){e.dictCode}),e.dictList=t.data.result.dictList):Object(i.a)()}).catch(function(e){Object(i.b)(e)})}},created:function(){this.setDefalutTime(),this.memberId&&(this.getIntegralDataPage(),this.getIntegralOperateType())}},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}]},[a("div",{staticClass:"search-top mBottom20"},[a("div",{staticClass:"left-search-wrap"},[a("el-select",{staticClass:"width160",attrs:{placeholder:"所有日志"},on:{change:e.handleSearch},model:{value:e.form.intervalInOut,callback:function(t){e.$set(e.form,"intervalInOut",t)},expression:"form.intervalInOut"}},[a("el-option",{key:-1,attrs:{label:"所有日志",value:-1}}),e._v(" "),a("el-option",{key:1,attrs:{label:"积分获取",value:1}}),e._v(" "),a("el-option",{key:2,attrs:{label:"积分扣除",value:2}})],1),e._v(" "),a("el-select",{staticClass:"width160",attrs:{placeholder:"所有事由"},on:{change:e.handleSearch},model:{value:e.form.dictCode,callback:function(t){e.$set(e.form,"dictCode",t)},expression:"form.dictCode"}},[a("el-option",{key:-1,attrs:{label:"所有事由",value:-1}}),e._v(" "),e._l(e.dictList,function(e){return a("el-option",{key:e.dictCode,attrs:{label:e.dictName,value:e.dictCode}})})],2),e._v(" "),a("el-select",{staticClass:"width160",attrs:{placeholder:"所有来源渠道"},on:{change:e.handleSearch},model:{value:e.form.sourceType,callback:function(t){e.$set(e.form,"sourceType",t)},expression:"form.sourceType"}},[a("el-option",{attrs:{label:"所有来源渠道",value:-1}}),e._v(" "),e._l(e.sourceTypeList,function(e){return a("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})],2),e._v(" "),a("el-select",{staticClass:"width160",attrs:{placeholder:"所有积分状态"},on:{change:e.handleSearch},model:{value:e.form.frozenStatus,callback:function(t){e.$set(e.form,"frozenStatus",t)},expression:"form.frozenStatus"}},[a("el-option",{attrs:{label:"所有积分状态",value:-1}}),e._v(" "),e._l(e.frozenStatusList,function(e){return a("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})],2),e._v(" "),a("el-date-picker",{staticStyle:{width:"256px"},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"}})],1),e._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.linkRoute("/integralDataPage")}}},[e._v("查看品牌积分")])],1),e._v(" "),a("div",{staticClass:"table-content"},[a("el-table",{ref:"multipleTable",attrs:{data:e.memberData,"tooltip-effect":"dark","max-height":e.height}},[a("el-table-column",{attrs:{prop:"createTime",label:"时间","min-width":"130px"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("div",{staticClass:"line-20"},[e._v(e._s(e._f("formatYMD")(t.row.createTime)))]),e._v(" "),a("div",{staticClass:"line-20"},[e._v(e._s(e._f("formatHMS")(t.row.createTime)))])]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"intervalInout",label:"日志类型","min-width":"90px"},scopedSlots:e._u([{key:"default",fn:function(t){return[1==t.row.intervalInout?a("span",[e._v("积分获取")]):e._e(),e._v(" "),0==t.row.intervalInout?a("span",[e._v("积分扣除")]):e._e()]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"memberIntegralName",label:"事由","min-width":"90px"}}),e._v(" "),a("el-table-column",{attrs:{prop:"intervalHistory",label:"日志详情","min-width":"90px"}}),e._v(" "),a("el-table-column",{attrs:{prop:"sourceType",label:"来源渠道","min-width":"90px",formatter:e.formatSourceType,"show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{prop:"brandName",label:"来源品牌","min-width":"150px","show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{prop:"remark",label:"备注","min-width":"160px","show-overflow-tooltip":""}})],1),e._v(" "),a("div",{staticClass:"page mTop20"},[a("dm-pagination",{attrs:{background:"","current-page":e.page.currentPage,"page-sizes":[20,40,60,80],"page-size":e.page.pageSize,layout:"total, sizes, prev, pager, next",total:e.page.totalCount},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1)],1)])},staticRenderFns:[]};var u=a("VU/8")(s,c,!1,function(e){a("ipjg")},"data-v-8b880b84",null);t.default=u.exports}});
\ No newline at end of file
dist/js/46.c8012342892d41b713a5.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/49.724a7e93a8f6c32e1af8.js 0 → 100644
<<<<<<<< HEAD:dist/js/48.93aa558e44d710df4f91.js
webpackJsonp([48],{"34RI":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=a("Dd8w"),s=a.n(i),n=a("WSiR"),r=a("AKaA"),o=a("NTL1"),u=a("JMoU"),c=a("8V46"),d=a("lRwf"),l=a.n(d),m={name:"membertask",mixins:[u.a],data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,navpath:[{name:"首页",path:""},{name:"会员",path:"/wechatmembers"},{name:"会员任务",path:""}],isEdit:null,missionList:[]}},methods:{changeVal:function(e){val=val.length>6?val.substr(0,6):val},getMemberMissionList:function(){var e=this;Object(r.a)(o.a.memberMissionList).then(function(t){0===t.data.errorCode?(e.isEdit=t.data.result.isEdit,e.missionList=t.data.result.missionList.map(function(e){return s()({},e,{item:e.item.map(function(e){return s()({},e,{statusEdit:1==e.status})})})})):Object(c.a)(t.data.message)}).catch(function(e){Object(c.b)(e)})},editRewardValue:function(e){e.isEdit?e.isEdit=!0:l.a.set(e,"isEdit",!0),e.isCurValue?e.isCurValue=e.rewardValue:l.a.set(e,"isCurValue",e.rewardValue)},submitRewardValue:function(e){Object(r.a)(o.a.memberMissionUpdate,{missionItemEnterpriseId:e.missionItemEnterpriseId,usedRule:e.usedRule,rewardRule:e.rewardRule,rewardValue:e.rewardValue}).then(function(t){0===t.data.errorCode?(e.isEdit=!1,Object(c.c)()):Object(c.a)(t.data.message)}).catch(function(e){Object(c.b)(e)})},cancleRewardValue:function(e){e.rewardValue=e.isCurValue,e.isEdit=!1},changeValue:function(e){var t=e.statusEdit?1:0;return 1==t&&0===e.rewardValue?(Object(c.a)("请完善积分奖励"),e.statusEdit=!1,!1):e.status===t?(e.statusEdit=!1,!1):void Object(r.a)(o.a.memberMissionOpen,{missionItemEnterpriseId:e.missionItemEnterpriseId,status:t}).then(function(a){0===a.data.errorCode?(e.status=t,Object(c.c)()):Object(c.a)(a.data.message)}).catch(function(e){Object(c.b)(e)})}},created:function(){this.getMemberMissionList(),this.$store.commit("mutations-slide",!1)},components:{"v-nav":n.a}},w={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-task"},[a("div",{staticClass:"achievement"},e._l(e.missionList,function(t,i){return a("div",{key:i,staticClass:"achievement-item"},[a("div",{staticClass:"achievement-top"},[a("span",{staticClass:"achievement-title"},[e._v(e._s(t.missionName))])]),e._v(" "),a("div",{staticClass:"achievement-editwrap"},[a("el-table",{attrs:{data:t.item,"tooltip-effect":"dark","header-row-class-name":"curheader"}},[a("el-table-column",{attrs:{prop:"missionItemName",label:"字段名称"}}),e._v(" "),a("el-table-column",{attrs:{prop:"rewardValue",label:"奖励积分额"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("p",[e._v("奖励\n "),a("el-input-number",{directives:[{name:"show",rawName:"v-show",value:1==t.row.isEdit,expression:"scope.row.isEdit == true"}],attrs:{maxlength:"6","controls-position":"right",min:0,max:1e5},model:{value:t.row.rewardValue,callback:function(a){e.$set(t.row,"rewardValue",a)},expression:"scope.row.rewardValue"}}),e._v(" "),a("span",{directives:[{name:"show",rawName:"v-show",value:!0!==t.row.isEdit,expression:"scope.row.isEdit !== true"}]},[e._v(" "+e._s(t.row.rewardValue)+" ")]),e._v(" 积分\n "),e.getCodeAuth("memberTaskSetAward")?a("i",{directives:[{name:"show",rawName:"v-show",value:1==e.isEdit&&!0!==t.row.isEdit,expression:"isEdit == 1 && scope.row.isEdit !== true"}],staticClass:"el-icon-edit pointer",attrs:{"limit-code":e.getCode("memberTaskSetAward")},on:{click:function(a){return e.editRewardValue(t.row)}}}):e._e(),e._v(" "),a("el-button",{directives:[{name:"show",rawName:"v-show",value:1==e.isEdit&&1==t.row.isEdit,expression:"isEdit == 1 && scope.row.isEdit == true"}],attrs:{type:"text"},on:{click:function(a){return e.submitRewardValue(t.row)}}},[e._v("\n 保存\n ")]),e._v(" "),a("el-button",{directives:[{name:"show",rawName:"v-show",value:1==e.isEdit&&1==t.row.isEdit,expression:"isEdit == 1 && scope.row.isEdit == true"}],attrs:{type:"text"},on:{click:function(a){return e.cancleRewardValue(t.row)}}},[e._v("\n 取消\n ")])],1)]}}])}),e._v(" "),1==e.isEdit?a("el-table-column",{attrs:{prop:"status",label:"开关",width:"300"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("div",{staticClass:"achievement-handler"},[e.getCodeAuth("memberTaskSwitch")?a("el-switch",{attrs:{"limit-code":e.getCode("memberTaskSwitch"),"active-text":"启用","inactive-text":"停用"},on:{change:function(a){return e.changeValue(t.row)}},model:{value:t.row.statusEdit,callback:function(a){e.$set(t.row,"statusEdit",a)},expression:"scope.row.statusEdit"}}):e._e()],1)]}}])}):e._e()],1)],1)])}),0)])},staticRenderFns:[]};var v=a("VU/8")(m,w,!1,function(e){a("LkqT")},null,null);t.default=v.exports},LkqT:function(e,t){}});
========
webpackJsonp([49],{"34RI":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=a("Dd8w"),s=a.n(i),n=a("WSiR"),r=a("AKaA"),o=a("NTL1"),u=a("JMoU"),c=a("8V46"),d=a("lRwf"),l=a.n(d),m={name:"membertask",mixins:[u.a],data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,navpath:[{name:"首页",path:""},{name:"会员",path:"/wechatmembers"},{name:"会员任务",path:""}],isEdit:null,missionList:[]}},methods:{changeVal:function(e){val=val.length>6?val.substr(0,6):val},getMemberMissionList:function(){var e=this;Object(r.a)(o.a.memberMissionList).then(function(t){0===t.data.errorCode?(e.isEdit=t.data.result.isEdit,e.missionList=t.data.result.missionList.map(function(e){return s()({},e,{item:e.item.map(function(e){return s()({},e,{statusEdit:1==e.status})})})})):Object(c.a)(t.data.message)}).catch(function(e){Object(c.b)(e)})},editRewardValue:function(e){e.isEdit?e.isEdit=!0:l.a.set(e,"isEdit",!0),e.isCurValue?e.isCurValue=e.rewardValue:l.a.set(e,"isCurValue",e.rewardValue)},submitRewardValue:function(e){Object(r.a)(o.a.memberMissionUpdate,{missionItemEnterpriseId:e.missionItemEnterpriseId,usedRule:e.usedRule,rewardRule:e.rewardRule,rewardValue:e.rewardValue}).then(function(t){0===t.data.errorCode?(e.isEdit=!1,Object(c.c)()):Object(c.a)(t.data.message)}).catch(function(e){Object(c.b)(e)})},cancleRewardValue:function(e){e.rewardValue=e.isCurValue,e.isEdit=!1},changeValue:function(e){var t=e.statusEdit?1:0;return 1==t&&0===e.rewardValue?(Object(c.a)("请完善积分奖励"),e.statusEdit=!1,!1):e.status===t?(e.statusEdit=!1,!1):void Object(r.a)(o.a.memberMissionOpen,{missionItemEnterpriseId:e.missionItemEnterpriseId,status:t}).then(function(a){0===a.data.errorCode?(e.status=t,Object(c.c)()):Object(c.a)(a.data.message)}).catch(function(e){Object(c.b)(e)})}},created:function(){this.getMemberMissionList(),this.$store.commit("mutations-slide",!1)},components:{"v-nav":n.a}},w={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-task"},[a("div",{staticClass:"achievement"},e._l(e.missionList,function(t,i){return a("div",{key:i,staticClass:"achievement-item"},[a("div",{staticClass:"achievement-top"},[a("span",{staticClass:"achievement-title"},[e._v(e._s(t.missionName))])]),e._v(" "),a("div",{staticClass:"achievement-editwrap"},[a("el-table",{attrs:{data:t.item,"tooltip-effect":"dark","header-row-class-name":"curheader"}},[a("el-table-column",{attrs:{prop:"missionItemName",label:"字段名称"}}),e._v(" "),a("el-table-column",{attrs:{prop:"rewardValue",label:"奖励积分额"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("p",[e._v("奖励\n "),a("el-input-number",{directives:[{name:"show",rawName:"v-show",value:1==t.row.isEdit,expression:"scope.row.isEdit == true"}],attrs:{maxlength:"6","controls-position":"right",min:0,max:1e5},model:{value:t.row.rewardValue,callback:function(a){e.$set(t.row,"rewardValue",a)},expression:"scope.row.rewardValue"}}),e._v(" "),a("span",{directives:[{name:"show",rawName:"v-show",value:!0!==t.row.isEdit,expression:"scope.row.isEdit !== true"}]},[e._v(" "+e._s(t.row.rewardValue)+" ")]),e._v(" 积分\n "),e.getCodeAuth("memberTaskSetAward")?a("i",{directives:[{name:"show",rawName:"v-show",value:1==e.isEdit&&!0!==t.row.isEdit,expression:"isEdit == 1 && scope.row.isEdit !== true"}],staticClass:"el-icon-edit pointer",attrs:{"limit-code":e.getCode("memberTaskSetAward")},on:{click:function(a){return e.editRewardValue(t.row)}}}):e._e(),e._v(" "),a("el-button",{directives:[{name:"show",rawName:"v-show",value:1==e.isEdit&&1==t.row.isEdit,expression:"isEdit == 1 && scope.row.isEdit == true"}],attrs:{type:"text"},on:{click:function(a){return e.submitRewardValue(t.row)}}},[e._v("\n 保存\n ")]),e._v(" "),a("el-button",{directives:[{name:"show",rawName:"v-show",value:1==e.isEdit&&1==t.row.isEdit,expression:"isEdit == 1 && scope.row.isEdit == true"}],attrs:{type:"text"},on:{click:function(a){return e.cancleRewardValue(t.row)}}},[e._v("\n 取消\n ")])],1)]}}])}),e._v(" "),1==e.isEdit?a("el-table-column",{attrs:{prop:"status",label:"开关",width:"300"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("div",{staticClass:"achievement-handler"},[e.getCodeAuth("memberTaskSwitch")?a("el-switch",{attrs:{"limit-code":e.getCode("memberTaskSwitch"),"active-text":"启用","inactive-text":"停用"},on:{change:function(a){return e.changeValue(t.row)}},model:{value:t.row.statusEdit,callback:function(a){e.$set(t.row,"statusEdit",a)},expression:"scope.row.statusEdit"}}):e._e()],1)]}}])}):e._e()],1)],1)])}),0)])},staticRenderFns:[]};var v=a("VU/8")(m,w,!1,function(e){a("LkqT")},null,null);t.default=v.exports},LkqT:function(e,t){}});
>>>>>>>> bugfix/会员卡券列表:dist/js/49.724a7e93a8f6c32e1af8.js
dist/js/50.b6aae173297058a469e1.js 0 → 100644
<<<<<<<< HEAD:dist/js/49.89105a4ec7ba94789015.js
webpackJsonp([49],{GyZt:function(e,t){},uT4N:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("woOf"),l=a.n(r),o=a("AKaA"),i=a("NTL1"),s=a("8V46"),n={name:"IntegralDailog",props:{dialogVisible:{type:Boolean,default:!1},ajaxObj:{type:Object,default:function(){return{pageName:""}}},selectObj:{type:Object,default:function(){return{totalCount:0,selectAll:!1,multipleList:[]}}},integralFlag:{type:String,default:""}},data:function(){return{visible:!1,form:{editType:1,accumulatPoints:0,remark:"",settlementStoreId:""},rules:{editType:[{required:!0,message:"请选择调整方式",trigger:"change"}],accumulatPoints:[{required:!0,message:"请选择调整额度",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}],settlementStoreId:[{required:!0,message:"请填写原始成本主体",trigger:"change"}]},btnLoading:!1,loading:!1,storeList:[]}},watch:{dialogVisible:function(e,t){this.visible=e}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},getStoreCodeName:function(e){var t=this;this.loading=!0,Object(o.c)(i.a.storeCodeName,{searchParam:e,flag:1}).then(function(e){0===e.data.errorCode?t.storeList=e.data.result:Object(s.a)(e.data.message)}).catch(function(e){Object(s.b)(e)}).finally(function(e){return t.loading=!1})},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;var a=e.selectObj,r=a.selectAll,n=a.multipleList,c=e.ajaxObj,m=c.memberSearchStr,u=c.pageSize,d=c.phoneNameCard,f=c.pageName;e.btnLoading=!0;var p=[];n.forEach(function(e){p.push(e.memberId)}),Object(o.a)(i.a.updateIntegrals,l()({},e.form,{memberIds:1==r?"-1":p.join(","),isCurrent:1==r?2:n.length==u?1:0,memberSearchParamStr:1==r?m||"-1":"",phoneNameCard:d,pageName:f})).then(function(t){console.log(t),0===t.data.errorCode?(Object(s.c)(""),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("successImport",t.data.result),e.$emit("refresh")):Object(s.a)()}).catch(function(e){Object(s.b)(e)}).finally(function(t){return e.btnLoading=!1})})}}},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-dialog",{attrs:{title:"批量调整积分","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[a("div",{staticClass:"checkedCustomers"},[e._v("\n 当前选中"),a("span",{staticClass:"num"},[e._v("\n "+e._s(e.selectObj.selectAll?e.selectObj.totalCount:e.selectObj.multipleList.length)+" ")]),e._v("位客户\n ")]),e._v(" "),a("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[a("el-form-item",{attrs:{label:"调整积分：",prop:"editType"}},[a("el-radio-group",{model:{value:e.form.editType,callback:function(t){e.$set(e.form,"editType",t)},expression:"form.editType"}},[a("el-radio",{attrs:{label:1}},[e._v("\n 增加积分\n ")]),e._v(" "),a("el-radio",{attrs:{label:2}},[e._v("\n 扣除积分\n ")])],1)],1),e._v(" "),a("el-form-item",{attrs:{label:"调整额度：",prop:"accumulatPoints"}},[a("el-input-number",{staticStyle:{width:"115px"},attrs:{"controls-position":"right",min:1,max:999999},model:{value:e.form.accumulatPoints,callback:function(t){e.$set(e.form,"accumulatPoints",t)},expression:"form.accumulatPoints"}})],1),e._v(" "),"gic"==e.integralFlag&&1==e.form.editType?a("el-form-item",{attrs:{label:"原始成本主体：",prop:"settlementStoreId"}},[a("el-select",{staticStyle:{width:"400px"},attrs:{prop:"settlementStoreId",filterable:"",remote:"","reserve-keyword":"",placeholder:"请输入门店名称/门店code","remote-method":e.getStoreCodeName,loading:e.loading},model:{value:e.form.settlementStoreId,callback:function(t){e.$set(e.form,"settlementStoreId",t)},expression:"form.settlementStoreId"}},e._l(e.storeList,function(e){return a("el-option",{key:e.storeId,attrs:{label:e.storeName,value:e.storeId}})}),1),e._v(" "),a("p",{staticClass:"sub-tip"},[e._v("\n 注：除输入选择具体门店外，还可输入总部，记总部名下\n ")])],1):e._e(),e._v(" "),a("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[a("el-input",{staticStyle:{width:"400px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),a("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var m=a("VU/8")(n,c,!1,function(e){a("GyZt")},"data-v-7091fa42",null);t.default=m.exports}});
========
webpackJsonp([50],{GyZt:function(e,t){},uT4N:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("woOf"),l=a.n(r),o=a("AKaA"),i=a("NTL1"),s=a("8V46"),n={name:"IntegralDailog",props:{dialogVisible:{type:Boolean,default:!1},ajaxObj:{type:Object,default:function(){return{pageName:""}}},selectObj:{type:Object,default:function(){return{totalCount:0,selectAll:!1,multipleList:[]}}},integralFlag:{type:String,default:""}},data:function(){return{visible:!1,form:{editType:1,accumulatPoints:0,remark:"",settlementStoreId:""},rules:{editType:[{required:!0,message:"请选择调整方式",trigger:"change"}],accumulatPoints:[{required:!0,message:"请选择调整额度",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}],settlementStoreId:[{required:!0,message:"请填写原始成本主体",trigger:"change"}]},btnLoading:!1,loading:!1,storeList:[]}},watch:{dialogVisible:function(e,t){this.visible=e}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},getStoreCodeName:function(e){var t=this;this.loading=!0,Object(o.c)(i.a.storeCodeName,{searchParam:e,flag:1}).then(function(e){0===e.data.errorCode?t.storeList=e.data.result:Object(s.a)(e.data.message)}).catch(function(e){Object(s.b)(e)}).finally(function(e){return t.loading=!1})},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;var a=e.selectObj,r=a.selectAll,n=a.multipleList,c=e.ajaxObj,m=c.memberSearchStr,u=c.pageSize,d=c.phoneNameCard,f=c.pageName;e.btnLoading=!0;var p=[];n.forEach(function(e){p.push(e.memberId)}),Object(o.a)(i.a.updateIntegrals,l()({},e.form,{memberIds:1==r?"-1":p.join(","),isCurrent:1==r?2:n.length==u?1:0,memberSearchParamStr:1==r?m||"-1":"",phoneNameCard:d,pageName:f})).then(function(t){console.log(t),0===t.data.errorCode?(Object(s.c)(""),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("successImport",t.data.result),e.$emit("refresh")):Object(s.a)()}).catch(function(e){Object(s.b)(e)}).finally(function(t){return e.btnLoading=!1})})}}},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-dialog",{attrs:{title:"批量调整积分","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[a("div",{staticClass:"checkedCustomers"},[e._v("\n 当前选中"),a("span",{staticClass:"num"},[e._v("\n "+e._s(e.selectObj.selectAll?e.selectObj.totalCount:e.selectObj.multipleList.length)+" ")]),e._v("位客户\n ")]),e._v(" "),a("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[a("el-form-item",{attrs:{label:"调整积分：",prop:"editType"}},[a("el-radio-group",{model:{value:e.form.editType,callback:function(t){e.$set(e.form,"editType",t)},expression:"form.editType"}},[a("el-radio",{attrs:{label:1}},[e._v("\n 增加积分\n ")]),e._v(" "),a("el-radio",{attrs:{label:2}},[e._v("\n 扣除积分\n ")])],1)],1),e._v(" "),a("el-form-item",{attrs:{label:"调整额度：",prop:"accumulatPoints"}},[a("el-input-number",{staticStyle:{width:"115px"},attrs:{"controls-position":"right",min:1,max:999999},model:{value:e.form.accumulatPoints,callback:function(t){e.$set(e.form,"accumulatPoints",t)},expression:"form.accumulatPoints"}})],1),e._v(" "),"gic"==e.integralFlag&&1==e.form.editType?a("el-form-item",{attrs:{label:"原始成本主体：",prop:"settlementStoreId"}},[a("el-select",{staticStyle:{width:"400px"},attrs:{prop:"settlementStoreId",filterable:"",remote:"","reserve-keyword":"",placeholder:"请输入门店名称/门店code","remote-method":e.getStoreCodeName,loading:e.loading},model:{value:e.form.settlementStoreId,callback:function(t){e.$set(e.form,"settlementStoreId",t)},expression:"form.settlementStoreId"}},e._l(e.storeList,function(e){return a("el-option",{key:e.storeId,attrs:{label:e.storeName,value:e.storeId}})}),1),e._v(" "),a("p",{staticClass:"sub-tip"},[e._v("\n 注：除输入选择具体门店外，还可输入总部，记总部名下\n ")])],1):e._e(),e._v(" "),a("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[a("el-input",{staticStyle:{width:"400px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),a("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var m=a("VU/8")(n,c,!1,function(e){a("GyZt")},"data-v-7091fa42",null);t.default=m.exports}});
>>>>>>>> bugfix/会员卡券列表:dist/js/50.b6aae173297058a469e1.js
dist/js/52.5593490f0502bda69324.js
webpackJsonp([52],{SxgG:function(e,a){},seIo:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var l=t("woOf"),i=t.n(l),r=t("a2Vx"),s=t("u6qo"),n={name:"ecm",props:{tableData:Object},mixins:[r.a,s.a],data:function(){return{search:{search:"",beginTime:"",endTime:"",marketingType:null},ecmTypeList:[{label:"积分",value:"integral"},{label:"短信",value:"message"},{label:"话务",value:"teltask"},{label:"群发任务",value:"qfxx"},{label:"图文消息",value:"teletext"},{label:"图片",value:"image"},{label:"文本消息",value:"text"},{label:"小程序",value:"wxa"},{label:"卡券",value:"card"}]}},methods:{change:function(){var e=this.tableData,a=e.currentPage,t=e.pageSize;this.search.beginTime=this.time?"string "==typeof this.time[0]?this.time[0]:this.dateformat(new Date(this.time[0]),"yyyy-MM-dd"):null,this.search.endTime=this.time?"string "==typeof this.time[0]?this.time[1]:this.dateformat(new Date(this.time[1]),"yyyy-MM-dd"):null;var l={currentPage:a,pageSize:t};this.$emit("changeSearch",i()({},this.search,l))}}},c={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"marketing-ecm"},[t("div",{staticClass:"search"},[t("el-input",{staticClass:"w260",attrs:{placeholder:"请输入计划名称","prefix-icon":"el-icon-search",clearable:""},on:{change:e.change},model:{value:e.search.search,callback:function(a){e.$set(e.search,"search",a)},expression:"search.search"}}),e._v(" "),t("el-date-picker",{staticClass:"ml10 w256",attrs:{clearable:!1,"value-format":"yyyy-MM-dd",pickerOptions:e.pickerOptions,type:"daterange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.change},model:{value:e.time,callback:function(a){e.time=a},expression:"time"}}),e._v(" "),t("el-select",{staticClass:"ml10 w160",attrs:{placeholder:"所有营销方式",clearable:""},on:{change:e.change},model:{value:e.search.marketingType,callback:function(a){e.$set(e.search,"marketingType",a)},expression:"search.marketingType"}},e._l(e.ecmTypeList,function(e){return t("el-option",{key:e.id,attrs:{value:e.value,label:e.label}})}),1)],1),e._v(" "),t("div",{staticClass:"table"},[t("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.tableData.loading,expression:"tableData.loading"}],staticStyle:{width:"100%"},attrs:{data:e.tableData.data,"tooltip-effect":"dark"}},e._l(e.tableData.tableHeader,function(a,l){return t("el-table-column",{key:l,attrs:{prop:a.prop,"min-width":a.minWidth,label:a.label,formatter:a.formatter,fixed:a.fixed,"show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(l){var i=l.row;return[a.formatter?t("span",{domProps:{innerHTML:e._s(a.formatter(i))}}):t("span",[e._v(e._s(i[a.prop]||"--"))])]}}])})}),1),e._v(" "),e.tableData.total>0?t("div",{staticClass:"pager"},[t("dm-pagination",{attrs:{background:"","current-page":e.tableData.currentPage,"page-sizes":e.tableData.pageSizeList,"page-size":e.tableData.pageSize,layout:"total, sizes, prev, pager, next",total:e.tableData.total},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e()],1)])},staticRenderFns:[]};var o=t("VU/8")(n,c,!1,function(e){t("SxgG")},"data-v-6ab91789",null);a.default=o.exports}});
\ No newline at end of file
<<<<<<<< HEAD:dist/js/52.5593490f0502bda69324.js
webpackJsonp([52],{SxgG:function(e,a){},seIo:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var l=t("woOf"),i=t.n(l),r=t("a2Vx"),s=t("u6qo"),n={name:"ecm",props:{tableData:Object},mixins:[r.a,s.a],data:function(){return{search:{search:"",beginTime:"",endTime:"",marketingType:null},ecmTypeList:[{label:"积分",value:"integral"},{label:"短信",value:"message"},{label:"话务",value:"teltask"},{label:"群发任务",value:"qfxx"},{label:"图文消息",value:"teletext"},{label:"图片",value:"image"},{label:"文本消息",value:"text"},{label:"小程序",value:"wxa"},{label:"卡券",value:"card"}]}},methods:{change:function(){var e=this.tableData,a=e.currentPage,t=e.pageSize;this.search.beginTime=this.time?"string "==typeof this.time[0]?this.time[0]:this.dateformat(new Date(this.time[0]),"yyyy-MM-dd"):null,this.search.endTime=this.time?"string "==typeof this.time[0]?this.time[1]:this.dateformat(new Date(this.time[1]),"yyyy-MM-dd"):null;var l={currentPage:a,pageSize:t};this.$emit("changeSearch",i()({},this.search,l))}}},c={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"marketing-ecm"},[t("div",{staticClass:"search"},[t("el-input",{staticClass:"w260",attrs:{placeholder:"请输入计划名称","prefix-icon":"el-icon-search",clearable:""},on:{change:e.change},model:{value:e.search.search,callback:function(a){e.$set(e.search,"search",a)},expression:"search.search"}}),e._v(" "),t("el-date-picker",{staticClass:"ml10 w256",attrs:{clearable:!1,"value-format":"yyyy-MM-dd",pickerOptions:e.pickerOptions,type:"daterange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.change},model:{value:e.time,callback:function(a){e.time=a},expression:"time"}}),e._v(" "),t("el-select",{staticClass:"ml10 w160",attrs:{placeholder:"所有营销方式",clearable:""},on:{change:e.change},model:{value:e.search.marketingType,callback:function(a){e.$set(e.search,"marketingType",a)},expression:"search.marketingType"}},e._l(e.ecmTypeList,function(e){return t("el-option",{key:e.id,attrs:{value:e.value,label:e.label}})}),1)],1),e._v(" "),t("div",{staticClass:"table"},[t("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.tableData.loading,expression:"tableData.loading"}],staticStyle:{width:"100%"},attrs:{data:e.tableData.data,"tooltip-effect":"dark"}},e._l(e.tableData.tableHeader,function(a,l){return t("el-table-column",{key:l,attrs:{prop:a.prop,"min-width":a.minWidth,label:a.label,formatter:a.formatter,fixed:a.fixed,"show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(l){var i=l.row;return[a.formatter?t("span",{domProps:{innerHTML:e._s(a.formatter(i))}}):t("span",[e._v(e._s(i[a.prop]||"--"))])]}}])})}),1),e._v(" "),e.tableData.total>0?t("div",{staticClass:"pager"},[t("dm-pagination",{attrs:{background:"","current-page":e.tableData.currentPage,"page-sizes":e.tableData.pageSizeList,"page-size":e.tableData.pageSize,layout:"total, sizes, prev, pager, next",total:e.tableData.total},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e()],1)])},staticRenderFns:[]};var o=t("VU/8")(n,c,!1,function(e){t("SxgG")},"data-v-6ab91789",null);a.default=o.exports}});
========
webpackJsonp([53],{SxgG:function(e,a){},seIo:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var l=t("woOf"),i=t.n(l),r=t("a2Vx"),s=t("u6qo"),n={name:"ecm",props:{tableData:Object},mixins:[r.a,s.a],data:function(){return{search:{search:"",beginTime:"",endTime:"",marketingType:null},ecmTypeList:[{label:"积分",value:"integral"},{label:"短信",value:"message"},{label:"话务",value:"teltask"},{label:"群发任务",value:"qfxx"},{label:"图文消息",value:"teletext"},{label:"图片",value:"image"},{label:"文本消息",value:"text"},{label:"小程序",value:"wxa"},{label:"卡券",value:"card"}]}},methods:{change:function(){var e=this.tableData,a=e.currentPage,t=e.pageSize;this.search.beginTime=this.time?"string "==typeof this.time[0]?this.time[0]:this.dateformat(new Date(this.time[0]),"yyyy-MM-dd"):null,this.search.endTime=this.time?"string "==typeof this.time[0]?this.time[1]:this.dateformat(new Date(this.time[1]),"yyyy-MM-dd"):null;var l={currentPage:a,pageSize:t};this.$emit("changeSearch",i()({},this.search,l))}}},c={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"marketing-ecm"},[t("div",{staticClass:"search"},[t("el-input",{staticClass:"w260",attrs:{placeholder:"请输入计划名称","prefix-icon":"el-icon-search",clearable:""},on:{change:e.change},model:{value:e.search.search,callback:function(a){e.$set(e.search,"search",a)},expression:"search.search"}}),e._v(" "),t("el-date-picker",{staticClass:"ml10 w256",attrs:{clearable:!1,"value-format":"yyyy-MM-dd",pickerOptions:e.pickerOptions,type:"daterange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.change},model:{value:e.time,callback:function(a){e.time=a},expression:"time"}}),e._v(" "),t("el-select",{staticClass:"ml10 w160",attrs:{placeholder:"所有营销方式",clearable:""},on:{change:e.change},model:{value:e.search.marketingType,callback:function(a){e.$set(e.search,"marketingType",a)},expression:"search.marketingType"}},e._l(e.ecmTypeList,function(e){return t("el-option",{key:e.id,attrs:{value:e.value,label:e.label}})}),1)],1),e._v(" "),t("div",{staticClass:"table"},[t("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.tableData.loading,expression:"tableData.loading"}],staticStyle:{width:"100%"},attrs:{data:e.tableData.data,"tooltip-effect":"dark"}},e._l(e.tableData.tableHeader,function(a,l){return t("el-table-column",{key:l,attrs:{prop:a.prop,"min-width":a.minWidth,label:a.label,formatter:a.formatter,fixed:a.fixed,"show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(l){var i=l.row;return[a.formatter?t("span",{domProps:{innerHTML:e._s(a.formatter(i))}}):t("span",[e._v(e._s(i[a.prop]||"--"))])]}}])})}),1),e._v(" "),e.tableData.total>0?t("div",{staticClass:"pager"},[t("dm-pagination",{attrs:{background:"","current-page":e.tableData.currentPage,"page-sizes":e.tableData.pageSizeList,"page-size":e.tableData.pageSize,layout:"total, sizes, prev, pager, next",total:e.tableData.total},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e()],1)])},staticRenderFns:[]};var o=t("VU/8")(n,c,!1,function(e){t("SxgG")},"data-v-6ab91789",null);a.default=o.exports}});
>>>>>>>> bugfix/会员卡券列表:dist/js/53.a5c0294dcd1f610ede44.js
dist/js/53.2f2de0c278e80b3db043.js
webpackJsonp([53],{"58by":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r("Dd8w"),a=r.n(i),l=r("woOf"),o=r.n(l),n=r("AKaA"),s=r("NTL1"),d=r("8V46"),u={name:"CustomergradeDialog",props:{dialogVisible:{type:Boolean,default:!1},isClique:{type:Boolean,default:!1},gradeId:{type:String,default:""},cliqueGradeId:{type:String,default:""},gradeList:{type:Array,default:function(){return[]}},cliqueGradeList:{type:Array,default:function(){return[]}},memberId:{type:String,default:""}},data:function(){return{visible:!1,form:{memberId:"",gradeId:"",remark:""},rules:{gradeId:[{required:!0,message:"请选择修改后等级",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}]},btnLoading:!1}},watch:{dialogVisible:function(e,t){if(this.visible=e,e){var r=this.isClique?this.cliqueGradeId:this.gradeId;this.form=o()(this.form,{gradeId:r,memberId:this.memberId})}}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.btnLoading=!0;var r=a()({},e.form,{isClique:Number(e.isClique)});Object(n.a)(s.a.memberGrade,o()({},r)).then(function(t){0===t.data.errorCode?setTimeout(function(){e.btnLoading=!1,Object(d.c)(),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("refresh")},2e3):(Object(d.a)(),e.btnLoading=!1)}).catch(function(t){e.btnLoading=!1,Object(d.b)(t)})})}}},c={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("el-dialog",{attrs:{title:"修改等级","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[r("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[r("el-form-item",{attrs:{label:"修改后等级：",prop:"gradeId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{placeholder:"请选择"},model:{value:e.form.gradeId,callback:function(t){e.$set(e.form,"gradeId",t)},expression:"form.gradeId"}},[e.isClique?e._l(e.cliqueGradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})}):e._l(e.gradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})})],2)],1),e._v(" "),r("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[r("el-input",{staticStyle:{width:"386px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var m=r("VU/8")(u,c,!1,function(e){r("v54v")},null,null);t.default=m.exports},v54v:function(e,t){}});
\ No newline at end of file
<<<<<<<< HEAD:dist/js/53.2f2de0c278e80b3db043.js
webpackJsonp([53],{"58by":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r("Dd8w"),a=r.n(i),l=r("woOf"),o=r.n(l),n=r("AKaA"),s=r("NTL1"),d=r("8V46"),u={name:"CustomergradeDialog",props:{dialogVisible:{type:Boolean,default:!1},isClique:{type:Boolean,default:!1},gradeId:{type:String,default:""},cliqueGradeId:{type:String,default:""},gradeList:{type:Array,default:function(){return[]}},cliqueGradeList:{type:Array,default:function(){return[]}},memberId:{type:String,default:""}},data:function(){return{visible:!1,form:{memberId:"",gradeId:"",remark:""},rules:{gradeId:[{required:!0,message:"请选择修改后等级",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}]},btnLoading:!1}},watch:{dialogVisible:function(e,t){if(this.visible=e,e){var r=this.isClique?this.cliqueGradeId:this.gradeId;this.form=o()(this.form,{gradeId:r,memberId:this.memberId})}}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.btnLoading=!0;var r=a()({},e.form,{isClique:Number(e.isClique)});Object(n.a)(s.a.memberGrade,o()({},r)).then(function(t){0===t.data.errorCode?setTimeout(function(){e.btnLoading=!1,Object(d.c)(),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("refresh")},2e3):(Object(d.a)(),e.btnLoading=!1)}).catch(function(t){e.btnLoading=!1,Object(d.b)(t)})})}}},c={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("el-dialog",{attrs:{title:"修改等级","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[r("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[r("el-form-item",{attrs:{label:"修改后等级：",prop:"gradeId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{placeholder:"请选择"},model:{value:e.form.gradeId,callback:function(t){e.$set(e.form,"gradeId",t)},expression:"form.gradeId"}},[e.isClique?e._l(e.cliqueGradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})}):e._l(e.gradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})})],2)],1),e._v(" "),r("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[r("el-input",{staticStyle:{width:"386px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var m=r("VU/8")(u,c,!1,function(e){r("v54v")},null,null);t.default=m.exports},v54v:function(e,t){}});
========
webpackJsonp([54],{"58by":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r("Dd8w"),a=r.n(i),l=r("woOf"),o=r.n(l),n=r("AKaA"),s=r("NTL1"),d=r("8V46"),u={name:"CustomergradeDialog",props:{dialogVisible:{type:Boolean,default:!1},isClique:{type:Boolean,default:!1},gradeId:{type:String,default:""},cliqueGradeId:{type:String,default:""},gradeList:{type:Array,default:function(){return[]}},cliqueGradeList:{type:Array,default:function(){return[]}},memberId:{type:String,default:""}},data:function(){return{visible:!1,form:{memberId:"",gradeId:"",remark:""},rules:{gradeId:[{required:!0,message:"请选择修改后等级",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}]},btnLoading:!1}},watch:{dialogVisible:function(e,t){if(this.visible=e,e){var r=this.isClique?this.cliqueGradeId:this.gradeId;this.form=o()(this.form,{gradeId:r,memberId:this.memberId})}}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.btnLoading=!0;var r=a()({},e.form,{isClique:Number(e.isClique)});Object(n.a)(s.a.memberGrade,o()({},r)).then(function(t){0===t.data.errorCode?setTimeout(function(){e.btnLoading=!1,Object(d.c)(),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("refresh")},2e3):(Object(d.a)(),e.btnLoading=!1)}).catch(function(t){e.btnLoading=!1,Object(d.b)(t)})})}}},c={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("el-dialog",{attrs:{title:"修改等级","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[r("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[r("el-form-item",{attrs:{label:"修改后等级：",prop:"gradeId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{placeholder:"请选择"},model:{value:e.form.gradeId,callback:function(t){e.$set(e.form,"gradeId",t)},expression:"form.gradeId"}},[e.isClique?e._l(e.cliqueGradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})}):e._l(e.gradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})})],2)],1),e._v(" "),r("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[r("el-input",{staticStyle:{width:"386px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var m=r("VU/8")(u,c,!1,function(e){r("v54v")},null,null);t.default=m.exports},v54v:function(e,t){}});
>>>>>>>> bugfix/会员卡券列表:dist/js/54.08fd719919cee3f28b8b.js
dist/js/53.a5c0294dcd1f610ede44.js 0 → 100644
<<<<<<<< HEAD:dist/js/52.5593490f0502bda69324.js
webpackJsonp([52],{SxgG:function(e,a){},seIo:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var l=t("woOf"),i=t.n(l),r=t("a2Vx"),s=t("u6qo"),n={name:"ecm",props:{tableData:Object},mixins:[r.a,s.a],data:function(){return{search:{search:"",beginTime:"",endTime:"",marketingType:null},ecmTypeList:[{label:"积分",value:"integral"},{label:"短信",value:"message"},{label:"话务",value:"teltask"},{label:"群发任务",value:"qfxx"},{label:"图文消息",value:"teletext"},{label:"图片",value:"image"},{label:"文本消息",value:"text"},{label:"小程序",value:"wxa"},{label:"卡券",value:"card"}]}},methods:{change:function(){var e=this.tableData,a=e.currentPage,t=e.pageSize;this.search.beginTime=this.time?"string "==typeof this.time[0]?this.time[0]:this.dateformat(new Date(this.time[0]),"yyyy-MM-dd"):null,this.search.endTime=this.time?"string "==typeof this.time[0]?this.time[1]:this.dateformat(new Date(this.time[1]),"yyyy-MM-dd"):null;var l={currentPage:a,pageSize:t};this.$emit("changeSearch",i()({},this.search,l))}}},c={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"marketing-ecm"},[t("div",{staticClass:"search"},[t("el-input",{staticClass:"w260",attrs:{placeholder:"请输入计划名称","prefix-icon":"el-icon-search",clearable:""},on:{change:e.change},model:{value:e.search.search,callback:function(a){e.$set(e.search,"search",a)},expression:"search.search"}}),e._v(" "),t("el-date-picker",{staticClass:"ml10 w256",attrs:{clearable:!1,"value-format":"yyyy-MM-dd",pickerOptions:e.pickerOptions,type:"daterange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.change},model:{value:e.time,callback:function(a){e.time=a},expression:"time"}}),e._v(" "),t("el-select",{staticClass:"ml10 w160",attrs:{placeholder:"所有营销方式",clearable:""},on:{change:e.change},model:{value:e.search.marketingType,callback:function(a){e.$set(e.search,"marketingType",a)},expression:"search.marketingType"}},e._l(e.ecmTypeList,function(e){return t("el-option",{key:e.id,attrs:{value:e.value,label:e.label}})}),1)],1),e._v(" "),t("div",{staticClass:"table"},[t("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.tableData.loading,expression:"tableData.loading"}],staticStyle:{width:"100%"},attrs:{data:e.tableData.data,"tooltip-effect":"dark"}},e._l(e.tableData.tableHeader,function(a,l){return t("el-table-column",{key:l,attrs:{prop:a.prop,"min-width":a.minWidth,label:a.label,formatter:a.formatter,fixed:a.fixed,"show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(l){var i=l.row;return[a.formatter?t("span",{domProps:{innerHTML:e._s(a.formatter(i))}}):t("span",[e._v(e._s(i[a.prop]||"--"))])]}}])})}),1),e._v(" "),e.tableData.total>0?t("div",{staticClass:"pager"},[t("dm-pagination",{attrs:{background:"","current-page":e.tableData.currentPage,"page-sizes":e.tableData.pageSizeList,"page-size":e.tableData.pageSize,layout:"total, sizes, prev, pager, next",total:e.tableData.total},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e()],1)])},staticRenderFns:[]};var o=t("VU/8")(n,c,!1,function(e){t("SxgG")},"data-v-6ab91789",null);a.default=o.exports}});
========
webpackJsonp([53],{SxgG:function(e,a){},seIo:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var l=t("woOf"),i=t.n(l),r=t("a2Vx"),s=t("u6qo"),n={name:"ecm",props:{tableData:Object},mixins:[r.a,s.a],data:function(){return{search:{search:"",beginTime:"",endTime:"",marketingType:null},ecmTypeList:[{label:"积分",value:"integral"},{label:"短信",value:"message"},{label:"话务",value:"teltask"},{label:"群发任务",value:"qfxx"},{label:"图文消息",value:"teletext"},{label:"图片",value:"image"},{label:"文本消息",value:"text"},{label:"小程序",value:"wxa"},{label:"卡券",value:"card"}]}},methods:{change:function(){var e=this.tableData,a=e.currentPage,t=e.pageSize;this.search.beginTime=this.time?"string "==typeof this.time[0]?this.time[0]:this.dateformat(new Date(this.time[0]),"yyyy-MM-dd"):null,this.search.endTime=this.time?"string "==typeof this.time[0]?this.time[1]:this.dateformat(new Date(this.time[1]),"yyyy-MM-dd"):null;var l={currentPage:a,pageSize:t};this.$emit("changeSearch",i()({},this.search,l))}}},c={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"marketing-ecm"},[t("div",{staticClass:"search"},[t("el-input",{staticClass:"w260",attrs:{placeholder:"请输入计划名称","prefix-icon":"el-icon-search",clearable:""},on:{change:e.change},model:{value:e.search.search,callback:function(a){e.$set(e.search,"search",a)},expression:"search.search"}}),e._v(" "),t("el-date-picker",{staticClass:"ml10 w256",attrs:{clearable:!1,"value-format":"yyyy-MM-dd",pickerOptions:e.pickerOptions,type:"daterange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:e.change},model:{value:e.time,callback:function(a){e.time=a},expression:"time"}}),e._v(" "),t("el-select",{staticClass:"ml10 w160",attrs:{placeholder:"所有营销方式",clearable:""},on:{change:e.change},model:{value:e.search.marketingType,callback:function(a){e.$set(e.search,"marketingType",a)},expression:"search.marketingType"}},e._l(e.ecmTypeList,function(e){return t("el-option",{key:e.id,attrs:{value:e.value,label:e.label}})}),1)],1),e._v(" "),t("div",{staticClass:"table"},[t("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.tableData.loading,expression:"tableData.loading"}],staticStyle:{width:"100%"},attrs:{data:e.tableData.data,"tooltip-effect":"dark"}},e._l(e.tableData.tableHeader,function(a,l){return t("el-table-column",{key:l,attrs:{prop:a.prop,"min-width":a.minWidth,label:a.label,formatter:a.formatter,fixed:a.fixed,"show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(l){var i=l.row;return[a.formatter?t("span",{domProps:{innerHTML:e._s(a.formatter(i))}}):t("span",[e._v(e._s(i[a.prop]||"--"))])]}}])})}),1),e._v(" "),e.tableData.total>0?t("div",{staticClass:"pager"},[t("dm-pagination",{attrs:{background:"","current-page":e.tableData.currentPage,"page-sizes":e.tableData.pageSizeList,"page-size":e.tableData.pageSize,layout:"total, sizes, prev, pager, next",total:e.tableData.total},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e()],1)])},staticRenderFns:[]};var o=t("VU/8")(n,c,!1,function(e){t("SxgG")},"data-v-6ab91789",null);a.default=o.exports}});
>>>>>>>> bugfix/会员卡券列表:dist/js/53.a5c0294dcd1f610ede44.js
dist/js/54.08fd719919cee3f28b8b.js 0 → 100644
<<<<<<<< HEAD:dist/js/53.2f2de0c278e80b3db043.js
webpackJsonp([53],{"58by":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r("Dd8w"),a=r.n(i),l=r("woOf"),o=r.n(l),n=r("AKaA"),s=r("NTL1"),d=r("8V46"),u={name:"CustomergradeDialog",props:{dialogVisible:{type:Boolean,default:!1},isClique:{type:Boolean,default:!1},gradeId:{type:String,default:""},cliqueGradeId:{type:String,default:""},gradeList:{type:Array,default:function(){return[]}},cliqueGradeList:{type:Array,default:function(){return[]}},memberId:{type:String,default:""}},data:function(){return{visible:!1,form:{memberId:"",gradeId:"",remark:""},rules:{gradeId:[{required:!0,message:"请选择修改后等级",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}]},btnLoading:!1}},watch:{dialogVisible:function(e,t){if(this.visible=e,e){var r=this.isClique?this.cliqueGradeId:this.gradeId;this.form=o()(this.form,{gradeId:r,memberId:this.memberId})}}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.btnLoading=!0;var r=a()({},e.form,{isClique:Number(e.isClique)});Object(n.a)(s.a.memberGrade,o()({},r)).then(function(t){0===t.data.errorCode?setTimeout(function(){e.btnLoading=!1,Object(d.c)(),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("refresh")},2e3):(Object(d.a)(),e.btnLoading=!1)}).catch(function(t){e.btnLoading=!1,Object(d.b)(t)})})}}},c={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("el-dialog",{attrs:{title:"修改等级","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[r("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[r("el-form-item",{attrs:{label:"修改后等级：",prop:"gradeId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{placeholder:"请选择"},model:{value:e.form.gradeId,callback:function(t){e.$set(e.form,"gradeId",t)},expression:"form.gradeId"}},[e.isClique?e._l(e.cliqueGradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})}):e._l(e.gradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})})],2)],1),e._v(" "),r("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[r("el-input",{staticStyle:{width:"386px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var m=r("VU/8")(u,c,!1,function(e){r("v54v")},null,null);t.default=m.exports},v54v:function(e,t){}});
========
webpackJsonp([54],{"58by":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=r("Dd8w"),a=r.n(i),l=r("woOf"),o=r.n(l),n=r("AKaA"),s=r("NTL1"),d=r("8V46"),u={name:"CustomergradeDialog",props:{dialogVisible:{type:Boolean,default:!1},isClique:{type:Boolean,default:!1},gradeId:{type:String,default:""},cliqueGradeId:{type:String,default:""},gradeList:{type:Array,default:function(){return[]}},cliqueGradeList:{type:Array,default:function(){return[]}},memberId:{type:String,default:""}},data:function(){return{visible:!1,form:{memberId:"",gradeId:"",remark:""},rules:{gradeId:[{required:!0,message:"请选择修改后等级",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}]},btnLoading:!1}},watch:{dialogVisible:function(e,t){if(this.visible=e,e){var r=this.isClique?this.cliqueGradeId:this.gradeId;this.form=o()(this.form,{gradeId:r,memberId:this.memberId})}}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.btnLoading=!0;var r=a()({},e.form,{isClique:Number(e.isClique)});Object(n.a)(s.a.memberGrade,o()({},r)).then(function(t){0===t.data.errorCode?setTimeout(function(){e.btnLoading=!1,Object(d.c)(),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("refresh")},2e3):(Object(d.a)(),e.btnLoading=!1)}).catch(function(t){e.btnLoading=!1,Object(d.b)(t)})})}}},c={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("el-dialog",{attrs:{title:"修改等级","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[r("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[r("el-form-item",{attrs:{label:"修改后等级：",prop:"gradeId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{placeholder:"请选择"},model:{value:e.form.gradeId,callback:function(t){e.$set(e.form,"gradeId",t)},expression:"form.gradeId"}},[e.isClique?e._l(e.cliqueGradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})}):e._l(e.gradeList,function(e){return r("el-option",{key:e.id,attrs:{label:e.name,value:e.id}})})],2)],1),e._v(" "),r("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[r("el-input",{staticStyle:{width:"386px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var m=r("VU/8")(u,c,!1,function(e){r("v54v")},null,null);t.default=m.exports},v54v:function(e,t){}});
>>>>>>>> bugfix/会员卡券列表:dist/js/54.08fd719919cee3f28b8b.js
dist/js/64.4d65d5cf62d48a17425b.js 0 → 100644
<<<<<<<< HEAD:dist/js/63.a291eb9caa8a5c757321.js
webpackJsonp([63],{FSpY:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("woOf"),o=r.n(a),i=r("Dd8w"),n=r.n(i),s=r("AKaA"),l=r("NTL1"),c=r("SJI6"),m=r("8V46"),d={name:"CustomermainstoreDialog",props:{dialogVisible:{type:Boolean,default:!1},obj:{type:Object,default:function(){return{}}}},data:function(){return{visible:!1,form:{mainStoreIdBak:"",mainStoreId:"",mainClerkId:"",remark:"",optType:1},rules:{mainStoreId:[{required:!0,message:"请选择服务门店",trigger:"change"}],mainClerkId:[{required:!0,message:"请选择专属导购",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}]},mainstoreList:[],clerkOptions:[],loading:!1,btnLoading:!1}},computed:n()({},Object(c.mapState)(["showEditClique"])),watch:{dialogVisible:function(e,t){if(this.visible=e,e){var r=this.obj,a=r.memberId,i=r.mainStoreName,n=r.mainStoreId,s=r.mainClerkId,l=r.clerkInStore;this.form=o()({},this.form,{memberId:a,mainStoreId:n,mainClerkId:0===l?"":s,mainStoreIdBak:n}),n&&(this.getMainStoreCodeName(i),this.getClerckList(n,!0))}}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},getMainStoreCodeName:function(e){var t=this;this.loading=!0,Object(s.c)(l.a.storeCodeName,{searchParam:e,flag:1}).then(function(e){0===e.data.errorCode?t.mainstoreList=e.data.result:Object(m.a)(e.data.message)}).catch(function(e){Object(m.b)(e)}).finally(function(e){return t.loading=!1})},getClerckList:function(e,t){var r=this;t||(this.form.mainClerkId=""),this.clerkOptions=[],Object(s.b)(l.a.getClerkList,{storeId:e,requestProject:"member"}).then(function(e){var t=e.data||{},a=t.errorCode,o=t.message,i=t.result,n=void 0===i?[]:i;if(0!=a)return r.$message.error(o);r.clerkOptions=n})},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.btnLoading=!0,Object(s.a)(l.a.updateMemberStore,o()({},e.form)).then(function(t){0===t.data.errorCode?setTimeout(function(){e.btnLoading=!1,Object(m.c)(),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("refresh")},4500):(Object(m.a)(),e.btnLoading=!1)}).catch(function(t){e.btnLoading=!1,Object(m.b)(t)})})}}},u={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("el-dialog",{attrs:{title:"修改服务门店","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[r("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[r("el-form-item",{attrs:{label:"服务门店：",prop:"mainStoreId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{filterable:"",remote:"","reserve-keyword":"",placeholder:"请输入门店名称/门店code","remote-method":e.getMainStoreCodeName,loading:e.loading,"popper-class":"option-wrap"},on:{change:e.getClerckList},model:{value:e.form.mainStoreId,callback:function(t){e.$set(e.form,"mainStoreId",t)},expression:"form.mainStoreId"}},e._l(e.mainstoreList,function(t){return r("el-option",{key:t.storeId,attrs:{label:t.storeName,value:t.storeId}},[r("p",{staticClass:"name"},[e._v("\n "+e._s(t.storeName)+"\n ")]),e._v(" "),r("p",{staticClass:"code"},[e._v("\n "+e._s(t.storeCode)+"\n ")])])}),1)],1),e._v(" "),r("el-form-item",{attrs:{label:"专属导购：",prop:"mainClerkId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{"popper-class":"option-wrap"},model:{value:e.form.mainClerkId,callback:function(t){e.$set(e.form,"mainClerkId",t)},expression:"form.mainClerkId"}},e._l(e.clerkOptions,function(t){return r("el-option",{key:t.clerkId,attrs:{value:t.clerkId,label:t.clerkName}},[r("p",{staticClass:"name"},[e._v("\n "+e._s(t.clerkName)+"\n ")]),e._v(" "),r("p",{staticClass:"code"},[e._v("\n "+e._s(t.clerkCode)+"\n ")])])}),1)],1),e._v(" "),r("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[r("el-input",{staticStyle:{width:"386px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var f=r("VU/8")(d,u,!1,function(e){r("ZFcD")},null,null);t.default=f.exports},ZFcD:function(e,t){}});
========
webpackJsonp([64],{FSpY:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("woOf"),o=r.n(a),i=r("Dd8w"),n=r.n(i),s=r("AKaA"),l=r("NTL1"),c=r("SJI6"),m=r("8V46"),d={name:"CustomermainstoreDialog",props:{dialogVisible:{type:Boolean,default:!1},obj:{type:Object,default:function(){return{}}}},data:function(){return{visible:!1,form:{mainStoreIdBak:"",mainStoreId:"",mainClerkId:"",remark:"",optType:1},rules:{mainStoreId:[{required:!0,message:"请选择服务门店",trigger:"change"}],mainClerkId:[{required:!0,message:"请选择专属导购",trigger:"change"}],remark:[{required:!0,message:"请输入原因备注",trigger:"change"}]},mainstoreList:[],clerkOptions:[],loading:!1,btnLoading:!1}},computed:n()({},Object(c.mapState)(["showEditClique"])),watch:{dialogVisible:function(e,t){if(this.visible=e,e){var r=this.obj,a=r.memberId,i=r.mainStoreName,n=r.mainStoreId,s=r.mainClerkId,l=r.clerkInStore;this.form=o()({},this.form,{memberId:a,mainStoreId:n,mainClerkId:0===l?"":s,mainStoreIdBak:n}),n&&(this.getMainStoreCodeName(i),this.getClerckList(n,!0))}}},methods:{cancel:function(){this.$refs.form.resetFields(),this.$emit("update:dialogVisible",!1)},getMainStoreCodeName:function(e){var t=this;this.loading=!0,Object(s.c)(l.a.storeCodeName,{searchParam:e,flag:1}).then(function(e){0===e.data.errorCode?t.mainstoreList=e.data.result:Object(m.a)(e.data.message)}).catch(function(e){Object(m.b)(e)}).finally(function(e){return t.loading=!1})},getClerckList:function(e,t){var r=this;t||(this.form.mainClerkId=""),this.clerkOptions=[],Object(s.b)(l.a.getClerkList,{storeId:e,requestProject:"member"}).then(function(e){var t=e.data||{},a=t.errorCode,o=t.message,i=t.result,n=void 0===i?[]:i;if(0!=a)return r.$message.error(o);r.clerkOptions=n})},submit:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.btnLoading=!0,Object(s.a)(l.a.updateMemberStore,o()({},e.form)).then(function(t){0===t.data.errorCode?setTimeout(function(){e.btnLoading=!1,Object(m.c)(),e.$refs.form.resetFields(),e.$emit("update:dialogVisible",!1),e.$emit("refresh")},4500):(Object(m.a)(),e.btnLoading=!1)}).catch(function(t){e.btnLoading=!1,Object(m.b)(t)})})}}},u={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("el-dialog",{attrs:{title:"修改服务门店","custom-class":"customer-dialog",visible:e.visible,"close-on-click-modal":!1,width:"600px"},on:{"update:visible":function(t){e.visible=t},close:e.cancel}},[r("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"133px"}},[r("el-form-item",{attrs:{label:"服务门店：",prop:"mainStoreId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{filterable:"",remote:"","reserve-keyword":"",placeholder:"请输入门店名称/门店code","remote-method":e.getMainStoreCodeName,loading:e.loading,"popper-class":"option-wrap"},on:{change:e.getClerckList},model:{value:e.form.mainStoreId,callback:function(t){e.$set(e.form,"mainStoreId",t)},expression:"form.mainStoreId"}},e._l(e.mainstoreList,function(t){return r("el-option",{key:t.storeId,attrs:{label:t.storeName,value:t.storeId}},[r("p",{staticClass:"name"},[e._v("\n "+e._s(t.storeName)+"\n ")]),e._v(" "),r("p",{staticClass:"code"},[e._v("\n "+e._s(t.storeCode)+"\n ")])])}),1)],1),e._v(" "),r("el-form-item",{attrs:{label:"专属导购：",prop:"mainClerkId"}},[r("el-select",{staticStyle:{width:"386px"},attrs:{"popper-class":"option-wrap"},model:{value:e.form.mainClerkId,callback:function(t){e.$set(e.form,"mainClerkId",t)},expression:"form.mainClerkId"}},e._l(e.clerkOptions,function(t){return r("el-option",{key:t.clerkId,attrs:{value:t.clerkId,label:t.clerkName}},[r("p",{staticClass:"name"},[e._v("\n "+e._s(t.clerkName)+"\n ")]),e._v(" "),r("p",{staticClass:"code"},[e._v("\n "+e._s(t.clerkCode)+"\n ")])])}),1)],1),e._v(" "),r("el-form-item",{attrs:{label:"原因备注：",prop:"remark"}},[r("el-input",{staticStyle:{width:"386px"},attrs:{type:"text",maxlength:"20","show-word-limit":"",placeholder:"请输入内容"},model:{value:e.form.remark,callback:function(t){e.$set(e.form,"remark",t)},expression:"form.remark"}})],1)],1),e._v(" "),r("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[r("el-button",{on:{click:e.cancel}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary",loading:e.btnLoading},on:{click:e.submit}},[e._v("确定")])],1)],1)],1)},staticRenderFns:[]};var f=r("VU/8")(d,u,!1,function(e){r("ZFcD")},null,null);t.default=f.exports},ZFcD:function(e,t){}});
>>>>>>>> bugfix/会员卡券列表:dist/js/64.4d65d5cf62d48a17425b.js
dist/js/65.8d9c5eee685da964ec92.js 0 → 100644
<<<<<<<< HEAD:dist/js/64.c990d68a129b5df93f50.js
webpackJsonp([64],{AUf2:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("Dd8w"),n=a.n(r),s=a("WSiR"),i=a("AKaA"),o=a("NTL1"),c=a("oAV5"),u=a("8V46"),l={name:"membergroup",data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,navpath:[{name:"首页",path:""},{name:"会员分组",path:""}],page:{pageSize:20,currentPage:1,totalCount:0},memberGroupList:[]}},filters:{formatCondition:function(e){JSON.parse(e);return e}},methods:{handleCurrentChange:function(e){this.page.currentPage=e,this.getFindMemberGroups({pageSize:20,currentPage:e})},handleSizeChange:function(e){this.page.pageSize=e,this.getFindMemberGroups({pageSize:e,currentPage:1})},addMemberGroup:function(){this.$router.push({path:"/membergroupAdd"})},handleDetailGrop:function(e){this.$router.push({path:"/membergroupDetail",query:{memberGroupId:e}})},getFindMemberGroups:function(e){var t=this;Object(i.a)(o.a.findMemberGroups,{pageSize:e.pageSize||20,currentPage:e.currentPage||1,shareStatus:0}).then(function(e){0===e.data.errorCode?(t.memberGroupList=e.data.result.page.result.map(function(e,t){return n()({},e,{memberSearchCount:Object(c.c)(e.memberSearchStr)})}),t.page.currentPage=e.data.result.page.currentPage,t.page.totalCount=e.data.result.page.totalCount):Object(u.a)(e.data.message)}).catch(function(e){Object(u.b)(e)})},handleDeleteGroup:function(e,t){var a=this;this.$confirm("确定删除该会员分组","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){Object(i.a)(o.a.deteleMemberGroup,{memberGroupId:e}).then(function(e){if(0!==e.data.errorCode)return Object(u.a)(e.data.message),!1;a.page.currentPage=1,a.getFindMemberGroups({}),a.$message({message:"删除成功",type:"success"})}).catch(function(e){Object(u.b)(e)})}).catch(function(e){Object(u.b)(e)})}},created:function(){this.getFindMemberGroups({}),this.$store.commit("mutations-slide",!1)},components:{"v-nav":s.a}},p={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"group-wrap"},[a("div",{staticClass:"group"},[a("div",{staticClass:"add-wrap"},[a("el-button",{staticClass:"add-btn",attrs:{type:"primary"},on:{click:e.addMemberGroup}},[e._v("新增分组")])],1),e._v(" "),e.page.totalCount>0?a("div",{staticClass:"groupwrap clear"},[e._l(e.memberGroupList,function(t,r){return a("div",{key:r,staticClass:"groupwrap-item"},[a("div",{staticClass:"groupwrap-content"},[a("div",{staticClass:"groupwrap-title"},[a("el-popover",{attrs:{placement:"top",width:"200",trigger:"hover",content:"备注： "+t.memberGroupDescribe}},[a("div",{staticClass:"member-group-name",attrs:{slot:"reference"},slot:"reference"},[e._v(e._s(t.memberGroupName))])])],1),e._v(" "),a("div",{staticClass:"groupwrap-total borderbmdashed"},[a("p",{staticClass:"groupwrap-text"},[e._v(e._s(t.memberCount)+" 人")])]),e._v(" "),a("div",{staticClass:"groupwrap-condition"},[e._v("筛选条件： "+e._s(t.memberSearchCount)+"项\n ")])]),e._v(" "),a("div",{staticClass:"groupwrap-handler"},[a("router-link",{staticClass:"mr6 pointer ml15 opt-icon",attrs:{to:{path:"/membergroupAdd",query:{memberGroupId:t.memberGroupId}},title:"编辑"}},[a("i",{staticClass:"el-icon-edit"})]),e._v(" "),a("span",{staticClass:"mr6 pointer opt-icon",attrs:{title:"详情"},on:{click:function(a){return e.handleDetailGrop(t.memberGroupId)}}},[a("i",{staticClass:"el-icon-document"})]),e._v(" "),a("span",{staticClass:"pointer opt-icon",attrs:{title:"删除"},on:{click:function(a){return e.handleDeleteGroup(t.memberGroupId,r)}}},[a("i",{staticClass:"el-icon-delete"})])],1)])}),e._v(" "),e.memberGroupList.length>0?a("div",{staticClass:"page mTop20"},[a("dm-pagination",{attrs:{background:"","current-page":e.page.currentPage,"page-sizes":[20,40,60,80],"page-size":e.page.pageSize,layout:"total, sizes, prev, pager, next",total:e.page.totalCount},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e(),e._v(" "),0==e.memberGroupList.length?a("div",{staticClass:"el-table__body-wrapper is-scrolling-none"},[e._m(0),e._v(" "),e._m(1)]):e._e()],2):e._e()])])},staticRenderFns:[function(){var e=this.$createElement,t=this._self._c||e;return t("table",{staticClass:"el-table__body",staticStyle:{width:"1077px"},attrs:{cellspacing:"0",cellpadding:"0",border:"0"}},[t("colgroup",[t("col",{attrs:{name:"el-table_3_column_9",width:"359"}}),this._v(" "),t("col",{attrs:{name:"el-table_3_column_10",width:"359"}}),this._v(" "),t("col",{attrs:{name:"el-table_3_column_11",width:"359"}})]),this._v(" "),t("tbody")])},function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"el-table__empty-block",staticStyle:{width:"100%",height:"256px"}},[t("span",{staticClass:"el-table__empty-text"},[this._v("暂无数据")])])}]};var m=a("VU/8")(l,p,!1,function(e){a("sOEb")},"data-v-3cbd8610",null);t.default=m.exports},sOEb:function(e,t){}});
========
webpackJsonp([65],{AUf2:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("Dd8w"),n=a.n(r),s=a("WSiR"),i=a("AKaA"),o=a("NTL1"),c=a("oAV5"),u=a("8V46"),l={name:"membergroup",data:function(){return{bodyHeight:document.body.clientHeight||document.documentElement.clientHeight,navpath:[{name:"首页",path:""},{name:"会员分组",path:""}],page:{pageSize:20,currentPage:1,totalCount:0},memberGroupList:[]}},filters:{formatCondition:function(e){JSON.parse(e);return e}},methods:{handleCurrentChange:function(e){this.page.currentPage=e,this.getFindMemberGroups({pageSize:20,currentPage:e})},handleSizeChange:function(e){this.page.pageSize=e,this.getFindMemberGroups({pageSize:e,currentPage:1})},addMemberGroup:function(){this.$router.push({path:"/membergroupAdd"})},handleDetailGrop:function(e){this.$router.push({path:"/membergroupDetail",query:{memberGroupId:e}})},getFindMemberGroups:function(e){var t=this;Object(i.a)(o.a.findMemberGroups,{pageSize:e.pageSize||20,currentPage:e.currentPage||1,shareStatus:0}).then(function(e){0===e.data.errorCode?(t.memberGroupList=e.data.result.page.result.map(function(e,t){return n()({},e,{memberSearchCount:Object(c.c)(e.memberSearchStr)})}),t.page.currentPage=e.data.result.page.currentPage,t.page.totalCount=e.data.result.page.totalCount):Object(u.a)(e.data.message)}).catch(function(e){Object(u.b)(e)})},handleDeleteGroup:function(e,t){var a=this;this.$confirm("确定删除该会员分组","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){Object(i.a)(o.a.deteleMemberGroup,{memberGroupId:e}).then(function(e){if(0!==e.data.errorCode)return Object(u.a)(e.data.message),!1;a.page.currentPage=1,a.getFindMemberGroups({}),a.$message({message:"删除成功",type:"success"})}).catch(function(e){Object(u.b)(e)})}).catch(function(e){Object(u.b)(e)})}},created:function(){this.getFindMemberGroups({}),this.$store.commit("mutations-slide",!1)},components:{"v-nav":s.a}},p={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"group-wrap"},[a("div",{staticClass:"group"},[a("div",{staticClass:"add-wrap"},[a("el-button",{staticClass:"add-btn",attrs:{type:"primary"},on:{click:e.addMemberGroup}},[e._v("新增分组")])],1),e._v(" "),e.page.totalCount>0?a("div",{staticClass:"groupwrap clear"},[e._l(e.memberGroupList,function(t,r){return a("div",{key:r,staticClass:"groupwrap-item"},[a("div",{staticClass:"groupwrap-content"},[a("div",{staticClass:"groupwrap-title"},[a("el-popover",{attrs:{placement:"top",width:"200",trigger:"hover",content:"备注： "+t.memberGroupDescribe}},[a("div",{staticClass:"member-group-name",attrs:{slot:"reference"},slot:"reference"},[e._v(e._s(t.memberGroupName))])])],1),e._v(" "),a("div",{staticClass:"groupwrap-total borderbmdashed"},[a("p",{staticClass:"groupwrap-text"},[e._v(e._s(t.memberCount)+" 人")])]),e._v(" "),a("div",{staticClass:"groupwrap-condition"},[e._v("筛选条件： "+e._s(t.memberSearchCount)+"项\n ")])]),e._v(" "),a("div",{staticClass:"groupwrap-handler"},[a("router-link",{staticClass:"mr6 pointer ml15 opt-icon",attrs:{to:{path:"/membergroupAdd",query:{memberGroupId:t.memberGroupId}},title:"编辑"}},[a("i",{staticClass:"el-icon-edit"})]),e._v(" "),a("span",{staticClass:"mr6 pointer opt-icon",attrs:{title:"详情"},on:{click:function(a){return e.handleDetailGrop(t.memberGroupId)}}},[a("i",{staticClass:"el-icon-document"})]),e._v(" "),a("span",{staticClass:"pointer opt-icon",attrs:{title:"删除"},on:{click:function(a){return e.handleDeleteGroup(t.memberGroupId,r)}}},[a("i",{staticClass:"el-icon-delete"})])],1)])}),e._v(" "),e.memberGroupList.length>0?a("div",{staticClass:"page mTop20"},[a("dm-pagination",{attrs:{background:"","current-page":e.page.currentPage,"page-sizes":[20,40,60,80],"page-size":e.page.pageSize,layout:"total, sizes, prev, pager, next",total:e.page.totalCount},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e(),e._v(" "),0==e.memberGroupList.length?a("div",{staticClass:"el-table__body-wrapper is-scrolling-none"},[e._m(0),e._v(" "),e._m(1)]):e._e()],2):e._e()])])},staticRenderFns:[function(){var e=this.$createElement,t=this._self._c||e;return t("table",{staticClass:"el-table__body",staticStyle:{width:"1077px"},attrs:{cellspacing:"0",cellpadding:"0",border:"0"}},[t("colgroup",[t("col",{attrs:{name:"el-table_3_column_9",width:"359"}}),this._v(" "),t("col",{attrs:{name:"el-table_3_column_10",width:"359"}}),this._v(" "),t("col",{attrs:{name:"el-table_3_column_11",width:"359"}})]),this._v(" "),t("tbody")])},function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"el-table__empty-block",staticStyle:{width:"100%",height:"256px"}},[t("span",{staticClass:"el-table__empty-text"},[this._v("暂无数据")])])}]};var m=a("VU/8")(l,p,!1,function(e){a("sOEb")},"data-v-3cbd8610",null);t.default=m.exports},sOEb:function(e,t){}});
>>>>>>>> bugfix/会员卡券列表:dist/js/65.8d9c5eee685da964ec92.js
dist/js/app.96ddd8bda1df7177945d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/manifest.0155526c476f59b6fa9e.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,u=0,i=[];u<c.length;u++)t=c[u],f[t]&&i.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);i.length;)i.shift()();if(n)for(u=0;u<n.length;u++)o=d(d.s=n[u]);return o};var c={},f={77:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"js/"+e+"."+{0:"ef7bf451572db41f8039",1:"eb732c388ecb85c78d77",2:"e068590560f41ab4d912",3:"e517c4670f752d2049c9",4:"206e80799afa87efd11d",5:"c04e2d1875638f762aab",6:"402a317917905ea64433",7:"7fd10209e0c5d70e6904",8:"a99921d3bfe33ac270ef",9:"7fba38b9f516a52ad577",10:"7ab742a58a02e0167515",11:"94f03db489d75fec7945",12:"22898c946ca9f377d437",13:"de420df1c2b9a8046b73",14:"93b9bb1fd46d7a92a912",15:"34b9bbd2c661926a1697",16:"9e63160ee1bbfe4e0df2",17:"a8702cc20df642a1c8a2",18:"917500e3b36e8be1a80c",19:"04f8c75b150912acf56b",20:"cb99532a4e545cad6aaa",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:"7410538cfaf9e63fab7d",43:"ce5a920e7f67a3d62932",44:"21e936e5aeb6d39365e1",45:"9dc1fa1473b9558e53cc",46:"69b1cc682929609634f5",47:"c366b68faef3f0b0552e",48:"45d9bd13ecef14139f13",49:"724a7e93a8f6c32e1af8",50:"b6aae173297058a469e1",51:"cc484e1358deec9b8b97",52:"867cc7f0a810c03e60bd",53:"a5c0294dcd1f610ede44",54:"08fd719919cee3f28b8b",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 a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/js/vendor.c657d67da16c1802184d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/axios/url.js
......@@ -120,8 +120,6 @@ const urlConfig = {
getMemberLogType: '/api-plug/member-oper-type-list',
getMemberLogReason: '/api-plug/member-oper-reason-list',
getMemberSourceList: '/api-plug/member-source-list',
getMemberLogType: '/api-plug/member-oper-type-list',
getMemberLogReason: '/api-plug/member-oper-reason-list',
getFrozenList: "/api-member/ajax-frozen-members",
batchUpdateFrozen: "/api-member/members-batch-update-frozen",
getExceptionList: '/api-member/list-exception-member',
......
src/components/wechatmembers/cardMixin.js
......@@ -26,6 +26,7 @@ export default {
},
methods: {
setDefalutTime(){
return
let start = new Date();
start.setFullYear(start.getFullYear() - 1);
start.setDate(start.getDate()+1);
......
src/components/wechatmembers/cardvoucher.vue
......@@ -72,10 +72,10 @@
:value=10
></el-option>
</el-select>
<el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" value-format="yyyy-MM-dd" @change="handleSearch" :clearable="false"> </el-date-picker>
<el-date-picker style="width: 256px;" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" value-format="yyyy-MM-dd" @change="handleSearch" clearable> </el-date-picker>
</div>
<p class="font14 tip-p">展示投放时间近两年的卡券</p>
<div class="table-content">
<!-- <p class="font14 tip-p">展示投放时间近一年的卡券</p> -->
<div class="table-content">
<el-table
:data="memberData"
tooltip-effect="dark"
......@@ -351,7 +351,6 @@ import nav from "../../common/navbar/navbar.vue";
import { doFetch } from "../../components/axios/api";
import url from "../../components/axios/url";
import authMethods from '@/mixins/auth';
import {formatYMD} from '@/common/filters/custom.js';
import {
checkFalse,
checkStatus,
......@@ -492,9 +491,6 @@ export default {
this.handleCheckDestory();
},
handleSearch() {
if(!this.dateDefault) {
this.setDefalutTime();
}
this.page.currentPage = 1;
this.getMemberCardsPage();
},
......@@ -558,14 +554,17 @@ export default {
});
},
getMemberCardsPage() {
let [ beginTime, endTime ] = this.dateDefault;
beginTime = beginTime ? new Date(beginTime).getTime() : null;
endTime = endTime ? new Date(endTime).getTime() : null;
doFetch(url.memberCardsPage, {
memberId: this.memberId,
pageSize: this.page.pageSize,
currentPage: this.page.currentPage,
cardReviceCode: this.cardReviceCode,
useStatus: this.useStatus,
// beginTime: this.dateDefault[0],
// endTime: this.dateDefault[1],
beginTime,
endTime
})
.then(res => {
if (res.data.errorCode === 0) {
......@@ -618,7 +617,6 @@ export default {
}
},
created() {
this.setDefalutTime()
if (this.memberId) {
this.getMemberCardsPage();
}
......@@ -627,23 +625,6 @@ export default {
},
components: {
"v-nav": nav
},
watch: {
'dateDefault': {
handler: function(selectTime) {
if(!selectTime){
let start = new Date();
start.setFullYear(start.getFullYear() - 1);
start.setDate(start.getDate() + 1);
start = `${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`;
let end = new Date();
end = `${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()}`;
selectTime = [formatYMD(new Date(start).getTime()), formatYMD(new Date(end).getTime())]
this.dateDefault = [formatYMD(new Date(start).getTime()), formatYMD(new Date(end).getTime())]
}
},
immediate: true
}
}
};
</script>
......
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