Leadfyy.co
/
hainan
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

develop
shuixiang 4 years ago
parent
8bf3e57b39 4d6b3dc045
commit
e4c2f09d44
5 changed files with 53 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      app/Admin/Repositories/MiniProgramDraft.php
  2. 28
      app/Admin/Repositories/MiniProgramList.php
  3. 28
      app/Admin/Repositories/MiniProgramTemplate.php
  4. 4
      app/Http/Controllers/Api/OrderController.php
  5. 4
      resources/views/admin/filter/select.blade.php

28
app/Admin/Repositories/MiniProgramDraft.php
View File

@ -7,6 +7,7 @@ use Dcat\Admin\Repositories\Repository;
use EasyWeChat\Factory;
use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
/**
* 小程序草稿箱
@ -15,10 +16,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
*/
class MiniProgramDraft extends Repository
{
public function getPrimaryKeyColumn()
{
return 'draft_id';
}
protected $keyName = 'draft_id';
/**
* 查询表格数据
@ -37,15 +35,21 @@ class MiniProgramDraft extends Repository
'aes_key' => $setting['service_aeskey'],
];
$openPlatform = Factory::openPlatform($config);
$codeTemplate = $openPlatform['code_template'];
if (empty($codeTemplate) || (!$list = $codeTemplate->getDrafts())) {
$data['total'] = 0;
$data['subjects'] = [];
$cache_key = 'mini_program:draft_list';
if ($data['subjects'] = Cache::get($cache_key)) {
$data['total'] = count($data['subjects']);
} else {
$data['total'] = count($list['draft_list']);
$data['subjects'] = $list['draft_list'] ?? [];
$openPlatform = Factory::openPlatform($config);
$codeTemplate = $openPlatform['code_template'];
if (empty($codeTemplate) || (!$list = $codeTemplate->getDrafts())) {
$data['total'] = 0;
$data['subjects'] = [];
} else {
$data['total'] = count($list['draft_list']);
$data['subjects'] = $list['draft_list'] ?? [];
Cache::put($cache_key, $list['draft_list'], 120);
}
}
return $model->makePaginator(

28
app/Admin/Repositories/MiniProgramList.php
View File

@ -7,6 +7,7 @@ use Dcat\Admin\Repositories\Repository;
use EasyWeChat\Factory;
use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
/**
* 小程序草稿箱
@ -15,10 +16,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
*/
class MiniProgramList extends Repository
{
public function getPrimaryKeyColumn()
{
return '';
}
protected $keyName = 'id';
/**
* 查询表格数据
@ -37,15 +35,21 @@ class MiniProgramList extends Repository
'aes_key' => $setting['service_aeskey'],
];
$openPlatform = Factory::openPlatform($config);
$codeTemplate = $openPlatform['code_template'];
if (empty($codeTemplate) || (!$list = $openPlatform->getAuthorizers())) {
$data['total'] = 0;
$data['subjects'] = [];
$cache_key = 'mini_program:list';
if ($data['subjects'] = Cache::get($cache_key)) {
$data['total'] = count($data['subjects']);
} else {
$data['total'] = count($list['list']);
$data['subjects'] = $list['list'] ?? [];
$openPlatform = Factory::openPlatform($config);
$codeTemplate = $openPlatform['code_template'];
if (empty($codeTemplate) || (!$list = $openPlatform->getAuthorizers())) {
$data['total'] = 0;
$data['subjects'] = [];
} else {
$data['total'] = count($list['list']);
$data['subjects'] = $list['list'] ?? [];
Cache::put($cache_key, $list['list'], 120);
}
}
return $model->makePaginator(

28
app/Admin/Repositories/MiniProgramTemplate.php
View File

@ -7,6 +7,7 @@ use Dcat\Admin\Repositories\Repository;
use EasyWeChat\Factory;
use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Cache;
/**
* 小程序模板
@ -15,10 +16,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
*/
class MiniProgramTemplate extends Repository
{
public function getPrimaryKeyColumn()
{
return 'template_id';
}
protected $keyName = 'template_id';
/**
* 查询表格数据
@ -37,15 +35,21 @@ class MiniProgramTemplate extends Repository
'aes_key' => $setting['service_aeskey'],
];
$openPlatform = Factory::openPlatform($config);
$codeTemplate = $openPlatform['code_template'];
if (empty($codeTemplate) || (!$list = $codeTemplate->list())) {
$data['total'] = 0;
$data['subjects'] = [];
$cache_key = 'mini_program:template_list';
if ($data['subjects'] = Cache::get($cache_key)) {
$data['total'] = count($data['subjects']);
} else {
$data['total'] = count($list['template_list']);
$data['subjects'] = $list['template_list'] ?? [];
$openPlatform = Factory::openPlatform($config);
$codeTemplate = $openPlatform['code_template'];
if (empty($codeTemplate) || (!$list = $codeTemplate->list())) {
$data['total'] = 0;
$data['subjects'] = [];
} else {
$data['total'] = count($list['template_list']);
$data['subjects'] = $list['template_list'] ?? [];
Cache::put($cache_key, $list['template_list'], 120);
}
}
return $model->makePaginator(

4
app/Http/Controllers/Api/OrderController.php
View File

@ -86,7 +86,9 @@ class OrderController extends Controller
Status::OFFLINE_UNPAID => '线下付款',
Status::PAY_EARNEST => '付尾款',
];
$v['status_text'] = '请在' . ceil($second / 60) . "分钟内" . ($text_arr[$v['status']] ?? '付款');
if (isset($text_arr[$v['status']])) {
$v['status_text'] = '请在' . ceil($second / 60) . "分钟内" . ($text_arr[$v['status']] ?? '付款');
}
} else if ($second < 0 && $v['status'] == Status::PAY_EARNEST) {
$v['status_text'] = '尾款支付已超时';
} /*else { //此部分由定时处理

4
resources/views/admin/filter/select.blade.php
View File

@ -3,10 +3,10 @@
<span class="input-group-text bg-white text-capitalize"><b>{!! $label !!}</b></span>
</div>
<select class="form-control {{ $class }}" name="{{$name}}" data-value="{{ join(',', $value) }}" style="width: 100%;">
<select class="form-control {{ $class }}" name="{{$name}}" data-value="{{ is_array($value) ? join(',', $value) : '' }}" style="width: 100%;">
<option value=""></option>
@foreach($options as $select => $option)
<option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, join(',', $value)) ?'selected':'' }}>{{$option}}</option>
<option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, is_array($value) ? join(',', $value) : '') ?'selected':'' }}>{{$option}}</option>
@endforeach
</select>
</div>

Write Preview
Loading…
Cancel
Save