zhangdehua 9 月之前
父節點
當前提交
9df156b827

+ 8 - 1
app/index/controller/Index.php

@@ -8,6 +8,7 @@ use app\console\service\OrderGetYundan as OrderGetYundanService;
 use app\index\model\Article as ArticleModel;
 use app\index\model\Comment as CommentModel;
 use app\index\model\Goods as GoodsModel;
+use app\index\model\GoodsCategoryRel;
 use app\index\model\user\UserAccessLog;
 use think\facade\Cache;
 use think\facade\Log;
@@ -162,10 +163,16 @@ class Index extends Controller
         $model = new CommentModel;
         $total = $model->rowsTotal($goodsId);
 
+        $goodsCategory = GoodsCategoryRel::where(['goods_id'=>$goods['goods_id']])->find()->toArray();
+        $is_lost_mary= 0;
+        if ($goodsCategory['category_id'] == GoodsCategoryRel::LOST_MARY_5000){
+            $is_lost_mary = 1;
+        }
+
         $flavors = ['STRAWBERRY-MANGO', 'BLUE RAZZ-ICE', 'WATERMELON', 'GRAPE', 'KIWI-PASSION-FRUIT-GUAVA', 'JUICY-PEACH', 'BLUEBERRY-ICE'];
 
 
-        return view('productDetails', ['goods' => $goods, 'comment_total' => $total, 'key' => $key]);
+        return view('productDetails', ['goods' => $goods, 'comment_total' => $total, 'key' => $key, 'is_lost_mary' => $is_lost_mary]);
     }
 
     public function aboutUs(): View

+ 38 - 0
app/index/model/GoodsCategoryRel.php

@@ -0,0 +1,38 @@
+<?php
+// +----------------------------------------------------------------------
+// | 萤火商城系统 [ 致力于通过产品和服务,帮助商家高效化开拓市场 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2021 https://www.yiovo.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed 这不是一个自由软件,不允许对程序代码以任何形式任何目的的再发行
+// +----------------------------------------------------------------------
+// | Author: 萤火科技 <admin@yiovo.com>
+// +----------------------------------------------------------------------
+declare (strict_types = 1);
+
+namespace app\index\model;
+
+use app\common\model\GoodsCategoryRel as GoodsCategoryRelModel;
+
+/**
+ * 商品分类模型
+ * Class Category
+ * @package app\common\model
+ */
+class GoodsCategoryRel extends GoodsCategoryRelModel
+{
+    /**
+     * 隐藏字段
+     * @var array
+     */
+    protected $hidden = [
+        'store_id',
+        'create_time',
+        'update_time'
+    ];
+
+    const LOST_MARY_5000 = 10002;
+    const GEEK_BAR = 10003;
+
+
+}

+ 83 - 72
app/index/view/index/productDetails.html

@@ -40,6 +40,7 @@
                 <div>
                     <!-- 口味 -->
                     <!-- 新增开始 -->
+                    {if $is_lost_mary == 1}
                     <div class="tasteContainer">
                         <div class="tasteItem" data-id="0">Choose {$goods.selling_point} Flavors Here:<span id="totalNum">0</span></div>
                         <div class="tasteItem" data-id="1">
@@ -113,6 +114,7 @@
                             <p class="tasteTitle">BLUEBERRY-ICE</p>
                         </div>
                     </div>
+                    {/if}
                     <!-- 新增结束 -->
                     <!-- 数量 -->
                     <div class="productNContainer">
@@ -229,6 +231,9 @@
         var needFlavorCnt = {$goods.selling_point};
         needFlavorCnt = parseInt(needFlavorCnt)
 
+        var isLostMary = {$is_lost_mary};
+        console.log(isLostMary)
+
         var flavors = {
             'STRAWBERRY-MANGO': 0,
             'BLUE-RAZZ-ICE': 0,
@@ -340,49 +345,52 @@
         //上面的添加按钮
         $(".addToCart").on(tap, function () {
             const number = $('#numberInput').val();
-            // 新增开始
-            var totalValue = 0;
-
-            var STRAWBERRY_MANGO_Num = parseInt($('#STRAWBERRY-MANGO-NUM').val());
-            flavors["STRAWBERRY-MANGO"] = STRAWBERRY_MANGO_Num
-            totalValue += STRAWBERRY_MANGO_Num;
-
-            var BLUE_RAZZ_ICE_Num = parseInt($('#BLUE-RAZZ-ICE-NUM').val());
-            totalValue += BLUE_RAZZ_ICE_Num;
-            flavors["BLUE-RAZZ-ICE"] = BLUE_RAZZ_ICE_Num
-
-            var WATERMELON_Num = parseInt($('#WATERMELON-NUM').val());
-            totalValue += WATERMELON_Num;
-            flavors["WATERMELON"] = WATERMELON_Num
-
-            var KIWI_PASSION_Num = parseInt($('#KIWI-PASSION-FRUIT-GUAVA-NUM').val());
-            totalValue += KIWI_PASSION_Num;
-            flavors["KIWI-PASSION-FRUIT-GUAVA"] = KIWI_PASSION_Num
-
-            var JUICY_PEACH_Num = parseInt($('#JUICY-PEACH-NUM').val());
-            totalValue += JUICY_PEACH_Num;
-            flavors["JUICY-PEACH"] = JUICY_PEACH_Num
-
-            var GRAPE_Num = parseInt($('#GRAPE-NUM').val());
-            totalValue += GRAPE_Num;
-            flavors["GRAPE"] = GRAPE_Num
-
-            var BLUEBERRY_ICE_Num = parseInt($('#BLUEBERRY-ICE-NUM').val());
-            totalValue += BLUEBERRY_ICE_Num;
-            flavors["BLUEBERRY-ICE"] = BLUEBERRY_ICE_Num
-
-            /*            $(".tasteItem").each(function () {
-                            var id = $(this).data("id");
-                            var value = parseInt($(this).find(".tasteInput").val()) || 0;
-                            totalValue += value;
-                            console.log("ID:", id, "Value:", value);
-                        });*/
-            console.log("Total Value:", totalValue);
-            console.log("flavors Value:", flavors);
-
-            if (totalValue !== needFlavorCnt  || totalValue != needFlavorCnt){
-                showToast('You should choose '+ needFlavorCnt +' flavor first for one pack')
-                return
+            if (isLostMary === 1 || isLostMary === '1'){
+
+                    // 新增开始
+                var totalValue = 0;
+
+                var STRAWBERRY_MANGO_Num = parseInt($('#STRAWBERRY-MANGO-NUM').val());
+                flavors["STRAWBERRY-MANGO"] = STRAWBERRY_MANGO_Num
+                totalValue += STRAWBERRY_MANGO_Num;
+
+                var BLUE_RAZZ_ICE_Num = parseInt($('#BLUE-RAZZ-ICE-NUM').val());
+                totalValue += BLUE_RAZZ_ICE_Num;
+                flavors["BLUE-RAZZ-ICE"] = BLUE_RAZZ_ICE_Num
+
+                var WATERMELON_Num = parseInt($('#WATERMELON-NUM').val());
+                totalValue += WATERMELON_Num;
+                flavors["WATERMELON"] = WATERMELON_Num
+
+                var KIWI_PASSION_Num = parseInt($('#KIWI-PASSION-FRUIT-GUAVA-NUM').val());
+                totalValue += KIWI_PASSION_Num;
+                flavors["KIWI-PASSION-FRUIT-GUAVA"] = KIWI_PASSION_Num
+
+                var JUICY_PEACH_Num = parseInt($('#JUICY-PEACH-NUM').val());
+                totalValue += JUICY_PEACH_Num;
+                flavors["JUICY-PEACH"] = JUICY_PEACH_Num
+
+                var GRAPE_Num = parseInt($('#GRAPE-NUM').val());
+                totalValue += GRAPE_Num;
+                flavors["GRAPE"] = GRAPE_Num
+
+                var BLUEBERRY_ICE_Num = parseInt($('#BLUEBERRY-ICE-NUM').val());
+                totalValue += BLUEBERRY_ICE_Num;
+                flavors["BLUEBERRY-ICE"] = BLUEBERRY_ICE_Num
+
+                /*            $(".tasteItem").each(function () {
+                                var id = $(this).data("id");
+                                var value = parseInt($(this).find(".tasteInput").val()) || 0;
+                                totalValue += value;
+                                console.log("ID:", id, "Value:", value);
+                            });*/
+                console.log("Total Value:", totalValue);
+                console.log("flavors Value:", flavors);
+
+                if (totalValue !== needFlavorCnt || totalValue != needFlavorCnt) {
+                    showToast('You should choose ' + needFlavorCnt + ' flavor first for one pack')
+                    return
+                }
             }
             // 新增结束
             addCart(number, flavors)
@@ -391,43 +399,46 @@
         //悬浮模块的添加按钮
         $(".fPrAddToCart").on(tap, function () {
             const number = $('#fPrNumberInput').val();
-            // 新增开始
-            var totalValue = 0;
+            if (isLostMary === 1 || isLostMary === '1'){
 
-            var STRAWBERRY_MANGO_Num = parseInt($('#STRAWBERRY-MANGO-NUM').val());
-            flavors["STRAWBERRY-MANGO"] = STRAWBERRY_MANGO_Num
-            totalValue += STRAWBERRY_MANGO_Num;
+                // 新增开始
+                var totalValue = 0;
 
-            var BLUE_RAZZ_ICE_Num = parseInt($('#BLUE-RAZZ-ICE-NUM').val());
-            totalValue += BLUE_RAZZ_ICE_Num;
-            flavors["BLUE-RAZZ-ICE"] = BLUE_RAZZ_ICE_Num
+                var STRAWBERRY_MANGO_Num = parseInt($('#STRAWBERRY-MANGO-NUM').val());
+                flavors["STRAWBERRY-MANGO"] = STRAWBERRY_MANGO_Num
+                totalValue += STRAWBERRY_MANGO_Num;
 
-            var WATERMELON_Num = parseInt($('#WATERMELON-NUM').val());
-            totalValue += WATERMELON_Num;
-            flavors["WATERMELON"] = WATERMELON_Num
+                var BLUE_RAZZ_ICE_Num = parseInt($('#BLUE-RAZZ-ICE-NUM').val());
+                totalValue += BLUE_RAZZ_ICE_Num;
+                flavors["BLUE-RAZZ-ICE"] = BLUE_RAZZ_ICE_Num
 
-            var KIWI_PASSION_Num = parseInt($('#KIWI-PASSION-FRUIT-GUAVA-NUM').val());
-            totalValue += KIWI_PASSION_Num;
-            flavors["KIWI-PASSION-FRUIT-GUAVA"] = KIWI_PASSION_Num
+                var WATERMELON_Num = parseInt($('#WATERMELON-NUM').val());
+                totalValue += WATERMELON_Num;
+                flavors["WATERMELON"] = WATERMELON_Num
 
-            var JUICY_PEACH_Num = parseInt($('#JUICY-PEACH-NUM').val());
-            totalValue += JUICY_PEACH_Num;
-            flavors["JUICY-PEACH"] = JUICY_PEACH_Num
+                var KIWI_PASSION_Num = parseInt($('#KIWI-PASSION-FRUIT-GUAVA-NUM').val());
+                totalValue += KIWI_PASSION_Num;
+                flavors["KIWI-PASSION-FRUIT-GUAVA"] = KIWI_PASSION_Num
 
-            var GRAPE_Num = parseInt($('#GRAPE-NUM').val());
-            totalValue += GRAPE_Num;
-            flavors["GRAPE"] = GRAPE_Num
+                var JUICY_PEACH_Num = parseInt($('#JUICY-PEACH-NUM').val());
+                totalValue += JUICY_PEACH_Num;
+                flavors["JUICY-PEACH"] = JUICY_PEACH_Num
 
-            var BLUEBERRY_ICE_Num = parseInt($('#BLUEBERRY-ICE-NUM').val());
-            totalValue += BLUEBERRY_ICE_Num;
-            flavors["BLUEBERRY-ICE"] = BLUEBERRY_ICE_Num
+                var GRAPE_Num = parseInt($('#GRAPE-NUM').val());
+                totalValue += GRAPE_Num;
+                flavors["GRAPE"] = GRAPE_Num
 
-            console.log("Total Value:", totalValue);
-            console.log("flavors Value:", flavors);
+                var BLUEBERRY_ICE_Num = parseInt($('#BLUEBERRY-ICE-NUM').val());
+                totalValue += BLUEBERRY_ICE_Num;
+                flavors["BLUEBERRY-ICE"] = BLUEBERRY_ICE_Num
 
-            if (totalValue !== needFlavorCnt  || totalValue != needFlavorCnt){
-                showToast('You should choose '+ needFlavorCnt +' flavor first for one pack')
-                return
+                console.log("Total Value:", totalValue);
+                console.log("flavors Value:", flavors);
+
+                if (totalValue !== needFlavorCnt  || totalValue != needFlavorCnt){
+                    showToast('You should choose '+ needFlavorCnt +' flavor first for one pack')
+                    return
+                }
             }
 
             addCart(number, flavors)
@@ -596,4 +607,4 @@
     });
 </script>
 
-{/block}
+{/block}

+ 20 - 19
public/assets/index/css/productDetails.css

@@ -7,10 +7,10 @@ body{
     justify-content: center;
 }
 .elementorContainer{
-    max-width: 13.2rem; 
+    max-width: 13.2rem;
     flex: 1;
     -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box; 
+    -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
 .footerContainer{
@@ -58,14 +58,14 @@ body{
     font-size: 0;
     background-color: #fff;
     margin-right: .25rem;
-}  
+}
 .prImgList .prImgItem:last-child{
     margin-right: 0;
 }
 .prImgList .prImgItem img{
     width: 100%;
     height: 100%;
-}   
+}
 .prevArrow,
 .nextArrow {
   position: absolute;
@@ -73,19 +73,20 @@ body{
   transform: translateY(-50%);
   width: 30px;
   height: 30px;
-  background-color: #000;
+  background-color: #ef3452;
   color: #fff;
   text-align: center;
   line-height: 30px;
   cursor: pointer;
   display: none;
+  border-radius: 30%;
 }
 
 
 .prevArrow {
     left: 10px;
   }
-  
+
   .nextArrow {
     right: 10px;
   }
@@ -93,7 +94,7 @@ body{
 
   .productInfoContainer{
     flex: 1;
-    border: .02rem solid rgba(0, 0, 0, .1); 
+    border: .02rem solid rgba(0, 0, 0, .1);
     min-height: 8.36rem;
     margin-left: .34rem;
     padding: 0 .28rem;
@@ -188,13 +189,13 @@ body{
     align-items: center;
     height: .62rem;
     box-sizing: border-box;
-    border: .02rem solid rgba(0, 0, 0, .1); 
+    border: .02rem solid rgba(0, 0, 0, .1);
     cursor: pointer;
   }
   .numberReduce,.numberAdd{
     height: 100%;
     width: .6rem;
-    border-right: .02rem solid rgba(0, 0, 0, .1); 
+    border-right: .02rem solid rgba(0, 0, 0, .1);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -202,7 +203,7 @@ body{
   }
   .numberAdd{
     border-right: none;
-    border-left: .02rem solid rgba(0, 0, 0, .1);  
+    border-left: .02rem solid rgba(0, 0, 0, .1);
   }
   #numberInput{
     height: 100%;
@@ -233,7 +234,7 @@ body{
   .safeContainer{
     width: 100%;
     min-height: .9rem;
-    border: .02rem solid rgba(0, 0, 0, .05); 
+    border: .02rem solid rgba(0, 0, 0, .05);
     border-radius: .06rem;
     position: relative;
     margin-bottom: .32rem;
@@ -272,7 +273,7 @@ body{
   }
   .articleTabBox{
     display: flex;
-    border-top: .02rem solid rgba(0, 0, 0, .1); 
+    border-top: .02rem solid rgba(0, 0, 0, .1);
   }
   .articleTabItem{
     position: relative;
@@ -313,7 +314,7 @@ body{
     color: #333333;
     font-size: .28rem;
     line-height: 1.4;
-  } 
+  }
   #richTextContainer,
   #richTextContainer p,
   #richTextContainer span,
@@ -328,7 +329,7 @@ body{
   #richTextContainer ol {
     font-size: .2rem;
     color: #434343;
-    line-height: 1.5;   
+    line-height: 1.5;
     /*
     margin-bottom: .32rem;
     */
@@ -340,7 +341,7 @@ body{
   }
   .fixedAddSection{
     display: none;
-    position: fixed; 
+    position: fixed;
     left: 0;
     right: 0;
     bottom: 0;
@@ -398,7 +399,7 @@ body{
   .fPrNumberReduce,.fPrNumberAdd{
     height: 100%;
     width: .4rem;
-    border-right: .02rem solid rgba(0, 0, 0, .1); 
+    border-right: .02rem solid rgba(0, 0, 0, .1);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -406,7 +407,7 @@ body{
   }
   .fPrNumberAdd{
     border-right: none;
-    border-left: .02rem solid rgba(0, 0, 0, .1);  
+    border-left: .02rem solid rgba(0, 0, 0, .1);
   }
   #fPrNumberInput{
     height: 100%;
@@ -524,7 +525,7 @@ body{
         padding: 0 .12rem;
     }
     .productContainer{
-       
+
     }
     .productImgContainer{
         width: 5.4rem;
@@ -745,4 +746,4 @@ body{
       font-size: .22rem;
       height: .52rem;
     }
-  }
+  }