hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

输出价格统一使用元

Browse Source
This commit is contained in:
邓皓元 2018-12-26 13:46:11 +08:00
parent 0e6d9ea9c9
commit 54028369d3
19 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Domains/Company/Http/Controllers/OrderController.php
View File

@ -97,6 +97,9 @@ class OrderController extends Controller
$order->order_status_name = $orderStatues[$order->order_status];
$order->transaction_status = $order->transaction_status;
$order->transaction_status_name = $transactionStatuses[$order->transaction_status];
$order->unit_price = sprintf('%.02f', $order->unit_price/100);
$order->total_price = sprintf('%.02f', $order->total_price/100);
$order->custom_price = sprintf('%.02f', $order->custom_price/100);
$order->extends = [
'cancel_remark' => $order->extends['cancel_remark'] ?? '',

3
app/Domains/Virtual/Http/Controllers/OrderController.php
View File

@ -88,6 +88,9 @@ class OrderController extends Controller
$order->order_status_name = $orderStatues[$order->order_status];
$order->transaction_status_name = $transactionStatuses[$order->transaction_status];
$order->logistics_company_name = $logistics[$order->logistics_company] ?? '';
$order->unit_price = sprintf('%.02f', $order->unit_price/100);
$order->total_price = sprintf('%.02f', $order->total_price/100);
$order->custom_price = sprintf('%.02f', $order->custom_price/100);
$order->extends = [
'cancel_remark' => $order->extends['cancel_remark'] ?? '',

7
app/Domains/Virtual/Services/OrderService.php
View File

@ -40,6 +40,13 @@ class OrderService extends Service
$res = $this->orderRepository->with(['company:id,name','package:id,name,carrier_operator'])
->withConditions($conditions)->applyConditions()->orderBy('order_at', 'desc')->paginate($limit);
$res->map(function ($item) {
$item->unit_price = sprintf('%.02f', $item->unit_price/100);
$item->total_price = sprintf('%.02f', $item->total_price/100);
$item->custom_price = sprintf('%.02f', $item->custom_price/100);
});
return $res;
}

8
app/Domains/Virtual/Services/PackageService.php
View File

@ -40,11 +40,15 @@ class PackageService extends Service
->applyConditions()->paginate($limit);
$carrierOperators = app(Dicts::class)->get('carrier_operator');
$packages->map(function ($item) use ($carrierOperators) {
$item->cost_price = sprintf('%.02f', $item->cost_price/100);
$item->guide_price = sprintf('%.02f', $item->guide_price/100);
$item->renewal_cost_price = sprintf('%.02f', $item->renewal_cost_price/100);
$item->renewal_guide_price = sprintf('%.02f', $item->renewal_guide_price/100);
$item->carrier_operator_name = $carrierOperators[$item->carrier_operator];
});
return $packages;
}

5
app/Domains/Virtual/Services/ProductService.php
View File

@ -33,6 +33,11 @@ class ProductService extends Service
{
$list = $this->productRepository->with(['company:id,name', 'package:id,name,carrier_operator'])
->withConditions($conditions)->applyConditions()->get();
$list->map(function ($item) {
$item->base_price = sprintf('%.02f', $item->base_price/100);
$item->renewal_price = sprintf('%.02f', $item->renewal_price/100);
});
return $list;
}

6
frontend/src/views/virtual/orders/detail.vue
View File

@ -25,7 +25,7 @@
<li class="ui-list">
<div class="ui-list-title">套餐单价:</div>
<div class="ui-list-content">{{Number(data.unit_price/100).toFixed(2)}} 元/服务周期</div>
<div class="ui-list-content">{{data.unit_price}} 元/服务周期</div>
</li>
<li class="ui-list">
@ -34,8 +34,8 @@
</li>
<li class="ui-list">
<div class="ui-list-title">套餐单价:</div>
<div class="ui-list-content">{{Number(data.unit_price/100).toFixed(2)}} 元</div>
<div class="ui-list-title">订单总计:</div>
<div class="ui-list-content">{{data.custom_price}} 元</div>
</li>
<li class="ui-list">

16
frontend/src/views/virtual/orders/js/index.js
View File

@ -62,12 +62,8 @@ export default {
},
{
title: '套餐单价(周期)',
key: '',
width: 135,
render: (h, { row, column, index }) => {
let price = Number(row.unit_price / 100);
return h('span', price.toFixed(2) + ' 元');
}
key: 'unit_price',
width: 135
},
{
title: '订单卡量',
@ -79,12 +75,8 @@ export default {
},
{
title: '订单金额',
key: '',
width: 100,
render: (h, { row, column, index }) => {
let price = Number(row.custom_price / 100);
return h('span', price.toFixed(2) + ' 元');
}
key: 'custom_price',
width: 100
},
{
title: '订单状态',

8
frontend/src/views/virtual/packages/edit.vue
View File

@ -105,28 +105,28 @@
<li class="ui-list">
<div class="ui-list-title">套餐成本价:</div>
<div class="ui-list-content">
<InputNumber :formatter="value => Number(value/100).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.cost_price"></InputNumber>&nbsp;元
<InputNumber :formatter="value => Number(value).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.cost_price"></InputNumber>&nbsp;元
</div>
</li>
<li class="ui-list">
<div class="ui-list-title">套餐指导价:</div>
<div class="ui-list-content">
<InputNumber :formatter="value => Number(value/100).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.guide_price"></InputNumber>&nbsp;元
<InputNumber :formatter="value => Number(value).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.guide_price"></InputNumber>&nbsp;元
</div>
</li>
<li class="ui-list">
<div class="ui-list-title">续费成本价:</div>
<div class="ui-list-content">
<InputNumber :formatter="value => Number(value/100).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.renewal_cost_price"></InputNumber>&nbsp;元
<InputNumber :formatter="value => Number(value).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.renewal_cost_price"></InputNumber>&nbsp;元
</div>
</li>
<li class="ui-list">
<div class="ui-list-title">续费指导价:</div>
<div class="ui-list-content">
<InputNumber :formatter="value => Number(value/100).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.renewal_guide_price"></InputNumber>&nbsp;元
<InputNumber :formatter="value => Number(value).toFixed(2)" :max="99999" :min="0" :step="0.01" v-model="params.renewal_guide_price"></InputNumber>&nbsp;元
</div>
</li>

4
frontend/src/views/virtual/products/edit.vue
View File

@ -27,14 +27,14 @@
<li class="ui-list">
<div class="ui-list-title">基础价格</div>
<div class="ui-list-content">
<InputNumber :max="10000" :min="0" :step="0.1" v-model.trim="params.base_price"></InputNumber>
<InputNumber :formatter="value => Number(value).toFixed(2)" :max="10000" :min="0" :step="0.1" v-model.trim="params.base_price"></InputNumber>
</div>
</li>
<li class="ui-list">
<div class="ui-list-title">续费价格</div>
<div class="ui-list-content">
<InputNumber :max="10000" :min="0" :step="0.1" v-model.trim="params.renewal_price"></InputNumber>
<InputNumber :formatter="value => Number(value).toFixed(2)" :max="10000" :min="0" :step="0.1" v-model.trim="params.renewal_price"></InputNumber>
</div>
</li>

20
frontend/src/views/virtual/products/js/index.js
View File

@ -47,21 +47,13 @@ export default {
},
{
title: '套餐价格',
key: '',
width: 100,
render: (h, { row, column, index }) => {
let price = Number(row.base_price / 100);
return h('span', price.toFixed(2));
}
key: 'base_price',
width: 100
},
{
title: '续费价格',
key: '',
width: 100,
render: (h, { row, column, index }) => {
let price = Number(row.renewal_price / 100);
return h('span', price.toFixed(2));
}
key: 'renewal_price',
width: 100
},
{
title: '运营商',
@ -188,8 +180,8 @@ export default {
if (row) {
isUpdate = true;
data = JSON.parse(JSON.stringify(row));
data.base_price = data.base_price ? Number(data.base_price / 100) : 0;
data.renewal_price = data.renewal_price ? Number(data.renewal_price / 100) : 0;
data.base_price = data.base_price ? data.base_price : 0;
data.renewal_price = data.renewal_price ? data.renewal_price : 0;
data.company_id = this.params.company_id;
} else {
data = { company_id: this.params.company_id };

2
public/js/app.643baedb.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/app.643baedb.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/js/app.cf0f9c74.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/app.cf0f9c74.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/js/chunk-6d306fd9.a5098d0a.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/chunk-6d306fd9.a5098d0a.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/js/chunk-6d306fd9.b060bdda.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/chunk-6d306fd9.b060bdda.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
resources/views/index.blade.php
View File

@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-6d306fd9.729cc3c7.css rel=prefetch><link href=/js/chunk-00ae0766.4cb97496.js rel=prefetch><link href=/js/chunk-6d306fd9.05d70464.js rel=prefetch><link href=/css/app.36043160.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.49e8676f.js rel=preload as=script><link href=/js/chunk-vendors.02a4e5bc.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.36043160.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.02a4e5bc.js></script><script src=/js/app.49e8676f.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-6d306fd9.729cc3c7.css rel=prefetch><link href=/js/chunk-00ae0766.4cb97496.js rel=prefetch><link href=/js/chunk-6d306fd9.b060bdda.js rel=prefetch><link href=/css/app.36043160.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.643baedb.js rel=preload as=script><link href=/js/chunk-vendors.02a4e5bc.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.36043160.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.02a4e5bc.js></script><script src=/js/app.643baedb.js></script></body></html>