diff --git a/crmeb/jobs/SendSmsJob.php b/crmeb/jobs/SendSmsJob.php index 3d7ef6e2..37482466 100644 --- a/crmeb/jobs/SendSmsJob.php +++ b/crmeb/jobs/SendSmsJob.php @@ -59,7 +59,6 @@ class SendSmsJob implements JobInterface } if ($status['notice_routine'] == 1) { try { - Log::info('订阅消息发送数据' . var_export($data, 1)); app()->make(WechatTemplateMessageService::class)->subscribeSendTemplate($data); } catch (\Exception $e) { Log::info('订阅消息发送失败' . var_export($data, 1) . $e->getMessage()); diff --git a/crmeb/services/WechatTemplateMessageService.php b/crmeb/services/WechatTemplateMessageService.php index 80c03412..b1889078 100644 --- a/crmeb/services/WechatTemplateMessageService.php +++ b/crmeb/services/WechatTemplateMessageService.php @@ -80,7 +80,6 @@ class WechatTemplateMessageService { event('wechat.subscribeTemplate.before',compact('data')); $res = $this->subscribeTemplateMessage($data); - Log::info('订阅消息发送Data' . var_export($data, 1)); if(!$res || !is_array($res))return true; foreach($res as $item){ diff --git a/public/mer.html b/public/mer.html index 4329a6ec..c9f83c1f 100644 --- a/public/mer.html +++ b/public/mer.html @@ -1 +1 @@ -
s&&(c=s),o=r}c=0?"p":"n",P=_;if(y&&(r[l][I]||(r[l][I]={p:_,n:_}),P=r[l][I][L]),x){var k=i.dataToPoint([M,I]);A=P,T=k[1]+c,D=k[0]-_,C=h,Math.abs(D) r&&O(i,t.substring(r,o)),O(i,n[2],n[1]),r=p.lastIndex}r "],a.isArray(t)&&(t=t.slice(),n=!0),r=e?t:n?[c(t[0]),c(t[1])]:c(t),a.isString(u)?u.replace("{value}",n?r[0]:r).replace("{value2}",n?r[1]:r):a.isFunction(u)?n?u(t[0],t[1]):u(t):n?t[0]===l[0]?i[0]+" "+r[1]:t[1]===l[1]?i[1]+" "+r[0]:r[0]+" - "+r[1]:r;function c(t){return t===l[0]?"min":t===l[1]?"max":(+t).toFixed(Math.min(s,20))}},resetExtent:function(){var t=this.option,e=g([t.min,t.max]);this._dataExtent=e},getDataDimension:function(t){var e=this.option.dimension,i=t.dimensions;if(null!=e||i.length){if(null!=e)return t.getDimension(e);for(var n=t.dimensions,a=n.length-1;a>=0;a--){var r=n[a],o=t.getDimensionInfo(r);if(!o.isCalculationCoord)return r}}},getExtent:function(){return this._dataExtent.slice()},completeVisualOption:function(){var t=this.ecModel,e=this.option,i={inRange:e.inRange,outOfRange:e.outOfRange},n=e.target||(e.target={}),r=e.controller||(e.controller={});a.merge(n,i),a.merge(r,i);var l=this.isCategory();function u(i){f(e.color)&&!i.inRange&&(i.inRange={color:e.color.slice().reverse()}),i.inRange=i.inRange||{color:t.get("gradientColor")},p(this.stateList,(function(t){var e=i[t];if(a.isString(e)){var n=o.get(e,"active",l);n?(i[t]={},i[t][e]=n):delete i[t]}}),this)}function c(t,e,i){var n=t[e],a=t[i];n&&!a&&(a=t[i]={},p(n,(function(t,e){if(s.isValidType(e)){var i=o.get(e,"inactive",l);null!=i&&(a[e]=i,"color"!==e||a.hasOwnProperty("opacity")||a.hasOwnProperty("colorAlpha")||(a.opacity=[0,0]))}})))}function g(t){var e=(t.inRange||{}).symbol||(t.outOfRange||{}).symbol,i=(t.inRange||{}).symbolSize||(t.outOfRange||{}).symbolSize,n=this.get("inactiveColor");p(this.stateList,(function(r){var o=this.itemSize,s=t[r];s||(s=t[r]={color:l?n:[n]}),null==s.symbol&&(s.symbol=e&&a.clone(e)||(l?"roundRect":["roundRect"])),null==s.symbolSize&&(s.symbolSize=i&&a.clone(i)||(l?o[0]:[o[0],o[0]])),s.symbol=h(s.symbol,(function(t){return"none"===t||"square"===t?"roundRect":t}));var u=s.symbolSize;if(null!=u){var c=-1/0;d(u,(function(t){t>c&&(c=t)})),s.symbolSize=h(u,(function(t){return m(t,[0,c],[0,o[0]],!0)}))}}),this)}u.call(this,n),u.call(this,r),c.call(this,n,"inRange","outOfRange"),g.call(this,r)},resetItemSize:function(){this.itemSize=[parseFloat(this.get("itemWidth")),parseFloat(this.get("itemHeight"))]},isCategory:function(){return!!this.option.categories},setSelected:v,getValueState:v,getVisualMeta:v}),x=y;t.exports=x},eaeb:function(t,e,i){var n=i("6d8b");function a(t,e){return n.map(["Radius","Angle"],(function(i,n){var a=this["get"+i+"Axis"](),r=e[n],o=t[n]/2,s="dataTo"+i,l="category"===a.type?a.getBandWidth():Math.abs(a[s](r-o)-a[s](r+o));return"Angle"===i&&(l=l*Math.PI/180),l}),this)}function r(t){var e=t.getRadiusAxis(),i=t.getAngleAxis(),r=e.getExtent();return r[0]>r[1]&&r.reverse(),{coordSys:{type:"polar",cx:t.cx,cy:t.cy,r:r[1],r0:r[0]},api:{coord:n.bind((function(n){var a=e.dataToRadius(n[0]),r=i.dataToAngle(n[1]),o=t.coordToPoint([a,r]);return o.push(a,r*Math.PI/180),o})),size:n.bind(a,t)}}}t.exports=r},eb6b:function(t,e,i){var n=i("6d8b"),a=i("e0d3"),r=a.makeInner,o=i("cd33"),s=i("133d"),l=n.each,u=n.curry,c=r();function h(t,e,i){var a=t.currTrigger,r=[t.x,t.y],o=t,c=t.dispatchAction||n.bind(i.dispatchAction,i),h=e.getComponent("axisPointer").coordSysAxesInfo;if(h){b(r)&&(r=s({seriesIndex:o.seriesIndex,dataIndex:o.dataIndex},e).point);var f=b(r),w=o.axesInfo,S=h.axesInfo,M="leave"===a||b(r),I={},A={},T={list:[],map:{}},D={showPointer:u(p,A),showTooltip:u(g,T)};l(h.coordSysMap,(function(t,e){var i=f||t.containPoint(r);l(h.coordSysAxesInfo[e],(function(t,e){var n=t.axis,a=x(w,t);if(!M&&i&&(!w||a)){var o=a&&a.value;null!=o||f||(o=n.pointToData(r)),null!=o&&d(t,o,D,!1,I)}}))}));var C={};return l(S,(function(t,e){var i=t.linkGroup;i&&!A[e]&&l(i.axesInfo,(function(e,n){var a=A[n];if(e!==t&&a){var r=a.value;i.mapper&&(r=t.axis.scale.parse(i.mapper(r,_(e),_(t)))),C[t.key]=r}}))})),l(C,(function(t,e){d(S[e],t,D,!0,I)})),m(A,S,I),v(T,r,t,c),y(S,c,i),I}}function d(t,e,i,a,r){var o=t.axis;if(!o.scale.isBlank()&&o.containData(e))if(t.involveSeries){var s=f(e,t),l=s.payloadBatch,u=s.snapToValue;l[0]&&null==r.seriesIndex&&n.extend(r,l[0]),!a&&t.snap&&o.containData(u)&&null!=u&&(e=u),i.showPointer(t,e,l,r),i.showTooltip(t,s,u)}else i.showPointer(t,e)}function f(t,e){var i=e.axis,n=i.dim,a=t,r=[],o=Number.MAX_VALUE,s=-1;return l(e.seriesModels,(function(e,u){var c,h,d=e.getData().mapDimension(n,!0);if(e.getAxisTooltipData){var f=e.getAxisTooltipData(d,t,i);h=f.dataIndices,c=f.nestestValue}else{if(h=e.getData().indicesOfNearest(d[0],t,"category"===i.type?.5:null),!h.length)return;c=e.getData().get(d[0],h[0])}if(null!=c&&isFinite(c)){var p=t-c,g=Math.abs(p);g<=o&&((g
"+r.map(n,(function(i,n){var a=e.get(e.mapDimension(i.dim),t);return s(i.name+" : "+a)})).join("
")},defaultOption:{zlevel:0,z:2,coordinateSystem:"radar",legendHoverLink:!0,radarIndex:0,lineStyle:{width:2,type:"solid"},label:{position:"top"},symbol:"emptyCircle",symbolSize:4}}),u=l;t.exports=u},a04e:function(t,e,i){var n=i("6cb7");n.registerSubTypeDefaulter("timeline",(function(){return"slider"}))},a15a:function(t,e,i){var n=i("6d8b"),a=i("2306"),r=i("9850"),o=a.extendShape({type:"triangle",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var i=e.cx,n=e.cy,a=e.width/2,r=e.height/2;t.moveTo(i,n-r),t.lineTo(i+a,n+r),t.lineTo(i-a,n+r),t.closePath()}}),s=a.extendShape({type:"diamond",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var i=e.cx,n=e.cy,a=e.width/2,r=e.height/2;t.moveTo(i,n-r),t.lineTo(i+a,n),t.lineTo(i,n+r),t.lineTo(i-a,n),t.closePath()}}),l=a.extendShape({type:"pin",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var i=e.x,n=e.y,a=e.width/5*3,r=Math.max(a,e.height),o=a/2,s=o*o/(r-o),l=n-r+o+s,u=Math.asin(s/o),c=Math.cos(u)*o,h=Math.sin(u),d=Math.cos(u),f=.6*o,p=.7*o;t.moveTo(i-c,l+s),t.arc(i,l,o,Math.PI-u,2*Math.PI+u),t.bezierCurveTo(i+c-h*f,l+s+d*f,i,n-p,i,n),t.bezierCurveTo(i,n-p,i-c+h*f,l+s+d*f,i-c,l+s),t.closePath()}}),u=a.extendShape({type:"arrow",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var i=e.height,n=e.width,a=e.x,r=e.y,o=n/3*2;t.moveTo(a,r),t.lineTo(a+o,r+i),t.lineTo(a,r+i/4*3),t.lineTo(a-o,r+i),t.lineTo(a,r),t.closePath()}}),c={line:a.Line,rect:a.Rect,roundRect:a.Rect,square:a.Rect,circle:a.Circle,diamond:s,pin:l,arrow:u,triangle:o},h={line:function(t,e,i,n,a){a.x1=t,a.y1=e+n/2,a.x2=t+i,a.y2=e+n/2},rect:function(t,e,i,n,a){a.x=t,a.y=e,a.width=i,a.height=n},roundRect:function(t,e,i,n,a){a.x=t,a.y=e,a.width=i,a.height=n,a.r=Math.min(i,n)/4},square:function(t,e,i,n,a){var r=Math.min(i,n);a.x=t,a.y=e,a.width=r,a.height=r},circle:function(t,e,i,n,a){a.cx=t+i/2,a.cy=e+n/2,a.r=Math.min(i,n)/2},diamond:function(t,e,i,n,a){a.cx=t+i/2,a.cy=e+n/2,a.width=i,a.height=n},pin:function(t,e,i,n,a){a.x=t+i/2,a.y=e+n/2,a.width=i,a.height=n},arrow:function(t,e,i,n,a){a.x=t+i/2,a.y=e+n/2,a.width=i,a.height=n},triangle:function(t,e,i,n,a){a.cx=t+i/2,a.cy=e+n/2,a.width=i,a.height=n}},d={};n.each(c,(function(t,e){d[e]=new t}));var f=a.extendShape({type:"symbol",shape:{symbolType:"",x:0,y:0,width:0,height:0},beforeBrush:function(){var t=this.style,e=this.shape;"pin"===e.symbolType&&"inside"===t.textPosition&&(t.textPosition=["50%","40%"],t.textAlign="center",t.textVerticalAlign="middle")},buildPath:function(t,e,i){var n=e.symbolType,a=d[n];"none"!==e.symbolType&&(a||(n="rect",a=d[n]),h[n](e.x,e.y,e.width,e.height,a.shape),a.buildPath(t,a.shape,i))}});function p(t,e){if("image"!==this.type){var i=this.style,n=this.shape;n&&"line"===n.symbolType?i.stroke=t:this.__isEmptyBrush?(i.stroke=t,i.fill=e||"#fff"):(i.fill&&(i.fill=t),i.stroke&&(i.stroke=t)),this.dirty(!1)}}function g(t,e,i,n,o,s,l){var u,c=0===t.indexOf("empty");return c&&(t=t.substr(5,1).toLowerCase()+t.substr(6)),u=0===t.indexOf("image://")?a.makeImage(t.slice(8),new r(e,i,n,o),l?"center":"cover"):0===t.indexOf("path://")?a.makePath(t.slice(7),{},new r(e,i,n,o),l?"center":"cover"):new f({shape:{symbolType:t,x:e,y:i,width:n,height:o}}),u.__isEmptyBrush=c,u.setColor=p,u.setColor(s),u}e.createSymbol=g},a18f:function(t,e,i){var n=i("3a56"),a=n.extend({type:"dataZoom.inside",defaultOption:{disabled:!1,zoomLock:!1,zoomOnMouseWheel:!0,moveOnMouseMove:!0,moveOnMouseWheel:!1,preventDefaultMouseMove:!0}});t.exports=a},a38d:function(t,e,i){var n=i("2306"),a=i("392f"),r=i("9680"),o=i("68ab"),s=n.extendShape({shape:{polyline:!1,curveness:0,segs:[]},buildPath:function(t,e){var i=e.segs,n=e.curveness;if(e.polyline)for(var a=0;a=0&&(t.dataIndex=i+(t.startIndex||0))})))},c.remove=function(){this._clearIncremental(),this._incremental=null,this.group.removeAll()},c._clearIncremental=function(){var t=this._incremental;t&&t.clearDisplaybles()};var h=u;t.exports=h},ca29:function(t,e,i){var n=i("6d9a"),a=n.eachAfter,r=n.eachBefore,o=i("22da"),s=o.init,l=o.firstWalk,u=o.secondWalk,c=o.separation,h=o.radialCoordinate,d=o.getViewRect;function f(t,e){t.eachSeriesByType("tree",(function(t){p(t,e)}))}function p(t,e){var i=d(t,e);t.layoutInfo=i;var n=t.get("layout"),o=0,f=0,p=null;"radial"===n?(o=2*Math.PI,f=Math.min(i.height,i.width)/2,p=c((function(t,e){return(t.parentNode===e.parentNode?1:2)/t.depth}))):(o=i.width,f=i.height,p=c());var g=t.getData().tree.root,m=g.children[0];if(m){s(g),a(m,l,p),g.hierNode.modifier=-m.hierNode.prelim,r(m,u);var v=m,y=m,x=m;r(m,(function(t){var e=t.getLayout().x;e=r;u++)o-=r;var c=y(i,e);return c>o&&(i="",c=0),o=t-c,n.ellipsis=i,n.ellipsisWidth=c,n.contentWidth=o,n.containerWidth=t,n}function T(t,e){var i=e.containerWidth,n=e.font,a=e.contentWidth;if(!i)return"";var r=y(t,n);if(r<=i)return t;for(var o=0;;o++){if(r<=a||o>=e.maxIterations){t+=e.ellipsis;break}var s=0===o?D(t,a,e.ascCharWidth,e.cnCharWidth):r>0?Math.floor(t.length*a/r):0;t=t.substr(0,s),r=y(t,n)}return""===t&&(t=e.placeholder),t}function D(t,e,i,n){for(var a=0,r=0,o=t.length;r