zhangdehua 1 rok pred
rodič
commit
4c16b2e6db

+ 5 - 0
app/index/view/base.html

@@ -268,5 +268,10 @@
 {block name="components"}{/block}
 
 </body>
+<script src="/assets/index/js/jquery-1.12.0.js"></script>
+<script src="/assets/index/js/flexible.js"></script>
+<script src="/assets/index/js/public.js?t=11"></script>
+<script src="/assets/index/js/productDetails.js?t=11"></script>
+<script src="/assets/index/js/jquery.lazyload.js"></script>
 {block name="scriptSrc"}{/block}
 </html>

+ 22 - 6
app/index/view/index/aboutUs.html

@@ -30,10 +30,26 @@
 
 {/block}
 {block name="scriptSrc"}
-<script src="/assets/index/js/jquery-1.12.0.js"></script>
-<script src="/assets/index/js/flexible.js"></script>
-<script src="/assets/index/js/public.js?t=111"></script>
-<script src="/assets/index/js/swiper.js?t=61"></script>
-<script src="/assets/index/js/jquery.lazyload.js"></script>
-<script src=/assets/index/js/index.js?t=61"></script>
+<script>
+    $(document).ready(function () {
+        //触屏事件 || 点击事件
+        const tap = "ontouchstart" in window ? "touchstart" : "click";
+
+        //订阅
+        $("#subscribeArrow").on(tap, function (event) {
+            showToast('success')
+        });
+
+        /**
+         * 吐司提示
+         * @param message 消息
+         * @returns
+         */
+        function showToast(message) {
+            var toastElement = $('#toastContainer');
+            toastElement.text(message);
+            toastElement.stop(true, true).fadeIn(200).delay(2000).fadeOut(200);
+        }
+    })
+</script>
 {/block}

+ 18 - 18
app/index/view/index/index.html

@@ -66,11 +66,11 @@
                                     </p>
                                     <p class="goodsScribe textEllipsis">${$goods['line_price_max']}</p>
                                 </div>
-                                <div class="goodsCollect">
-                                    <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect"
-                                         title="collect">
-                                    <p class="collectNumber textEllipsis">99</p>
-                                </div>
+<!--                                <div class="goodsCollect">-->
+<!--                                    <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect"-->
+<!--                                         title="collect">-->
+<!--                                    <p class="collectNumber textEllipsis">99</p>-->
+<!--                                </div>-->
                             </div>
                             <div class="goodsReviews">
                                 <div class="goodsStarContainer">
@@ -124,11 +124,11 @@
                                     </p>
                                     <p class="goodsScribe textEllipsis">${$goods['line_price_max']}</p>
                                 </div>
-                                <div class="goodsCollect">
-                                    <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect"
-                                         title="collect">
-                                    <p class="collectNumber textEllipsis">99</p>
-                                </div>
+<!--                                <div class="goodsCollect">-->
+<!--                                    <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect"-->
+<!--                                         title="collect">-->
+<!--                                    <p class="collectNumber textEllipsis">99</p>-->
+<!--                                </div>-->
                             </div>
                             <div class="goodsReviews">
                                 <div class="goodsStarContainer">
@@ -229,10 +229,10 @@
                             <p class="goodsPrice textEllipsis">
                                 <span>$</span>{$deal['goods_price_min']}
                             </p>
-                            <div class="goodsCollect">
-                                <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect" title="collect">
-                                <p class="collectNumber textEllipsis">99</p>
-                            </div>
+<!--                            <div class="goodsCollect">-->
+<!--                                <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect" title="collect">-->
+<!--                                <p class="collectNumber textEllipsis">99</p>-->
+<!--                            </div>-->
                         </div>
                         <div class="goodsReviews">
                             <div class="goodsStarContainer">
@@ -284,10 +284,10 @@
                             <p class="goodsPrice textEllipsis">
                                 <span>$</span>{$deal['goods_price_min']}
                             </p>
-                            <div class="goodsCollect">
-                                <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect" title="collect">
-                                <p class="collectNumber textEllipsis">99</p>
-                            </div>
+<!--                            <div class="goodsCollect">-->
+<!--                                <img src="/assets/index/asstes/icon/gsCollect.png" alt="collect" title="collect">-->
+<!--                                <p class="collectNumber textEllipsis">99</p>-->
+<!--                            </div>-->
                         </div>
                         <div class="goodsReviews">
                             <div class="goodsStarContainer">

+ 22 - 6
app/index/view/index/privacyPolicy.html

@@ -99,10 +99,26 @@
 </div>
 {/block}
 {block name="scriptSrc"}
-<script src="/assets/index/js/jquery-1.12.0.js"></script>
-<script src="/assets/index/js/flexible.js"></script>
-<script src="/assets/index/js/public.js?t=111"></script>
-<script src="/assets/index/js/swiper.js?t=61"></script>
-<script src="/assets/index/js/jquery.lazyload.js"></script>
-<script src=/assets/index/js/index.js?t=61"></script>
+<script>
+    $(document).ready(function () {
+        //触屏事件 || 点击事件
+        const tap = "ontouchstart" in window ? "touchstart" : "click";
+
+        //订阅
+        $("#subscribeArrow").on(tap, function (event) {
+            showToast('success')
+        });
+
+        /**
+         * 吐司提示
+         * @param message 消息
+         * @returns
+         */
+        function showToast(message) {
+            var toastElement = $('#toastContainer');
+            toastElement.text(message);
+            toastElement.stop(true, true).fadeIn(200).delay(2000).fadeOut(200);
+        }
+    })
+</script>
 {/block}

+ 22 - 6
app/index/view/index/returnWarranty.html

@@ -127,10 +127,26 @@
 </div>
 {/block}
 {block name="scriptSrc"}
-<script src="/assets/index/js/jquery-1.12.0.js"></script>
-<script src="/assets/index/js/flexible.js"></script>
-<script src="/assets/index/js/public.js?t=111"></script>
-<script src="/assets/index/js/swiper.js?t=61"></script>
-<script src="/assets/index/js/jquery.lazyload.js"></script>
-<script src=/assets/index/js/index.js?t=61"></script>
+<script>
+    $(document).ready(function () {
+        //触屏事件 || 点击事件
+        const tap = "ontouchstart" in window ? "touchstart" : "click";
+
+        //订阅
+        $("#subscribeArrow").on(tap, function (event) {
+            showToast('success')
+        });
+
+        /**
+         * 吐司提示
+         * @param message 消息
+         * @returns
+         */
+        function showToast(message) {
+            var toastElement = $('#toastContainer');
+            toastElement.text(message);
+            toastElement.stop(true, true).fadeIn(200).delay(2000).fadeOut(200);
+        }
+    })
+</script>
 {/block}

+ 22 - 6
app/index/view/index/salesTerms.html

@@ -106,10 +106,26 @@
 </div>
 {/block}
 {block name="scriptSrc"}
-<script src="/assets/index/js/jquery-1.12.0.js"></script>
-<script src="/assets/index/js/flexible.js"></script>
-<script src="/assets/index/js/public.js?t=111"></script>
-<script src="/assets/index/js/swiper.js?t=61"></script>
-<script src="/assets/index/js/jquery.lazyload.js"></script>
-<script src=/assets/index/js/index.js?t=61"></script>
+<script>
+    $(document).ready(function () {
+        //触屏事件 || 点击事件
+        const tap = "ontouchstart" in window ? "touchstart" : "click";
+
+        //订阅
+        $("#subscribeArrow").on(tap, function (event) {
+            showToast('success')
+        });
+
+        /**
+         * 吐司提示
+         * @param message 消息
+         * @returns
+         */
+        function showToast(message) {
+            var toastElement = $('#toastContainer');
+            toastElement.text(message);
+            toastElement.stop(true, true).fadeIn(200).delay(2000).fadeOut(200);
+        }
+    })
+</script>
 {/block}

+ 22 - 6
app/index/view/index/vapePoints.html

@@ -45,10 +45,26 @@
 </div>
 {/block}
 {block name="scriptSrc"}
-<script src="/assets/index/js/jquery-1.12.0.js"></script>
-<script src="/assets/index/js/flexible.js"></script>
-<script src="/assets/index/js/public.js?t=111"></script>
-<script src="/assets/index/js/swiper.js?t=61"></script>
-<script src="/assets/index/js/jquery.lazyload.js"></script>
-<script src=/assets/index/js/index.js?t=61"></script>
+<script>
+    $(document).ready(function () {
+        //触屏事件 || 点击事件
+        const tap = "ontouchstart" in window ? "touchstart" : "click";
+
+        //订阅
+        $("#subscribeArrow").on(tap, function (event) {
+            showToast('success')
+        });
+
+        /**
+         * 吐司提示
+         * @param message 消息
+         * @returns
+         */
+        function showToast(message) {
+            var toastElement = $('#toastContainer');
+            toastElement.text(message);
+            toastElement.stop(true, true).fadeIn(200).delay(2000).fadeOut(200);
+        }
+    })
+</script>
 {/block}

+ 11 - 1
app/index/view/user/order.html

@@ -56,8 +56,13 @@
         <div class="pageConten">
             <div class="orderContainer" id="orderContainer">
                 <!-- <div class="orderItem">
+                                            <div class="orderImg">
+                                <img src="https://www.buranshao.com/Content/Img/iqos3duo.jpg" alt="">
+                            </div>
+                            <div class="orderInfo">
                     <h2 class="orderTitle">#某某电子烟</h2>
                     <p class="orderTime">创建时间:2019-07-03 12:00:00</p>
+                     </div>
                 </div> -->
             </div>
             <div id="loadingIndicator">loading...</div>
@@ -140,9 +145,14 @@
                         console.log(item)
                         container.append(`
                         <div class="orderItem" data-id="${item.order_id}">
+                            <div class="orderImg">
+                                <img src="${item.goods[0].goods_image}" alt="">
+                            </div>
+                             <div class="orderInfo">
                                 <h2 class="orderTitle">${item.goods[0].goods_name}(${item.order_no})</h2>
                                 <p class="orderTime">Created at:${item.create_time}</p>
-                            </div> `);
+                            </div>
+                        </div>`);
                     });
                     // 更新当前页数
                     page++;

+ 25 - 3
public/assets/index/css/order.css

@@ -21,10 +21,28 @@ body{
     justify-content: space-between;
     background-color: #FFF;
     border-radius: .06rem;
-    padding: .24rem;
+    padding: .12rem;
     cursor: pointer;
     margin-bottom: .24rem;
 }
+.orderImg{
+    width: .6rem;
+    height: .6rem;
+    border-radius: .04rem;
+    overflow: hidden;
+    background-color: #f8f8f8;
+}
+.orderImg img{
+    width: 100%;
+    height: 100%;
+}
+.orderInfo{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding-left: .12rem;
+}
 .orderTitle{
     word-break: break-all;
     flex: 1;
@@ -53,9 +71,13 @@ body{
     .orderContainer{
         padding: .24rem;
     }
-    .orderItem{
+    .orderImg{
+        width: .8rem;
+        height: .8rem;
+    }
+    .orderInfo{
         display: block;
-        padding: .16rem;
+        padding-left: .16rem;
     }
     .orderTitle{
         padding-right: 0;