Merge remote-tracking branch 'origin/master'

app/index/controller/User.php

@@ -81,15 +81,18 @@ class User extends Controller
         }
 
         $createTimeInt = strtotime($model['create_time']);
+        $selfTrack = [];
 
-        $selfTrack[2] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 5), 'text' => 'Order paid', 'desc' => 'Successful'];
+        if (time() > $createTimeInt + 9864) {
+            $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 9864), 'text' => 'Orders taken', 'desc' => 'The order has entered the warehouse'];
+        }
 
         if (time() > $createTimeInt + 3653) {
-            $selfTrack[1] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 3653), 'text' => 'Orders taken', 'desc' => 'The merchant has received your order and is waiting to be shipped'];
-        }
-        if (time() > $createTimeInt + 9864) {
-            $selfTrack[0] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 9864), 'text' => 'Orders taken', 'desc' => 'The order has entered the warehouse'];
+            $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 3653), 'text' => 'Orders taken', 'desc' => 'The merchant has received your order and is waiting to be shipped'];
         }
+
+        $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 5), 'text' => 'Order paid', 'desc' => 'Successful'];
+
         return view('orderDetails', ['order' => $model, 'orderAddress' => $orderAddress, 'selfTrack' => $selfTrack, 'f1Track' => $f1Track]);
     }
 

app/index/view/user/orderDetails.html

@@ -158,7 +158,7 @@
                     <!-- 物流信息 -->
                     <div class="logisticsBox eleBox">
                         <div class="logsTeFlex">
-                            <p class="logsTitle">Logistics tracks</p>
+                            <p class="logsTitle">Logistics Tracks</p>
                             <div class="openButton">
                                 <img src="/assets/index/asstes/icon/slt.png" alt="">
                             </div>
@@ -205,7 +205,7 @@
                     <!-- 客户信息 -->
                     <div class="customInfo eleBox">
                         <div class="cusTeFlex">
-                            <p class="cusTeTitle">客户信息</p>
+                            <p class="cusTeTitle">Recipient Information</p>
                             <div class="openButton">
                                 <img src="/assets/index/asstes/icon/slt.png" alt="">
                             </div>
@@ -259,6 +259,10 @@
                             <!--                                    <p class="aiValue">XXXXXXXXXX</p>-->
                             <!--                                </div>-->
                             <div class="addInfoItem">
+                                <p class="aiKey">City</p>
+                                <p class="aiValue">{$orderAddress['city']}</p>
+                            </div>
+                            <div class="addInfoItem">
                                 <p class="aiKey">State</p>
                                 <p class="aiValue">{$orderAddress['region']['region']}</p>
                             </div>

public/assets/index/css/aboutUs.css

@@ -21,6 +21,10 @@ h2 {
     color: #333;
 }
 
+h1 {
+    padding-top: 0.4rem;
+}
+
 p {
     line-height: 1.6;
 }

public/assets/index/css/common.css

@@ -860,7 +860,7 @@ a:active, a:focus {
 
     .acceptRightInfo {
         justify-content: flex-start;
-        padding-left: 0;
+        padding-left: 0.4rem;
         padding-top: .4rem;
     }
 
@@ -991,7 +991,7 @@ a:active, a:focus {
 
     .acceptLeftInfo {
         max-width: none;
-        margin-left: .5rem;
+        /*margin-left: .5rem;*/
     }
 
     .acceptLeftInfo .weAcc {

public/install/data/install_data.sql

@@ -881,56 +881,56 @@ INSERT INTO `yoshop_user_grade` VALUES ('10003', '钻石会员', '3', '{\"expend
 # 1.0.0
 INSERT INTO `yoshop_region` VALUES (1, '', 0, '', 1);
 INSERT INTO `yoshop_region` VALUES (2, '', 1, '', 2);
-INSERT INTO `yoshop_region` VALUES (3, 'Alabama', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (4, 'Alaska', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (5, 'Arizona', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (6, 'Arkansas', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (7, 'California', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (8, 'Colorado', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (9, 'Connecticut', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (10, 'Delaware', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (11, 'Florida', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (12, 'Georgia', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (13, 'Hawaii', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (14, 'Idaho', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (15, 'Illinois', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (16, 'Indiana', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (17, 'Iowa', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (18, 'Kansas', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (19, 'Kentucky', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (20, 'Louisiana', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (21, 'Maine', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (22, 'Maryland', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (23, 'Massachusetts', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (24, 'Michigan', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (25, 'Minnesota', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (26, 'Mississippi', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (27, 'Missouri', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (28, 'Montana', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (29, 'Nebraska', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (30, 'Nevada', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (31, 'New Hampshire', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (32, 'New Jersey', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (33, 'New Mexico', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (34, 'New York', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (35, 'North Carolina', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (36, 'North Dakota', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (37, 'Ohio', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (38, 'Oklahoma', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (39, 'Oregon', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (40, 'Pennsylvania', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (41, 'Rhode Island', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (42, 'South Carolina', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (43, 'South Dakota', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (44, 'Tennessee', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (45, 'Texas', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (46, 'Utah', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (47, 'Vermont', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (48, 'Virginia', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (49, 'Washington', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (50, 'West Virginia', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (51, 'Wisconsin', 2, '', 3);
-INSERT INTO `yoshop_region` VALUES (52, 'Wyoming', 2, '', 3);
+INSERT INTO `yoshop_region` VALUES (3, 'Alabama', 2, 'AL', 3);
+INSERT INTO `yoshop_region` VALUES (4, 'Alaska', 2, 'AK', 3);
+INSERT INTO `yoshop_region` VALUES (5, 'Arizona', 2, '	AZ', 3);
+INSERT INTO `yoshop_region` VALUES (6, 'Arkansas', 2, '	AR', 3);
+INSERT INTO `yoshop_region` VALUES (7, 'California', 2, '	CA', 3);
+INSERT INTO `yoshop_region` VALUES (8, 'Colorado', 2, 'CO', 3);
+INSERT INTO `yoshop_region` VALUES (9, 'Connecticut', 2, 'CT', 3);
+INSERT INTO `yoshop_region` VALUES (10, 'Delaware', 2, '	DE', 3);
+INSERT INTO `yoshop_region` VALUES (11, 'Florida', 2, 'FL', 3);
+INSERT INTO `yoshop_region` VALUES (12, 'Georgia', 2, 'GA', 3);
+INSERT INTO `yoshop_region` VALUES (13, 'Hawaii', 2, 'HI', 3);
+INSERT INTO `yoshop_region` VALUES (14, 'Idaho', 2, 'ID', 3);
+INSERT INTO `yoshop_region` VALUES (15, 'Illinois', 2, 'IL', 3);
+INSERT INTO `yoshop_region` VALUES (16, 'Indiana', 2, '	IN', 3);
+INSERT INTO `yoshop_region` VALUES (17, 'Iowa', 2, '	IA', 3);
+INSERT INTO `yoshop_region` VALUES (18, 'Kansas', 2, '	KS', 3);
+INSERT INTO `yoshop_region` VALUES (19, 'Kentucky', 2, '	KY', 3);
+INSERT INTO `yoshop_region` VALUES (20, 'Louisiana', 2, 'LA', 3);
+INSERT INTO `yoshop_region` VALUES (21, 'Maine', 2, 'ME', 3);
+INSERT INTO `yoshop_region` VALUES (22, 'Maryland', 2, '	MD', 3);
+INSERT INTO `yoshop_region` VALUES (23, 'Massachusetts', 2, '	MA', 3);
+INSERT INTO `yoshop_region` VALUES (24, 'Michigan', 2, '	MI', 3);
+INSERT INTO `yoshop_region` VALUES (25, 'Minnesota', 2, 'MN', 3);
+INSERT INTO `yoshop_region` VALUES (26, 'Mississippi', 2, '	MS', 3);
+INSERT INTO `yoshop_region` VALUES (27, 'Missouri', 2, '	MO', 3);
+INSERT INTO `yoshop_region` VALUES (28, 'Montana', 2, '	MT', 3);
+INSERT INTO `yoshop_region` VALUES (29, 'Nebraska', 2, '	NE', 3);
+INSERT INTO `yoshop_region` VALUES (30, 'Nevada', 2, '	NV', 3);
+INSERT INTO `yoshop_region` VALUES (31, 'New Hampshire', 2, '	NH', 3);
+INSERT INTO `yoshop_region` VALUES (32, 'New Jersey', 2, '	NJ', 3);
+INSERT INTO `yoshop_region` VALUES (33, 'New Mexico', 2, 'NM', 3);
+INSERT INTO `yoshop_region` VALUES (34, 'New York', 2, '	NY', 3);
+INSERT INTO `yoshop_region` VALUES (35, 'North Carolina', 2, '	NC', 3);
+INSERT INTO `yoshop_region` VALUES (36, 'North Dakota', 2, '	ND', 3);
+INSERT INTO `yoshop_region` VALUES (37, 'Ohio', 2, '	OH', 3);
+INSERT INTO `yoshop_region` VALUES (38, 'Oklahoma', 2, '	OK', 3);
+INSERT INTO `yoshop_region` VALUES (39, 'Oregon', 2, '	OR', 3);
+INSERT INTO `yoshop_region` VALUES (40, 'Pennsylvania', 2, '	PA', 3);
+INSERT INTO `yoshop_region` VALUES (41, 'Rhode Island', 2, '	RI', 3);
+INSERT INTO `yoshop_region` VALUES (42, 'South Carolina', 2, 'SC', 3);
+INSERT INTO `yoshop_region` VALUES (43, 'South Dakota', 2, '	SD', 3);
+INSERT INTO `yoshop_region` VALUES (44, 'Tennessee', 2, 'TN', 3);
+INSERT INTO `yoshop_region` VALUES (45, 'Texas', 2, 'TX', 3);
+INSERT INTO `yoshop_region` VALUES (46, 'Utah', 2, '	UT', 3);
+INSERT INTO `yoshop_region` VALUES (47, 'Vermont', 2, '	VT', 3);
+INSERT INTO `yoshop_region` VALUES (48, 'Virginia', 2, '	VA', 3);
+INSERT INTO `yoshop_region` VALUES (49, 'Washington', 2, '	WA', 3);
+INSERT INTO `yoshop_region` VALUES (50, 'West Virginia', 2, 'WV', 3);
+INSERT INTO `yoshop_region` VALUES (51, 'Wisconsin', 2, '	WI', 3);
+INSERT INTO `yoshop_region` VALUES (52, 'Wyoming', 2, '	WY', 3);
 
 INSERT INTO `yoshop_store_api` VALUES ('11185', '删除订单', '/order.event/delete', '11132', '135', '1614556800', '1614556800');
 INSERT INTO `yoshop_store_menu` VALUES ('10141', '20', '删除订单', '', 'delete', '10051', '115', '1614556800', '1614556800');