diff --git a/src/components/common/AddressFormDialog.vue b/src/components/common/AddressFormDialog.vue
new file mode 100644
index 0000000..2dc4400
--- /dev/null
+++ b/src/components/common/AddressFormDialog.vue
@@ -0,0 +1,317 @@
+<template>
+  <el-dialog
+    :title="`${type === 'add' ? '新增' : '编辑'}收货地址`"
+    :visible="visible"
+    width="700px"
+    @close="handleClose"
+  >
+    <el-form
+      :model="form"
+      :rules="rules"
+      ref="addressForm"
+      label-width="100px"
+      size="small"
+    >
+      <el-form-item label="收货人" prop="username">
+        <el-input
+          v-model="form.username"
+          placeholder="请填写收货人姓名,限制10个字符"
+          maxlength="10"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="所在地区" prop="region">
+        <div class="region-selector">
+          <el-select
+            v-model="form.province_id"
+            placeholder="选择省份/直辖市"
+            @change="handleProvinceChange"
+            class="region-select"
+          >
+            <el-option
+              v-for="province in provinces"
+              :key="province.id"
+              :label="province.name"
+              :value="province.id"
+            ></el-option>
+          </el-select>
+
+          <el-select
+            v-model="form.city_id"
+            placeholder="选择城市"
+            @change="handleCityChange"
+            class="region-select"
+            :disabled="!form.province_id"
+          >
+            <el-option
+              v-for="city in cities"
+              :key="city.id"
+              :label="city.name"
+              :value="city.id"
+            ></el-option>
+          </el-select>
+
+          <el-select
+            v-model="form.district_id"
+            placeholder="选择县区"
+            class="region-select"
+            :disabled="!form.city_id"
+          >
+            <el-option
+              v-for="district in districts"
+              :key="district.id"
+              :label="district.name"
+              :value="district.id"
+            ></el-option>
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item label="详细地址" prop="detail_addr">
+        <el-input
+          v-model="form.detail_addr"
+          placeholder="请填写详细地址,限制500个字符"
+          maxlength="500"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="手机号码" prop="mobile">
+        <el-input
+          v-model="form.mobile"
+          placeholder="请填写手机号码,限制11位数字"
+          maxlength="11"
+          oninput="value=value.replace(/[^\d]/g,'')"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button size="small" @click="handleClose">取消</el-button>
+      <el-button size="small" type="primary" @click="saveAddress"
+        >保存</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "AddressFormDialog",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    type: {
+      type: String,
+      required: true,
+      validator: (val) => ["add", "edit"].includes(val),
+    },
+    initialData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    const validateMobile = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error("请输入手机号码"));
+      } else if (!/^1[3-9]\d{9}$/.test(value)) {
+        return callback(new Error("请输入正确的11位手机号码"));
+      } else {
+        callback();
+      }
+    };
+
+    const validateRegion = (rule, value, callback) => {
+      if (
+        !this.form.province_id ||
+        !this.form.city_id ||
+        !this.form.district_id
+      ) {
+        return callback(new Error("请完整选择省市区"));
+      }
+      callback();
+    };
+
+    return {
+      form: {
+        id: null,
+        username: "",
+        detail_addr: "",
+        mobile: "",
+        province_id: null,
+        city_id: null,
+        district_id: null,
+        region: "",
+      },
+      rules: {
+        username: [
+          { required: true, message: "请输入收货人姓名", trigger: "blur" },
+          { max: 10, message: "姓名不能超过10个字符", trigger: "blur" },
+        ],
+        region: [
+          { required: true, validator: validateRegion, trigger: "change" },
+        ],
+        detail_addr: [
+          { required: true, message: "请输入详细地址", trigger: "blur" },
+          { max: 500, message: "详细地址不能超过500个字符", trigger: "blur" },
+        ],
+        mobile: [
+          { required: true, validator: validateMobile, trigger: "blur" },
+        ],
+        },
+      regionData: []
+    };
+  },
+  computed: {
+    provinces() {
+      return this.regionData.filter((item) => item.level === 1);
+    },
+    cities() {
+      if (!this.form.province_id) return [];
+      return this.regionData.filter(
+        (item) => item.level === 2 && item.pid === this.form.province_id
+      );
+    },
+    districts() {
+      if (!this.form.city_id) return [];
+      return this.regionData.filter(
+        (item) => item.level === 3 && item.pid === this.form.city_id
+      );
+    },
+  },
+  watch: {
+    visible(val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+    initialData: {
+      handler() {
+        if (this.visible) {
+          this.initForm();
+        }
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.getRegionData();
+  },
+  methods: {
+    // 获取地区数据
+    async getRegionData() {
+      try {
+        const res = await this.post({}, "/api/uservice/user/getAreas");
+        if (res && res.data) {
+          this.regionData = res.data;
+        } else {
+          this.$message.error("获取地区数据失败");
+        }
+      } catch (error) {
+        console.error("获取地区数据出错:", error);
+        this.$message.error("获取地区数据时发生错误");
+      }
+    },
+    initForm() {
+      this.$nextTick(() => {
+        if (this.$refs.addressForm) {
+          this.$refs.addressForm.resetFields();
+        }
+
+        this.form = {
+          id: this.type === "edit" ? this.initialData.id : null,
+          username: this.initialData.username || "",
+          detail_addr: this.initialData.detail_addr || "",
+          mobile: this.initialData.mobile || "",
+          province_id: this.initialData.province_id || null,
+          city_id: this.initialData.city_id || null,
+          district_id: this.initialData.district_id || null,
+          region: this.initialData.region || "",
+        };
+
+        // 如果没有ID信息再尝试通过文本匹配
+        if (
+          this.type === "edit" &&
+          this.initialData.region &&
+          !this.form.province_id
+        ) {
+          this.echoRegionSelection(this.initialData.region);
+        }
+      });
+    },
+    echoRegionSelection(regionText) {
+      const regions = regionText.split(" ");
+      if (regions.length < 3) return;
+
+      const province = this.provinces.find((p) => p.name === regions[0]);
+      if (province) {
+        this.form.province_id = province.id;
+
+        this.$nextTick(() => {
+          const city = this.cities.find((c) => c.name === regions[1]);
+          if (city) {
+            this.form.city_id = city.id;
+
+            this.$nextTick(() => {
+              const district = this.districts.find(
+                (d) => d.name === regions[2]
+              );
+              if (district) {
+                this.form.district_id = district.id;
+              }
+            });
+          }
+        });
+      }
+    },
+    handleProvinceChange() {
+      this.form.city_id = null;
+      this.form.district_id = null;
+    },
+    handleCityChange() {
+      this.form.district_id = null;
+    },
+    saveAddress() {
+      this.$refs.addressForm.validate(async (valid) => {
+        if (!valid) return;
+
+        const province = this.provinces.find(
+          (p) => p.id === this.form.province_id
+        );
+        const city = this.cities.find((c) => c.id === this.form.city_id);
+        const district = this.districts.find(
+          (d) => d.id === this.form.district_id
+        );
+
+        if (!(province && city && district)) {
+          this.$message.warning("地区信息不完整");
+          return;
+        }
+
+        const formData = {
+          ...this.form,
+          region: `${province.name} ${city.name} ${district.name}`,
+        };
+
+        this.$emit("save", formData);
+        this.handleClose();
+      });
+    },
+    handleClose() {
+      this.$emit("update:visible", false);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.region-selector {
+  display: flex;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.region-select {
+  min-width: 180px;
+  flex: 1;
+  max-width: 30%;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/layout/HeaderNav.vue b/src/components/layout/HeaderNav.vue
index 3bb8646..1d4ec3b 100644
--- a/src/components/layout/HeaderNav.vue
+++ b/src/components/layout/HeaderNav.vue
@@ -94,7 +94,7 @@
 
         <!-- 电话 -->
         <div class="phone-entry">
-          <router-link to="#">
+          <div>
             <img
               src="https://static.ticket.sz-trip.com/shiweisuzhou/pc/login/phone.png"
               alt="联系电话"
@@ -103,7 +103,7 @@
             <span class="cart-count" v-if="cartTotalCount > 0 && false">{{
               cartTotalCount
             }}</span>
-          </router-link>
+          </div>
         </div>
       </div>
     </div>
@@ -175,18 +175,14 @@ export default {
   methods: {
     ...mapActions(["fetchCategories", "logout"]),
     handleSearch() {
-      if (!this.searchText.trim()) return; // 避免空搜索
+      if (!this.searchText.trim()) return;
 
       this.$store.commit("setSearchText", this.searchText);
 
       // 判断当前是否在搜索结果页
-      const isSearchPage =
-        this.$route.path === "/ProductList" &&
-        this.$route.query.type === "search";
-
-      if (isSearchPage) {
+      if (this.$route.path === "/ProductList") {
         // 如果在搜索页，触发父组件更新或重新获取数据
-        this.$emit("search", this.searchText);
+        this.$bus.emit("search-product", this.searchText);
       } else {
         // 不在搜索页则跳转
         this.$router.push({
@@ -206,6 +202,8 @@ export default {
             .then(() => {
               // 假设logout是异步操作
               this.$message.success("退出登录成功");
+              // 跳转到登录页，并记录当前路径用于登录后跳转
+              localStorage.setItem("redirectPath", this.$route.path);
               this.$router.push("/Login"); // 退出后跳转到登录页
             })
             .catch((err) => {
diff --git a/src/components/layout/HomeLayout.vue b/src/components/layout/HomeLayout.vue
index 7968458..45940ea 100644
--- a/src/components/layout/HomeLayout.vue
+++ b/src/components/layout/HomeLayout.vue
@@ -1,13 +1,19 @@
 <template>
   <div class="home-layout-container">
     <!-- 左侧导航栏 -->
-    <router-link to="/productList" class="left-nav">
+    <div class="left-nav">
       <ul class="nav-list">
-        <li v-for="item in tagList" :key="item.id" class="nav-item">
+        <router-link
+          :to="'/productList?id=' + item.id"
+          tag="li"
+          v-for="item in tagList"
+          :key="item.id"
+          class="nav-item"
+        >
           <img :src="util.showImg(item.image)" alt="" />{{ item.name }}
-        </li>
+        </router-link>
       </ul>
-    </router-link>
+    </div>
 
     <!-- 轮播图 -->
     <div class="main-content">
@@ -40,28 +46,28 @@
       </div>
 
       <div class="func-icons" v-if="$store.getters.isUserLogin">
-        <div class="icon-item">
+        <router-link to="/User/UserCenter" class="icon-item">
           <i class="icon el-icon-user"></i>
           <span>个人中心</span>
-        </div>
-        <div class="icon-item">
+        </router-link>
+        <router-link to="/User/OrderList" class="icon-item">
           <i class="icon el-icon-goods"></i>
           <span>我的订单</span>
-        </div>
-        <div class="icon-item">
+        </router-link>
+        <router-link to="/User/ViewHistory" class="icon-item">
           <i class="icon el-icon-star-off"></i>
           <span>我的收藏</span>
-        </div>
-        <div class="icon-item">
+        </router-link>
+        <router-link to="/User/UserCenter" class="icon-item">
           <i class="icon el-icon-pie-chart"></i>
           <span>议价单</span>
-        </div>
+        </router-link>
       </div>
 
-      <div class="announcement">
+      <!-- <div class="announcement">
         <el-tag type="danger" size="mini">公告</el-tag>
         <span>2099年12月平台重要新规速递</span>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
diff --git a/src/components/layout/Sidebar.vue b/src/components/layout/Sidebar.vue
index 54c72b9..fa09546 100644
--- a/src/components/layout/Sidebar.vue
+++ b/src/components/layout/Sidebar.vue
@@ -1,28 +1,22 @@
 <template>
   <div class="sidebar-container">
     <!-- 购物车 -->
-    <div 
-      class="sidebar-item" 
-      @click="handleCartClick"
-    >
-      <el-badge :value="cartCount" class="item-badge">
+    <div class="sidebar-item" @click="handleCartClick">
+      <el-badge :value="$store.getters.getCartTotalCount" class="item-badge">
         <i class="el-icon-shopping-cart-full"></i>
       </el-badge>
       <div class="item-text">购物车</div>
     </div>
 
     <!-- 在线客服 -->
-    <div 
-      class="sidebar-item" 
-      @click="handleServiceClick"
-    >
+    <div class="sidebar-item" @click="handleServiceClick">
       <i class="el-icon-headset"></i>
       <div class="item-text">在线客服</div>
     </div>
 
     <!-- 回到顶部 -->
-    <div 
-      class="sidebar-item back-to-top" 
+    <div
+      class="sidebar-item back-to-top"
       @click="handleBackToTop"
       :class="{ active: isShowBackTop }"
     >
@@ -33,22 +27,28 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 export default {
-  name: 'Sidebar',
+  name: "Sidebar",
   data() {
     return {
       cartCount: 3, // 购物车数量，可根据实际情况动态获取
       isShowBackTop: false, // 是否显示回到顶部激活态
-      scrollTimer: null // 节流定时器
+      scrollTimer: null, // 节流定时器
     };
   },
+  computed: {
+    // 通过 mapGetters 映射，简化模板中的写法
+    ...mapGetters(["getCartTotalCount"]),
+  },
   mounted() {
     // 监听滚动事件
-    window.addEventListener('scroll', this.handleScroll);
+    window.addEventListener("scroll", this.handleScroll);
+    this.$store.dispatch("fetchCartCount");
   },
   beforeDestroy() {
     // 移除滚动监听
-    window.removeEventListener('scroll', this.handleScroll);
+    window.removeEventListener("scroll", this.handleScroll);
     if (this.scrollTimer) {
       clearTimeout(this.scrollTimer);
     }
@@ -57,18 +57,18 @@ export default {
     // 处理购物车点击
     handleCartClick() {
       // 这里可跳转到购物车页面
-      this.$router.push('/User/ShoppingCart');
+      this.$router.push("/User/ShoppingCart");
     },
 
     // 处理在线客服点击
     handleServiceClick() {
       // 这里可实现客服功能，如唤起客服弹窗或跳转到客服页面
-      this.$message.info('正在唤起在线客服...');
+      this.$message.info("正在唤起在线客服...");
     },
 
     // 处理回到顶部
     handleBackToTop() {
-      window.scrollTo({ top: 0, behavior: 'smooth' });
+      window.scrollTo({ top: 0, behavior: "smooth" });
     },
 
     // 处理滚动事件
@@ -81,8 +81,8 @@ export default {
         // 滚动超过 300px 显示激活态
         this.isShowBackTop = window.pageYOffset > 300;
       }, 200);
-    }
-  }
+    },
+  },
 };
 </script>
 
diff --git a/src/components/product/AddToCartDialog.vue b/src/components/product/AddToCartDialog.vue
new file mode 100644
index 0000000..03d850b
--- /dev/null
+++ b/src/components/product/AddToCartDialog.vue
@@ -0,0 +1,213 @@
+<template>
+  <!-- 加入购物车弹框 -->
+  <el-dialog
+    title="加入购物车"
+    :visible.sync="dialogVisible"
+    width="360px"
+    :close-on-click-modal="false"
+    :show-close="false"
+  >
+    <!-- 商品信息 -->
+    <div class="cart-dialog__product">
+      <img v-lazy="product.headimg" alt="商品图片" class="product-img" />
+      <div class="product-info">
+        <h4 class="product-name">{{ product.sku_name || "商品名称" }}</h4>
+        <p class="product-price">¥{{ product.price / 100 }}</p>
+      </div>
+    </div>
+
+    <!-- 数量选择器 -->
+    <div class="cart-dialog__quantity">
+      <label>购买数量：</label>
+      <el-input-number
+        v-model="buyQuantity"
+        :min="1"
+        :max="product.stock"
+        :step="1"
+        class="quantity-input"
+        @change="handleQuantityChange"
+      ></el-input-number>
+      <span class="stock-tip" v-if="product.stock">
+        库存仅剩 {{ product.stock }} 件
+      </span>
+    </div>
+
+    <!-- 底部按钮区 -->
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false" class="cancel-btn">
+        取消
+      </el-button>
+      <el-button
+        type="primary"
+        @click="handleAddToCart"
+        :loading="loading"
+        class="confirm-btn"
+      >
+        加入购物车
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { mapActions } from "vuex";
+
+export default {
+  name: "AddToCartDialog",
+  props: {
+    // 接收父组件传入的商品数据（必填）
+    product: {
+      type: Object,
+      required: true,
+      default: () => ({
+        id: "",
+        name: "",
+        price: 0,
+        avatar: "https://picsum.photos/100", // 默认占位图
+        stock: 99, // 默认库存
+      }),
+    },
+    // 控制弹框显示/隐藏
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    buyQuantity: {
+      type: Number,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      loading: false, // 按钮加载状态
+    };
+  },
+  computed: {
+    // 双向绑定弹框显示状态
+    dialogVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+  },
+  methods: {
+    // 映射 Vuex 的加入购物车 action
+    ...mapActions(["addToCart"]),
+
+    // 数量变更时校验
+    handleQuantityChange(val) {
+      if (val > this.product.stock) {
+        this.buyQuantity = this.product.stock;
+        this.$message.warning(`库存不足，最多可购买 ${this.product.stock} 件`);
+      }
+    },
+
+    // 加入购物车逻辑
+    async handleAddToCart() {
+      this.loading = true;
+      try {
+        // 调用 Vuex action 加入购物车（携带数量）
+        await this.addToCart({
+          ...this.product,
+          quantity: this.buyQuantity,
+        });
+
+        // 关闭弹框
+        this.dialogVisible = false;
+
+        // 重置状态（下次打开时恢复默认）
+        this.buyQuantity = 1;
+      } catch (err) {
+        this.$message.error(err.message || "加入购物车失败，请重试");
+      } finally {
+        this.loading = false;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.cart-dialog__product {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #f5f5f5;
+
+  .product-img {
+    width: 80px;
+    height: 80px;
+    object-fit: cover;
+    border-radius: 4px;
+    margin-right: 15px;
+  }
+
+  .product-info {
+    flex: 1;
+
+    .product-name {
+      font-size: 16px;
+      color: #333;
+      margin: 0 0 8px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .product-price {
+      font-size: 18px;
+      color: #ff4400;
+      margin: 0;
+      font-weight: 500;
+    }
+  }
+}
+
+.cart-dialog__quantity {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+
+  label {
+    font-size: 14px;
+    color: #666;
+    margin-right: 15px;
+  }
+
+  .quantity-input {
+    width: 120px;
+  }
+
+  .stock-tip {
+    font-size: 12px;
+    color: #999;
+    margin-left: 15px;
+  }
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+  padding-top: 10px;
+
+  .cancel-btn {
+    margin-right: 10px;
+    border-color: #e5e5e5;
+    color: #666;
+  }
+
+  .confirm-btn {
+    background-color: #6a8a27;
+    border-color: #6a8a27;
+
+    &:hover {
+      background-color: #5a7a1f;
+      border-color: #5a7a1f;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/product/Evaluate.vue b/src/components/product/Evaluate.vue
index b1ec80f..83da011 100644
--- a/src/components/product/Evaluate.vue
+++ b/src/components/product/Evaluate.vue
@@ -152,6 +152,7 @@ import { Empty, Pagination } from "element-ui";
 
 export default {
   name: "ProductReviews",
+  props: ["id"],
   components: {
     ElEmpty: Empty,
     ElPagination: Pagination,
@@ -394,7 +395,20 @@ export default {
       return this.filteredReviews.slice(startIndex, endIndex);
     },
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
+    // 评价列表
+    getList() {
+      this.get({
+        product_id: this.id,
+        offset: 0,
+        limit: 999
+      }, '/api/product/product_comment_list').then(res => {
+        
+      })
+    },
     // 筛选条件改变
     handleFilterChange(filterType) {
       this.activeFilter = filterType;
diff --git a/src/components/product/ProductList.vue b/src/components/product/ProductList.vue
index 5e501d7..9e5f41b 100644
--- a/src/components/product/ProductList.vue
+++ b/src/components/product/ProductList.vue
@@ -1,15 +1,18 @@
 <template>
   <div class="product-list">
     <div class="product-grid">
-      <div v-for="product in products" :key="product.id" class="product-card">
+      <router-link
+        :to="`/Detail/${product.id}`"
+        v-for="product in products"
+        :key="product.id"
+        class="product-card"
+      >
         <div class="product-img">
-          <router-link :to="`/Detail/${product.id}`">
-            <img
-              v-lazy="product.headimg"
-              :alt="product.title"
-              class="product-pic"
-            />
-          </router-link>
+          <img
+            v-lazy="product.headimg"
+            :alt="product.title"
+            class="product-pic"
+          />
         </div>
         <div class="product-info">
           <div class="flex-between">
@@ -33,13 +36,12 @@
               type="primary"
               size="small"
               style="background-color: #6a8a27; border: none"
-              @click="addToCart(product)"
             >
-              <el-icon name="el-icon-shopping-cart"></el-icon> 加入购物车
+              <el-icon name="el-icon-shopping-cart"></el-icon> 立即购买
             </el-button>
           </div>
         </div>
-      </div>
+      </router-link>
     </div>
 
     <!-- 无商品时显示 -->
@@ -60,38 +62,7 @@ export default {
       default: () => [],
     },
   },
-  methods: {
-    ...mapActions(["addToCart"]),
-    addToCart(product) {
-      // 检查用户是否登录
-      if (!this.$store.getters.isUserLogin) {
-        this.$confirm("您尚未登录，是否前往登录？", "提示", {
-          confirmButtonText: "登录",
-          cancelButtonText: "取消",
-          type: "info",
-        })
-          .then(() => {
-            this.$router.push({
-              path: "/login",
-              query: { redirect: this.$route.fullPath },
-            });
-          })
-          .catch(() => {
-            // 取消登录
-          });
-        return;
-      }
-
-      this.addToCart({
-        id: product.id,
-        name: product.name,
-        price: product.price,
-        image: product.image,
-        quantity: 1,
-      });
-      this.$message.success("已加入购物车");
-    },
-  },
+  methods: {},
 };
 </script>
 
diff --git a/src/libs/axios.js b/src/libs/axios.js
index 0c16a7a..312a7d9 100644
--- a/src/libs/axios.js
+++ b/src/libs/axios.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import axios from "axios";
 import { Message, MessageBox, Loading } from "element-ui"; // 引入 Element UI 组件
 import store from '@/store';
+import router from "@/router"
 
 const http = axios.create({
   timeout: 6000 // 请求超时时间
@@ -21,8 +22,9 @@ http.interceptors.request.use((config) => {
     config.baseURL = process.env.VUE_APP_URL;
   }
   
-  const token = store.state.user?.userInfo?.token || '';
-  config.headers['token'] = token || "745f2b4c-49b7-4393-bf58-bc380a87149a";
+  const token = store.state.user?.info?.token || '';
+  config.headers['token'] = token || ""
+  // config.headers['token'] = token || "745f2b4c-49b7-4393-bf58-bc380a87149a";
   config.headers['Content-Type'] = 'application/json;charset=UTF-8';
 
   // 统一添加 platform_type = 2 参数
@@ -73,6 +75,18 @@ http.interceptors.response.use(response => {
       MessageBox.alert(errorMsg, '错误提示', {
         confirmButtonText: '确定',
         type: 'error'
+      }).then(() => {
+        if (resData.code === 401) {
+          // 存储当前路由（排除登录页自身，避免死循环）
+          const currentPath = router.currentRoute.fullPath;
+          if (currentPath !== '/Login') { // 假设登录页路径是 /Login
+            localStorage.setItem('redirectPath', currentPath); // 存到本地存储
+          }
+          // 登录操作
+          router.push("/Login")
+        }
+      }).catch(() => {
+        
       });
       // return Promise.reject(new Error(errorMsg));
     }
@@ -100,6 +114,7 @@ http.interceptors.response.use(response => {
           type: 'warning'
         }).then(() => {
           // 登录操作
+          router.push("/Login")
         }).catch(() => {
           // 取消登录回调
         });
diff --git a/src/main.js b/src/main.js
index 0fa1ee4..79dc976 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,6 +15,9 @@ Vue.use(utils)
 Vue.config.productionTip = false
 Vue.use(ElementUI)
 
+// 注册全局事件总线
+Vue.prototype.$bus = new Vue()
+
 // 配置图片懒加载
 Vue.use(VueLazyload, {
   preLoad: 1.3, // 预加载高度比例
diff --git a/src/router/index.js b/src/router/index.js
index 29e5387..15406a8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import store from '@/store';
 
 Vue.use(Router)
 
@@ -264,7 +265,7 @@ router.beforeEach((to, from, next) => {
   
   // 验证登录状态
   if (to.meta.requireAuth) {
-    const token = localStorage.getItem('token')
+    const token = store.state.user?.info?.token || '';
     if (token) {
       next()
     } else {
diff --git a/src/store/index.js b/src/store/index.js
index dfa7d94..0cb183b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -34,9 +34,19 @@ export default new Vuex.Store({
     categories: [],
     // 全局加载状态
     loading: false,
-    searchText: '' // 存储搜索词
+    searchText: '', // 存储搜索词
+    // 存储订单数据
+    orderData: null
   },
   mutations: {
+    // 设置订单数据
+    setOrderData(state, data) {
+      state.orderData = data
+    },
+    // 清空订单数据
+    clearOrderData(state) {
+      state.orderData = null
+    },
     // 更新分类数据
     UPDATE_CATEGORIES(state, categories) {
       state.categories = categories
@@ -63,52 +73,9 @@ export default new Vuex.Store({
       localStorage.removeItem('token')
     },
     
-    // 添加商品到购物车
-    ADD_TO_CART(state, product) {
-      const existingItem = state.cart.items.find(item => item.id === product.id)
-      
-      if (existingItem) {
-        existingItem.quantity += product.quantity || 1
-      } else {
-        state.cart.items.push({
-          ...product,
-          quantity: product.quantity || 1
-        })
-      }
-      
-      this.commit('UPDATE_CART_TOTAL')
-    },
-    
-    // 从购物车移除商品
-    REMOVE_FROM_CART(state, productId) {
-      state.cart.items = state.cart.items.filter(item => item.id !== productId)
-      this.commit('UPDATE_CART_TOTAL')
-    },
-    
-    // 更新购物车商品数量
-    UPDATE_CART_ITEM_QUANTITY(state, { productId, quantity }) {
-      const item = state.cart.items.find(item => item.id === productId)
-      if (item) {
-        item.quantity = quantity
-        this.commit('UPDATE_CART_TOTAL')
-      }
-    },
-    
-    // 清空购物车
-    CLEAR_CART(state) {
-      state.cart.items = []
-      this.commit('UPDATE_CART_TOTAL')
-    },
-    
-    // 更新购物车总计
-    UPDATE_CART_TOTAL(state) {
-      state.cart.totalCount = state.cart.items.reduce((total, item) => {
-        return total + item.quantity
-      }, 0)
-      
-      state.cart.totalPrice = state.cart.items.reduce((total, item) => {
-        return total + (item.price * item.quantity)
-      }, 0)
+    // 更新购物车总数
+    UPDATE_CART_TOTAL_COUNT(state, count) {
+      state.cart.totalCount = count
     },
 
     setSearchText(state, text) {
@@ -116,6 +83,10 @@ export default new Vuex.Store({
     }
   },
   actions: {
+    // 提交订单数据
+    submitOrderData({ commit }, data) {
+      commit('setOrderData', data)
+    },
     // 获取分类数据
     fetchCategories({ commit }) {
       commit('UPDATE_LOADING', true)
@@ -143,26 +114,99 @@ export default new Vuex.Store({
     },
     
     // 添加商品到购物车
-    addToCart({ commit }, product) {
-      commit('ADD_TO_CART', product)
+    addToCart({ dispatch }, product) {
+      // 调用接口，参数为商品id和数量
+      return Vue.prototype.post(
+        {
+          sku_id: product.id,
+          num: product.quantity || 1
+        },
+        "/api/cart/add_sku"
+      ).then((res) => {
+        if (res) {
+          // 添加成功后重新获取购物车数量
+          return dispatch('fetchCartCount')
+        }
+      }).catch((err) => {
+        console.error('添加到购物车请求失败', err);
+        throw err
+      });
+    },
+
+    // 获取购物车数量
+    fetchCartCount({ commit, state }) {
+      // 检查是否存在token，不存在则直接返回0
+      if (!state.user.token) {
+        commit('UPDATE_CART_TOTAL_COUNT', 0)
+        return Promise.resolve(0)
+      }
+      return Vue.prototype.post(
+        {},
+        "/api/cart/get_count"
+      ).then((res) => {
+        console.log('购物车数量接口返回', res)
+        if (res.code == 1) {
+          commit('UPDATE_CART_TOTAL_COUNT', res.data)
+        }
+        return res.data
+      }).catch((err) => {
+        console.error('获取购物车数量失败', err)
+        throw err
+      });
     },
     
     // 从购物车移除商品
-    removeFromCart({ commit }, productId) {
-      commit('REMOVE_FROM_CART', productId)
+    removeFromCart({ dispatch }, productId) {
+      // 调用删除接口
+      return Vue.prototype.post(
+        { sku_id: productId },
+        "/api/cart/remove_sku"
+      ).then(() => {
+        // 删除成功后重新获取购物车数量
+        return dispatch('fetchCartCount')
+      }).catch(err => {
+        console.error('删除购物车商品失败', err)
+        throw err
+      })
     },
     
     // 更新购物车商品数量
-    updateCartItemQuantity({ commit }, payload) {
-      commit('UPDATE_CART_ITEM_QUANTITY', payload)
+    updateCartItemQuantity({ dispatch }, { productId, quantity }) {
+      // 调用更新数量接口
+      return Vue.prototype.post(
+        { 
+          sku_id: productId,
+          num: quantity
+        },
+        "/api/cart/add_sku"
+      ).then(() => {
+        // 更新成功后重新获取购物车数量
+        return dispatch('fetchCartCount')
+      }).catch(err => {
+        console.error('更新购物车商品数量失败', err)
+        throw err
+      })
     },
     
     // 清空购物车
-    clearCart({ commit }) {
-      commit('CLEAR_CART')
+    clearCart({ dispatch }) {
+      // 调用清空接口
+      return Vue.prototype.post(
+        {},
+        "/api/cart/clear"
+      ).then(() => {
+        // 清空成功后重新获取购物车数量
+        return dispatch('fetchCartCount')
+      }).catch(err => {
+        console.error('清空购物车失败', err)
+        throw err
+      })
     }
   },
   getters: {
+    // 获取订单数据
+    getOrderData: state => state.orderData,
+
     // 获取分类列表
     getCategories: state => state.categories,
     
@@ -172,9 +216,6 @@ export default new Vuex.Store({
     // 获取购物车商品总数
     getCartTotalCount: state => state.cart.totalCount,
     
-    // 获取购物车商品总价
-    getCartTotalPrice: state => state.cart.totalPrice,
-    
     // 获取用户登录状态
     isUserLogin: state => state.user.isLogin,
     
diff --git a/src/views/Detail/Index.vue b/src/views/Detail/Index.vue
index 40ea35d..d93c93f 100644
--- a/src/views/Detail/Index.vue
+++ b/src/views/Detail/Index.vue
@@ -43,32 +43,29 @@
         </h2>
 
         <div class="product-tags">
-          <el-tag
-            effect="dark"
-            size="mini"
-            v-for="(item, index) in info.display_tags.split(',')"
-            :key="index"
-            style="margin-right: 5px"
-            >{{ item }}</el-tag
-          >
+          <div v-if="info.display_tags" style="display: inline-block">
+            <el-tag
+              effect="dark"
+              size="mini"
+              v-for="(item, index) in info.display_tags.split(',')"
+              :key="index"
+              style="margin-right: 5px"
+              >{{ item }}</el-tag
+            >
+          </div>
           <span class="subtitle">{{ info.subtitle }}</span>
         </div>
 
         <div class="price-info">
           <span class="price-label">售价</span>
-          <span class="price-amount">¥{{ info.price / 100 }}</span>
+          <span class="price-amount">¥{{ info.sku[selectedSpec].price / 100 }}</span>
           <span class="sales-volume">已售 {{ info.sales_number }}</span>
         </div>
 
         <div class="product-attr">
-          <div class="attr-item">
-            <span class="attr-label">起订量</span>
-            <span class="attr-value">{{ moq }}</span>
-          </div>
-
           <div class="attr-item">
             <span class="attr-label">收货方式</span>
-            <span class="attr-value">{{ deliveryMethod }}</span>
+            <span class="attr-value">邮寄</span>
           </div>
 
           <div class="attr-item spec-group">
@@ -86,6 +83,13 @@
             </div>
           </div>
 
+          <div class="attr-item" v-if="currentMinQuantity > 1">
+            <span class="attr-label">起订量</span>
+            <span class="attr-value">{{
+              currentMinQuantity
+            }}件</span>
+          </div>
+
           <div class="attr-item">
             <span class="attr-label">发货地</span>
             <span class="attr-value">{{ info.supplier_address }}</span>
@@ -114,8 +118,10 @@
             circle
             @click="increaseQuantity"
           ></el-button>
-          <el-button type="primary" class="buy-btn">一口价购买</el-button>
-          <el-button type="success" class="cart-btn">加入购物车</el-button>
+          <el-button type="primary" class="buy-btn" @click="buyNow">一口价购买</el-button>
+          <el-button type="success" class="cart-btn" @click="addCart"
+            >加入购物车</el-button
+          >
           <el-button type="info" class="bargain-btn">议价</el-button>
           <el-button
             icon="el-icon-share"
@@ -135,10 +141,14 @@
           v-for="(item, index) in hotRecommendData"
           :key="index"
           class="product-item"
+          @click="
+            id = item.id;
+            onReload();
+          "
         >
-          <img v-lazy="item.imgUrl" alt="" />
+          <img v-lazy="item.headimg" alt="" />
           <div class="product-name">{{ item.title }}</div>
-          <div class="product-price">￥{{ item.price }}</div>
+          <div class="product-price">￥{{ item.price / 100 }}</div>
         </div>
       </div>
 
@@ -165,21 +175,32 @@
         ></div>
 
         <!-- 商品评价 -->
-        <Evaluate v-show="tabIndex" />
+        <Evaluate v-show="tabIndex" :id="id" />
       </div>
     </div>
+
+    <!-- 加入购物车弹框 -->
+    <AddToCartDialog
+      :product="sku"
+      :buyQuantity="quantity"
+      :visible.sync="showAddCartDialog"
+    />
   </div>
 </template>
 
 <script>
 import Evaluate from "@/components/product/Evaluate.vue";
+import AddToCartDialog from "@/components/product/AddToCartDialog.vue";
+import { mapActions } from 'vuex';
 export default {
   name: "ProductDetail",
   components: {
     Evaluate,
+    AddToCartDialog,
   },
   data() {
     return {
+      id: "",
       info: {},
       activeIndex: 0, // 当前激活的图片索引
       productCount: "52个",
@@ -190,36 +211,42 @@ export default {
       otherInfo: "下单填写留言，即免费赠送精美贺卡！",
       deliveryRange: "全国（可配送至全国1000多个城市，苏州市区内免配送费）",
       quantity: 1,
-      hotRecommendData: [
-        {
-          id: 1,
-          imgUrl: "https://picsum.photos/id/103/500/500", // 替换成实际图片地址，也可用本地相对路径
-          title: "北欧花艺素雅仿真花",
-          price: 359,
-        },
-        {
-          id: 2,
-          imgUrl: "https://picsum.photos/id/103/500/500",
-          title: "生日玫瑰鲜花",
-          price: 359,
-        },
-        {
-          id: 3,
-          imgUrl: "https://picsum.photos/id/103/500/500",
-          title: "香雪兰小苍兰鲜花",
-          price: 359,
-        },
-        {
-          id: 4,
-          imgUrl: "https://picsum.photos/id/103/500/500",
-          title: "现代创意简约仿真花艺",
-          price: 359,
-        },
-      ],
+      hotRecommendData: [],
       tabIndex: 0,
+      showAddCartDialog: false,
+      sku: {},
     };
   },
+  computed: {
+    // 获取当前选中规格的最小起订量
+    currentMinQuantity() {
+      if (!this.info?.sku || this.info.sku.length === 0) return 1;
+      return this.info.sku[this.selectedSpec].start_number || 1;
+    },
+  },
+  watch: {
+    // 当切换规格时，自动更新数量为新规格的起订量
+    selectedSpec() {
+      this.quantity = this.currentMinQuantity;
+    }
+  },
   methods: {
+    ...mapActions(['submitOrderData']),
+    buyNow() {
+      const orderItems = [
+        {
+          product: this.info,
+          sku: this.info.sku[this.selectedSpec],
+          quantity: this.quantity
+        }
+      ]
+
+      this.submitOrderData({
+        from: 'product',
+        items: orderItems // 按供应商分组的商品数组
+      });
+      this.$router.push('/Order');
+    },
     // 处理轮播图切换事件 - 同步更新activeIndex
     handleCarouselChange(index) {
       this.activeIndex = index;
@@ -240,7 +267,7 @@ export default {
     },
 
     decreaseQuantity() {
-      if (this.quantity > 1) {
+      if (this.quantity > this.currentMinQuantity) {
         this.quantity--;
       }
     },
@@ -252,19 +279,57 @@ export default {
     handleShare() {
       this.$message.info("分享功能待实现");
     },
+
+    // 加入购物车
+    addCart() {
+      this.sku = this.info.sku[this.selectedSpec];
+      this.showAddCartDialog = true;
+    },
+
+    // 产品推荐
+    getRecommend() {
+      this.post(
+        {
+          offset: 0,
+          limit: 6,
+          rand: true,
+          product_ids: this.id,
+        },
+        "/api/search/product_recommend"
+      ).then((res) => {
+        this.hotRecommendData = res.data.list;
+      });
+    },
+
+    // 获取详情
+    getDetail() {
+      this.get({ id: this.id }, "/api/product/get_product_detail").then(
+        (res) => {
+          this.info = res.data;
+          if (this.info.sku && this.info.sku.length > 0) {
+            // 确保选中的规格索引有效
+            if (this.selectedSpec >= this.info.sku.length) {
+              this.selectedSpec = 0;
+            }
+            // 设置初始数量为起订量
+            this.quantity = this.currentMinQuantity;
+          }
+        }
+      );
+    },
+
+    onReload() {
+      this.getDetail();
+      this.getRecommend();
+    },
   },
   mounted() {
     // 初始化检查轮播组件是否存在
     if (!this.$refs.carousel) {
       console.warn("轮播组件未正确加载，请检查ref属性是否设置");
     }
-
-    this.get(
-      { id: this.$route.params.id },
-      "/api/product/get_product_detail"
-    ).then((res) => {
-      this.info = res.data;
-    });
+    this.id = this.$route.params.id;
+    this.onReload();
   },
 };
 </script>
@@ -467,10 +532,12 @@ export default {
 
   .hot-recommend-sidebar {
     min-width: 200px;
+    max-width: 200px;
     padding: 10px;
     // border: 1px solid #eee;
     background-color: #f7f9fa;
     margin-right: 20px;
+    cursor: pointer;
 
     .hot-title {
       border-left: 4px solid #ff4d4f;
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 0a23313..499c619 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -97,7 +97,6 @@ export default {
     this.getTopBanner();
     this.getTags();
     this.getProductList();
-    this.post({}, "/api/uservice/user/getMyInfo").then((res) => {});
   },
   methods: {
     // 头部banner
@@ -118,11 +117,12 @@ export default {
     getTags() {
       this.post(
         {
-          pid: 662,
+          pid: 683,
         },
         "/api/product/tag_list"
       ).then((res) => {
         this.tagList = res.data;
+        this.tagList[0].id = 662;
       });
     },
     // 三个分类商品
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 5ba44fd..b011f2f 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -265,8 +265,10 @@ export default {
                 token: res.data.token,
               });
 
-              // 登录成功后跳转首页
-              this.$router.push("/");
+              // 登录成功后获取存储的跳转路径
+              const redirectPath = localStorage.getItem('redirectPath');
+              this.$router.push(redirectPath || '/');
+              localStorage.removeItem('redirectPath');
             }
           });
 
diff --git a/src/views/Order/Index.vue b/src/views/Order/Index.vue
index 6f38e4e..13fa574 100644
--- a/src/views/Order/Index.vue
+++ b/src/views/Order/Index.vue
@@ -3,7 +3,11 @@
     <!-- 页面标题 -->
     <div class="page-header">
       <h2>填写收货人信息</h2>
-      <el-button type="text" class="address-book-btn">
+      <el-button
+        type="text"
+        class="address-book-btn"
+        @click="openDialog('add', {})"
+      >
         新增/修改地址
       </el-button>
     </div>
@@ -12,7 +16,7 @@
     <div class="info-section">
       <h3>收货人信息</h3>
       <div class="address-item">
-        <span class="label">收货人地址：</span>
+        <span class="label">收货地址：</span>
         <div class="address-content">
           <div
             class="saved-address"
@@ -23,22 +27,32 @@
           >
             <span class="name-tag">{{ addr.name }} {{ addr.province }}</span>
             <span class="detail">{{ addr.address }} {{ addr.phone }}</span>
-            <el-button type="text" class="set-default-btn">设为默认</el-button>
-            <el-button type="text" class="edit-btn">编辑</el-button>
-            <el-button type="text" class="delete-btn">删除</el-button>
+            <!-- <el-button type="text" class="set-default-btn">设为默认</el-button> -->
+            <el-button
+              type="text"
+              class="edit-btn"
+              @click.stop="handleEdit(addr)"
+              >编辑</el-button
+            >
+            <el-button
+              type="text"
+              class="delete-btn"
+              @click.stop="handleDelete()"
+              >删除</el-button
+            >
           </div>
         </div>
       </div>
 
-      <div class="trade-type-item">
+      <!-- <div class="trade-type-item">
         <span class="label">交易方式：</span>
         <el-radio-group v-model="selectedTradeType">
           <el-radio :label="1">先款后货</el-radio>
           <el-radio :label="2">货到付款</el-radio>
         </el-radio-group>
-      </div>
+      </div> -->
 
-      <h3>发票信息</h3>
+      <!-- <h3>发票信息</h3>
       <div class="invoice-type-item">
         <span class="label">发票类型：</span>
         <el-radio-group v-model="selectedInvoiceType">
@@ -62,27 +76,7 @@
           ></el-option>
         </el-select>
         <el-button type="text" class="add-title-btn">+ 添加</el-button>
-      </div>
-
-      <h3>收票地址</h3>
-      <div class="invoice-address-item">
-        <span class="label">收票地址：</span>
-        <div class="address-content">
-          <div
-            class="saved-address"
-            v-for="(addr, index) in invoiceAddresses"
-            :key="index"
-            @click="selectInvoiceAddress(index)"
-            :class="{ selected: selectedInvoiceAddressIndex === index }"
-          >
-            <span class="name-tag">{{ addr.name }} {{ addr.province }}</span>
-            <span class="detail">{{ addr.address }} {{ addr.phone }}</span>
-            <el-button type="text" class="set-default-btn">设为默认</el-button>
-            <el-button type="text" class="edit-btn">编辑</el-button>
-            <el-button type="text" class="delete-btn">删除</el-button>
-          </div>
-        </div>
-      </div>
+      </div> -->
     </div>
 
     <!-- 签署合同 -->
@@ -188,34 +182,32 @@
         </el-button>
       </div>
     </div>
+
+    <!-- 引入地址编辑组件 -->
+    <AddressFormDialog
+      :visible="dialogVisible"
+      :type="dialogType"
+      :initial-data="dialogData"
+      @update:visible="dialogVisible = $event"
+      @save="handleSaveAddress"
+    />
   </div>
 </template>
 
 <script>
+import { mapGetters, mapMutations } from "vuex";
+import AddressFormDialog from "@/components/common/AddressFormDialog.vue"; // 引入组件
+
 export default {
   name: "OrderPage",
+  components: {
+    AddressFormDialog, // 注册组件
+  },
   data() {
     return {
       // 收货地址相关
-      addresses: [
-        {
-          id: 1,
-          name: "郑小工",
-          province: "江苏省",
-          address: "苏州市吴中区文化创意大厦16层",
-          phone: "13000000000",
-          isDefault: true,
-        },
-        {
-          id: 2,
-          name: "郑小工",
-          province: "江苏省",
-          address: "苏州市吴中区文化创意大厦16层",
-          phone: "13000000001",
-          isDefault: false,
-        },
-      ],
-      selectedAddressIndex: 0,
+      addresses: [],
+      selectedAddressIndex: -1,
 
       // 交易方式
       selectedTradeType: 1, // 1:先款后货 2:货到付款
@@ -231,115 +223,260 @@ export default {
       ],
       selectedInvoiceTitle: null,
 
-      // 收票地址
-      invoiceAddresses: [
-        {
-          id: 1,
-          name: "郑小工",
-          province: "江苏省",
-          address: "苏州市吴中区文化创意大厦16层",
-          phone: "13000000000",
-          isDefault: true,
-        },
-        {
-          id: 2,
-          name: "郑小工",
-          province: "江苏省",
-          address: "苏州市吴中区文化创意大厦16层",
-          phone: "13000000001",
-          isDefault: false,
-        },
-      ],
-      selectedInvoiceAddressIndex: 0,
-
       // 订单分组
-      orderGroups: [
-        {
-          supplier: "新疆特色农产品开发有限公司",
-          items: [
-            {
-              image: "https://picsum.photos/50/50?random=1",
-              name: "产品标题产品标题产品标题",
-              spec: "规格名称一样",
-              price: "¥449",
-              quantity: 1,
-              freight: "¥0.00",
-              deliveryType: "邮寄",
-              subtotal: "¥449.00",
-            },
-            {
-              image: "https://picsum.photos/50/50?random=2",
-              name: "产品标题产品标题",
-              spec: "规格名称一样",
-              price: "¥199",
-              quantity: 1,
-              freight: "¥0.00",
-              deliveryType: "快递",
-              subtotal: "¥199.00",
-            },
-          ],
-          remark: "",
-        },
-        {
-          supplier: "新疆特色农产品开发有限公司",
-          items: [
-            {
-              image: "https://picsum.photos/50/50?random=3",
-              name: "产品标题产品标题产品标题",
-              spec: "规格名称一样",
-              price: "¥339",
-              quantity: 1,
-              freight: "¥0.00",
-              deliveryType: "邮寄",
-              subtotal: "¥339.00",
-            },
-          ],
-          remark: "",
-        },
-      ],
+      orderGroups: [],
 
       // 总计信息
       totalGoodsCount: 3,
       totalGoodsAmount: 973,
       totalFreight: 0,
-      totalPayAmount: 973,
+      totalPayAmount: 0,
+
+      dialogVisible: false,
+      dialogType: "add",
+      dialogData: {},
     };
   },
   computed: {
+    ...mapGetters(["getOrderData"]),
     // 获取选中的收货地址
     selectedAddress() {
       return this.addresses[this.selectedAddressIndex] || {};
     },
   },
+  mounted() {
+    if (this.getOrderData) {
+      this.initOrderData(this.getOrderData);
+      // this.clearOrderData(); // 清空Vuex数据
+      console.log(this.getOrderData);
+    } else {
+      this.$message.error("未获取到商品信息，请重新操作");
+      this.$router.go(-1);
+    }
+    this.getAddress();
+  },
   methods: {
-    // 选择收货地址
-    selectAddress(index) {
-      this.selectedAddressIndex = index;
+    ...mapMutations(["clearOrderData"]),
+    // 新增地址
+    openDialog(type, item) {
+      this.dialogType = type;
+      this.dialogData = { ...item };
+      this.dialogVisible = true;
     },
-
-    // 选择收票地址
-    selectInvoiceAddress(index) {
-      this.selectedInvoiceAddressIndex = index;
+    // 编辑地址
+    handleEdit(row) {
+      console.log(row);
+      row.username = row.name;
+      row.mobile = row.tel;
+      this.openDialog("edit", row);
     },
-
-    // 提交订单
-    submitOrder() {
-      // 表单验证
-      if (this.selectedAddressIndex === null) {
-        this.$message.warning("请选择收货地址");
+    // 删除地址
+    handleDelete(row) {
+      this.$confirm("此操作将永久删除该地址, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.post(
+            {
+              id: row.id,
+            },
+            "/api/uservice/user/delConsignee"
+          ).then((res) => {
+            if (res.code == 1) {
+              this.getAddress();
+              this.$message.success("删除成功!");
+            }
+          });
+        })
+        .catch(() => {
+          this.$message.info("已取消删除");
+        });
+    },
+    // 初始化订单数据
+    initOrderData(data) {
+      if (data.from === "product") {
+        // 来自商品详情页：单个商品，需手动按供应商分组
+        const item = data.items[0];
+        this.orderGroups = [
+          {
+            supplier: item.product.supplier_name,
+            items: this.formatItems([item]), // 格式化商品数据
+          },
+        ];
+      } else if (data.from === "cart") {
+        // 来自购物车：已按供应商分组
+        this.orderGroups = Object.entries(data.groups).map(
+          ([supplier, items]) => ({
+            supplier,
+            items: this.formatItems(items), // 格式化商品数据
+          })
+        );
+      }
+      this.calculateTotal(); // 计算总价
+    },
+    // 格式化商品数据（统一价格单位、计算小计等）
+    formatItems(items) {
+      return items.map((item) => ({
+        id: item.sku.id,
+        productId: item.product.id,
+        name: item.product.title,
+        image: item.product.headimg,
+        spec: item.sku.sku_name,
+        price: (item.sku.price / 100).toFixed(2), // 转换为元
+        quantity: item.quantity,
+        freight: "0.00", // 暂固定，实际项目可从接口获取
+        deliveryType: "邮寄",
+        // 原逻辑：仅计算商品金额
+        // subtotal: ((item.sku.price / 100) * item.quantity).toFixed(2),
+
+        // 新逻辑：商品金额 + 运费（初始运费为0时和原逻辑一致）
+        subtotal: (
+          (item.sku.price / 100) * item.quantity +
+          parseFloat("0.00")
+        ).toFixed(2),
+      }));
+    },
+    // 获取邮费的方法中，在更新运费后重新计算小计
+    getPost() {
+      // 检查是否有选中的地址
+      if (!this.selectedAddress.id) {
+        this.$message.warning("请先选择收货地址");
         return;
       }
 
-      if (!this.selectedInvoiceTitle) {
-        this.$message.warning("请选择发票抬头");
-        return;
+      // 重置总运费
+      this.totalFreight = 0;
+
+      // 存储所有请求的Promise
+      const freightPromises = [];
+
+      // 循环所有商品分组和商品，逐个获取邮费
+      this.orderGroups.forEach((group, groupIndex) => {
+        group.items.forEach((item, itemIndex) => {
+          // 构建单个商品的请求参数
+          const params = {
+            consignee_id: this.selectedAddress.id,
+            sku_id: item.id,
+            num: item.quantity,
+          };
+
+          // 发起单个请求并存储Promise
+          const promise = this.post(params, "/api/order/get_post_price")
+            .then((res) => {
+              if (res.code === 1) {
+                // 更新当前商品的邮费
+                const freight = (res.data.price / 100).toFixed(2);
+                item.freight = freight;
+
+                // 重新计算小计（商品金额+运费）
+                item.subtotal = (
+                  parseFloat(item.price) * item.quantity +
+                  parseFloat(freight)
+                ).toFixed(2);
+
+                // 累加总运费
+                this.totalFreight = (
+                  parseFloat(this.totalFreight) + parseFloat(freight)
+                ).toFixed(2);
+              }
+            })
+            .catch((err) => {
+              console.error(`获取商品 ${item.id} 邮费失败`, err);
+              this.$message.error(`获取商品 ${item.name} 邮费失败，请重试`);
+            });
+
+          freightPromises.push(promise);
+        });
+      });
+
+      // 所有请求完成后重新计算总金额
+      Promise.all(freightPromises).then(() => {
+        this.calculateTotal();
+      });
+    },
+    // 计算总运费的方法
+    calculateTotalFreight() {
+      let total = 0;
+      this.orderGroups.forEach((group) => {
+        group.items.forEach((item) => {
+          console.log(item)
+          total += parseFloat(item.freight);
+        });
+      });
+      this.totalFreight = total.toFixed(2);
+    },
+    // 计算总金额
+    calculateTotal() {
+      let totalCount = 0;
+      let totalAmount = 0;
+
+      this.orderGroups.forEach((group) => {
+        group.items.forEach((item) => {
+          totalCount += item.quantity;
+          totalAmount += parseFloat(item.subtotal);
+        });
+      });
+
+      this.totalGoodsCount = totalCount;
+      this.totalGoodsAmount = totalAmount.toFixed(2);
+      // 使用最新计算的总运费
+      this.totalPayAmount = (
+        totalAmount + parseFloat(this.totalFreight)
+      ).toFixed(2);
+    },
+    // 处理保存地址
+    handleSaveAddress(formData) {
+      formData.is_default = 0;
+      if (this.dialogType === "add") {
+        this.post(formData, "/api/uservice/user/addNewConsignee").then(
+          (res) => {
+            if (res.code == 1) {
+              this.$message.success("保存成功");
+              this.getAddress();
+              this.dialogVisible = false;
+            }
+          }
+        );
+      } else {
+        this.post(formData, "/api/uservice/user/editConsignee").then((res) => {
+          if (res.code == 1) {
+            this.$message.success("保存成功");
+            this.getAddress();
+            this.dialogVisible = false;
+          }
+        });
       }
+    },
+    // 获取收货地址
+    getAddress() {
+      this.post(
+        {
+          contactType: "CONSIGNEE",
+          offset: "0",
+          limit: "100",
+        },
+        "/api/uservice/user/getContactOrConsignee"
+      ).then((res) => {
+        if (res) {
+          this.addresses = res.data || [];
+        }
+      });
+    },
+    // 选择收货地址
+    selectAddress(index) {
+      this.selectedAddressIndex = index;
+      // 选择地址后立即获取邮费
+      this.getPost();
+    },
 
-      if (this.selectedInvoiceAddressIndex === null) {
-        this.$message.warning("请选择收票地址");
+    // 提交订单
+    submitOrder() {
+      if (!this.selectedAddress.id) {
+        this.$message.warning("请先选择收货地址");
         return;
       }
-
       this.$message.success("订单提交成功！");
       // 实际项目中可跳转至订单详情页
       // this.$router.push('/order/detail');
@@ -394,7 +531,7 @@ export default {
     .invoice-address-item {
       margin-bottom: 15px;
       display: flex;
-      align-items: flex-start;
+      align-items: center;
 
       .label {
         width: 120px;
diff --git a/src/views/ProductPage/Index.vue b/src/views/ProductPage/Index.vue
index bdcceb1..7921a31 100644
--- a/src/views/ProductPage/Index.vue
+++ b/src/views/ProductPage/Index.vue
@@ -11,9 +11,9 @@
       >
         <el-option
           v-for="cat in categories"
-          :key="cat.value"
-          :label="cat.label"
-          :value="cat.value"
+          :key="cat.id"
+          :label="cat.name"
+          :value="cat.id"
         ></el-option>
       </el-select>
 
@@ -53,45 +53,33 @@
       <div
         class="product-card"
         v-for="(product, index) in visibleProducts"
-        :key="product.id"
+        :key="index"
         @click="goToDetail(product.id)"
       >
-        <el-image
-          v-lazy="product.image"
-          :alt="product.name"
+        <img
+          v-lazy="product.headimg"
+          :alt="product.title"
           class="product-img"
-          lazy
           fit="cover"
-        >
-          <div slot="placeholder" class="image-placeholder">
+        />
+        <!-- <div slot="placeholder" class="image-placeholder">
             <i class="el-icon-loading"></i>
-          </div>
-        </el-image>
-        <div
-          class="tag"
-          v-if="product.tag"
-          :style="{ backgroundColor: product.tagColor }"
-        >
-          {{ product.tag }}
-        </div>
+          </div> -->
+        <!-- </img> -->
         <div class="product-info">
-          <div class="product-name">{{ product.name }}</div>
+          <div class="product-name">{{ product.title }}</div>
           <div class="price-row">
-            <span class="current-price">¥{{ product.price.toFixed(2) }}</span>
-            <span class="original-price" v-if="product.originalPrice"
-              >¥{{ product.originalPrice.toFixed(2) }}</span
+            <span class="current-price">¥{{ product.price / 100 }}</span>
+            <span class="original-price" v-if="product.market_price"
+              >¥{{ product.market_price / 100 }}</span
             >
           </div>
-          <div class="sales-volume" v-if="product.sales > 0">
-            <i class="el-icon-shopping-cart"></i> 已售 {{ product.sales }}
+          <div class="sales-volume">
+            <i class="el-icon-shopping-cart"></i> 已售
+            {{ product.sales_number }}
           </div>
-          <el-button
-            type="primary"
-            size="mini"
-            class="cart-btn"
-            @click.prevent="addToCart(product)"
-          >
-            加入购物车
+          <el-button type="primary" size="mini" class="cart-btn">
+            立即购买
           </el-button>
         </div>
       </div>
@@ -132,177 +120,19 @@ export default {
       currentPage: 1,
       pageSize: 12,
       // 商品数据
-      products: [
-        {
-          id: 1,
-          name: "无线蓝牙耳机 主动降噪长续航",
-          image: "https://picsum.photos/id/101/300/300",
-          price: 359.0,
-          originalPrice: 499.0,
-          category: "digital",
-          tag: "限时折扣",
-          tagColor: "#FF6B6B",
-          sales: 120,
-        },
-        {
-          id: 2,
-          name: "智能手表 心率监测运动计步",
-          image: "https://picsum.photos/id/102/300/300",
-          price: 259.0,
-          originalPrice: 329.0,
-          category: "digital",
-          tag: "新品",
-          tagColor: "#4ECDC4",
-          sales: 86,
-        },
-        {
-          id: 3,
-          name: "纯棉短袖T恤 宽松休闲",
-          image: "https://picsum.photos/id/103/300/300",
-          price: 89.0,
-          originalPrice: 129.0,
-          category: "life",
-          sales: 320,
-        },
-        {
-          id: 4,
-          name: "新鲜水果礼盒 当季混合装",
-          image: "https://picsum.photos/id/104/300/300",
-          price: 159.0,
-          category: "food",
-          tag: "热销",
-          tagColor: "#FF9F1C",
-          sales: 215,
-        },
-        {
-          id: 5,
-          name: "全自动咖啡机 家用小型",
-          image: "https://picsum.photos/id/105/300/300",
-          price: 1299.0,
-          originalPrice: 1599.0,
-          category: "life",
-          sales: 45,
-        },
-        {
-          id: 6,
-          name: "高清投影仪 家用办公两用",
-          image: "https://picsum.photos/id/106/300/300",
-          price: 2499.0,
-          category: "digital",
-          tag: "推荐",
-          tagColor: "#2EC4B6",
-          sales: 78,
-        },
-        {
-          id: 7,
-          name: "进口红酒 赤霞珠干红",
-          image: "https://picsum.photos/id/107/300/300",
-          price: 199.0,
-          originalPrice: 258.0,
-          category: "food",
-          sales: 63,
-        },
-        {
-          id: 8,
-          name: "瑜伽垫 防滑专业健身垫",
-          image: "https://picsum.photos/id/108/300/300",
-          price: 129.0,
-          category: "life",
-          sales: 156,
-        },
-        {
-          id: 9,
-          name: "机械键盘 青轴游戏专用",
-          image: "https://picsum.photos/id/109/300/300",
-          price: 299.0,
-          originalPrice: 399.0,
-          category: "digital",
-          tag: "限时折扣",
-          tagColor: "#FF6B6B",
-          sales: 92,
-        },
-        {
-          id: 10,
-          name: "有机蔬菜礼盒 新鲜配送",
-          image: "https://picsum.photos/id/110/300/300",
-          price: 89.0,
-          category: "food",
-          sales: 205,
-        },
-        {
-          id: 11,
-          name: "北欧风落地灯 客厅卧室",
-          image: "https://picsum.photos/id/111/300/300",
-          price: 199.0,
-          category: "life",
-          sales: 57,
-        },
-        {
-          id: 12,
-          name: "便携式充电宝 20000mAh",
-          image: "https://picsum.photos/id/112/300/300",
-          price: 129.0,
-          originalPrice: 169.0,
-          category: "digital",
-          sales: 310,
-        },
-      ],
+      visibleProducts: [],
+      totalProducts: 0,
       // 分类选项
-      categories: [
-        { label: "全部", value: "" },
-        { label: "美食", value: "food" },
-        { label: "生活", value: "life" },
-        { label: "数码", value: "digital" },
-      ],
+      categories: [],
+      id: "",
+      keyword: "",
     };
   },
   computed: {
     ...mapGetters(["getSearchText"]),
-    // 筛选后商品
-    filteredProducts() {
-      return this.products.filter((product) => {
-        // 分类筛选
-        const categoryMatch = this.selectedCategory
-          ? product.category === this.selectedCategory
-          : true;
-
-        // 关键词搜索筛选
-        const keywordMatch = this.searchKeyword
-          ? product.name
-              .toLowerCase()
-              .includes(this.searchKeyword.toLowerCase())
-          : true;
-
-        return categoryMatch && keywordMatch;
-      });
-    },
-    // 排序处理
-    sortedProducts() {
-      const sorted = [...this.filteredProducts];
-      console.log(...this.filteredProducts, sorted);
-
-      switch (this.selectedSort) {
-        case "price_asc":
-          return sorted.sort((a, b) => a.price - b.price);
-        case "price_desc":
-          return sorted.sort((a, b) => b.price - a.price);
-        case "sales_asc":
-          return sorted.sort((a, b) => a.sales - b.sales);
-        case "sales_desc":
-          return sorted.sort((a, b) => b.sales - a.sales);
-        default: // 综合排序（默认按ID）
-          return sorted.sort((a, b) => a.id - b.id);
-      }
-    },
-    // 分页后商品
-    visibleProducts() {
-      const start = (this.currentPage - 1) * this.pageSize;
-      const end = start + this.pageSize;
-      return this.sortedProducts.slice(start, end);
-    },
-    // 商品总数
-    totalProducts() {
-      return this.sortedProducts.length;
+    // 计算当前页对应的offset
+    currentOffset() {
+      return (this.currentPage - 1) * this.pageSize;
     },
   },
   watch: {
@@ -317,58 +147,142 @@ export default {
   created() {
     this.type = this.$route.query?.type;
     this.searchKeyword = this.getSearchText;
-    this.fetchProducts();
+    this.getTagList();
+
+    // 监听搜索事件
+    this.$bus.on("search-product", (keyword) => {
+      // 更新搜索关键词
+      this.searchKeyword = keyword;
+      // 重置分页到第一页
+      this.currentPage = 1;
+      // 重新请求数据
+      this.fetchProducts();
+    });
+  },
+  // 组件销毁时移除事件监听（避免内存泄漏）
+  beforeDestroy() {
+    this.$bus.off("search-product");
+    // 清空搜索词
+    this.searchKeyword = "";
+    // 同时更新Vuex中的搜索词状态
+    this.$store.commit("setSearchText", "");
+    // 重置分页和筛选条件（可选）
+    this.currentPage = 1;
+    this.selectedCategory = "";
+    this.selectedSort = "default";
   },
   methods: {
-    // 获取列表
+    // 获取分类
+    getTagList() {
+      this.post(
+        {
+          pid: 683,
+        },
+        "/api/product/tag_list"
+      ).then((res) => {
+        this.categories = res.data;
+        this.categories[0].id = 662;
+        // 获取路由中的id参数
+        const routeId = this.$route.query.id || 662;
+        if (routeId) {
+          // 存储路由id
+          this.id = routeId;
+          // 查找匹配的分类并选中
+          const matchedCategory = this.categories.find(
+            (cat) => cat.id == routeId
+          );
+          console.log(routeId, matchedCategory);
+          if (matchedCategory) {
+            this.selectedCategory = matchedCategory.name;
+          }
+        }
+        this.fetchProducts();
+      });
+    },
+    // 获取列表 - 使用offset和limit参数
     async fetchProducts() {
-      console.log(this.getSearchText);
-      // const response = await this.$axios.get('/api/products', { params });
+      // 构建请求参数
+      const params = {
+        tag_id: this.id || this.selectedCategory,
+        offset: this.currentOffset,
+        limit: this.pageSize,
+        title: this.searchKeyword,
+        ...this.parseSortParams(),
+      };
+
+      // 如果有搜索关键词，添加到请求参数中
+      if (this.searchKeyword) {
+        params.keyword = this.searchKeyword;
+      }
+
+      const response = await this.post(
+        params,
+        "/api/product/get_product_by_tag"
+      );
+
+      // 假设接口返回格式包含list和total字段
+      this.visibleProducts = response.data.list || [];
+      this.totalProducts = Number(response.data.total) || 0;
     },
 
-    // 搜索处理
-    handleSearch() {
-      this.currentPage = 1; // 搜索后重置到第一页
+    // 排序参数
+    parseSortParams() {
+      if (this.selectedSort === "default") {
+        return {}; // 综合排序不需要参数
+      }
+
+      // 拆分排序类型和排序方向
+      const [sortField, order] = this.selectedSort.split("_");
+      // 转换为接口需要的字段名
+      const sortMap = {
+        sales: "sales_number",
+        price: "price",
+      };
+
+      return {
+        sort: sortMap[sortField],
+        order: order,
+      };
     },
 
     // 分类变更处理
-    handleCategoryChange() {
+    handleCategoryChange(event) {
+      this.id = event;
       this.currentPage = 1; // 切换分类后重置到第一页
+      this.fetchProducts();
     },
 
     // 排序变更处理
     handleSortChange() {
       this.currentPage = 1; // 切换排序后重置到第一页
+      this.fetchProducts();
     },
 
     // 分页大小改变
     handleSizeChange(val) {
       this.pageSize = val;
-      this.currentPage = 1;
+      this.currentPage = 1; // 改变每页条数时重置到第一页
+      this.fetchProducts();
     },
 
     // 当前页改变
     handleCurrentChange(val) {
       this.currentPage = val;
+      this.fetchProducts();
       // 滚动到页面顶部
       window.scrollTo(0, 0);
     },
 
-    // 加入购物车
-    addToCart(product) {
-      this.$message.success(`${product.name} 已加入购物车`);
-      // 实际项目中这里会调用购物车API
-    },
-
     // 跳转详情页
     goToDetail(id) {
-      this.$router.push(`/product/${id}`);
+      this.$router.push(`/Detail/${id}`);
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+/* 样式部分保持不变 */
 .product-grid-page {
   padding: 20px;
   background-color: #f5f7fa;
@@ -555,4 +469,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/User/UserAddress.vue b/src/views/User/UserAddress.vue
index 19b31a9..0ac058b 100644
--- a/src/views/User/UserAddress.vue
+++ b/src/views/User/UserAddress.vue
@@ -1,201 +1,198 @@
 <template>
   <div class="bg">
-    <el-card style="width: 100%;">
-        <div slot="header" class="clearfix flex-between">
-            <div>
-              收货地址
-              <span style="font-size: 12px;color:#666">收票人地址统一使用该地址管理设置</span>
-            </div>
-            
-            <el-button size="small" style="float: right;" type="primary" @click="openDialog('add', {})">新增地址</el-button>
+    <el-card style="width: 100%">
+      <div slot="header" class="clearfix flex-between">
+        <div>
+          收货地址
+          <span style="font-size: 12px; color: #666"
+            >收票人地址统一使用该地址管理设置</span
+          >
         </div>
 
-        <el-table :data="addresses" border style="width: 100%;">
-            <el-table-column prop="receiver" label="收货人" width="120"></el-table-column>
-            <el-table-column prop="region" label="所在地区" width="120"></el-table-column>
-            <el-table-column prop="detailAddress" label="详细地址" width="300"></el-table-column>
-            <el-table-column prop="phone" label="手机号码" width="150"></el-table-column>
-            <el-table-column prop="fixedPhone" label="固定电话" width="150"></el-table-column>
-            <el-table-column prop="alias" label="地区别名" width="120"></el-table-column>
-            <el-table-column label="操作" width="200">
-                <template slot-scope="scope">
-                <el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
-          <!-- 分页 -->
-        <div style="text-align: right; margin-top: 20px;">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="searchParam.currentPage"
-            :page-sizes="[5, 10, 20]"
-            :page-size="searchParam.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="searchParam.total"
-          ></el-pagination>
-        </div>
+        <el-button
+          size="small"
+          style="float: right"
+          type="primary"
+          @click="openDialog('add', {})"
+          >新增地址</el-button
+        >
+      </div>
 
+      <el-table :data="addresses" border style="width: 100%">
+        <el-table-column
+          prop="name"
+          label="收货人"
+          width="120"
+        ></el-table-column>
+        <el-table-column
+          prop="address"
+          label="收货地址"
+          width="auto"
+        ></el-table-column>
+        <el-table-column
+          prop="tel"
+          label="手机号码"
+          width="150"
+        ></el-table-column>
+        <el-table-column label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.row)"
+              >编辑</el-button
+            >
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
 
-        
+      <!-- 分页 -->
+      <div style="text-align: right; margin-top: 20px">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="searchParam.currentPage"
+          :page-sizes="[5, 10, 20]"
+          :page-size="searchParam.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="searchParam.total"
+        ></el-pagination>
+      </div>
     </el-card>
 
-
-    <el-dialog :title="`${address.type === 'add' ? '新增' : '编辑'}收货地址`" :visible.sync="dialogVisible" width="700px">
-      <el-form :model="address" label-width="100px" size="small">
-        <el-form-item label="*收货人">
-          <el-input v-model="address.receiver" placeholder="请填写收货人姓名,限制40个字符"></el-input>
-        </el-form-item>
-        <el-form-item label="*所在地区">
-          <el-select v-model="address.region" placeholder="请选择所在地区">
-            <el-option label="北京" value="北京"></el-option>
-            <el-option label="上海" value="上海"></el-option>
-            <el-option label="广州" value="广州"></el-option>
-            <el-option label="深圳" value="深圳"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="*详细地址">
-          <el-input v-model="address.detailAddress" placeholder="请填写详细地址,限制500个字符"></el-input>
-        </el-form-item>
-        <el-form-item label="*手机号码">
-          <el-input v-model="address.phone" placeholder="请填写手机号码,限制11位数字"></el-input>
-        </el-form-item>
-        <el-form-item label="固定电话">
-          <el-input v-model="address.fixedPhone" placeholder="请填写固定号码,限制40个字符"></el-input>
-        </el-form-item>
-        <el-form-item label="地区别名">
-          <el-input v-model="address.alias" placeholder="请填写常用名称,限制40个字符"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">取消</el-button>
-        <el-button size="small" type="primary" @click="saveAddress">保存</el-button>
-      </div>
-    </el-dialog>
+    <!-- 引入地址编辑组件 -->
+    <AddressFormDialog
+      :visible="dialogVisible"
+      :type="dialogType"
+      :initial-data="dialogData"
+      @update:visible="dialogVisible = $event"
+      @save="handleSaveAddress"
+    />
   </div>
 </template>
+
 <script>
+import AddressFormDialog from "@/components/common/AddressFormDialog.vue"; // 引入组件
+
 export default {
-  name: 'UserInfo',
+  name: "AddressManagement",
+  components: {
+    AddressFormDialog, // 注册组件
+  },
   data() {
     return {
-        user: {},
-        searchParam: {pageSize: 5, currentPage: 1,total: 10},
-        dialogVisible: false,
-        addresses: [
-          {
-            id: 1,
-            receiver: '张三',
-            region: '北京',
-            detailAddress: '北京市朝阳区xx街道xx小区xx号楼xx单元',
-            phone: '13800138000',
-            fixedPhone: '010-12345678',
-            alias: '家'
-          },
-          {
-            id: 2,
-            receiver: '李四',
-            region: '上海',
-            detailAddress: '上海市浦东新区xx街道xx小区xx号楼xx单元',
-            phone: '13900139000',
-            fixedPhone: '021-12345678',
-            alias: '公司'
-          },
-          {
-            id: 3,
-            receiver: '王五',
-            region: '广州',
-            detailAddress: '广州市天河区xx街道xx小区xx号楼xx单元',
-            phone: '13700137000',
-            fixedPhone: '020-12345678',
-            alias: '朋友家'
-          }
-        ],
-        address: {
-          type: 'add',
-          id: '',
-          receiver: '',
-          region: '',
-          detailAddress: '',
-          phone: '',
-          fixedPhone: '',
-          alias: ''
-        }
-    }
+      user: {},
+      searchParam: { pageSize: 5, currentPage: 1, total: 0 },
+      dialogVisible: false,
+      dialogType: "add",
+      dialogData: {},
+      addresses: [],
+    };
   },
-  methods:{
-        // 分页大小改变
+  mounted() {
+    this.getAddress();
+  },
+  methods: {
+    // 获取收货地址
+    getAddress() {
+      this.post(
+        {
+          contactType: "CONSIGNEE",
+          offset: "0",
+          limit: "100",
+        },
+        "/api/uservice/user/getContactOrConsignee"
+      ).then((res) => {
+        if (res) {
+          this.addresses = res.data || [];
+          this.searchParam.total = this.addresses.length;
+        }
+      });
+    },
+
+    // 分页相关方法
     handleSizeChange(val) {
-        this.searchParam.pageSize = val;
+      this.searchParam.pageSize = val;
+      this.searchParam.currentPage = 1;
     },
-    
-    // 当前页改变
     handleCurrentChange(val) {
-        this.searchParam.currentPage = val;
+      this.searchParam.currentPage = val;
     },
-    openDialog (type, item) {
-      this.address = {
-        type: type,
-        id: item.id || "",
-        receiver: item.receiver || "",
-        region: item.region || "",
-        detailAddress: item.detailAddress || "",
-        phone: item.phone || "",
-        fixedPhone: item.fixedPhone || "",
-        alias: item.alias || ""
-      }
+
+    // 打开对话框
+    openDialog(type, item) {
+      this.dialogType = type;
+      this.dialogData = { ...item };
       this.dialogVisible = true;
     },
 
-    saveAddress() {
-          if (this.address.id) {
-            // 编辑地址
-            const index = this.addresses.findIndex(item => item.id === this.address.id);
-            if (index !== -1) {
-              this.addresses[index] = { ...this.address };
+    // 处理保存地址
+    handleSaveAddress(formData) {
+      formData.is_default = 0;
+      if (this.dialogType === "add") {
+        this.post(formData, "/api/uservice/user/addNewConsignee").then(
+          (res) => {
+            if (res.code == 1) {
+              this.$message.success("保存成功");
+              this.getAddress();
+              this.dialogVisible = false;
             }
-          } else {
-            // 新增地址
-            this.address.id = Date.now();
-            this.addresses.push({ ...this.address });
           }
-          this.$message({
-            message: '保存成功',
-            type: 'success'
-          });
-          this.dialogVisible = false;
-        },
-        handleEdit(row) {
-          this.address = { ...row };
-          this.dialogVisible = true;
-        },
-        handleDelete(row) {
-          this.$confirm('此操作将永久删除该地址, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            const index = this.addresses.findIndex(item => item.id === row.id);
-            if (index !== -1) {
-              this.addresses.splice(index, 1);
+        );
+      } else {
+        this.post(formData, "/api/uservice/user/editConsignee").then((res) => {
+          if (res.code == 1) {
+            this.$message.success("保存成功");
+            this.getAddress();
+            this.dialogVisible = false;
+          }
+        });
+      }
+    },
+
+    // 编辑地址
+    handleEdit(row) {
+      console.log(row);
+      row.username = row.name;
+      row.mobile = row.tel;
+      this.openDialog("edit", row);
+    },
+
+    // 删除地址
+    handleDelete(row) {
+      this.$confirm("此操作将永久删除该地址, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.post(
+            {
+              id: row.id,
+            },
+            "/api/uservice/user/delConsignee"
+          ).then((res) => {
+            if (res.code == 1) {
+              this.getAddress();
+              this.$message.success("删除成功!");
             }
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            });
           });
-        }
-  }
-  
-}
+        })
+        .catch(() => {
+          this.$message.info("已取消删除");
+        });
+    },
+  },
+};
 </script>
-<style lang="scss" scoped>
 
+<style lang="scss" scoped>
+.flex-between {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
\ No newline at end of file