zhangdehua 1 سال پیش
والد
کامیت
6208b7fd30

+ 1 - 3
app/index/controller/Cart.php

@@ -44,9 +44,7 @@ class Cart extends Controller
         $list = $service->getList();
         // 购物车商品总数量
         $cartTotal = (new CartModel)->getCartTotal();
-        //dd($list->toArray(),$cartTotal);
         $user = $this->getCurrentLoginUser();
-        //dd($user->toArray());
         $cartMoney = '0.00';
         foreach ($list as $item) {
             $temp = bcmul(strval($item['goods_num']), $item['goods']['goods_price_min'], 2);
@@ -55,7 +53,7 @@ class Cart extends Controller
 
         $payPoints = intval(bcmul($cartMoney, '100', 0));//订单所需积分
         $payByPoints = false;
-        if (intval($user['points']) >= $payPoints) {
+        if ($payPoints > 0 && intval($user['points']) >= $payPoints) {
             $payByPoints = true;
         }
 

+ 1 - 1
app/index/view/base.html

@@ -144,7 +144,7 @@
             <div class="footerConter">
                 <div class="leftText">
                     <p class="ltK">Free to contact our customer service through whatsapp now:</p>
-                    <p class="ltV">Sign up for the Free Shipping Vapes</p>
+                    <a href="/index/user/order.html"><p class="ltV">Sign up for the Free Shipping Vapes</p></a>
                 </div>
                 <div class="footerInuptBox">
                     <img class="mailIcon" src="/assets/index/asstes/icon/mailIcon.png" alt="">

+ 1 - 1
app/index/view/cart/shoppingCart.html

@@ -136,7 +136,7 @@
             <div class="mbItem">
                 <div class="windInfoBox freeshipping">
                     {if $payByPoints}
-                    <p class="key">You can redeem this order for free through points!</p>
+                    <p class="key">You can redeem this order for free using your points! REDEEM NOW.</p>
                     {/if}
                 </div>
                 <div class="windInfoBox">

+ 1 - 1
config/cookie.php

@@ -8,7 +8,7 @@ return [
     // cookie 保存路径
     'path'      => '/',
     // cookie 有效域名
-    'domain'    => 'vape.lmm.gold',
+    'domain'    => env('app.domain', ''),
     //  cookie 启用安全传输
     'secure'    => false,
     // httponly设置

+ 1 - 1
public/assets/index/css/common.css

@@ -396,7 +396,7 @@ a:active, a:focus {
     display: flex;
 }
 .leftText{
-    max-width: 2rem;
+    max-width: 2.4rem;
     margin-right: .8rem;
 }
 .leftText .ltK{