积分

app/index/view/cart/shoppingCart.html

@@ -283,26 +283,9 @@
             toastElement.stop(true, true).fadeIn(200).delay(2000).fadeOut(200);
         }
 
-        // const VAPES_TOKEN = "vapes_token"
-        //
-        // //未登录处理
-        // function isLogin() {
-        //     //用户token
-        //     const vapesToken = localStorage.getItem("vapes_token")
-        //     if (!vapesToken || vapesToken === "") {
-        //         setTimeout(() => {
-        //             window.location.href = "./login.html?return=1"
-        //         }, 80)
-        //     }
-        //     return vapesToken && vapesToken !== "";
-        // }
-        //
-        // isLogin();
-
         //支付方法
         const orderPayment = (params) => {
             console.log(params)
-            //const vapesToken = localStorage.getItem("vapes_token");
             return new Promise(function (resolve, reject) {
                 $.ajax({
                     url: "/index/checkout/submit?payType=30&mode=cart&address_id=2",
@@ -325,6 +308,30 @@
             });
         }
 
+        const orderPaymentPoints = (params) => {
+            console.log(params)
+            return new Promise(function (resolve, reject) {
+                $.ajax({
+                    url: "/index/checkout/submit?payType=50&mode=cart&address_id=2",
+                    method: "POST",
+                    data: JSON.stringify(params),
+                    headers: {
+                        "Content-Type": "application/json",
+                        "storeId": "10001",
+                        "platform": "H5",
+                        // "Access-Token": vapesToken
+                    },
+                    dataType: "json",
+                    success: function (response) {
+                        resolve(response);
+                    },
+                    error: function (xhr, status, error) {
+                        reject(error);
+                    }
+                });
+            });
+        }
+
 
         /**
          * 商品操作方法
@@ -438,6 +445,26 @@
             }
         });
 
+        //支付
+        $(".checkoutButton").on(tap, async function () {
+            console.log("points")
+            const params = {
+                "delivery": 10,
+                "address_id": 2
+            }
+            console.log(params)
+            const res = await orderPaymentPoints(params)
+            console.log(res)
+            const {status, message, data} = res || {}
+            if (status === 200 || status === "200") {
+                window.open(data.payment.approval_link, "_blank");
+            } else if (status === 401 || status === "401") {
+                window.location.replace('../passport/logIn.html')
+            } else {
+                showToast(message)
+            }
+        });
+
 
         //商品减少
         $(".numberReduce").on(tap, function () {

app/index/view/index/index.html

@@ -100,11 +100,11 @@
                 <a href="/index/cart/shoppingCart.html">
                     <h2 class="menuItemTitle shoppingCartIcon">Shopping Cart</h2>
                 </a></div>
+<!--            <div class="mobileMenuItem">-->
+<!--                <h2 class="menuItemTitle collectIcon">Collect</h2>-->
+<!--            </div>-->
             <div class="mobileMenuItem">
-                <h2 class="menuItemTitle collectIcon">Collect</h2>
-            </div>
-            <div class="mobileMenuItem">
-                <a href="/index/user/personal.html">
+                <a href="/index/user/order.html">
                     <h2 class="menuItemTitle userIcon">Personal</h2>
                 </a>
             </div>
@@ -143,11 +143,11 @@
                     <img class="tabLink" src="/assets/index/asstes/icon/tabLinkIcon.png" alt="">
                     <p class="tabUnderline"></p>
                 </div>
-                <div class="tabItem">
-                    <h3 class="tabName">video</h3>
-                    <img class="tabLink" src="/assets/index/asstes/icon/tabLinkIcon.png" alt="">
-                    <p class="tabUnderline"></p>
-                </div>
+<!--                <div class="tabItem">-->
+<!--                    <h3 class="tabName">video</h3>-->
+<!--                    <img class="tabLink" src="/assets/index/asstes/icon/tabLinkIcon.png" alt="">-->
+<!--                    <p class="tabUnderline"></p>-->
+<!--                </div>-->
                 <div class="tabItem">
                     <h3 class="tabName">BEST SELLERS</h3>
                     <img class="tabLink" src="/assets/index/asstes/icon/tabLinkIcon.png" alt="">
@@ -192,21 +192,6 @@
                                         {/lt}
                                     </p>
                                     {/for}
-                                    <!--                                    <p class="goodsStarItem">-->
-                                    <!--                                        <img src="/assets/index/asstes/icon/selStar.png" alt="">-->
-                                    <!--                                    </p>-->
-                                    <!--                                    <p class="goodsStarItem">-->
-                                    <!--                                        <img src="/assets/index/asstes/icon/star.png" alt="">-->
-                                    <!--                                    </p>-->
-                                    <!--                                    <p class="goodsStarItem">-->
-                                    <!--                                        <img src="/assets/index/asstes/icon/star.png" alt="">-->
-                                    <!--                                    </p>-->
-                                    <!--                                    <p class="goodsStarItem">-->
-                                    <!--                                        <img src="/assets/index/asstes/icon/star.png" alt="">-->
-                                    <!--                                    </p>-->
-                                    <!--                                    <p class="goodsStarItem">-->
-                                    <!--                                        <img src="/assets/index/asstes/icon/star.png" alt="">-->
-                                    <!--                                    </p>-->
                                 </div>
                                 <div class="reviewsNumber">
                                     <p class="number textEllipsis">{$goods['comment_cnt']}</p>
@@ -258,32 +243,6 @@
                     </div>
                 </a>
                 {/foreach}
-                <!--                <a href="">-->
-                <!--                    <div class="newConterItem">-->
-                <!--                        <div class="newsDateBox">-->
-                <!--                            <p>02-06</p>-->
-                <!--                            <p class="year">2024</p>-->
-                <!--                        </div>-->
-                <!--                        <div class="newConterImg">-->
-                <!--                            <img class="lazy" src="/assets/index/asstes/icon/transparent.png"-->
-                <!--                                 data-original="https://img0.baidu.com/it/u=3316636492,2799302396&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1709398800&t=0b33f33f41e44709ced5e8c8a1113b6b"-->
-                <!--                                 alt="">-->
-                <!--                        </div>-->
-                <!--                        <div class="newConterInfo">-->
-                <!--                            <h3 class="newConterTitle">Explore a Variety of ChoicesExplore a Variety of Choices-->
-                <!--                                Whether yoExplore a Variety of Choices Whether yoExplore a Variety of Choices-->
-                <!--                                Whether yo Whether you're-->
-                <!--                                aseasonedvaper or</h3>-->
-                <!--                            <div class="newsInfoRl">-->
-                <!--                                <p class="rlDate">2024-02-06</p>-->
-                <!--                                <div class="newsMore active">-->
-                <!--                                    <p class="textEllipsis">More</p>-->
-                <!--                                    <span>+</span>-->
-                <!--                                </div>-->
-                <!--                            </div>-->
-                <!--                        </div>-->
-                <!--                    </div>-->
-                <!--                </a>-->
             </div>
         </div>
     </article>

app/index/view/index/productDetails.html

@@ -51,12 +51,12 @@
                 </div>
             </a>
             <!-- 收藏 -->
-            <div class="headIconItem collectIcon">
-                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">
-            </div>
+<!--            <div class="headIconItem collectIcon">-->
+<!--                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">-->
+<!--            </div>-->
             <!-- 个人中心 -->
 
-            <a href="/index/user/personal.html">
+            <a href="/index/user/order.html">
                 <div class="headIconItem userIcon">
                     <img src="/assets/index/asstes/icon/user.png" alt="user" tabindex="user">
                 </div>
@@ -97,9 +97,9 @@
             <a href="/index/cart/shoppingCart.html">
                 <h2 class="menuItemTitle shoppingCartIcon">Shopping Cart</h2>
             </a>
-            <div class="mobileMenuItem">
-                <h2 class="menuItemTitle collectIcon">Collect</h2>
-            </div>
+<!--            <div class="mobileMenuItem">-->
+<!--                <h2 class="menuItemTitle collectIcon">Collect</h2>-->
+<!--            </div>-->
             <div class="mobileMenuItem">
                 <a href="/index/user/personal.html">
                     <h2 class="menuItemTitle userIcon">Personal</h2>

app/index/view/user/order.html

@@ -42,11 +42,11 @@
                 </div>
             </a>
             <!-- 收藏 -->
-            <div class="headIconItem collectIcon">
-                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">
-            </div>
+<!--            <div class="headIconItem collectIcon">-->
+<!--                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">-->
+<!--            </div>-->
             <!-- 个人中心 -->
-            <a href="/index/user/personal.html">
+            <a href="/index/user/order.html">
                 <div class="headIconItem userIcon">
                     <img src="/assets/index/asstes/icon/user.png" alt="user" tabindex="user">
                 </div>
@@ -83,9 +83,9 @@
             <div class="mobileMenuItem">
                 <h2 class="menuItemTitle shoppingCartIcon">Shopping Cart</h2>
             </div>
-            <div class="mobileMenuItem">
-                <h2 class="menuItemTitle collectIcon">Collect</h2>
-            </div>
+<!--            <div class="mobileMenuItem">-->
+<!--                <h2 class="menuItemTitle collectIcon">Collect</h2>-->
+<!--            </div>-->
             <div class="mobileMenuItem active">
                 <h2 class="menuItemTitle userIcon">Personal</h2>
             </div>

app/index/view/user/orderDetails.html

@@ -46,7 +46,7 @@
 <!--                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">-->
 <!--            </div>-->
             <!-- 个人中心 -->
-            <a href="/index/user/personal.html">
+            <a href="/index/user/order.html">
                 <div class="headIconItem userIcon">
                     <img src="/assets/index/asstes/icon/user.png" alt="user" tabindex="user">
                 </div>
@@ -83,9 +83,9 @@
             <div class="mobileMenuItem">
                 <h2 class="menuItemTitle shoppingCartIcon">Shopping Cart</h2>
             </div>
-            <div class="mobileMenuItem">
-                <h2 class="menuItemTitle collectIcon">Collect</h2>
-            </div>
+<!--            <div class="mobileMenuItem">-->
+<!--                <h2 class="menuItemTitle collectIcon">Collect</h2>-->
+<!--            </div>-->
             <div class="mobileMenuItem active">
                 <h2 class="menuItemTitle userIcon">Personal</h2>
             </div>

app/index/view/user/personal.html

@@ -1,249 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge，chrome=1">
-    <meta name='apple-touch-fullscreen' content='yes'>
-    <meta name="apple-mobile-web-app-capable" content="yes"/>
-    <meta content="fullscreen=yes,preventMove=no" name="ML-Config">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="renderer" content="webkit">
-    <meta name="apple-mobile-web-app-capable" content="yes"/>
-    <meta name="keywords" content="电子烟,关键字"/>
-    <meta name="Description" content="网站描述"/>
-    <title>个人中心</title>
-    <link rel="stylesheet" href="/assets/index/css/common.css?t=18">
-    <link rel="stylesheet" href="/assets/index/css/personal.css">
-</head>
-
-<body>
-<!-- 头部导航栏 -->
-<header class="headerContainer" id="headerContainer">
-    <!-- 顶部提示 -->
-    <div class="warnContainer">
-        <h4 class="warnText">containscontainscontainsWARNING: This product contains nicotine. Nicotine is an addicti
-        </h4>
-    </div>
-    <!-- pc端头部 -->
-    <div id="computerEndHeader">
-        <a href="../index/index.html">
-            <h1 class="computerLogo">
-                <img src="/assets/index/asstes/icon/logo.png" alt="Free Shipping Vapes" title="Free Shipping Vapes">
-            </h1>
-        </a>
-        <div class="headNavContainer">
-            <nav class="headNavItem active">
-                <h2 class="headNavTitle">NEW VAPES</h2>
-                <p class="back"></p>
-            </nav>
-            <nav class="headNavItem">
-                <h2 class="headNavTitle">DISPOSABLES</h2>
-                <p class="back"></p>
-            </nav>
-        </div>
-        <div class="headIconContainer">
-            <!-- 购物车 -->
-            <a href="/index/cart/shoppingCart.html">
-                <div class="headIconItem shoppingCartIcon">
-                    <img src="/assets/index/asstes/icon/shoppingCart.png" alt="shoppingCart" tabindex="shoppingCart">
-                </div>
-            </a>
-            <!-- 收藏 -->
-            <div class="headIconItem collectIcon">
-                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">
-            </div>
-            <!-- 个人中心 -->
-            <div class="headIconItem userIcon">
-                <img src="/assets/index/asstes/icon/user.png" alt="user" tabindex="user">
-            </div>
-        </div>
-    </div>
-    <!-- 移动端头部 -->
-    <div id="mobileEndHeader">
-        <div class="mobileEndHeaderConten">
-            <a href="../index/index.html">
-                <h1 class="mobileLogo">
-                    <img src="/assets/index/asstes/icon/logo.png" alt="Free Shipping Vapes" title="Free Shipping Vapes">
-                </h1>
-            </a>
-            <div class="mobileUserIconList">
-                <div class="mobileUserIcon userIcon">
-                    <img src="/assets/index/asstes/icon/user.png" alt="user" tabindex="user">
-                </div>
-            </div>
-            <div class="mobileMenu">
-                <p id="mobileMenuBot">
-                    <span id="mobileMenuLink"></span>
-                </p>
-            </div>
-        </div>
-        <!-- 移动端菜单 -->
-        <section class="mobileMenuFixed">
-            <div class="mobileMenuItem">
-                <h2 class="menuItemTitle">NEW VAPES</h2>
-            </div>
-            <div class="mobileMenuItem">
-                <h2 class="menuItemTitle">DISPOSABLES</h2>
-            </div>
-            <div class="mobileMenuItem">
-                <h2 class="menuItemTitle shoppingCartIcon">Shopping Cart</h2>
-            </div>
-            <div class="mobileMenuItem">
-                <h2 class="menuItemTitle collectIcon">Collect</h2>
-            </div>
-            <div class="mobileMenuItem active">
-                <h2 class="menuItemTitle userIcon">Personal</h2>
-            </div>
-        </section>
-    </div>
-</header>
-<main id="main">
-    <section class="pageContainer">
-        <div class="pageMain">
-            <div class="navContainer">
-                <a href="#">
-                    <nav class="navItem">
-                        <div class="navItemFlex">
-                            <img src="/assets/index/asstes/icon/hm.png" alt="">
-                            <h2 class="navTitle">首页</h2>
-                        </div>
-                    </nav>
-                </a>
-                <nav class="navItem">
-                    <div class="navItemFlex">
-                        <img src="/assets/index/asstes/icon/order.png" alt="">
-                        <h2 class="navTitle">订单中心</h2>
-                    </div>
-                    <div class="sunNavBox">
-                        <a href="#">
-                            <nav class="sunNavItem active">
-                                <h3 class="sunNavTitle">待发货订单</h3>
-                            </nav>
-                        </a>
-                        <a href="#">
-                            <nav class="sunNavItem">
-                                <h3 class="sunNavTitle">已发货订单</h3>
-                            </nav>
-                        </a>
-                        <a href="#">
-                            <nav class="sunNavItem">
-                                <h3 class="sunNavTitle">已收货订单</h3>
-                            </nav>
-                        </a>
-                    </div>
-                </nav>
-                <a href="#">
-                    <nav class="navItem">
-                        <div class="navItemFlex">
-                            <img src="/assets/index/asstes/icon/jf.png" alt="">
-                            <h2 class="navTitle">我的积分</h2>
-                        </div>
-                    </nav>
-                </a>
-            </div>
-        </div>
-    </section>
-</main>
-
-<!-- 底部 -->
-<footer class="footerContainer" id="footerContainer">
-    <section class="sectionContainer">
-        <div class="elementorContainer">
-            <div class="footerConter">
-                <div class="leftText">
-                    <p class="ltK">NEWALETTER</p>
-                    <p class="ltV">Sign up for the Vapesourcing newsletter</p>
-                </div>
-                <div class="footerInuptBox">
-                    <img class="mailIcon" src="/assets/index/asstes/icon//mailIcon.png" alt="">
-                    <input class="footerInupt" type="text">
-                    <img class="arrowIcon" src="/assets/index/asstes/icon/arrowIcon.png" alt="">
-                </div>
-                <div class="footerIconContainer">
-                    <div class="footerIconList">
-                        <a href="#">
-                            <div class="footerIconItem">
-                                <img src="https://i1.branchcn.com/social_media/Wechat.png" alt="">
-                            </div>
-                        </a>
-                        <a href="#">
-                            <div class="footerIconItem">
-                                <img src="https://i1.branchcn.com/social_media/Wechat.png" alt="">
-                            </div>
-                        </a>
-                        <a href="#">
-                            <div class="footerIconItem">
-                                <img src="https://i1.branchcn.com/social_media/Wechat.png" alt="">
-                            </div>
-                        </a>
-                    </div>
-                    <div class="footerVlsaImg">
-                        <a href="#">
-                            <div class="footerVlsaItem">
-                                <img src="https://img2.baidu.com/it/u=1367821108,121397947&fm=253&fmt=auto&app=138&f=JPEG?w=1200&h=500"
-                                     alt="">
-                            </div>
-                        </a>
-                        <a href="#">
-                            <div class="footerVlsaItem">
-                                <img src="https://img2.baidu.com/it/u=1367821108,121397947&fm=253&fmt=auto&app=138&f=JPEG?w=1200&h=500"
-                                     alt="">
-                            </div>
-                        </a>
-                        <a href="#">
-                            <div class="footerVlsaItem">
-                                <img src="https://img2.baidu.com/it/u=1367821108,121397947&fm=253&fmt=auto&app=138&f=JPEG?w=1200&h=500"
-                                     alt="">
-                            </div>
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-</footer>
-
-<!-- 年龄提示层 -->
-<section class="maskContainer">
-    <div class="ageReminderBox">
-        <img class="ageReminderBack"
-             src="https://img1.baidu.com/it/u=3449617615,1431463931&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1709485200&t=489bafcac7c5bebed91cf50c14356269"
-             alt="">
-        <div class="ageReminderInfo">
-            <h3>ARE YOU OF LEAAL SMOKIND AGE?</h3>
-            <div class="ageReminderButBox">
-                <div class="ageRBut ageReminderNo"><span>NO</span></div>
-                <div class="ageRBut ageReminderYes"><span>Yes, I am 21+</span></div>
-            </div>
-        </div>
-    </div>
-</section>
-</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/swiper.js?t=6"></script>
-<script src="/assets/index/js/jquery.lazyload.js"></script>
-<script>
-    $(document).ready(function () {
-
-        //未登录处理
-        function isLogin() {
-            //用户token
-            const vapesToken = localStorage.getItem("vapes_token")
-            if (!vapesToken || vapesToken === "") {
-                setTimeout(() => {
-                    window.location.href = "./login.html?return=1"
-                }, 80)
-            }
-        }
-
-        isLogin()
-
-    })
-</script>
-
-</html>