diff --git a/app/Controllers/VueController.php b/app/Controllers/VueController.php
index 3190a2d3..501a98dc 100644
--- a/app/Controllers/VueController.php
+++ b/app/Controllers/VueController.php
@@ -8,6 +8,7 @@ use App\Models\Code;
use App\Models\Payback;
use App\Models\Paylist;
use App\Models\Ann;
+use App\Models\Shop;
use App\Services\Auth;
use App\Services\Config;
use App\Services\Payment;
@@ -152,7 +153,7 @@ class VueController extends BaseController {
if (!$paybacks_sum = Payback::where("ref_by", $this->user->id)->sum('ref_get')) {
$paybacks_sum = 0;
}
- $paybacks->setPath('/user/invite');
+ $paybacks->setPath('/#/user/panel');
$res['inviteInfo'] = array(
"code" => $code,
@@ -166,4 +167,28 @@ class VueController extends BaseController {
return $response->getBody()->write(json_encode($res));
}
+ public function getUserShops($request, $response, $args)
+ {
+ $shops = Shop::where("status", 1)->orderBy("name")->get();
+
+ $res['arr'] = array(
+ 'shops' => $shops,
+ );
+ $res['ret'] = 1;
+
+ return $response->getBody()->write(json_encode($res));
+ }
+
+ public function getCredit($request, $response, $args)
+ {
+ $user = $this->user;
+
+ $res['arr'] = array(
+ 'credit' => $user->money,
+ );
+ $res['ret'] = 1;
+
+ return $response->getBody()->write(json_encode($res));
+ }
+
}
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index 14cc7339..0ac303dd 100755
--- a/config/routes.php
+++ b/config/routes.php
@@ -374,6 +374,8 @@ $app->get('/logout', 'App\Controllers\VueController:vuelogout');
$app->get('/globalconfig', 'App\Controllers\VueController:getGlobalConfig');
$app->get('/getuserinfo', 'App\Controllers\VueController:getUserInfo');
$app->get('/getuserinviteinfo', 'App\Controllers\VueController:getUserInviteInfo');
+$app->get('/getusershops', 'App\Controllers\VueController:getUserShops');
+$app->get('/getcredit', 'App\Controllers\VueController:getCredit');
/**
* chenPay
diff --git a/public/theme/material/css/index.css b/public/theme/material/css/index.css
index acf6d63b..7916e466 100755
--- a/public/theme/material/css/index.css
+++ b/public/theme/material/css/index.css
@@ -33,6 +33,10 @@ a {
align-items: center;
}
+.justify-center {
+ justify-content: center;
+}
+
.wrap {
flex-wrap: wrap;
}
@@ -49,6 +53,10 @@ a {
margin-bottom: 0 !important;
}
+.relative {
+ position: relative;
+}
+
[v-cloak] {
display: none;
}
@@ -206,12 +214,19 @@ button.btn-user.index-btn-active {
color: #D1335B;
}
+.card,
+.tips,
+.btn-inline,
+.btn-forinput,
.staff a,
.input-control input,
.auth-submit,
.button-round,
.button-index,
-input.checkbox {
+input.checkbox,
+.buy-submit,
+.font-light,
+.list-shop {
transition: all .3s;
}
@@ -231,7 +246,8 @@ input.checkbox {
border-color: #adadad;
}
-.auth-submit {
+.auth-submit,
+.buy-submit {
border-radius: 3px;
color: #D1335B;
background: white;
@@ -242,12 +258,28 @@ input.checkbox {
width: 81%;
}
+.buy-submit {
+ min-height: unset;
+ width: unset;
+ margin: 0;
+ font-size: 16px;
+ padding: .15rem .5rem;
+ width: 48%;
+}
+
.auth-submit:hover,
-.auth-submit:focus {
+.auth-submit:focus,
+.buy-submit:hover,
+.buy-submit:focus {
background-color: #d6d6d6;
border-color: #d6d6d6;
}
+.buy-submit:disabled {
+ color: #858585;
+ cursor: not-allowed;
+}
+
.auth,
.user,
.pw {
@@ -408,9 +440,11 @@ select {
#register {
margin-top: 2rem;
}
+
#embed-captcha-reg {
min-height: 44px;
}
+
#embed-captcha-reg .geetest_btn {
margin-left: auto;
margin-right: auto;
@@ -420,9 +454,11 @@ select {
.auth-tg {
margin-top: 2rem;
}
+
.auth-tg p {
padding: 0 2rem;
}
+
.auth-tg p a {
color: #D1335B;
}
@@ -430,14 +466,14 @@ select {
.card {
border: 1px solid #434857;
margin-bottom: 1.5rem;
- transition: all .3s;
}
.user-btngroup {
margin-bottom: 1.5rem;
}
-.card:hover {
+.card:hover,
+.list-shop:hover {
border: 1px solid white;
box-shadow: 0 0 5px 1px gray;
}
@@ -462,7 +498,6 @@ select {
overflow: hidden;
color: #b1b3bb;
margin: .75rem 0;
- transition: all .3s;
}
.font-light:hover {
@@ -476,29 +511,53 @@ select {
border: 1px solid;
font-size: 14px;
border-radius: 3px;
- transition: all .3s;
}
.tips-blue {
color: #1997c6;
border-color: #1997c6;
}
+
.tips-gold {
color: #faad14;
border-color: #faad14;
}
-.tips-blue:hover {
+.tips-green {
+ color: #52c41a;
+ border-color: #52c41a;
+}
+
+.tips-cyan {
+ color: #13c2c2;
+ border-color: #13c2c2;
+}
+
+.tips-blue:hover,
+.tips-gold:hover,
+.tips-green:hover,
+.tips-cyan:hover {
color: white;
- background: #1997c6;
}
+
+.tips-blue:hover {
+ background-color: #1997c6;
+}
+
.tips-gold:hover {
- color: white;
background-color: #faad14;
}
+.tips-green:hover {
+ background-color: #52c41a;
+}
+
+.tips-cyan:hover {
+ background-color: #13c2c2;
+}
+
.ann {
- background-color: rgba(255,255,255,0.2);
+ background-color: rgba(255, 255, 255, 0.2);
border-radius: 5px;
padding: .1rem 1rem;
}
@@ -514,7 +573,7 @@ select {
.input-copy input {
height: unset;
- background: rgba(255,255,255,0);
+ background: rgba(255, 255, 255, 0);
cursor: pointer;
}
@@ -529,7 +588,7 @@ select {
.user-invite input,
.btn-inline {
- background: rgba(255,255,255,0);
+ background: rgba(255, 255, 255, 0);
}
.btn-inline {
@@ -538,8 +597,8 @@ select {
border-radius: 3px;
font-size: 14px;
padding: .3rem .8rem;
- transition: all .3s;
}
+
.btn-inline:hover {
background: #D1335B;
color: white;
@@ -549,10 +608,62 @@ select {
font-size: 14px;
}
+.list-shop {
+ padding: .5rem;
+ font-size: 1.2rem;
+ border: 1px solid #434857;
+ margin-bottom: .7rem;
+ width: 95%;
+}
+
+.list-shop:hover {
+ transform: translateX(1rem);
+}
+
+.coupon-checker {
+ height: 30px;
+ background-color: rgba(255, 255, 255, 0);
+ padding: 0 .5rem;
+ margin-bottom: .5rem;
+}
+
+.coupon-checker:hover,
+.coupon-checker,
+.btn-forinput {
+ background-color: rgba(255, 255, 255, 0);
+}
+
+.btn-forinput {
+ color: #1997c6;
+ border: none;
+ outline: none;
+ position: absolute;
+ top: .3rem;
+ font-size: 14px;
+ z-index: 1;
+}
+
+.btn-forinput:hover {
+ color: white;
+}
+
+button[name=check] {
+ right: 1.5rem;
+}
+
+button[name=reset] {
+ right: .2rem;
+}
+
+.order-checker-content {
+ margin: .5rem 0
+}
+
@media screen and (min-width:35.5em) {
.auth-tg {
margin-top: 0;
}
+
.auth-sm a {
min-width: 120px;
}
@@ -611,7 +722,8 @@ select {
padding-right: 3rem;
}
- .ann {
+ .ann,
+ .user-shop {
max-height: 385px;
overflow: auto;
}
@@ -763,7 +875,7 @@ input[type=checkbox].uim-checkbox {
padding: 0;
text-align: center;
border: 1px solid #1997c6;
- box-shadow: 0 0 5px 1px gray;
+ box-shadow: 0 0 5px 1px gray;
}
.uim-dropdown-menu li {
@@ -788,11 +900,13 @@ input[type=checkbox].uim-checkbox {
min-width: 120px;
}
-.dropdown-fade-enter-active,.dropdown-fade-leave-active {
+.dropdown-fade-enter-active,
+.dropdown-fade-leave-active {
transition: all .2s ease;
}
-.dropdown-fade-enter,.dropdown-fade-leave-to {
+.dropdown-fade-enter,
+.dropdown-fade-leave-to {
transform-origin: top;
transform: scaleY(0);
opacity: 0;
@@ -804,6 +918,144 @@ input[type=checkbox].uim-checkbox {
width: 100%;
}
+/* modal */
+
+.uim-modal-mask,
+.uim-modal {
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 100vh;
+ width: 100vw;
+ background-color: black;
+ opacity: .4;
+ z-index: 20;
+}
+
+.uim-modal {
+ opacity: 1;
+ background-color: unset;
+ display: flex;
+ justify-content: center;
+}
+
+.uim-modal-card {
+ z-index: 21;
+ margin-top: 6rem;
+ background-color: white;
+ width: 450px;
+ border-radius: 7px;
+ color: #434857;
+ margin-bottom: auto;
+ box-shadow: 0 0 5px 2px gray;
+ position: relative;
+}
+
+.uim-modal-title {
+ border-bottom: 1px solid;
+}
+
+.uim-modal-title h3 {
+ padding: .22rem 1.5rem;
+ margin: 1rem 0;
+}
+
+.uim-modal-body {
+ font-size: 18px;
+ padding: 1rem 0 1rem 2rem;
+}
+
+.uim-modal-body div {
+ flex-basis: 100%;
+}
+
+.uim-modal-footer {
+ display: flex;
+ padding: .75rem 0;
+ border-top: 1px solid;
+ align-items: center;
+}
+
+.uim-modal-footer div {
+ flex-basis: 50%;
+}
+
+.uim-modal-footer>div:first-of-type {
+ padding-left: 1.5rem;
+}
+
+.uim-modal-footer>div:last-of-type {
+ text-align: right;
+}
+
+button.uim-modal-confirm {
+ margin-right: 1.5rem;
+ padding: .5rem .4rem;
+ min-width: 80px;
+ background-color: #2d8cf0;
+ border-radius: 4px;
+ border: 1px solid;
+ color: white;
+}
+
+.uim-modal-close {
+ position: absolute;
+ right: .75rem;
+ top: .45rem;
+ font-size: 1.5rem;
+ padding: .5rem .75rem;
+ cursor: pointer;
+}
+
+/* switch */
+
+.uim-switch-body {
+ background-color: #ccc;
+ border-radius: 25px;
+ cursor: pointer;
+}
+
+.uim-switch-body:after {
+ content: "";
+ height: 20px;
+ width: 20px;
+ border-radius: 50%;
+ position: absolute;
+ background-color: white;
+ top: 2px;
+ left: 2px;
+}
+
+.uim-switch-body,
+.uim-switch-body:after {
+ transition: all .3s;
+ display: inline-block;
+}
+
+.uim-switch-body input,
+.uim-switch-body {
+ height: 24px;
+ width: 46px;
+ position: relative;
+}
+
+.uim-switch-body input {
+ z-index: 1;
+ opacity: 0;
+}
+
+.uim-switch-body-active:after {
+ transform: translateX(22px);
+}
+
+.uim-switch-body-active {
+ background-color: #2d8cf0;
+}
+
+.switch-text {
+ font-size: 14px;
+}
+
/* loading 动画 */
.spinner {
width: 60px;
@@ -852,47 +1104,67 @@ input[type=checkbox].uim-checkbox {
height: 32px;
position: relative;
transition: all .3s;
- }
-
- .cube1, .cube2 {
+}
+
+.cube1,
+.cube2 {
background-color: white;
width: 30px;
height: 30px;
position: absolute;
top: 0;
left: 0;
-
+
-webkit-animation: cubemove 1.8s infinite ease-in-out;
animation: cubemove 1.8s infinite ease-in-out;
- }
-
- .cube2 {
+}
+
+.cube2 {
-webkit-animation-delay: -0.9s;
animation-delay: -0.9s;
- }
-
- @-webkit-keyframes cubemove {
- 25% { -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5) }
- 50% { -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg) }
- 75% { -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5) }
- 100% { -webkit-transform: rotate(-360deg) }
- }
-
- @keyframes cubemove {
+}
+
+@-webkit-keyframes cubemove {
+ 25% {
+ -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5)
+ }
+
+ 50% {
+ -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg)
+ }
+
+ 75% {
+ -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5)
+ }
+
+ 100% {
+ -webkit-transform: rotate(-360deg)
+ }
+}
+
+@keyframes cubemove {
25% {
- transform: translateX(42px) rotate(-90deg) scale(0.5);
- -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5);
- } 50% {
- transform: translateX(42px) translateY(42px) rotate(-179deg);
- -webkit-transform: translateX(42px) translateY(42px) rotate(-179deg);
- } 50.1% {
- transform: translateX(42px) translateY(42px) rotate(-180deg);
- -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg);
- } 75% {
- transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
- -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
- } 100% {
- transform: rotate(-360deg);
- -webkit-transform: rotate(-360deg);
- }
- }
+ transform: translateX(42px) rotate(-90deg) scale(0.5);
+ -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5);
+ }
+
+ 50% {
+ transform: translateX(42px) translateY(42px) rotate(-179deg);
+ -webkit-transform: translateX(42px) translateY(42px) rotate(-179deg);
+ }
+
+ 50.1% {
+ transform: translateX(42px) translateY(42px) rotate(-180deg);
+ -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg);
+ }
+
+ 75% {
+ transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
+ -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
+ }
+
+ 100% {
+ transform: rotate(-360deg);
+ -webkit-transform: rotate(-360deg);
+ }
+}
\ No newline at end of file
diff --git a/resources/views/material/index.tpl b/resources/views/material/index.tpl
index 6209beff..4c2ffeb5 100755
--- a/resources/views/material/index.tpl
+++ b/resources/views/material/index.tpl
@@ -105,8 +105,10 @@