Merge branch 'master' of /data/git/tiantian2

master
songweizong 3 years ago
commit 7b2f9762a2

@ -222,7 +222,22 @@ class StatisticsController extends CommonController
$model_recharge = Recharge::whereHas("order", function ($query) use ($request) {
$query->where("project_id", $request->project_id);
})->whereNotNull("paid_at")->whereRaw("UNIX_TIMESTAMP(`paid_at`) between {$from_date_timestamp} and {$to_date_timestamp}");
})->whereNotNull("paid_at")
->with(['order' => function ($query) {
$query->with([
"orderItems",
"firstItem",
"lastItem",
"project",
"product",
"customer",
"manager",
"bed" => function ($query) {
$query->with(["room", "building"]);
}
]);
}])->whereRaw("UNIX_TIMESTAMP(`paid_at`) between {$from_date_timestamp} and {$to_date_timestamp}");
$model_refund = Refund::whereHas("order", function ($query) use ($request) {
$query->where("project_id", $request->project_id);
})->whereNotNull("paid_at")->whereRaw("UNIX_TIMESTAMP(`paid_at`) between {$from_date_timestamp} and {$to_date_timestamp}");
@ -290,7 +305,6 @@ class StatisticsController extends CommonController
$new_order_total = Orders::whereBetween('created_at', [$from_date, $to_date])
->where("project_id", $request->project_id)
->count();
return response()->json(compact(
"checkout",
"refund", "recharge", "payment_methods",

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>护工管理</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.cc2b96e4.js></script><script src=/h5/static/js/index.b469799f.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.ec1e34c0.js></script><script src=/h5/static/js/index.27d106a7.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["package-packagevideo-pages-videoinfo-videoinfo"],{"0dfb":function(t,e,n){"use strict";n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return i}));var i={topnav:n("1928").default},a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",[n("topnav",{attrs:{title:"视频详情"},on:{tohome:function(e){arguments[0]=e=t.$handleEvent(e),t.tohome.apply(void 0,arguments)}}}),n("v-uni-view",{staticClass:"content"},[n("v-uni-video",{staticStyle:{width:"720rpx",height:"330rpx"},attrs:{src:t.host+t.item.video,poster:t.host+t.item.poster,"object-fit":"fill"}}),n("v-uni-view",{staticClass:"videotitle"},[t._v(t._s(t.item.title))])],1)],1)},o=[]},1928:function(t,e,n){"use strict";n.r(e);var i=n("61ce"),a=n("c135");for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);n("fe5f");var f=n("f0c5"),c=Object(f["a"])(a["default"],i["b"],i["c"],!1,null,"2198d501",null,!1,i["a"],void 0);e["default"]=c.exports},"282f":function(t,e,n){var i=n("52f1");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("fcad02c6",i,!0,{sourceMap:!1,shadowMode:!1})},"4c0d":function(t,e,n){var i=n("a6fb");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("627b5d4e",i,!0,{sourceMap:!1,shadowMode:!1})},"52f1":function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,".icon-home[data-v-2198d501]{padding-left:%?55?%;font-size:%?42?%}.nav[data-v-2198d501]{height:%?160?%;background-image:linear-gradient(130deg,#52d5a6,#43c9cf);display:flex;align-items:center;padding:%?0?% %?30?%;padding-top:%?48?%;position:fixed;box-sizing:border-box;top:%?0?%;left:0;width:100%;overflow:hidden;z-index:9999;justify-content:space-between}.nav .navLeft[data-v-2198d501]{display:flex}.nav .navTitle[data-v-2198d501]{font-family:SourceHanSansCN-Medium;font-size:%?36?%;color:#fff;letter-spacing:%?0.37?%;line-height:%?50?%;margin-left:%?40?%;font-weight:600}.nav .navLeft .icon-fanhui[data-v-2198d501]{color:#fff;font-size:%?45?%}.navRight[data-v-2198d501]{display:flex;align-items:center}",""]),t.exports=e},"61ce":function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){}));var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",[n("v-uni-view",{staticClass:"nav"},[n("v-uni-view",{staticClass:"navLeft"},[n("v-uni-view",{staticClass:"back",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.toback.apply(void 0,arguments)}}},[n("v-uni-text",{staticClass:"iconfont icon-fanhui"})],1),n("v-uni-view",{staticClass:"navTitle"},[t._v(t._s(t.title))])],1),n("v-uni-view",{staticClass:"navRight"},[t._t("default"),"home"==t.hasHome?n("v-uni-text",{staticClass:"iconfont icon-home iconTop",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.tohome.apply(void 0,arguments)}}}):t._e()],2)],1)],1)},a=[]},"7d75":function(t,e,n){"use strict";var i=n("4c0d"),a=n.n(i);a.a},"94e5":function(t,e,n){"use strict";n("7a82"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=n("21db"),a={data:function(){return{item:{},host:""}},onLoad:function(t){this.loadInfo(t.id),this.host=i.HOST},methods:{tohome:function(){uni.navigateTo({url:"../../../../pages/index/index"})},loadInfo:function(t){var e=this;i.request({bindThis:e,api:"manager/get-video/"+t,customLoading:!1,utilSuccess:function(t){e.item=t},utilFail:function(t){}})}}};e.default=a},a6fb:function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,"uni-page-body[data-v-a0ee2c06]{padding-top:%?160?%}.content[data-v-a0ee2c06]{padding:%?20?%}.videotitle[data-v-a0ee2c06]{margin-top:%?20?%}",""]),t.exports=e},ae23:function(t,e,n){"use strict";n.r(e);var i=n("0dfb"),a=n("e023");for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);n("7d75");var f=n("f0c5"),c=Object(f["a"])(a["default"],i["b"],i["c"],!1,null,"a0ee2c06",null,!1,i["a"],void 0);e["default"]=c.exports},bf47:function(t,e,n){"use strict";n("7a82"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={name:"topnav",props:{title:{type:String,default:""},hasHome:{type:String,default:"home"}},data:function(){return{}},methods:{toback:function(){uni.navigateBack({delta:0})},tohome:function(){this.$emit("tohome")}}};e.default=i},c135:function(t,e,n){"use strict";n.r(e);var i=n("bf47"),a=n.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=a.a},e023:function(t,e,n){"use strict";n.r(e);var i=n("94e5"),a=n.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=a.a},fe5f:function(t,e,n){"use strict";var i=n("282f"),a=n.n(i);a.a}}]);

@ -1 +0,0 @@
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["package-packagevideo-pages-videoinfo-videoinfo"],{"01f0":function(t,e,n){"use strict";n.r(e);var i=n("0dee"),a=n.n(i);for(var o in i)"default"!==o&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=a.a},"0dee":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={name:"topnav",props:{title:{type:String,default:""},hasHome:{type:String,default:"home"}},data:function(){return{}},methods:{toback:function(){uni.navigateBack({delta:0})},tohome:function(){this.$emit("tohome")}}};e.default=i},"1b73":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=n("313c"),a={data:function(){return{item:{},host:""}},onLoad:function(t){this.loadInfo(t.id),this.host=i.HOST},methods:{tohome:function(){uni.navigateTo({url:"../../../../pages/index/index"})},loadInfo:function(t){var e=this;i.request({bindThis:e,api:"manager/get-video/"+t,customLoading:!1,utilSuccess:function(t){e.item=t},utilFail:function(t){}})}}};e.default=a},"20c1":function(t,e,n){var i=n("256c");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("519a66e1",i,!0,{sourceMap:!1,shadowMode:!1})},"256c":function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,"uni-page-body[data-v-a0ee2c06]{padding-top:%?160?%}.content[data-v-a0ee2c06]{padding:%?20?%}.videotitle[data-v-a0ee2c06]{margin-top:%?20?%}",""]),t.exports=e},"40fe":function(t,e,n){"use strict";n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return i}));var i={topnav:n("c85e").default},a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",[n("topnav",{attrs:{title:"视频详情"},on:{tohome:function(e){arguments[0]=e=t.$handleEvent(e),t.tohome.apply(void 0,arguments)}}}),n("v-uni-view",{staticClass:"content"},[n("v-uni-video",{staticStyle:{width:"720rpx",height:"330rpx"},attrs:{src:t.host+t.item.video,poster:t.host+t.item.poster,"object-fit":"fill"}}),n("v-uni-view",{staticClass:"videotitle"},[t._v(t._s(t.item.title))])],1)],1)},o=[]},"4c26":function(t,e,n){"use strict";n.r(e);var i=n("1b73"),a=n.n(i);for(var o in i)"default"!==o&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=a.a},"5ead":function(t,e,n){"use strict";var i=n("20c1"),a=n.n(i);a.a},"6bb8":function(t,e,n){"use strict";n.r(e);var i=n("40fe"),a=n("4c26");for(var o in a)"default"!==o&&function(t){n.d(e,t,(function(){return a[t]}))}(o);n("5ead");var c,u=n("f0c5"),f=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"a0ee2c06",null,!1,i["a"],c);e["default"]=f.exports},"77a6":function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return i}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",[n("v-uni-view",{staticClass:"nav"},[n("v-uni-view",{staticClass:"navLeft"},[n("v-uni-view",{staticClass:"back",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.toback.apply(void 0,arguments)}}},[n("v-uni-text",{staticClass:"iconfont icon-fanhui"})],1),n("v-uni-view",{staticClass:"navTitle"},[t._v(t._s(t.title))])],1),n("v-uni-view",{staticClass:"navRight"},[t._t("default"),"home"==t.hasHome?n("v-uni-text",{staticClass:"iconfont icon-home iconTop",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.tohome.apply(void 0,arguments)}}}):t._e()],2)],1)],1)},o=[]},"9b58":function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,".icon-home[data-v-2198d501]{padding-left:%?55?%;font-size:%?42?%}.nav[data-v-2198d501]{height:%?160?%;background-image:linear-gradient(130deg,#52d5a6,#43c9cf);display:flex;align-items:center;padding:%?0?% %?30?%;padding-top:%?48?%;position:fixed;box-sizing:border-box;top:%?0?%;left:0;width:100%;overflow:hidden;z-index:9999;justify-content:space-between}.nav .navLeft[data-v-2198d501]{display:flex}.nav .navTitle[data-v-2198d501]{font-family:SourceHanSansCN-Medium;font-size:%?36?%;color:#fff;letter-spacing:%?0.37?%;line-height:%?50?%;margin-left:%?40?%;font-weight:600}.nav .navLeft .icon-fanhui[data-v-2198d501]{color:#fff;font-size:%?45?%}.navRight[data-v-2198d501]{display:flex;align-items:center}",""]),t.exports=e},c25c:function(t,e,n){var i=n("9b58");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("e30b2bb6",i,!0,{sourceMap:!1,shadowMode:!1})},c85e:function(t,e,n){"use strict";n.r(e);var i=n("77a6"),a=n("01f0");for(var o in a)"default"!==o&&function(t){n.d(e,t,(function(){return a[t]}))}(o);n("caf7");var c,u=n("f0c5"),f=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"2198d501",null,!1,i["a"],c);e["default"]=f.exports},caf7:function(t,e,n){"use strict";var i=n("c25c"),a=n.n(i);a.a}}]);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save