Skip to content

M
member
Commit d6ad6d7a by huaying
Options

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

# Conflicts:
#	dist/css/app.762f3b4bbaf0f954d47ff1408aeb3106.css
#	dist/css/app.b519d5f1d01fe35ca4a29120f33dc338.css
#	dist/css/app.d30b3be0ce282975dbeaf93943712da6.css
#	dist/index.html
#	dist/js/10.ccef2d43649dc2d7a9d7.js
#	dist/js/10.ee9b5530520a9311232a.js
#	dist/js/11.5faad302060a6fc16c52.js
#	dist/js/14.9198d17d3f402b9d9b84.js
#	dist/js/15.02d09171c81b9d839652.js
#	dist/js/15.ee806b049a3fb549c32c.js
#	dist/js/16.4be539a0edfddc9ecd63.js
#	dist/js/43.85d013cc084561cb92e1.js
#	dist/js/44.116c855829dadb726059.js
#	dist/js/44.2cf16f169bc0126bcd90.js
#	dist/js/48.1d834faf203c73b863ca.js
#	dist/js/58.4ced35b64936f0147996.js
#	dist/js/59.252f70a90cde2e6eca78.js
#	dist/js/60.f58b2745b7b3d40913f4.js
#	dist/js/61.5b2a9468c3878b2f307f.js
#	dist/js/62.e97122171e8f7ad71fd5.js
#	dist/js/73.d3aa406ef3dfb1751c5c.js
#	src/common/filters/custom.js
#	src/components/allCustomers/order-list/order-table.vue
parents 029310b1 e06737f6
Showing with 88 additions and 27 deletions
dist/css/app.762f3b4bbaf0f954d47ff1408aeb3106.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/app.b519d5f1d01fe35ca4a29120f33dc338.css
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.b519d5f1d01fe35ca4a29120f33dc338.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><style href=//at.alicdn.com/t/font_2996579_ubjq74uy5wj.css></style><script src=//at.alicdn.com/t/font_2859043_ckil7xvsqi.js></script><script src=//web-1251519181.file.myqcloud.com/lib/lodash.min.js></script><title></title><link rel="shortcut icon" href=./favicon.ico><link href=./css/app.762f3b4bbaf0f954d47ff1408aeb3106.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> feature/9月基础迭代
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./js/manifest.56cc9a2577bf3e72ef01.js></script><script type=text/javascript src=./js/vendor.c657d67da16c1802184d.js></script><script type=text/javascript src=./js/app.a9c9ba9e87bccf09904e.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.56cc9a2577bf3e72ef01.js></script><script type=text/javascript src=./js/vendor.c657d67da16c1802184d.js></script><script type=text/javascript src=./js/app.a9c9ba9e87bccf09904e.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./js/manifest.4c1c425cab61ccf1ef0b.js></script><script type=text/javascript src=./js/vendor.c657d67da16c1802184d.js></script><script type=text/javascript src=./js/app.07dec559fc8f5e736ea7.js></script></body></html>
>>>>>>> feature/9月基础迭代
dist/js/1.293aad8df812d35a4cf8.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/17.4e5eac2c993d26f5d0d3.js 0 → 100644
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
dist/js/43.33da891afabbb8027c09.js 0 → 100644
webpackJsonp([43],{csN7:function(e,t){},feYS:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=a("Dd8w"),r=a.n(s),i=a("WSiR"),n=a("AKaA"),l=a("NTL1"),o=a("8V46"),c=a("EOvX"),d={name:"infoMall",data:function(){return{memberId:this.$route.query.memberId||"",navpath:[{name:"首页",path:""},{name:"客户列表",path:"/allCustomers"},{name:"客户详情",path:"/customerDetail?memberId="+this.$route.query.memberId||""},{name:"微盟订单",path:""}],page:{currentPage:1,pageSize:20,totalCount:0},memberData:[],search:"",isWm:!0}},filters:{formatColorSize:function(e){var t="";e&&(t=JSON.parse(e).map(function(e){return e.key+": "+e.value})[0]);return t},mallname:function(e){var t="";e&&JSON.parse(e).forEach(function(e){t+=e.propName+":"+e.valueName+" "});return t}},methods:{handleCurrentChange:function(e){this.page.currentPage=e,this.getMemberOrderPage()},handleSizeChange:function(e){this.page.pageSize=e,this.getMemberOrderPage()},getMemberOrderPage:function(){var e=this;Object(n.a)(this.isWm?l.a.getWMList:l.a.getOtherList,{memberId:this.memberId,pageSize:this.page.pageSize,currentPage:this.page.currentPage,orderStatus:this.search||void 0}).then(function(t){0===t.data.errorCode?(e.memberData=t.data.result.page.result.map(function(e){return r()({},e,{createTime:e.createTime?Object(c.a)(new Date(e.createTime),"yyyy-MM-dd hh:mm:ss"):"--"})}),console.log(e.memberData),e.page.currentPage=t.data.result.page.currentPage,e.page.totalCount=t.data.result.page.totalCount):Object(o.a)(t.data.message)}).catch(function(e){Object(o.b)(e)})},goback:function(){this.$router.push({path:"customerDetail",query:{memberId:this.memberId}})},searchChangd:function(){this.page.currentPage=1,this.getMemberOrderPage()}},mounted:function(){console.log(this.$route),"微盟订单"==this.$route.meta.title?(this.isWm=!0,this.navpath[3].name="微盟订单"):(this.isWm=!1,this.navpath[3].name="其他订单"),this.memberId&&this.getMemberOrderPage(),this.$store.commit("mutations-slide",!1)},components:{"v-nav":i.a}},m={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"mall-container"},[a("div",{staticClass:"min100"},[a("v-nav",{attrs:{navpath:e.navpath}}),e._v(" "),a("div",{staticClass:"record"},[a("header",[a("el-select",{attrs:{placeholder:"全部类型",clearable:""},on:{change:e.searchChangd},model:{value:e.search,callback:function(t){e.search=t},expression:"search"}},[a("el-option",{attrs:{label:"购买",value:1}}),e._v(" "),a("el-option",{attrs:{label:"退款",value:2}}),e._v(" "),a("el-option",{attrs:{label:"退换货",value:4}})],1)],1),e._v(" "),a("div",{staticClass:"mTop20 pBottom100"},[a("div",{staticClass:"groupmember mBottom40"},[a("div",{},[e._m(0),e._v(" "),e._l(e.memberData,function(t,s){return[e.memberData&&e.memberData.length>0?a("div",{key:s,staticClass:"mTop20 member-table-txt"},[a("div",{staticClass:"orderheader"},[a("div",{staticClass:"headerinfo"},[e._v("订单编号: "+e._s(t.orderNumber))]),e._v(" "),a("div",{staticClass:"headerinfo"},[e._v("下单时间："+e._s(t.createTime))]),e._v(" "),a("div",{staticClass:"headerinfo"},[e._v("收件人： "+e._s(t.buyerName))]),e._v(" "),a("div",{staticClass:"headerinfo"},[e._v("手机号码："+e._s(t.buyerPhone))]),e._v(" "),a("div",{staticClass:"headerinfo"},[e._v("收货地址："+e._s(t.addressInfo))])]),e._v(" "),a("div",{staticClass:"record-table",style:{height:t.orderItemList?80*t.orderItemList.length+"px":""}},[a("div",{staticClass:"record-flex70"},e._l(t.orderItemList,function(t,s){return a("div",{key:s,staticClass:"record-tablecontent"},[a("div",{staticClass:"w-43"},[a("div",{staticStyle:{display:"flex","flex-wrap":"wrap","align-items":"center"}},[a("div",{staticStyle:{flex:"0 0 60px"}},[a("img",{attrs:{width:"60",height:"60",src:t.mallProImageUrl,alt:""}})]),e._v(" "),a("div",{staticStyle:{flex:"1","margin-left":"5px"}},[a("div",{staticClass:"font14 break"},[e._v(e._s(t.mallProName))]),e._v(" "),a("div",{staticClass:"mTop10 font14 member-goods-txt"},[e._v(e._s(t.mallProSkuAttr))])])])]),e._v(" "),a("div",{staticClass:"w-14"},[e._v(e._s(t.mallProPrice))]),e._v(" "),a("div",{staticClass:"w-21"},[e._v(e._s(t.mallProNumber))]),e._v(" "),a("div",{staticClass:"w-21"},[e._v(e._s(0>t.payAmount?t.payAmount:"--"))])])}),0),e._v(" "),a("div",{staticClass:"width15 talign font14 borderight",style:{lineHeight:t.orderItemList?80*t.orderItemList.length+"px":""}},[a("div",{staticClass:"posrelative"},[e._v(e._s(t.payAmount)+"\n "),a("div",{staticClass:"posabsolute"},[e._v("（￥"+e._s(t.orderItemFreight)+"）")])])]),e._v(" "),a("div",{staticClass:"width15 font14 talign",style:{lineHeight:t.orderItemList?80*t.orderItemList.length+"px":""}},[1==t.orderStatus?a("div",[e._v("购买")]):e._e(),e._v(" "),2==t.orderStatus?a("div",[e._v("退款")]):e._e(),e._v(" "),4==t.orderStatus?a("div",[e._v("退换货")]):e._e()])])]):e._e()]}),e._v(" "),e.memberData&&0==e.memberData.length?a("div",{staticStyle:{"text-align":"center","font-size":"14px"}},[a("span",{staticClass:"el-table__empty-text"},[e._v("暂无数据")])]):e._e(),e._v(" "),e.page.totalCount>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()],2)])])])],1)])},staticRenderFns:[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"record-header"},[a("div",{staticClass:"w-30"},[e._v("商品信息")]),e._v(" "),a("div",{staticClass:"w-10"},[e._v("单价")]),e._v(" "),a("div",{staticClass:"w-15"},[e._v("数量")]),e._v(" "),a("div",{staticClass:"w-15"},[e._v("退款金额")]),e._v(" "),a("div",{staticClass:"w-15"},[e._v("实付款")]),e._v(" "),a("div",{staticClass:"w-15"},[e._v("订单类型")])])}]};var v=a("VU/8")(d,m,!1,function(e){a("csN7")},null,null);t.default=v.exports}});
\ No newline at end of file
dist/js/56.27de620403f9d0d1363f.js 0 → 100644
webpackJsonp([56],{jUox:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var i=t("woOf"),n=t.n(i),r=t("a2Vx"),s=t("u6qo"),l={name:"AiRecord",props:{tableData:Object},mixins:[r.a,s.a],data:function(){return{search:{planName:"",aiStartTime:"",aiEndTime:""}}},methods:{change:function(){var e=this.tableData,a=e.currentPage,t=e.pageSize;this.search.aiStartTime=this.time?"string "==typeof this.time[0]?this.time[0]:this.dateformat(new Date(this.time[0]),"yyyy-MM-dd"):null,this.search.aiEndTime=this.time?"string "==typeof this.time[0]?this.time[1]:this.dateformat(new Date(this.time[1]),"yyyy-MM-dd"):null,this.$emit("changeSearch",n()({pageNum:a,pageSize:t},this.search))}}},o={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"marketing-message"},[t("div",{staticClass:"search"},[t("el-input",{staticClass:"w256",attrs:{placeholder:"请输入活动名称",type:"text","prefix-icon":"el-icon-search",clearable:""},on:{change:e.change},model:{value:e.search.planName,callback:function(a){e.$set(e.search,"planName",a)},expression:"search.planName"}}),e._v(" "),t("el-date-picker",{staticClass:"w256 ml10",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("span",{staticClass:"search-tip ml10"},[e._v("同一客户同时外呼成功并发送短信营销次数算作两次")])],1),e._v(" "),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,i){return t("el-table-column",{key:i,attrs:{prop:a.prop,"min-width":a.minWidth,label:a.label,fixed:a.fixed,"show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(i){var n=i.row;return[a.formatter?t("span",{domProps:{innerHTML:e._s(a.formatter(n))}}):t("span",[e._v(e._s(n[a.prop]||"--"))])]}}])})}),1),e._v(" "),e.tableData.total>0?t("dm-pagination",{staticStyle:{"margin-top":"20px","text-align":"right"},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}}):e._e()],1)},staticRenderFns:[]};var c=t("VU/8")(l,o,!1,function(e){t("k8ci")},"data-v-596a0fa4",null);a.default=c.exports},k8ci:function(e,a){}});
\ No newline at end of file
dist/js/57.de9cea7e014e484ea98f.js 0 → 100644
webpackJsonp([57],{FTwj:function(e,a){},c0nE:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=t("woOf"),r=t.n(n),i=t("a2Vx"),l=t("u6qo"),c=(new Date).getMonth()+1,s=(new Date).setMonth(c-7),o=new Date(s).setHours(24),d={name:"card",props:{tableData:Object},mixins:[i.a,l.a],data:function(){return{launchTime:[new Date(o),new Date],collectionTime:[new Date(o),new Date],search:{putBeginTime:"",putEndTime:"",receiveBeginTime:"",receiveEndTime:"",search:"",receiveCode:null}}},methods:{change:function(){var e=this.tableData,a=e.currentPage,t=e.pageSize,n=this.launchTime,i=this.collectionTime;this.search.putBeginTime=n?"string "==typeof n[0]?n[0]:this.dateformat(new Date(n[0]),"yyyy-MM-dd"):null,this.search.putEndTime=n?"string "==typeof n[0]?n[1]:this.dateformat(new Date(n[1]),"yyyy-MM-dd"):null,this.search.receiveBeginTime=i?i[0]:null,this.search.receiveEndTime=i?i[1]:null;var l={currentPage:a,pageSize:t};this.$emit("changeSearch",r()({},this.search,l))}}},h={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"marketing-card"},[t("div",{staticClass:"search mb10"},[e._v("\n 投放时间："),t("el-date-picker",{staticClass:"w256 mb10 mr10",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.launchTime,callback:function(a){e.launchTime=a},expression:"launchTime"}}),e._v("\n 领取时间："),t("el-date-picker",{staticClass:"mr10 w256 mb10",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.collectionTime,callback:function(a){e.collectionTime=a},expression:"collectionTime"}}),e._v(" "),t("el-input",{staticClass:"w260 mr10 mb10",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-select",{staticClass:"w160 mb10",attrs:{placeholder:"所有投放渠道",clearable:""},on:{change:e.change},model:{value:e.search.receiveCode,callback:function(a){e.$set(e.search,"receiveCode",a)},expression:"search.receiveCode"}},e._l(e.tableData.dictList,function(e){return t("el-option",{key:e.dictCode,attrs:{value:e.dictCode,label:e.dictName}})}),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,n){return t("el-table-column",{key:n,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(n){var r=n.row;return[a.formatter?t("span",{domProps:{innerHTML:e._s(a.formatter(r))}}):t("span",[e._v(e._s(r[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 p=t("VU/8")(d,h,!1,function(e){t("FTwj")},"data-v-55f93cbe",null);a.default=p.exports}});
\ No newline at end of file
dist/js/58.4ced35b64936f0147996.js 0 → 100644
<<<<<<<< HEAD:dist/js/59.252f70a90cde2e6eca78.js
webpackJsonp([59],{aSkV:function(e,t){},ae7D:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=a("WSiR"),i=a("AKaA"),n=a("8V46"),c={components:{"v-nav":s.a},data:function(){return{navpath:[{name:"首页",path:""},{name:"微信会员",path:"/wechatmembers"},{name:"会员设置",path:""}],value:!1,projectName:"member",actionUrl:"/api-plug/upload-img",dilogVisible:!1,maxlength:5,dilogImageUrl:""}},methods:{uploadOnSuccess:function(e){e.file.url=e.res.result[0].qcloudImageUrl,this.imageList.push(e.file)},deleteImage:function(e){this.imageList.splice(e,1)},saveSet:function(e){var t=this;Object(i.a)("/api-member/members-setting",{optype:e,appStatus:this.value?1:0}).then(function(a){0===a.data.errorCode?(1==a.data.result.appStatus&&(t.value=!0),2==e&&(t.$message({message:"设置成功！",type:"success"}),setTimeout(function(){t.$router.push({path:"/wechatmembers"})},1e3))):Object(n.a)(a.data.message)})},sortImg:function(e){this.imageList=e}},created:function(){this.saveSet(1),this.$store.commit("mutations-slide",!0)}},r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-setting"},[a("div",{staticClass:"minheight"},[a("div",{staticClass:"setting-con"},[a("div",{staticClass:"setting-container"},[a("el-switch",{model:{value:e.value,callback:function(t){e.value=t},expression:"value"}}),e._v(" "),a("span",{staticClass:"member-setting-txt"},[e._v("是否允许好办通过会员姓名、手机号和卡号搜索查询全品牌会员")])],1),e._v(" "),a("div",{staticClass:"save-btn"},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.saveSet(2)}}},[e._v("保存")])],1)])])])},staticRenderFns:[]};var u=a("VU/8")(c,r,!1,function(e){a("aSkV")},"data-v-54360f10",null);t.default=u.exports}});
========
webpackJsonp([58],{aSkV:function(e,t){},ae7D:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=a("WSiR"),i=a("AKaA"),n=a("8V46"),c={components:{"v-nav":s.a},data:function(){return{navpath:[{name:"首页",path:""},{name:"微信会员",path:"/wechatmembers"},{name:"会员设置",path:""}],value:!1,projectName:"member",actionUrl:"/api-plug/upload-img",dilogVisible:!1,maxlength:5,dilogImageUrl:""}},methods:{uploadOnSuccess:function(e){e.file.url=e.res.result[0].qcloudImageUrl,this.imageList.push(e.file)},deleteImage:function(e){this.imageList.splice(e,1)},saveSet:function(e){var t=this;Object(i.a)("/api-member/members-setting",{optype:e,appStatus:this.value?1:0}).then(function(a){0===a.data.errorCode?(1==a.data.result.appStatus&&(t.value=!0),2==e&&(t.$message({message:"设置成功！",type:"success"}),setTimeout(function(){t.$router.push({path:"/wechatmembers"})},1e3))):Object(n.a)(a.data.message)})},sortImg:function(e){this.imageList=e}},created:function(){this.saveSet(1),this.$store.commit("mutations-slide",!0)}},r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-setting"},[a("div",{staticClass:"minheight"},[a("div",{staticClass:"setting-con"},[a("div",{staticClass:"setting-container"},[a("el-switch",{model:{value:e.value,callback:function(t){e.value=t},expression:"value"}}),e._v(" "),a("span",{staticClass:"member-setting-txt"},[e._v("是否允许好办通过会员姓名、手机号和卡号搜索查询全品牌会员")])],1),e._v(" "),a("div",{staticClass:"save-btn"},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.saveSet(2)}}},[e._v("保存")])],1)])])])},staticRenderFns:[]};var u=a("VU/8")(c,r,!1,function(e){a("aSkV")},"data-v-54360f10",null);t.default=u.exports}});
>>>>>>>> feature/9月基础迭代:dist/js/58.4ced35b64936f0147996.js
dist/js/59.1928ea2a1d254982e538.js 0 → 100644
webpackJsonp([59],{Vjs3:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("Dd8w"),o=a.n(r),s=a("WSiR"),l=a("AKaA"),n=a("NTL1"),i=a("8V46"),d=a("EOvX"),c={name:"infoMall",filters:{orderTypeFilter:function(e){switch(e){case 1:return"购买";case 2:return"退款";case 4:return"退换货";default:return""}},formatColorSize:function(e){var t="";e&&(t=JSON.parse(e).map(function(e){return e.key+": "+e.value})[0]);return t},mallname:function(e){var t="";e&&JSON.parse(e).forEach(function(e){t+=e.propName+":"+e.valueName+" "});return t}},data:function(){return{memberId:this.$route.query.memberId||"",navpath:[{name:"首页",path:""},{name:"客户列表",path:"/allCustomers"},{name:"客户详情",path:"/customerDetail?memberId="+this.$route.query.memberId||""},{name:"微盟订单",path:""}],page:{currentPage:1,pageSize:20,totalCount:0},memberData:[],search:"",isWm:!0,tableColumnList:[{label:"商品",width:"500",prop:"mallProName","show-overflow-tooltip":!1},{label:"单价","min-width":"55",prop:"mallProPrice","show-overflow-tooltip":!0},{label:"数量","min-width":"55",prop:"mallProNumber","show-overflow-tooltip":!0},{label:"订单类型","min-width":"80",prop:"orderStatus","show-overflow-tooltip":!0},{label:"小计（实付）","min-width":"110",prop:"payAmount","show-overflow-tooltip":!0},{label:"收货信息",width:"400",prop:"deliveryInfo","show-overflow-tooltip":!1}],orderColor:{1:"#303133",2:"#FA8C16",4:"#F5222D"}}},methods:{handleCurrentChange:function(e){this.page.currentPage=e,this.getMemberOrderPage()},handleSizeChange:function(e){this.page.pageSize=e,this.getMemberOrderPage()},getMemberOrderPage:function(){var e=this;Object(l.a)(this.isWm?n.a.getWMList:n.a.getOtherList,{memberId:this.memberId,pageSize:this.page.pageSize,currentPage:this.page.currentPage,orderStatus:this.search||void 0}).then(function(t){0===t.data.errorCode?(e.memberData=t.data.result.page.result.map(function(e){return o()({},e,{createTime:e.createTime?Object(d.a)(new Date(e.createTime),"yyyy-MM-dd hh:mm:ss"):"--"})}),console.log(e.memberData),e.page.currentPage=t.data.result.page.currentPage,e.page.totalCount=t.data.result.page.totalCount):Object(i.a)(t.data.message)}).catch(function(e){Object(i.b)(e)})},goback:function(){this.$router.push({path:"customerDetail",query:{memberId:this.memberId}})},searchChangd:function(){this.page.currentPage=1,this.getMemberOrderPage()},spanMethod:function(e){var t=e.rowIndex,a=e.columnIndex,r=e.length;return[3,4,5].includes(a)?0===t?{rowspan:r,colspan:1}:{rowspan:0,colspan:0}:{rowspan:1,colspan:1}}},mounted:function(){console.log(this.$route),"微盟订单"==this.$route.meta.title?(this.isWm=!0,this.navpath[3].name="微盟订单"):(this.isWm=!1,this.navpath[3].name="其他订单"),this.memberId&&this.getMemberOrderPage(),this.$store.commit("mutations-slide",!0)},components:{"v-nav":s.a}},m={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"mall-container-new"},[a("div",{staticClass:"record"},[a("header",[a("el-select",{attrs:{placeholder:"全部类型",clearable:""},on:{change:e.searchChangd},model:{value:e.search,callback:function(t){e.search=t},expression:"search"}},[a("el-option",{attrs:{label:"购买",value:1}}),e._v(" "),a("el-option",{attrs:{label:"退款",value:2}}),e._v(" "),a("el-option",{attrs:{label:"退换货",value:4}})],1)],1),e._v(" "),a("div",{directives:[{name:"loading",rawName:"v-loading",value:e.load,expression:"load"}],staticClass:"table-content"},[a("el-table",{class:["only-head-table",e.memberData.length?"":"no-data"]},e._l(e.tableColumnList,function(t){return a("el-table-column",e._b({key:t},"el-table-column",Object.assign({},t),!1))}),1),e._v(" "),e.memberData.length?a("div",{staticClass:"only-content-table-list"},e._l(e.memberData,function(t){return a("div",{key:t,staticClass:"group-item"},[a("div",{staticClass:"group-header"},[a("div",{staticClass:"left"},[a("p",{staticClass:"order-number"},[e._v("\n 订单编号："+e._s(t.orderNumber)+"\n ")]),e._v(" "),a("p",{staticClass:"order-time"},[e._v("\n 下单时间："+e._s(t.createTime)+"\n ")])])]),e._v(" "),a("el-table",{staticClass:"only-content-table",attrs:{data:t.orderItemList,"span-method":function(a){return e.spanMethod(Object.assign({},a,{length:t.orderItemList.length}))}}},[e._l(e.tableColumnList,function(r){return[a("el-table-column",e._b({key:r,scopedSlots:e._u([{key:"default",fn:function(o){var s=o.row;return[["orderStatus","deliveryInfo","payAmount"].includes(r.prop)?["orderStatus"===r.prop?[a("div",{style:{paddingLeft:"14px",color:e.orderColor[t.orderStatus]}},[e._v(e._s(e._f("orderTypeFilter")(t.orderStatus))+"\n ")])]:"deliveryInfo"===r.prop?[a("div",{staticClass:"delivery-info"},[a("p",{staticClass:"delivery-info-line"},[e._v("收件人："+e._s(t.buyerName||"--"))]),e._v(" "),a("p",{staticClass:"delivery-info-line"},[e._v("手机号："+e._s(t.buyerPhone||"--"))]),e._v(" "),a("el-tooltip",{staticClass:"item",attrs:{disabled:!t.addressInfo||t.addressInfo&&t.addressInfo.length<=25,effect:"dark",content:"收货地址："+t.addressInfo,placement:"top-start","open-delay":200}},[a("p",{staticClass:"delivery-info-line",staticStyle:{overflow:"hidden","text-overflow":"ellipsis","white-space":"nowrap"}},[e._v("收货地址："+e._s(t.addressInfo||"--"))])])],1)]:[a("div",{staticStyle:{display:"flex","align-items":"center","padding-left":"14px"}},[e._v("\n ￥"+e._s(e._f("fomatFloat")(t[r.prop]))+"\n ")])]]:["mallProName"===r.prop?a("div",{staticClass:"good-info"},[a("el-image",{attrs:{fit:"cover",src:s.mallProImageUrl?s.mallProImageUrl:"./static/img/default-goods.png"}},[a("div",{staticClass:"image-slot",attrs:{slot:"error"},slot:"error"},[a("img",{attrs:{width:"60",src:e.brokeImg,alt:""}})])]),e._v(" "),a("div",{staticClass:"info-detail"},[a("el-tooltip",{staticClass:"item",attrs:{disabled:s.mallProName.length<49,effect:"dark",content:s.mallProName,placement:"top-start","open-delay":200}},[a("div",{staticClass:"good-name"},[e._v(e._s(s.mallProName))])]),e._v(" "),a("div",{staticClass:"good-attr"},[e._v(e._s(s.mallProSkuAttr))])],1)],1):"mallProPrice"===r.prop?a("div",{staticClass:"price-info"},[e._v("￥"+e._s(e._f("fomatFloat")(s.mallProPrice)))]):a("div",{staticStyle:{"padding-left":"14px"}},[e._v(e._s(s.mallProNumber))])]]}}])},"el-table-column",Object.assign({},r),!1))]})],2)],1)}),0):e._e(),e._v(" "),e.page.totalCount>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()],1)])])},staticRenderFns:[]};var p=a("VU/8")(c,m,!1,function(e){a("eWFD")},"data-v-51d88d5e",null);t.default=p.exports},eWFD:function(e,t){}});
\ No newline at end of file
dist/js/59.252f70a90cde2e6eca78.js
webpackJsonp([59],{aSkV:function(e,t){},ae7D:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=a("WSiR"),i=a("AKaA"),n=a("8V46"),c={components:{"v-nav":s.a},data:function(){return{navpath:[{name:"首页",path:""},{name:"微信会员",path:"/wechatmembers"},{name:"会员设置",path:""}],value:!1,projectName:"member",actionUrl:"/api-plug/upload-img",dilogVisible:!1,maxlength:5,dilogImageUrl:""}},methods:{uploadOnSuccess:function(e){e.file.url=e.res.result[0].qcloudImageUrl,this.imageList.push(e.file)},deleteImage:function(e){this.imageList.splice(e,1)},saveSet:function(e){var t=this;Object(i.a)("/api-member/members-setting",{optype:e,appStatus:this.value?1:0}).then(function(a){0===a.data.errorCode?(1==a.data.result.appStatus&&(t.value=!0),2==e&&(t.$message({message:"设置成功！",type:"success"}),setTimeout(function(){t.$router.push({path:"/wechatmembers"})},1e3))):Object(n.a)(a.data.message)})},sortImg:function(e){this.imageList=e}},created:function(){this.saveSet(1),this.$store.commit("mutations-slide",!0)}},r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-setting"},[a("div",{staticClass:"minheight"},[a("div",{staticClass:"setting-con"},[a("div",{staticClass:"setting-container"},[a("el-switch",{model:{value:e.value,callback:function(t){e.value=t},expression:"value"}}),e._v(" "),a("span",{staticClass:"member-setting-txt"},[e._v("是否允许好办通过会员姓名、手机号和卡号搜索查询全品牌会员")])],1),e._v(" "),a("div",{staticClass:"save-btn"},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.saveSet(2)}}},[e._v("保存")])],1)])])])},staticRenderFns:[]};var u=a("VU/8")(c,r,!1,function(e){a("aSkV")},"data-v-54360f10",null);t.default=u.exports}});
\ No newline at end of file
<<<<<<<< HEAD:dist/js/59.252f70a90cde2e6eca78.js
webpackJsonp([59],{aSkV:function(e,t){},ae7D:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=a("WSiR"),i=a("AKaA"),n=a("8V46"),c={components:{"v-nav":s.a},data:function(){return{navpath:[{name:"首页",path:""},{name:"微信会员",path:"/wechatmembers"},{name:"会员设置",path:""}],value:!1,projectName:"member",actionUrl:"/api-plug/upload-img",dilogVisible:!1,maxlength:5,dilogImageUrl:""}},methods:{uploadOnSuccess:function(e){e.file.url=e.res.result[0].qcloudImageUrl,this.imageList.push(e.file)},deleteImage:function(e){this.imageList.splice(e,1)},saveSet:function(e){var t=this;Object(i.a)("/api-member/members-setting",{optype:e,appStatus:this.value?1:0}).then(function(a){0===a.data.errorCode?(1==a.data.result.appStatus&&(t.value=!0),2==e&&(t.$message({message:"设置成功！",type:"success"}),setTimeout(function(){t.$router.push({path:"/wechatmembers"})},1e3))):Object(n.a)(a.data.message)})},sortImg:function(e){this.imageList=e}},created:function(){this.saveSet(1),this.$store.commit("mutations-slide",!0)}},r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-setting"},[a("div",{staticClass:"minheight"},[a("div",{staticClass:"setting-con"},[a("div",{staticClass:"setting-container"},[a("el-switch",{model:{value:e.value,callback:function(t){e.value=t},expression:"value"}}),e._v(" "),a("span",{staticClass:"member-setting-txt"},[e._v("是否允许好办通过会员姓名、手机号和卡号搜索查询全品牌会员")])],1),e._v(" "),a("div",{staticClass:"save-btn"},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.saveSet(2)}}},[e._v("保存")])],1)])])])},staticRenderFns:[]};var u=a("VU/8")(c,r,!1,function(e){a("aSkV")},"data-v-54360f10",null);t.default=u.exports}});
========
webpackJsonp([58],{aSkV:function(e,t){},ae7D:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=a("WSiR"),i=a("AKaA"),n=a("8V46"),c={components:{"v-nav":s.a},data:function(){return{navpath:[{name:"首页",path:""},{name:"微信会员",path:"/wechatmembers"},{name:"会员设置",path:""}],value:!1,projectName:"member",actionUrl:"/api-plug/upload-img",dilogVisible:!1,maxlength:5,dilogImageUrl:""}},methods:{uploadOnSuccess:function(e){e.file.url=e.res.result[0].qcloudImageUrl,this.imageList.push(e.file)},deleteImage:function(e){this.imageList.splice(e,1)},saveSet:function(e){var t=this;Object(i.a)("/api-member/members-setting",{optype:e,appStatus:this.value?1:0}).then(function(a){0===a.data.errorCode?(1==a.data.result.appStatus&&(t.value=!0),2==e&&(t.$message({message:"设置成功！",type:"success"}),setTimeout(function(){t.$router.push({path:"/wechatmembers"})},1e3))):Object(n.a)(a.data.message)})},sortImg:function(e){this.imageList=e}},created:function(){this.saveSet(1),this.$store.commit("mutations-slide",!0)}},r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-setting"},[a("div",{staticClass:"minheight"},[a("div",{staticClass:"setting-con"},[a("div",{staticClass:"setting-container"},[a("el-switch",{model:{value:e.value,callback:function(t){e.value=t},expression:"value"}}),e._v(" "),a("span",{staticClass:"member-setting-txt"},[e._v("是否允许好办通过会员姓名、手机号和卡号搜索查询全品牌会员")])],1),e._v(" "),a("div",{staticClass:"save-btn"},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.saveSet(2)}}},[e._v("保存")])],1)])])])},staticRenderFns:[]};var u=a("VU/8")(c,r,!1,function(e){a("aSkV")},"data-v-54360f10",null);t.default=u.exports}});
>>>>>>>> feature/9月基础迭代:dist/js/58.4ced35b64936f0147996.js
dist/js/60.f58b2745b7b3d40913f4.js 0 → 100644
<<<<<<<< HEAD:dist/js/61.5b2a9468c3878b2f307f.js
webpackJsonp([61],{GlIC:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("Xxa5"),n=r.n(a),m=r("exGp"),o=r.n(m),i=r("WSiR"),s=r("Rrai"),u=r("l/JR"),d={name:"img-list",components:{vNav:i.a,photoAlbum:s.default},data:function(){return{api:{getOneMemberAlbum:"/api-member/getOneMemberAlbum"},navpath:[{name:"首页",path:""},{name:"客户详情",path:"/customerDetail?memberId="+this.$route.query.memberId||""},{name:"相册",path:""}],from:"",memberId:"",folderId:""}},created:function(){var e=this;return o()(n.a.mark(function t(){var r,a,m,o;return n.a.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=e.$route.query.from,a=e.$route.query.memberId,m=e.$route.query.folderId,e.memberId=a,e.folderId=m,t.next=7,e.getImgList();case 7:o=e.folderData.filter(function(e){return e.id===m}),e.navpath[2]={name:"相册",path:"/photo-album?memberId="+a+"&from="+r},o.length>0&&e.navpath.push({name:o[0].name,path:""});case 10:case"end":return t.stop()}},t,e)}))()},methods:{getImgList:function(){var e=this;return u.a.get(this.api.getOneMemberAlbum+"/"+this.memberId).then(function(t){var r=t.data,a=r.code,n=r.message,m=r.data;m=m||[],200===a?e.folderData=m.slice():e.$message.error(n)})}}},c={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"page-content"},[t("photo-album",{attrs:{"member-id":this.memberId,"folder-id":this.folderId}})],1)},staticRenderFns:[]};var l=r("VU/8")(d,c,!1,function(e){r("HsoD")},"data-v-4d005540",null);t.default=l.exports},HsoD:function(e,t){}});
========
webpackJsonp([60],{GlIC:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("Xxa5"),n=r.n(a),m=r("exGp"),o=r.n(m),i=r("WSiR"),s=r("Rrai"),u=r("l/JR"),d={name:"img-list",components:{vNav:i.a,photoAlbum:s.default},data:function(){return{api:{getOneMemberAlbum:"/api-member/getOneMemberAlbum"},navpath:[{name:"首页",path:""},{name:"客户详情",path:"/customerDetail?memberId="+this.$route.query.memberId||""},{name:"相册",path:""}],from:"",memberId:"",folderId:""}},created:function(){var e=this;return o()(n.a.mark(function t(){var r,a,m,o;return n.a.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=e.$route.query.from,a=e.$route.query.memberId,m=e.$route.query.folderId,e.memberId=a,e.folderId=m,t.next=7,e.getImgList();case 7:o=e.folderData.filter(function(e){return e.id===m}),e.navpath[2]={name:"相册",path:"/photo-album?memberId="+a+"&from="+r},o.length>0&&e.navpath.push({name:o[0].name,path:""});case 10:case"end":return t.stop()}},t,e)}))()},methods:{getImgList:function(){var e=this;return u.a.get(this.api.getOneMemberAlbum+"/"+this.memberId).then(function(t){var r=t.data,a=r.code,n=r.message,m=r.data;m=m||[],200===a?e.folderData=m.slice():e.$message.error(n)})}}},c={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"page-content"},[t("photo-album",{attrs:{"member-id":this.memberId,"folder-id":this.folderId}})],1)},staticRenderFns:[]};var l=r("VU/8")(d,c,!1,function(e){r("HsoD")},"data-v-4d005540",null);t.default=l.exports},HsoD:function(e,t){}});
>>>>>>>> feature/9月基础迭代:dist/js/60.f58b2745b7b3d40913f4.js
dist/js/61.5b2a9468c3878b2f307f.js
webpackJsonp([61],{GlIC:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("Xxa5"),n=r.n(a),m=r("exGp"),o=r.n(m),i=r("WSiR"),s=r("Rrai"),u=r("l/JR"),d={name:"img-list",components:{vNav:i.a,photoAlbum:s.default},data:function(){return{api:{getOneMemberAlbum:"/api-member/getOneMemberAlbum"},navpath:[{name:"首页",path:""},{name:"客户详情",path:"/customerDetail?memberId="+this.$route.query.memberId||""},{name:"相册",path:""}],from:"",memberId:"",folderId:""}},created:function(){var e=this;return o()(n.a.mark(function t(){var r,a,m,o;return n.a.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=e.$route.query.from,a=e.$route.query.memberId,m=e.$route.query.folderId,e.memberId=a,e.folderId=m,t.next=7,e.getImgList();case 7:o=e.folderData.filter(function(e){return e.id===m}),e.navpath[2]={name:"相册",path:"/photo-album?memberId="+a+"&from="+r},o.length>0&&e.navpath.push({name:o[0].name,path:""});case 10:case"end":return t.stop()}},t,e)}))()},methods:{getImgList:function(){var e=this;return u.a.get(this.api.getOneMemberAlbum+"/"+this.memberId).then(function(t){var r=t.data,a=r.code,n=r.message,m=r.data;m=m||[],200===a?e.folderData=m.slice():e.$message.error(n)})}}},c={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"page-content"},[t("photo-album",{attrs:{"member-id":this.memberId,"folder-id":this.folderId}})],1)},staticRenderFns:[]};var l=r("VU/8")(d,c,!1,function(e){r("HsoD")},"data-v-4d005540",null);t.default=l.exports},HsoD:function(e,t){}});
\ No newline at end of file
<<<<<<<< HEAD:dist/js/61.5b2a9468c3878b2f307f.js
webpackJsonp([61],{GlIC:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("Xxa5"),n=r.n(a),m=r("exGp"),o=r.n(m),i=r("WSiR"),s=r("Rrai"),u=r("l/JR"),d={name:"img-list",components:{vNav:i.a,photoAlbum:s.default},data:function(){return{api:{getOneMemberAlbum:"/api-member/getOneMemberAlbum"},navpath:[{name:"首页",path:""},{name:"客户详情",path:"/customerDetail?memberId="+this.$route.query.memberId||""},{name:"相册",path:""}],from:"",memberId:"",folderId:""}},created:function(){var e=this;return o()(n.a.mark(function t(){var r,a,m,o;return n.a.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=e.$route.query.from,a=e.$route.query.memberId,m=e.$route.query.folderId,e.memberId=a,e.folderId=m,t.next=7,e.getImgList();case 7:o=e.folderData.filter(function(e){return e.id===m}),e.navpath[2]={name:"相册",path:"/photo-album?memberId="+a+"&from="+r},o.length>0&&e.navpath.push({name:o[0].name,path:""});case 10:case"end":return t.stop()}},t,e)}))()},methods:{getImgList:function(){var e=this;return u.a.get(this.api.getOneMemberAlbum+"/"+this.memberId).then(function(t){var r=t.data,a=r.code,n=r.message,m=r.data;m=m||[],200===a?e.folderData=m.slice():e.$message.error(n)})}}},c={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"page-content"},[t("photo-album",{attrs:{"member-id":this.memberId,"folder-id":this.folderId}})],1)},staticRenderFns:[]};var l=r("VU/8")(d,c,!1,function(e){r("HsoD")},"data-v-4d005540",null);t.default=l.exports},HsoD:function(e,t){}});
========
webpackJsonp([60],{GlIC:function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=r("Xxa5"),n=r.n(a),m=r("exGp"),o=r.n(m),i=r("WSiR"),s=r("Rrai"),u=r("l/JR"),d={name:"img-list",components:{vNav:i.a,photoAlbum:s.default},data:function(){return{api:{getOneMemberAlbum:"/api-member/getOneMemberAlbum"},navpath:[{name:"首页",path:""},{name:"客户详情",path:"/customerDetail?memberId="+this.$route.query.memberId||""},{name:"相册",path:""}],from:"",memberId:"",folderId:""}},created:function(){var e=this;return o()(n.a.mark(function t(){var r,a,m,o;return n.a.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=e.$route.query.from,a=e.$route.query.memberId,m=e.$route.query.folderId,e.memberId=a,e.folderId=m,t.next=7,e.getImgList();case 7:o=e.folderData.filter(function(e){return e.id===m}),e.navpath[2]={name:"相册",path:"/photo-album?memberId="+a+"&from="+r},o.length>0&&e.navpath.push({name:o[0].name,path:""});case 10:case"end":return t.stop()}},t,e)}))()},methods:{getImgList:function(){var e=this;return u.a.get(this.api.getOneMemberAlbum+"/"+this.memberId).then(function(t){var r=t.data,a=r.code,n=r.message,m=r.data;m=m||[],200===a?e.folderData=m.slice():e.$message.error(n)})}}},c={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"page-content"},[t("photo-album",{attrs:{"member-id":this.memberId,"folder-id":this.folderId}})],1)},staticRenderFns:[]};var l=r("VU/8")(d,c,!1,function(e){r("HsoD")},"data-v-4d005540",null);t.default=l.exports},HsoD:function(e,t){}});
>>>>>>>> feature/9月基础迭代:dist/js/60.f58b2745b7b3d40913f4.js
dist/js/61.bd732b46da067ee67672.js 0 → 100644
webpackJsonp([61],{kVpV:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=a("AKaA"),r=a("WSiR"),o=a("NTL1"),s=a("8V46"),l={data:function(){return{navpath:[{name:"首页",path:""},{name:"微信会员",path:""},{name:"批量导入",path:""},{name:"日志详情",path:""}],tableData:[],page:{currentPage:1,pageSize:20,totalCount:0},integralType:"积分扣除",count:{all:0,success:0,error:0},batchId:"",batchType:""}},methods:{exportExcel:function(){window.location.href=o.a.downloadErrorData+"?requestProject=member&batchType="+this.batchType+"&batchId="+this.batchId},handleCurrentChange:function(e){this.page.currentPage=e,this.getLogsDetail()},handleSizeChange:function(e){this.page.pageSize=e,this.getLogsDetail()},getLogsDetail:function(){var e=this,t={batchId:this.batchId,batchType:this.batchType,currentPage:this.page.currentPage,pageSize:this.page.pageSize};Object(n.c)(o.a.queryBatchRetErrInfo,t).then(function(t){if(0==t.data.errorCode){var a=t.data.result;console.log(a),e.page.totalCount=a.totalCount,e.tableData=a.result}else Object(s.a)(t.data.message)}).catch(function(e){Object(s.b)(e)})}},created:function(){console.log(sessionStorage.getItem("bulkLogsDetail"));var e=JSON.parse(sessionStorage.getItem("bulkLogsDetail")),t=e.batchId,a=e.batchType,n=e.total,r=e.succeedNum,o=e.errorNum;this.batchId=t,this.batchType=a,console.log(this.batchType),this.count.all=n,this.count.success=r,this.count.error=o,this.getLogsDetail()},components:{NavPath:r.a}},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{attrs:{id:"bulkLogsDetail"}},[a("div",{staticClass:"contentBulkIntegral"},[a("div",{staticClass:"flex"},[a("span",{staticClass:"headerTips"},[e._v("总条数："+e._s(e.count.all)+" 条，成功导入 "+e._s(e.count.success)+" 条，"),a("span",{staticClass:"headerTipsError"},[e._v("错误 "+e._s(e.count.error)+" 条")])]),e._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:e.exportExcel}},[a("i",{staticClass:"iconfont icon-icon_yunxiazai"}),e._v(" 导出")])],1),e._v(" "),a("el-table",{attrs:{data:e.tableData}},[a("el-table-column",{attrs:{prop:"sequence",label:"序号"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.sequence||"--")+"\n ")]}}])}),e._v(" "),a("el-table-column",{attrs:{prop:"errorCause",label:"错误提示"}}),e._v(" "),a("el-table-column",{attrs:{prop:"cardNum",label:"会员卡号"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.cardNum||"--")+"\n ")]}}])}),e._v(" "),11==e.batchType||12==e.batchType?a("el-table-column",{attrs:{prop:"opIntegral",label:"变更额度"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.opIntegral||"--")+"\n ")]}}])}):e._e(),e._v(" "),11==e.batchType?a("el-table-column",{attrs:{label:"成本主体"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.costStoreName||"--")+"\n ")]}}])}):e._e(),e._v(" "),13==e.batchType?a("el-table-column",{attrs:{label:"等级编码"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.gradeCode||"--")+"\n ")]}}])}):e._e(),e._v(" "),13==e.batchType?a("el-table-column",{attrs:{label:"等级名称"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.gradeName||"--")+"\n ")]}}])}):e._e(),e._v(" "),14==e.batchType?a("el-table-column",{attrs:{label:"门店代码"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.costStoreCode||"--")+"\n ")]}}])}):e._e(),e._v(" "),14==e.batchType?a("el-table-column",{attrs:{label:"门店名称"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.costStoreName||"--")+"\n ")]}}])}):e._e(),e._v(" "),a("el-table-column",{attrs:{prop:"remark",label:"原因备注"},scopedSlots:e._u([{key:"default",fn:function(t){var a=t.row;return[e._v("\n "+e._s(a.remark||"--")+"\n ")]}}])})],1),e._v(" "),e.tableData.length>0?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}}):e._e()],1)])},staticRenderFns:[]};var u=a("VU/8")(l,c,!1,function(e){a("ohWn")},"data-v-4cc9e10e",null);t.default=u.exports},ohWn:function(e,t){}});
\ No newline at end of file
dist/js/app.07dec559fc8f5e736ea7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/manifest.4c1c425cab61ccf1ef0b.js 0 → 100644
!function(e){var d=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,u=0,i=[];u<a.length;u++)t=a[u],c[t]&&i.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(d&&d(a,b,n);i.length;)i.shift()();if(n)for(u=0;u<n.length;u++)o=f(f.s=n[u]);return o};var a={},c={77:0};function f(d){if(a[d])return a[d].exports;var c=a[d]={i:d,l:!1,exports:{}};return e[d].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var d=c[e];if(0===d)return new Promise(function(e){e()});if(d)return d[2];var a=new Promise(function(a,f){d=c[e]=[a,f]});d[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"js/"+e+"."+{0:"be1de94f77da2de53a8e",1:"293aad8df812d35a4cf8",2:"55e364d4dce81cbf3886",3:"e517c4670f752d2049c9",4:"05853d6d29681342a3d8",5:"c04e2d1875638f762aab",6:"2bb8a1447899510868c2",7:"19e8b084340b52369f4c",8:"dbd9df36ecf9d2c3bd4f",9:"7fba38b9f516a52ad577",10:"ee9b5530520a9311232a",11:"94f03db489d75fec7945",12:"22898c946ca9f377d437",13:"de420df1c2b9a8046b73",14:"5a8a206c1678391e139c",15:"ee806b049a3fb549c32c",16:"4be539a0edfddc9ecd63",17:"4e5eac2c993d26f5d0d3",18:"b08113713bb5a21ddb87",19:"b6b0e98c789fb11b5665",20:"2bf41420445815e79d31",21:"aad3e0dea43a68a7c24b",22:"c2cee029932b962edad7",23:"49c5f70aa2df001ce96a",24:"cf16e476b19922ec1d66",25:"4194b0ce3512b3f90a0b",26:"f5d3c024e9c181e5f6f3",27:"6fe85fbd4f3992c58c0a",28:"da42eaf139d4d76e749d",29:"e875def2e1dea51eaa6d",30:"5f90c696de8128d60b0c",31:"1cf3627d20c9983203be",32:"301f085c1f3f56350a36",33:"90e7995f9acb85bf6a78",34:"6ac7f3e10f4178056197",35:"1e34e7535d7b65751d7c",36:"02fd2eb2381b2716abab",37:"2c65468340b62d80c531",38:"ca0d1c71f2684c00bab7",39:"dc34a7975f628007b449",40:"f79cf717bc2cf1ed3676",41:"ada46ccba09bb2833ab5",42:"24f846da5a615ad03932",43:"33da891afabbb8027c09",44:"116c855829dadb726059",45:"b982df3d51c78dc898d5",46:"c8012342892d41b713a5",47:"3d5bc75156091e718207",48:"93aa558e44d710df4f91",49:"89105a4ec7ba94789015",50:"77f3352c2c75708f6e8f",51:"7cf96ad2793415cf2387",52:"5593490f0502bda69324",53:"2f2de0c278e80b3db043",54:"a964d919cd1043441e5b",55:"c167452aa4127822480d",56:"27de620403f9d0d1363f",57:"de9cea7e014e484ea98f",58:"4ced35b64936f0147996",59:"1928ea2a1d254982e538",60:"f58b2745b7b3d40913f4",61:"bd732b46da067ee67672",62:"e97122171e8f7ad71fd5",63:"5ddb8eea7eabae4389f1",64:"4d65d5cf62d48a17425b",65:"8d9c5eee685da964ec92",66:"da48bb2b2e79132bba88",67:"166da148fe61e9ccc3a0",68:"a97c7b2e6948734d4422",69:"afec6dcdc80dabe9fc9b",70:"0246afa2c3ab9bce434e",71:"ddaf262f26209f50bdc3",72:"fe3cd350bf66f971d7bb",73:"f0f7e229e47738da672a",74:"e179b4ff2bebfbd3e493"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var d=c[e];0!==d&&(d&&d[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,d,a){f.o(e,d)||Object.defineProperty(e,d,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var d=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(d,"a",d),d},f.o=function(e,d){return Object.prototype.hasOwnProperty.call(e,d)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/common/filters/custom.js
......@@ -59,9 +59,17 @@ let fomatFloat = val => {
}
}
let fomatFloatN = val => {
if (val || val == 0) {
return parseFloat(val).toFixed(2)
} else {
return '';
}
}
let defaultImg = val => {
if(!val) {
return './static/img/default.png'
}
}
export { formatTime,fomatNumber,fomatText,formatYMD,fomatFloat,defaultImg, formatHMS }
export { formatTime,fomatNumber,fomatText,formatYMD,fomatFloat,fomatFloatN,defaultImg,formatHMS }
src/components/allCustomers/allCustomersList.vue
......@@ -64,7 +64,7 @@
/>
</template>
</el-select>
<el-button v-if="getCodeAuth('memberBatchImport')" :limit-code="getCode('memberBatchImport')" type="primary" @click="batchImport" style="margin-right:5px">批量导入修改</el-button>
<el-button v-if="getCodeAuth('memberBatchImport')" :limit-code="getCode('memberBatchImport')" type="primary" @click="batchImport" style="margin-right:5px">批量导入</el-button>
</el-form-item>
</el-form>
<!-- <div class="action-wrap">
......@@ -137,6 +137,7 @@
</div>
<div class="list-section-table">
<el-table
:max-height="maxHeight"
v-loading="loading"
:data="tableData"
tooltip-effect="dark"
......@@ -153,7 +154,7 @@
:label="memberFieldsName[colum]"
:prop="colum"
show-overflow-tooltip
:min-width="colum==='name' ? 210 : colum == 'status' ? 170 : 150"
:min-width="colum==='name' ? 200 : colum == 'status' ? 170 : (colum == 'lastCostTime' || colum == 'allChannelLastCostTime' || colum == 'allChannelCostTimes' || colum == 'allChannelCostAllPaid' || colum == 'costFeePaid' || colum == 'lastCost') ? 180 : 150"
:fixed="colum==='name'"
:sortable="['name','grade','status','channel','createCardStoreName','cardNo','forzenStatus','mainStoreName'].includes(colum)?false:isExist[colum]?'custom':false"
>
......@@ -247,6 +248,11 @@
<div>{{ row.createTime.split(' ')[0] }}</div>
<div>{{ row.createTime.split(' ')[1] }}</div>
</div>
<!-- 最近消费时间(全渠道) -->
<!-- <div v-else-if="colum == 'allChannelLastCostTime'">
<div>{{ row.allChannelLastCostTime.split(' ')[0] }}</div>
<div>{{ row.allChannelLastCostTime.split(' ')[1] }}</div>
</div> -->
<!-- 关注时间 -->
<div v-else-if="colum == 'attentionDate'">
<div>{{ row.attentionTime.split(' ')[0] }}</div>
......
src/components/allCustomers/components/importDialog.vue
......@@ -18,6 +18,7 @@
>
<el-form-item label="导入类型" prop="importValue">
<el-select
style="width: 460px"
v-model="formByImport.importValue"
placeholder="请选择导入类型"
@change="handleChangeType"
......@@ -39,21 +40,10 @@
<div class="dialogTips">
<h3><i class="el-icon-info"></i><span>导入规则</span></h3>
<p>
1. 通过导入Excel表格的形式变更GIC已存在的会员信息；不支持导入新会员数据
</p>
<p>
2. 仅支持.xlsx 文件的导入；每次导入数据量最多为10000条；文件大小不超过1M
</p>
<p>
3.
导入类型不同，文件模板也不同，请严格按照模板内容填入会员数据，否则将会报错
</p>
<p>
4. 请仔细核对需要变更的会员数据是否准确，否则GIC校验不通过将无法执行成功
</p>
<p>
5.
超管账号支持导入变更全部会员信息，已分权商户的子管理员账号仅可修改管辖范围内的会员信息
1. 仅支持.xlsx 文件的导入；每次导入数据量最多为10000条；文件大小不超过1M。<br/>
2. 导入类型不同，文件模板也不同，请严格按照模板内容填入会员数据，否则将会报错。<br/>
3. 请仔细核对需要变更的会员数据是否准确，否则GIC校验不通过将无法执行成功。<br/>
4. 超管账号支持导入变更全部会员信息，已分权商户的子管理员账号仅可新增、修改管辖范围内的会员信息。
</p>
</div>
<span slot="footer" class="dialog-footer">
......@@ -206,8 +196,8 @@ export default {
border: none;
}
.dialogTips {
padding-bottom: 8px;
padding-top: 22px;
padding-bottom: 24px;
padding-top: 20px;
border-top: 1px dashed #DCDFE6;
color: #909399;
h3 {
......@@ -225,6 +215,10 @@ export default {
}
p {
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
line-height: 20px;
}
}
.success_icon {
......
src/components/allCustomers/index.js
......@@ -21,6 +21,7 @@ export default {
name: "allCustomersList",
data() {
return {
maxHeight: '',
selectChannelValue: '',
selectChannelList: {
selectOptions: {
......@@ -242,11 +243,22 @@ export default {
this.getGradeList();
this.getCliqueGradeList();
this.getMemberSourceList();
let screenHeight = document.documentElement.clientHeight - 293 + 'px';
this.$nextTick(() => {
this.maxHeight = screenHeight;
});
},
mounted() {
this.getFindMemberFields();
this.getAjaxMembers();
this.getEnterpriseInfo();
const that = this;
window.onresize = () => {
return (() => {
let screenHeight = document.documentElement.clientHeight - 293 + 'px';
that.maxHeight = screenHeight;
})();
};
},
activated(){
this.getAjaxMembers();
......@@ -336,10 +348,14 @@ export default {
tableData = resultData.map(ele => ({
...ele,
avgNumber: ele.avgNumber.toFixed(2),
allChannelLastCostTime:
ele.allChannelLastCostTime != -1
? formatLongTime(ele.allChannelLastCostTime, 2)
: "--", // 最近消费时间(全渠道)
lastCostTime:
ele.lastCostTime != -1
? formatLongTime(ele.lastCostTime, 2)
: "--", // 最近消费时间
: "--", // 最近消费时间(线下)
createTime:
ele.createTime != -1
? formatLongTime(ele.createTime, 1)
......
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