Changes
This commit is contained in:
senyao
parent
429e5fc4a9
commit
761de32221
|
|
@ -124,10 +124,10 @@
|
|||
</div>
|
||||
<div class="card-panel-description">
|
||||
<div class="card-panel-text">
|
||||
待使用订单数30天 <count-to :start-val="0" :end-val="tobeused_30" :duration="10" class="card-panel-num" style="color: #666" />
|
||||
待使用订单数30天 <count-to :start-val="0" :end-val="tobeused_30" :duration="10" class="card-panel-num" style="color: #ea517f" />
|
||||
</div>
|
||||
<div class="card-panel-text">
|
||||
待使用订单金额30天 <count-to :start-val="0" :end-val="tobeused_price_30" :duration="10" class="card-panel-num" style="color: #666" />
|
||||
待使用订单金额30天 <count-to :start-val="0" :end-val="tobeused_price_30" :duration="10" class="card-panel-num" style="color: #ea517f" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -152,10 +152,10 @@
|
|||
</div>
|
||||
<div class="card-panel-description">
|
||||
<div class="card-panel-text">
|
||||
待使用订单数60天 <count-to :start-val="0" :end-val="tobeused_60" :duration="10" class="card-panel-num" style="color: #666" />
|
||||
待使用订单数60天 <count-to :start-val="0" :end-val="tobeused_60" :duration="10" class="card-panel-num" style="color: #ea517f" />
|
||||
</div>
|
||||
<div class="card-panel-text">
|
||||
待使用订单金额60天 <count-to :start-val="0" :end-val="tobeused_price_60" :duration="10" class="card-panel-num" style="color: #666" />
|
||||
待使用订单金额60天 <count-to :start-val="0" :end-val="tobeused_price_60" :duration="10" class="card-panel-num" style="color: #ea517f" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -180,10 +180,10 @@
|
|||
</div>
|
||||
<div class="card-panel-description">
|
||||
<div class="card-panel-text">
|
||||
待使用订单数80天 <count-to :start-val="0" :end-val="tobeused_80" :duration="10" class="card-panel-num" style="color: #666" />
|
||||
待使用订单数80天 <count-to :start-val="0" :end-val="tobeused_80" :duration="10" class="card-panel-num" style="color: #ea517f" />
|
||||
</div>
|
||||
<div class="card-panel-text">
|
||||
待使用订单金额80天<count-to :start-val="0" :end-val="tobeused_price_80" :duration="10" class="card-panel-num" style="color: #666" />
|
||||
待使用订单金额80天 <count-to :start-val="0" :end-val="tobeused_price_80" :duration="10" class="card-panel-num" style="color: #ea517f" />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ module.exports = {
|
|||
},
|
||||
proxy: {
|
||||
'/dev-api': { // 接口地址 以 api开头的都走下面的配置
|
||||
target: 'http://192.168.1.132:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
|
||||
target: 'http://127.0.0.1:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
|
||||
ws: true, // 是否支持 websocket 请求 支持
|
||||
changeOrigin: true, // 是否启用跨域
|
||||
pathRewrite: {
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ class IndexController extends base
|
|||
ELSE 0
|
||||
END) AS tobeused_30,
|
||||
SUM(CASE
|
||||
WHEN ((os=1 AND order_status=3) OR (os=2 AND order_status=4) OR (os=3 AND order_status=1)) AND create_at >= ' . $startOfThirtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN actual_price
|
||||
WHEN ((os=1 AND order_status=3) OR (os=2 AND order_status=4) OR (os=3 AND order_status=1)) AND create_at >= ' . $startOfThirtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN total_price
|
||||
ELSE 0
|
||||
END) AS tobeused_price_30,
|
||||
SUM(CASE
|
||||
|
|
@ -156,7 +156,7 @@ class IndexController extends base
|
|||
ELSE 0
|
||||
END) AS tobeused_60,
|
||||
SUM(CASE
|
||||
WHEN ((os=1 AND order_status=3) OR (os=2 AND order_status=4) OR (os=3 AND order_status=1)) AND create_at >= ' . $startOfSixtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN actual_price
|
||||
WHEN ((os=1 AND order_status=3) OR (os=2 AND order_status=4) OR (os=3 AND order_status=1)) AND create_at >= ' . $startOfSixtyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN total_price
|
||||
ELSE 0
|
||||
END) AS tobeused_price_60,
|
||||
SUM(CASE
|
||||
|
|
@ -164,7 +164,7 @@ class IndexController extends base
|
|||
ELSE 0
|
||||
END) AS tobeused_80,
|
||||
SUM(CASE
|
||||
WHEN ((os=1 AND order_status=3) OR (os=2 AND order_status=4) OR (os=3 AND order_status=1)) AND create_at >= ' . $startOfEightyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN actual_price
|
||||
WHEN ((os=1 AND order_status=3) OR (os=2 AND order_status=4) OR (os=3 AND order_status=1)) AND create_at >= ' . $startOfEightyDaysAgoTimestamp . ' AND create_at <= ' . $endOfDayTimestamp . ' THEN total_price
|
||||
ELSE 0
|
||||
END) AS tobeused_price_80
|
||||
');
|
||||
|
|
@ -186,12 +186,12 @@ class IndexController extends base
|
|||
'asset_price' => $order->asset_price ?? 0,
|
||||
'refund' => $order->refund ?? 0,
|
||||
'refund_price' => $order->refund_price ?? 0,
|
||||
'tobeused_30' => $order->refund_30 ?? 0,
|
||||
'tobeused_price_30' => $order->refund_price_30 ?? 0.00,
|
||||
'tobeused_60' => $order->refund_60 ?? 0,
|
||||
'tobeused_price_60' => $order->refund_price_60 ?? 0.00,
|
||||
'tobeused_80' => $order->refund_80 ?? 0,
|
||||
'tobeused_price_80' => $order->refund_price_80 ?? 0.00
|
||||
'tobeused_30' => $order->tobeused_30 ?? 0,
|
||||
'tobeused_price_30' => $order->tobeused_price_30 ?? 0.00,
|
||||
'tobeused_60' => $order->tobeused_60 ?? 0,
|
||||
'tobeused_price_60' => $order->tobeused_price_60 ?? 0.00,
|
||||
'tobeused_80' => $order->tobeused_80 ?? 0,
|
||||
'tobeused_price_80' => $order->tobeused_price_80 ?? 0.00
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
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…
Reference in New Issue