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

w

Browse Source
This commit is contained in:
邓皓元 2019-09-23 16:35:59 +08:00
parent 1b80e6e6e8
commit fb26aa8946
6 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php
View File

@ -162,6 +162,11 @@ trait OrderCardConcern
if (isset($conditions['sell_starttime']) && isset($conditions['sell_endtime'])) {
$query->whereRaw(sprintf("sim in (SELECT sim FROM virtual_order_cards_partition WHERE type in (0, 1) AND created_at >= '%s' AND created_at <= '%s' AND deleted_at is null AND refunded_at is null)", $conditions['sell_starttime'], $conditions['sell_endtime']));
}
if (isset($conditions['has_type'])) {
$conditions['has_type'] = array_wrap($conditions['has_type']);
$query->whereRaw(sprintf("sim in (SELECT sim from virtual_order_cards_partition WHERE type in (%s))", implode(',', $conditions['has_type'])));
}
});
if (isset($conditions['card_status'])) {

8
frontend/src/views/virtual/cards/index.vue
View File

@ -82,6 +82,14 @@
<li class="handle-item w-250">
<Input clearable placeholder="套餐类型" v-model.trim="params.prop_package"></Input>
</li>
<li class="handle-item w-250">
<Select clearable multiple placeholder="存在订单" v-model="params.has_type">
<Option :value="1">续费</Option>
<Option :value="2">续费包</Option>
<Option :value="3">加油包</Option>
</Select>
</li>
</ul>
<ul class="handle-wraper">

3
frontend/src/views/virtual/cards/js/index.js
View File

@ -14,6 +14,7 @@ export default {
package_name: "",
prop_product: "",
prop_package: "",
has_type: [],
carrier_operator: "",
card_status: "",
time: [],
@ -225,7 +226,7 @@ export default {
resetSearch() {
for (let k in this.params) {
if (k === "time" || k === "activated_time") {
if (k === "time" || k === "activated_time" || k === "has_type") {
this.params[k] = [];
} else {
this.params[k] = "";

1
public/js/app.f6c8168d.js Normal file
View File

File diff suppressed because one or more lines are too long

8
public/js/chunk-2190ce90.5ced95c3.js 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-2190ce90.53edb7ab.css rel=prefetch><link href=/css/chunk-9c85aab4.6166dab5.css rel=prefetch><link href=/js/chunk-2190ce90.9ee88810.js rel=prefetch><link href=/js/chunk-29ecfeab.11f34170.js rel=prefetch><link href=/js/chunk-5b684432.3ffe9c78.js rel=prefetch><link href=/js/chunk-9c85aab4.9b7da8a1.js rel=prefetch><link href=/css/app.42353d5a.css rel=preload as=style><link href=/css/chunk-vendors.1ec583d1.css rel=preload as=style><link href=/js/app.d9d4ec7b.js rel=preload as=script><link href=/js/chunk-vendors.3b4ff77b.js rel=preload as=script><link href=/css/chunk-vendors.1ec583d1.css rel=stylesheet><link href=/css/app.42353d5a.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.3b4ff77b.js></script><script src=/js/app.d9d4ec7b.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-2190ce90.53edb7ab.css rel=prefetch><link href=/css/chunk-9c85aab4.6166dab5.css rel=prefetch><link href=/js/chunk-2190ce90.5ced95c3.js rel=prefetch><link href=/js/chunk-29ecfeab.11f34170.js rel=prefetch><link href=/js/chunk-5b684432.3ffe9c78.js rel=prefetch><link href=/js/chunk-9c85aab4.9b7da8a1.js rel=prefetch><link href=/css/app.42353d5a.css rel=preload as=style><link href=/css/chunk-vendors.1ec583d1.css rel=preload as=style><link href=/js/app.f6c8168d.js rel=preload as=script><link href=/js/chunk-vendors.3b4ff77b.js rel=preload as=script><link href=/css/chunk-vendors.1ec583d1.css rel=stylesheet><link href=/css/app.42353d5a.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.3b4ff77b.js></script><script src=/js/app.f6c8168d.js></script></body></html>