fix

app/index/view/user/order.html

@@ -116,6 +116,8 @@
             }
         }
 
+        initNavState()
+
         // 加载数据函数
         function loadData(orderType) {
             if (isLoading) {
@@ -195,7 +197,6 @@
             }
         });
 
-        initNavState()
     })
 </script>
 

app/index/view/user/orderDetails.html

@@ -28,17 +28,17 @@
                         </nav>
                     </a>
                     <a href="#">
-                        <nav class="sunNavItem orderNavItem" id="treat" data-type="treat">
+                        <nav class="sunNavItem orderNavItem" id="treat" data-type="delivery">
                             <h3 class="sunNavTitle">To be shipped</h3>
                         </nav>
                     </a>
                     <a href="#">
-                        <nav class="sunNavItem orderNavItem" data-type="shipped">
+                        <nav class="sunNavItem orderNavItem" data-type="received">
                             <h3 class="sunNavTitle">Shipped</h3>
                         </nav>
                     </a>
                     <a href="#">
-                        <nav class="sunNavItem orderNavItem" data-type="take">
+                        <nav class="sunNavItem orderNavItem" data-type="comment">
                             <h3 class="sunNavTitle">Received</h3>
                         </nav>
                     </a>
@@ -79,14 +79,18 @@
                             <p class="orTime">Created At:{$order['create_time']}</p>
                         </div>
                         <div class="orStList">
+                            {if $order['pay_status'] == 20}
                             <div class="orStItem paid">
                                 <span></span>
                                 <p>Paid</p>
                             </div>
+                            {/if}
+                            {if $order['delivery_status'] == 20}
                             <div class="orStItem shipped">
                                 <span></span>
-                                <p>To be shipped</p>
+                                <p>shipped</p>
                             </div>
+                            {/if}
                         </div>
                     </div>
                     <!-- 订单商品 -->
@@ -96,7 +100,7 @@
                             <div class="ogMarkButton">Pay With PayPal</div>
                         </div>
                         <p class="ogTips">
-                            Your goods will be shipped in 2 3days
+                            Your goods will be shipped in 72 hours
                         </p>
                         {foreach $order['goods'] as $goods}
 
@@ -320,7 +324,7 @@
         </div>
         <div class="evaluateItem">
             <div class="textareaBox">
-                <textarea id="evaluateTextarea" placeholder="评价一下吧"></textarea>
+                <textarea id="evaluateTextarea" placeholder="Review now"></textarea>
             </div>
         </div>
         <div class="evaluateBotBox">
@@ -339,14 +343,13 @@
 <script src="/assets/index/js/jquery.lazyload.js"></script>
 <script>
     $(document).ready(function () {
-        $("#loadingModel").hide(0);
+        initNavState()
 
+        $("#loadingModel").hide(0);
         var orderId = "{$order['order_id']}";
-        console.log('orderId::', orderId)
         var payStatus = "{$order['pay_status']}";
-        console.log('payStatus::', payStatus)
         $('#ogMarkButton').hide(0)
-        if (payStatus === "10" || payStatus === 10) {
+        if (payStatus === "10") {
             $('#ogMarkButton').show(0)
         }
 
@@ -366,9 +369,7 @@
 
         $(".openButton").on(tap, function () {
             const parentEle = $(this).closest('.eleBox')
-            console.log(parentEle)
             const openBoxEle = parentEle.find(".openBox")
-            console.log(openBoxEle)
             openBoxEle.stop().slideToggle(80);
         });
 
@@ -377,6 +378,7 @@
             const url = window.location.href;
             const searchParams = new URLSearchParams(new URL(url).search);
             const orderType = searchParams.get("orderType");
+            console.log(orderType)
             //订单中心菜单列表
             const orderNavItemList = $(".orderNavItem")
             //是否存在匹配项
@@ -423,7 +425,6 @@
 
         //支付按钮点击
         $(".ogMarkButton").on(tap, async function () {
-            console.log("paypaing")
             $("#loadingModel").show(0)
 
             const params = {}
@@ -443,7 +444,6 @@
 
         function fetchOrder(interId) {
             $.get('/index/order/detail?orderId=' + orderId, function (res) {
-                console.log(res.data.order.pay_status);
                 if (res.status == 200 && res.data.order.pay_status == 20) {
                     clearInterval(interId);
                     $("#loadingModel").hide(0);
@@ -457,8 +457,6 @@
             window.location.replace(`/index/user/order.html?orderType=${type}`)
         });
 
-        initNavState()
-
         //商品id（评价记录）
         let goodsId