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

parse

Browse Source
This commit is contained in:
邓皓元 2019-01-03 16:25:48 +08:00
parent d31f8a3177
commit ef003d927a
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Domains/Virtual/Repositories/OrderRepository.php
View File

@ -3,6 +3,7 @@
namespace App\Domains\Virtual\Repositories; namespace App\Domains\Virtual\Repositories;
use App\Core\Repository; use App\Core\Repository;
use Illuminate\Support\Carbon;
use App\Models\Virtual\Order as Model; use App\Models\Virtual\Order as Model;
use App\Domains\Virtual\Services\CommonService; use App\Domains\Virtual\Services\CommonService;
@ -108,11 +109,11 @@ class OrderRepository extends Repository
} }
if (isset($conditions['starttime'])) { if (isset($conditions['starttime'])) {
$this->model = $this->model->where('order_at', '>=', $conditions['starttime']); $this->model = $this->model->where('order_at', '>=', Carbon::parse($conditions['starttime']));
} }
if (isset($conditions['endtime'])) { if (isset($conditions['endtime'])) {
$this->model = $this->model->where('order_at', '<=', $conditions['endtime']); $this->model = $this->model->where('order_at', '<=', Carbon::parse($conditions['endtime']));
} }
return $this; return $this;

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

@ -89,7 +89,7 @@ class PackageService extends Service
$message = [ $message = [
'sn.required' => '请输入套餐编号', 'sn.required' => '请输入套餐编号',
'sn.between' => '套餐编号长度不合法', 'sn.between' => '套餐编号长度不合法',
'sn.unique' => '套餐编号已存在，请重新输入', 'sn.unique' => '已存在相同的套餐，请勿重复添加',
'name.required' => '请输入套餐名称', 'name.required' => '请输入套餐名称',
'name.between' => '套餐名称长度不合法', 'name.between' => '套餐名称长度不合法',
'name.unique' => '套餐名称已经被其他用户所使用', 'name.unique' => '套餐名称已经被其他用户所使用',

24
composer.lock generated
View File

@ -591,17 +591,17 @@
}, },
{ {
"name": "dipper/excel", "name": "dipper/excel",
"version": "3.1.8", "version": "3.1.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "ssh://gogs@git.fxft.net:2222/composer/excel.git", "url": "ssh://gogs@git.fxft.net:2222/composer/excel.git",
"reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c" "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc"
}, },
"dist": { "dist": {
"type": "tar", "type": "tar",
"url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.8-4fd466.tar", "url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.9-c8a27a.tar",
"reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c", "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc",
"shasum": "2f4c7f6deb2cf9a91dd5d2714bffe92e009ccd6e" "shasum": "68794cf40c5fbab6d0c0738cb5738734f3c06471"
}, },
"require": { "require": {
"illuminate/support": "5.5.* || 5.6.* || 5.7.*", "illuminate/support": "5.5.* || 5.6.* || 5.7.*",
@ -641,7 +641,7 @@
"MIT" "MIT"
], ],
"description": "Supercharged Excel exports and imports in Laravel", "description": "Supercharged Excel exports and imports in Laravel",
"time": "2019-01-03T04:46:21+00:00" "time": "2019-01-03T08:02:52+00:00"
}, },
{ {
"name": "dipper/flashmessage", "name": "dipper/flashmessage",
@ -680,17 +680,17 @@
}, },
{ {
"name": "dipper/foundation", "name": "dipper/foundation",
"version": "1.1.18", "version": "1.1.19",
"source": { "source": {
"type": "git", "type": "git",
"url": "ssh://gogs@git.fxft.net:2222/composer/foundation.git", "url": "ssh://gogs@git.fxft.net:2222/composer/foundation.git",
"reference": "b7858823f651bca9c77bd7b581543b9ece15ba27" "reference": "a7179259b7b4707c570aef46fa7679f14382a584"
}, },
"dist": { "dist": {
"type": "tar", "type": "tar",
"url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.18-002594.tar", "url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.19-4a2c7e.tar",
"reference": "b7858823f651bca9c77bd7b581543b9ece15ba27", "reference": "a7179259b7b4707c570aef46fa7679f14382a584",
"shasum": "33cdb0c76d433e20fea1f0d7a43d603f5e2242c9" "shasum": "6bc71487f98e44d82aff274a25d56c24b894de1e"
}, },
"require": { "require": {
"barryvdh/laravel-cors": "~0.11", "barryvdh/laravel-cors": "~0.11",
@ -724,7 +724,7 @@
} }
], ],
"description": "The Foundation of the Dipper Architecture project for Lumen", "description": "The Foundation of the Dipper Architecture project for Lumen",
"time": "2019-01-03T06:02:57+00:00" "time": "2019-01-03T07:51:26+00:00"
}, },
{ {
"name": "dipper/jwt-auth", "name": "dipper/jwt-auth",

8
frontend/src/views/user/roles/detail.vue
View File

@ -3,22 +3,22 @@
<div class="page-detail-wrap" v-if="data"> <div class="page-detail-wrap" v-if="data">
<ul> <ul>
<li class="ui-list"> <li class="ui-list">
<div class="ui-list-title">角色名：</div> <div class="ui-list-title">角色名:</div>
<div class="ui-list-content">{{data.name}}</div> <div class="ui-list-content">{{data.name}}</div>
</li> </li>
<li class="ui-list"> <li class="ui-list">
<div class="ui-list-title">备注：</div> <div class="ui-list-title">备注:</div>
<div class="ui-list-content">{{data.remark}}</div> <div class="ui-list-content">{{data.remark}}</div>
</li> </li>
<li class="ui-list"> <li class="ui-list">
<div class="ui-list-title">创建时间：</div> <div class="ui-list-title">创建时间:</div>
<div class="ui-list-conten">{{data.created_at}}</div> <div class="ui-list-conten">{{data.created_at}}</div>
</li> </li>
<li class="ui-list"> <li class="ui-list">
<div class="ui-list-title">更新时间：</div> <div class="ui-list-title">更新时间:</div>
<div class="ui-list-content">{{data.updated_at}}</div> <div class="ui-list-content">{{data.updated_at}}</div>
</li> </li>
</ul> </ul>

28
vendor/composer/installed.json vendored
View File

@ -604,18 +604,18 @@
}, },
{ {
"name": "dipper/excel", "name": "dipper/excel",
"version": "3.1.8", "version": "3.1.9",
"version_normalized": "3.1.8.0", "version_normalized": "3.1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "ssh://gogs@git.fxft.net:2222/composer/excel.git", "url": "ssh://gogs@git.fxft.net:2222/composer/excel.git",
"reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c" "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc"
}, },
"dist": { "dist": {
"type": "tar", "type": "tar",
"url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.8-4fd466.tar", "url": "https://composer.fxft.online/dist/dipper/excel/dipper-excel-3.1.9-c8a27a.tar",
"reference": "5340629004d0788541eb813a9d6ff6c6e27a0d5c", "reference": "1cb0beafaf1e61456fe3b33e749b24455a7e11fc",
"shasum": "2f4c7f6deb2cf9a91dd5d2714bffe92e009ccd6e" "shasum": "68794cf40c5fbab6d0c0738cb5738734f3c06471"
}, },
"require": { "require": {
"illuminate/support": "5.5.* || 5.6.* || 5.7.*", "illuminate/support": "5.5.* || 5.6.* || 5.7.*",
@ -630,7 +630,7 @@
"phpunit/phpunit": "^7.0", "phpunit/phpunit": "^7.0",
"predis/predis": "^1.1" "predis/predis": "^1.1"
}, },
"time": "2019-01-03T04:46:21+00:00", "time": "2019-01-03T08:02:52+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"laravel": { "laravel": {
@ -697,18 +697,18 @@
}, },
{ {
"name": "dipper/foundation", "name": "dipper/foundation",
"version": "1.1.18", "version": "1.1.19",
"version_normalized": "1.1.18.0", "version_normalized": "1.1.19.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "ssh://gogs@git.fxft.net:2222/composer/foundation.git", "url": "ssh://gogs@git.fxft.net:2222/composer/foundation.git",
"reference": "b7858823f651bca9c77bd7b581543b9ece15ba27" "reference": "a7179259b7b4707c570aef46fa7679f14382a584"
}, },
"dist": { "dist": {
"type": "tar", "type": "tar",
"url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.18-002594.tar", "url": "https://composer.fxft.online/dist/dipper/foundation/dipper-foundation-1.1.19-4a2c7e.tar",
"reference": "b7858823f651bca9c77bd7b581543b9ece15ba27", "reference": "a7179259b7b4707c570aef46fa7679f14382a584",
"shasum": "33cdb0c76d433e20fea1f0d7a43d603f5e2242c9" "shasum": "6bc71487f98e44d82aff274a25d56c24b894de1e"
}, },
"require": { "require": {
"barryvdh/laravel-cors": "~0.11", "barryvdh/laravel-cors": "~0.11",
@ -723,7 +723,7 @@
"league/flysystem": "~1.0", "league/flysystem": "~1.0",
"nesbot/carbon": "~1.21" "nesbot/carbon": "~1.21"
}, },
"time": "2019-01-03T06:02:57+00:00", "time": "2019-01-03T07:51:26+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

4
vendor/dipper/excel/src/Sheet.php vendored
View File

@ -342,9 +342,7 @@ class Sheet
public function fromQuery(FromQuery $sheetExport, Worksheet $worksheet) public function fromQuery(FromQuery $sheetExport, Worksheet $worksheet)
{ {
$sheetExport->query()->chunk($this->getChunkSize($sheetExport), function ($chunk) use ($sheetExport, $worksheet) { $sheetExport->query()->chunk($this->getChunkSize($sheetExport), function ($chunk) use ($sheetExport, $worksheet) {
foreach ($chunk as $row) { $this->appendRows($chunk, $sheetExport);
$this->appendRow($row, $sheetExport);
}
}); });
} }