购物车地址

app/index/controller/Cart.php

@@ -76,6 +76,7 @@ class Cart extends Controller
                 $res['fullName'] = $addr['name'].' '.$addr['last_name'];
                 $res['phone'] = $addr['phone'];
                 $res['email'] = $addr['email'];
+                $res['regionId'] = $addr['region_id'];
             }
         }
 

app/index/model/UserAddress.php

@@ -92,10 +92,11 @@ class UserAddress extends UserAddressModel
             // 设为默认收货地址
             !$user['address_id'] && $this->setDefault((int)$this['address_id']);
             //return true;
-            $regionValue = $data['region'][2]['label'] ?? '';
+            //$regionValue = $data['region'][2]['label'] ?? '';
+            $region = Region::get(['id' => $data['region_id']]);
             return [
                 'address_id' => $this['address_id'],
-                'full' => $data['detail'] . ',' . $regionValue . '(' . $data['zip_code'] . '),US',
+                'full' => $data['detail'] . ',' . $region['name'] . '(' . $data['zip_code'] . '),US',
                 'zip_code' => $data['zip_code'],
                 'name' => $data['name'],
                 'last_name' => $data['last_name'],

app/index/view/cart/shoppingCart.html

@@ -360,14 +360,17 @@
 <script>
     $(document).ready(function () {
 
+        var addressId = {$addressId};
+
         //默认地址
         const defaultAddressInfo = {
-            userName: "userName",
-            phoneNumber: "123456789",
-            areaSelect: "0",
-            address: "addressaddress",
-            mailbox: "123456789@qq.com",
-            postalCode: "123456"
+            userName: "{$name}",
+            lastName: "{$lastName}",
+            phoneNumber: "{$phone}",
+            areaSelect: "{$regionId}",
+            address: "{$full}",
+            mailbox: "{$email}",
+            postalCode: "{$zipCode}"
         }
         // 是否已填写过地址
         let isAddress = true
@@ -386,12 +389,13 @@
 
         //初始化表单
         function initAddressForm() {
-            const {userName, phoneNumber, areaSelect, address, mailbox, postalCode} = defaultAddressInfo || {}
+            const {userName, lastName,phoneNumber, areaSelect, address, mailbox, postalCode} = defaultAddressInfo || {}
             userName && $("#userName").val(userName)
+            lastName && $("#lastName").val(lastName)
             phoneNumber && $("#phoneNumber").val(phoneNumber)
             areaSelect && $("#areaSelect").val(areaSelect)
             address && $("#address").val(address)
-            // mailbox && $("#mailbox").val(mailbox)
+            mailbox && $("#mailbox").val(mailbox)
             postalCode && $("#postalCode").val(postalCode)
         }
 
@@ -455,7 +459,7 @@
                     last_name: lastName,
                     phone: phoneNumber,
                     email: mailbox,
-                    region: [{label: '', value: 1}, {label: '', value: 2}, {label: areaSelect, value: 4}],
+                    region: [{label: '', value: 1}, {label: '', value: 2}, {label: areaSelect, value: areaSelect}],
                     //mailbox,
                     detail: address,
                     zip_code: postalCode
@@ -494,6 +498,7 @@
             if (status === 200 || status === "200") {
                 showToast('Success')
                 setTimeout(function () {
+                    addressId = data.address_id
                     $("#addressText").text(data.full)
                     $("#fullNameText").text(data.name + " " + data.last_name)
                     $("#contactNumberText").text(data.phone)

app/index/view/index/productDetails.html

@@ -311,7 +311,7 @@
         const tap = "ontouchstart" in window ? "touchstart" : "click";
 
         //用户存储token名
-        const VAPES_TOKEN = "vapes_token"
+        const VAPES_TOKEN = "PHPSESSID"
 
         var vapesToken = '';
 
@@ -329,7 +329,7 @@
          * @returns
          */
         const isLogin = (state) => {
-            vapesToken = localStorage.getItem(VAPES_TOKEN);
+            vapesToken = sessionStorage.getItem(VAPES_TOKEN);
             state = state || true;
             if (!vapesToken || vapesToken === 'undefined' || vapesToken === "" && state) {
                 window.location.href = "../passport/login.html?return=1"
@@ -343,8 +343,6 @@
          * @returns
          */
         function addCart(number) {
-            const state = isLogin()
-
             if (!number || number <= 0) {
                 showToast("Please enter the quantity of products")
                 return