——————————————

Carson

src/main/resources/static/10.028fd4f2.async.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[10],{FLJs:function(e,t,a){e.exports={tableList:"antd-pro-pages-commune-commune-list-style-tableList",tableListOperator:"antd-pro-pages-commune-commune-list-style-tableListOperator",aaa:"antd-pro-pages-commune-commune-list-style-aaa",headerInfo:"antd-pro-pages-commune-commune-list-style-headerInfo",primary:"antd-pro-pages-commune-commune-list-style-primary",success:"antd-pro-pages-commune-commune-list-style-success",warning:"antd-pro-pages-commune-commune-list-style-warning",error:"antd-pro-pages-commune-commune-list-style-error",info:"antd-pro-pages-commune-commune-list-style-info",dark:"antd-pro-pages-commune-commune-list-style-dark",tableListForm:"antd-pro-pages-commune-commune-list-style-tableListForm",submitButtons:"antd-pro-pages-commune-commune-list-style-submitButtons"}},jniA:function(e,t,a){"use strict";var l=a("TqRt"),m=a("284h");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0,a("IzEo");var n=l(a("bx4M"));a("14J3");var d=l(a("BMrR"));a("+L6B");var r=l(a("2/Rp"));a("jCWc");var u=l(a("kPKH")),o=l(a("pVnL"));a("5NDa");var c=l(a("5rEg")),s=l(a("MVZn"));a("Pwec");var i=l(a("CtXQ"));a("y8nQ");var f=l(a("Vl3Y"));a("iQDF");var p,h,E,y,g=l(a("+eQT")),b=m(a("q1tI")),Y=l(a("mOP9")),v=a("MuoO"),D=l(a("wd/R")),M=l(a("CkN6")),F=l(a("zHco")),T=a("+n12"),L=l(a("FLJs")),x=g.default.RangePicker,I={labelCol:{span:4}},S=f.default.Item,C=e=>Object.keys(e).map(t=>e[t]).join(","),k={M:"\u7537",F:"\u5973"},w=e=>{var t=e.title,a=e.value,l=e.bordered,m=e.type;return b.default.createElement("div",{className:`${L.default.headerInfo} ${L.default[m]}`},b.default.createElement("span",null,t),b.default.createElement("p",null,a),l&&b.default.createElement("em",null))},N=(p=(0,v.connect)(e=>{var t=e.communeList,a=e.loading;return{communeList:t,loading:a.effects["communeList/fetch"]}}),h=f.default.create(),p(E=h(E=class extends b.PureComponent{constructor(){super(...arguments),this.state={expandForm:!1,formValues:{}},this.columns=[{title:"\u4f1a\u5458\u59d3\u540d",dataIndex:"communeName"},{title:"UID",dataIndex:"uid"},{title:"\u6027\u522b",dataIndex:"gender",render:e=>k[e]},{title:"\u7ed1\u5b9a\u624b\u673a\u53f7",dataIndex:"mobilePhone"},{title:"\u4f1a\u5458\u5165\u793e\u65f6\u95f4",dataIndex:"communeTime",render:e=>e?b.default.createElement("span",null,(0,D.default)(e).format("YYYY-MM-DD HH:mm:ss")):""},{title:"\u4f1a\u5458\u5230\u671f\u65f6\u95f4",dataIndex:"communeEndTime"},{title:"\u6700\u8fd1\u6c9f\u901a\u65f6\u95f4",dataIndex:"lastCommunicationTime",render:e=>e?b.default.createElement("span",null,(0,D.default)(e).format("YYYY-MM-DD HH:mm:ss")):""},{title:"\u64cd\u4f5c",render:(e,t)=>{var a={id:t.id,uid:t.uid},l={pathname:"/commune/preview",query:a};return b.default.createElement(b.Fragment,null,b.default.createElement(Y.default,{to:l},b.default.createElement(i.default,{type:"solution",theme:"outlined"}),"\u8be6\u60c5"))}}],this.handleStandardTableChange=((e,t,a)=>{var l=this.props.dispatch,m=this.state.formValues,n=Object.keys(t).reduce((e,a)=>{var l=(0,s.default)({},e);return l[a]=C(t[a]),l},{}),d=(0,s.default)({current:e.current,pageSize:e.pageSize},m,n);a.field&&(d.sorter=`${a.field}_${a.order}`),l({type:"communeList/fetch",payload:d})}),this.handleFormReset=(()=>{var e=this.props,t=e.form,a=e.dispatch;t.resetFields(),this.setState({formValues:{}}),a({type:"communeList/fetch",payload:{current:1,pageSize:10}})}),this.toggleForm=(()=>{var e=this.state.expandForm;this.setState({expandForm:!e})}),this.handleSearch=(e=>{e.preventDefault();var t=this.props,a=t.dispatch,l=t.form;l.validateFields((e,t)=>{if(!e){var l=(0,s.default)({},t,{updatedAt:t.updatedAt&&t.updatedAt.valueOf(),current:1,pageSize:10,communeTimeStart:t.communeTime&&t.communeTime[0].format("YYYY-MM-DD [00:00:00]")||"",communeTimeEnd:t.communeTime&&t.communeTime[1].format("YYYY-MM-DD [00:00:00]")||"",communeEndTimeStart:t.communeEndTime&&t.communeEndTime[0].format("YYYY-MM-DD [00:00:00]")||"",communeEndTimeEnd:t.communeEndTime&&t.communeEndTime[1].format("YYYY-MM-DD [00:00:00]")||"",lastCommunicationTimeStart:t.communicateDate&&t.communicateDate[0].format("YYYY-MM-DD [00:00:00]")||"",lastCommunicationTimeEnd:t.communicateDate&&t.communicateDate[1].format("YYYY-MM-DD [00:00:00]")||""});delete l.communeTime,delete l.communeEndTime,delete l.communicateDate,l=(0,T.removeEmptyQuery)(l),this.setState({formValues:l}),a({type:"communeList/fetch",payload:l})}})})}componentDidMount(){var e=this.props.dispatch;e({type:"communeList/fetch",payload:{current:1,pageSize:10}}),this.fetchCommunicationNumberMethod(),y=setInterval(()=>this.fetchCommunicationNumberMethod(),6e5)}componentWillUnmount(){clearInterval(y)}fetchCommunicationNumberMethod(){var e=this.props.dispatch;e({type:"communeList/fetchCommunicationNumber"})}renderSimpleForm(){var e=this.props.form.getFieldDecorator;return b.default.createElement(f.default,{onSubmit:this.handleSearch,layout:"inline"},b.default.createElement(d.default,{gutter:{md:8,lg:24,xl:48}},b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,(0,o.default)({label:"\u4f1a\u5458\u59d3\u540d"},I),e("communeName")(b.default.createElement(c.default,{placeholder:"\u8bf7\u8f93\u5165\u4f1a\u5458\u59d3\u540d"})))),b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,(0,o.default)({label:"\u624b\u673a\u53f7\u7801"},I),e("mobilePhone")(b.default.createElement(c.default,{placeholder:"\u8bf7\u8f93\u5165\u4f1a\u5458\u624b\u673a\u53f7"})))),b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,(0,o.default)({label:"\u4f1a\u5458UID "},I),e("uid")(b.default.createElement(c.default,{placeholder:"\u8bf7\u8f93\u5165\u4f1a\u5458\u7684UID"})))),b.default.createElement(u.default,{md:6,sm:24},b.default.createElement("span",{className:L.default.submitButtons},b.default.createElement(r.default,{type:"primary",htmlType:"submit"},"\u67e5\u8be2"),b.default.createElement(r.default,{style:{marginLeft:8},onClick:this.handleFormReset},"\u91cd\u7f6e"),b.default.createElement("a",{style:{marginLeft:8},onClick:this.toggleForm},"\u9ad8\u7ea7\u641c\u7d22 ",b.default.createElement(i.default,{type:"down"}))))))}renderAdvancedForm(){var e=this.props.form.getFieldDecorator;return b.default.createElement(f.default,{onSubmit:this.handleSearch,layout:"inline"},b.default.createElement(d.default,{gutter:{md:8,lg:24,xl:48}},b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,(0,o.default)({label:"\u4f1a\u5458\u59d3\u540d"},I),e("communeName")(b.default.createElement(c.default,{placeholder:"\u8bf7\u8f93\u5165\u4f1a\u5458\u59d3\u540d"})))),b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,{label:"\u624b\u673a\u53f7\u7801"},e("mobilePhone")(b.default.createElement(c.default,{placeholder:"\u8bf7\u8f93\u5165\u4f1a\u5458\u624b\u673a\u53f7"})))),b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,{label:"\u4f1a\u5458UID "},e("uid")(b.default.createElement(c.default,{placeholder:"\u8bf7\u8f93\u5165\u4f1a\u5458\u7684UID"}))))),b.default.createElement(d.default,{gutter:{md:8,lg:24,xl:48}},b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,{label:"\u5165\u793e\u65f6\u95f4"},e("communeTime")(b.default.createElement(x,{ranges:{"1\u5e74\u524d":[(0,D.default)("20140101","YYYYMMDD"),(0,D.default)().subtract(1,"years")],"2\u5e74\u524d":[(0,D.default)("20140101","YYYYMMDD"),(0,D.default)().subtract(2,"years")]}})))),b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,{label:"\u5230\u671f\u65f6\u95f4"},e("communeEndTime")(b.default.createElement(x,{ranges:{"1\u5468\u540e":[(0,D.default)(),(0,D.default)().add(7,"days")],"1\u6708\u540e":[(0,D.default)(),(0,D.default)().add(1,"months")]}})))),b.default.createElement(u.default,{md:6,sm:24},b.default.createElement(S,{label:"\u6c9f\u901a\u65f6\u95f4"},e("communicateDate")(b.default.createElement(x,{ranges:{"7\u5929\u524d":[(0,D.default)("20140101","YYYYMMDD"),(0,D.default)().subtract(7,"days")],"30\u5929\u524d":[(0,D.default)("20140101","YYYYMMDD"),(0,D.default)().subtract(30,"days")]}}))))),b.default.createElement("div",{style:{overflow:"hidden"}},b.default.createElement("div",{style:{float:"right",marginBottom:24}},b.default.createElement(r.default,{type:"primary",htmlType:"submit"},"\u67e5\u8be2"),b.default.createElement(r.default,{style:{marginLeft:8},onClick:this.handleFormReset},"\u91cd\u7f6e"),b.default.createElement("a",{style:{marginLeft:8},onClick:this.toggleForm},"\u6536\u8d77 ",b.default.createElement(i.default,{type:"up"})))))}renderForm(){var e=this.state.expandForm;return e?this.renderAdvancedForm():this.renderSimpleForm()}render(){var e=this.props,t=e.communeList,a=t.data,l=t.summary,m=e.loading,r=b.default.createElement(n.default,{bordered:!1},b.default.createElement(d.default,null,b.default.createElement(u.default,{sm:6,xs:24},b.default.createElement(w,{title:"\u5f53\u65e5\u6c9f\u901a(\u4eba\u6570)",value:l.one,type:"success",bordered:!0})),b.default.createElement(u.default,{sm:6,xs:24},b.default.createElement(w,{title:"\u4ece\u672a\u6c9f\u901a(\u4eba\u6570)",value:l.all_non,type:"dark",bordered:!0})),b.default.createElement(u.default,{sm:6,xs:24},b.default.createElement(w,{title:"\u4e00\u5468\u672a\u6c9f\u901a(\u4eba\u6570)",value:l.seven_non,type:"warning",bordered:!0})),b.default.createElement(u.default,{sm:6,xs:24},b.default.createElement(w,{title:"\u4e00\u6708\u672a\u6c9f\u901a(\u4eba\u6570)",value:l.month_non,type:"error"}))));return b.default.createElement(F.default,{content:r,title:`\u4f1a\u5458\u5217\u8868${a&&a.pagination&&a.pagination.total?`(${a.pagination.total}\u4eba)`:""}`},b.default.createElement(n.default,{bordered:!1},b.default.createElement("div",{className:L.default.tableList},b.default.createElement("div",{className:L.default.tableListForm},this.renderForm()),b.default.createElement(M.default,{loading:m,data:a,columns:this.columns,onChange:this.handleStandardTableChange}))))}})||E)||E),P=N;t.default=P}}]);
\ No newline at end of file

src/main/resources/static/asset-manifest.json

 {
+<<<<<<< HEAD
   "vendors.css": "/fun-member/vendors.84602358.chunk.css",
   "vendors.js": "/fun-member/vendors.aaca79b8.async.js",
   "1.8daba3b9.async.js": "/fun-member/1.8daba3b9.async.js",
@@ -30,6 +31,39 @@
   "18.e4a59ccd.chunk.css": "/fun-member/18.e4a59ccd.chunk.css",
   "18.f216a2de.async.js": "/fun-member/18.f216a2de.async.js",
   "19.0dc92a85.async.js": "/fun-member/19.0dc92a85.async.js",
+=======
+  "vendors.css": "/fun-member/vendors.2e2d08d9.chunk.css",
+  "vendors.js": "/fun-member/vendors.753f2057.async.js",
+  "1.91f382a2.async.js": "/fun-member/1.91f382a2.async.js",
+  "2.ea6beda0.async.js": "/fun-member/2.ea6beda0.async.js",
+  "umi.css": "/fun-member/umi.f2838268.css",
+  "umi.js": "/fun-member/umi.e8620da5.js",
+  "4.544675e9.chunk.css": "/fun-member/4.544675e9.chunk.css",
+  "4.4c4ed1e3.async.js": "/fun-member/4.4c4ed1e3.async.js",
+  "5.700553e7.chunk.css": "/fun-member/5.700553e7.chunk.css",
+  "5.1db4e544.async.js": "/fun-member/5.1db4e544.async.js",
+  "6.10012a9e.chunk.css": "/fun-member/6.10012a9e.chunk.css",
+  "6.84fda66d.async.js": "/fun-member/6.84fda66d.async.js",
+  "7.5ed65583.chunk.css": "/fun-member/7.5ed65583.chunk.css",
+  "7.0f91623f.async.js": "/fun-member/7.0f91623f.async.js",
+  "8.634db9ce.chunk.css": "/fun-member/8.634db9ce.chunk.css",
+  "8.0b78dbea.async.js": "/fun-member/8.0b78dbea.async.js",
+  "9.73b0e2f1.async.js": "/fun-member/9.73b0e2f1.async.js",
+  "10.dceca9e3.chunk.css": "/fun-member/10.dceca9e3.chunk.css",
+  "10.028fd4f2.async.js": "/fun-member/10.028fd4f2.async.js",
+  "11.4b218158.async.js": "/fun-member/11.4b218158.async.js",
+  "12.cff27ae8.chunk.css": "/fun-member/12.cff27ae8.chunk.css",
+  "12.e5a2c48d.async.js": "/fun-member/12.e5a2c48d.async.js",
+  "13.f97155be.async.js": "/fun-member/13.f97155be.async.js",
+  "14.78d24814.chunk.css": "/fun-member/14.78d24814.chunk.css",
+  "14.83be6cab.async.js": "/fun-member/14.83be6cab.async.js",
+  "15.484ec3f0.async.js": "/fun-member/15.484ec3f0.async.js",
+  "16.f053caf4.async.js": "/fun-member/16.f053caf4.async.js",
+  "17.ccd43bbd.async.js": "/fun-member/17.ccd43bbd.async.js",
+  "18.73dc73e8.chunk.css": "/fun-member/18.73dc73e8.chunk.css",
+  "18.fd4e1707.async.js": "/fun-member/18.fd4e1707.async.js",
+  "19.906608a4.async.js": "/fun-member/19.906608a4.async.js",
+>>>>>>> parent of 03eb09d... public
   "static/logo.png": "/fun-member/static/logo.9c71805a.png",
   "favicon.png": "/fun-member/favicon.png",
   "color.less": "/fun-member/color.less",

src/main/resources/static/index.html

-<!DOCTYPE html><html lang="en"><head><link rel="stylesheet" href="/fun-member/umi.64a8f8e8.css"><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>&#x7231;&#x73A9;&#x9AD8;&#x5C14;&#x592B;-&#x4F1A;&#x5458;&#x6863;&#x6848;</title><link rel="icon" href="/favicon.png" type="image/x-icon"><script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.5/dist/data-set.min.js"></script><script>window.routerBase = "/";</script></head><body><div id="root"></div><script src="/fun-member/umi.7ff3e0e8.js"></script></body></html>
\ No newline at end of file
+<<<<<<< HEAD
+<!DOCTYPE html><html lang="en"><head><link rel="stylesheet" href="/fun-member/umi.64a8f8e8.css"><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>&#x7231;&#x73A9;&#x9AD8;&#x5C14;&#x592B;-&#x4F1A;&#x5458;&#x6863;&#x6848;</title><link rel="icon" href="/favicon.png" type="image/x-icon"><script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.5/dist/data-set.min.js"></script><script>window.routerBase = "/";</script></head><body><div id="root"></div><script src="/fun-member/umi.7ff3e0e8.js"></script></body></html>
+=======
+<!DOCTYPE html><html lang="en"><head><link rel="stylesheet" href="/fun-member/umi.f2838268.css"><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta name="viewport" content="width=device-width,initial-scale=1"><title>&#x7231;&#x73A9;&#x9AD8;&#x5C14;&#x592B;-&#x4F1A;&#x5458;&#x6863;&#x6848;</title><link rel="icon" href="/fun-member/favicon.png" type="image/x-icon"><script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.5/dist/data-set.min.js"></script><script>window.routerBase = "/";</script></head><body>
+    <link rel="stylesheet/less" type="text/css" href="/color.less" />
+    <script>
+      window.less = {
+        async: false,
+        env: 'production'
+      };
+    </script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.2/less.min.js"></script>
+        <div id="root"></div><script src="/fun-member/umi.e8620da5.js"></script></body></html>
+>>>>>>> parent of 03eb09d... public