From 2767b352366db925f8567d8e73783122aec873a9 Mon Sep 17 00:00:00 2001
From: "1054425342@qq.com" <1054425342@qq.com>
Date: Wed, 13 Aug 2025 10:55:46 +0800
Subject: [PATCH] style

---
 README_AreaPicker.md               |  253 ++++
 common/index.js                    |   10 +-
 components/AreaPicker.vue          |  429 ++++++
 components/ProductSection.vue      |   31 +-
 components/header.vue              |  175 ++-
 manifest.json                      |   14 +-
 pages.json                         |   12 +-
 pages/index/iSoul.vue              | 2155 ++++++++++++++--------------
 pages/index/index.vue              |  436 +++---
 pages/index/timeShopBank.vue       |    6 +-
 static/js/request.js               |   35 +-
 subPackages/equityGoods/detail.vue |  336 +++--
 subPackages/equityGoods/index.vue  |   25 +-
 subPackages/equityGoods/list.vue   | 1275 ++++++++--------
 subPackages/orderQy/confrim.vue    |  793 +++++++++-
 subPackages/orderQy/detail.vue     |  123 +-
 subPackages/orderQy/list.vue       |  135 +-
 subPackages/user/collection.vue    |  408 ++++++
 utils/request.js                   |    4 +-
 19 files changed, 4387 insertions(+), 2268 deletions(-)
 create mode 100644 README_AreaPicker.md
 create mode 100644 components/AreaPicker.vue
 create mode 100644 subPackages/user/collection.vue

diff --git a/README_AreaPicker.md b/README_AreaPicker.md
new file mode 100644
index 0000000..374ec7a
--- /dev/null
+++ b/README_AreaPicker.md
@@ -0,0 +1,253 @@
+# 省市区选择组件使用说明
+
+## 概述
+
+`AreaPicker.vue` 是一个功能完整的省市区三级联动选择组件，支持自定义样式插槽，可以灵活地集成到各种页面中。
+
+## 功能特性
+
+- ✅ 省市区三级联动选择
+- ✅ 支持默认值设置
+- ✅ 支持插槽自定义显示样式
+- ✅ 完整的事件回调
+- ✅ 灵活的数据请求方式
+- ✅ 错误处理和容错机制
+
+## Props
+
+| 参数 | 类型 | 默认值 | 说明 |
+|------|------|--------|------|
+| placeholder | String | '请选择' | 占位符文本 |
+| defaultValue | Object | null | 默认选中值，格式：`{ provinceId, cityId, areaId }` |
+| disabled | Boolean | false | 是否禁用 |
+
+## Events
+
+| 事件名 | 参数 | 说明 |
+|--------|------|------|
+| change | data | 选择改变时触发，返回选中的省市区信息 |
+
+### change 事件返回数据格式
+
+```javascript
+{
+  provinceId: '110000',    // 省份ID
+  cityId: '110100',        // 城市ID
+  areaId: '110101',        // 区域ID
+  fullText: '北京市北京市东城区'  // 完整地址文本
+}
+```
+
+## Methods
+
+| 方法名 | 参数 | 返回值 | 说明 |
+|--------|------|--------|------|
+| getValue | - | Object | 获取当前选中的值 |
+| reset | - | - | 重置选择 |
+
+## 插槽使用
+
+组件提供了默认插槽，允许完全自定义显示样式。插槽提供以下数据：
+
+| 插槽参数 | 类型 | 说明 |
+|----------|------|------|
+| selectedText | String | 当前选中的完整文本 |
+| placeholder | String | 占位符文本 |
+| provinceData | Array | 省份数据列表 |
+| cityData | Array | 城市数据列表 |
+| areaData | Array | 区域数据列表 |
+| multiIndex | Array | 当前选中的索引数组 |
+| currentSelection | Object | 当前选中的详细信息 |
+
+### currentSelection 对象结构
+
+```javascript
+{
+  province: { id: '110000', name: '北京市' },
+  city: { id: '110100', name: '北京市' },
+  area: { id: '110101', name: '东城区' },
+  fullText: '北京市北京市东城区'
+}
+```
+
+## 使用示例
+
+### 基本使用
+
+```vue
+<template>
+  <view>
+    <!-- 使用默认样式 -->
+    <AreaPicker
+      ref="areaPicker"
+      placeholder="请选择省市区"
+      :defaultValue="{ provinceId: '110000', cityId: '110100', areaId: '110101' }"
+      @change="onAreaChange"
+    />
+  </view>
+</template>
+
+<script>
+export default {
+  methods: {
+    onAreaChange(data) {
+      console.log('选中的地区：', data)
+    }
+  }
+}
+</script>
+```
+
+### 自定义样式（插槽）
+
+```vue
+<template>
+  <view>
+    <!-- 自定义样式1：简单自定义 -->
+    <AreaPicker
+      placeholder="请选择省市区"
+      @change="onAreaChange"
+    >
+      <template v-slot="{ selectedText, placeholder }">
+        <view class="custom-display">
+          <text class="icon">📍</text>
+          <text class="text">{{ selectedText || placeholder }}</text>
+          <text class="arrow">▼</text>
+        </view>
+      </template>
+    </AreaPicker>
+    
+    <!-- 自定义样式2：显示详细信息 -->
+    <AreaPicker
+      placeholder="请选择省市区"
+      @change="onAreaChange"
+    >
+      <template v-slot="{ selectedText, placeholder, currentSelection }">
+        <view class="detail-display">
+          <view v-if="currentSelection.province" class="detail-info">
+            <text>省：{{ currentSelection.province.name }}</text>
+            <text>市：{{ currentSelection.city.name }}</text>
+            <text>区：{{ currentSelection.area.name }}</text>
+          </view>
+          <text v-else class="placeholder">{{ placeholder }}</text>
+        </view>
+      </template>
+    </AreaPicker>
+  </view>
+</template>
+
+<script>
+export default {
+  methods: {
+    onAreaChange(data) {
+      console.log('选中的地区：', data)
+    }
+  }
+}
+</script>
+
+<style>
+.custom-display {
+  display: flex;
+  align-items: center;
+  padding: 12px 16px;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  border-radius: 25px;
+  color: white;
+}
+
+.icon {
+  margin-right: 10px;
+}
+
+.text {
+  flex: 1;
+}
+
+.arrow {
+  margin-left: 10px;
+}
+
+.detail-display {
+  padding: 15px;
+  background-color: #f8f9fa;
+  border: 2px dashed #dee2e6;
+  border-radius: 8px;
+}
+
+.detail-info {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.placeholder {
+  color: #adb5bd;
+  font-style: italic;
+}
+</style>
+```
+
+### 在 header 组件中使用
+
+```vue
+<template>
+  <view>
+    <header 
+      :isSearch="true"
+      :isAreaPicker="true"
+      areaPlaceholder="请选择省市区"
+      :defaultAreaValue="{ provinceId: '110000', cityId: '110100', areaId: '110101' }"
+      @areaChange="onAreaChange"
+    />
+  </view>
+</template>
+
+<script>
+export default {
+  methods: {
+    onAreaChange(data) {
+      console.log('选中的地区：', data)
+    }
+  }
+}
+</script>
+```
+
+## 数据接口要求
+
+组件需要后端提供省市区数据接口，接口返回格式如下：
+
+```javascript
+// 省份数据
+[
+  { id: '110000', name: '北京市' },
+  { id: '120000', name: '天津市' },
+  // ...
+]
+
+// 城市数据（根据省份ID获取）
+[
+  { id: '110100', name: '北京市', pid: '110000' },
+  // ...
+]
+
+// 区域数据（根据城市ID获取）
+[
+  { id: '110101', name: '东城区', pid: '110100' },
+  { id: '110102', name: '西城区', pid: '110100' },
+  // ...
+]
+```
+
+## 注意事项
+
+1. 组件会自动处理数据请求的多种方式（父组件 Post 方法、全局 Post 方法、uni.request）
+2. 建议在使用前确保数据接口正常可用
+3. 插槽内容会完全替换默认的显示样式
+4. 可以通过 ref 调用组件的 getValue() 和 reset() 方法
+5. 组件支持设置默认值，会自动回显对应的省市区信息
+
+## 完整示例
+
+查看 `AreaPickerSlotExample.vue` 文件获取完整的使用示例，包含多种自定义样式的演示。
\ No newline at end of file
diff --git a/common/index.js b/common/index.js
index 3e90280..3c6081f 100644
--- a/common/index.js
+++ b/common/index.js
@@ -25,9 +25,13 @@ async function getLocationInfo() {
           location,
           success(response) {
 			  console.log(response)
-            let info = response.result;
-            location.province = info.address_component.province;
-			location.cityCode = info.ad_info.city_code.slice(3);
+			  let info = response.result;
+			  let _c = info.ad_info.adcode.slice(0,3)
+			location.cityId = info.ad_info.city_code.slice(3);
+			location.provinceId = _c.padEnd(6,'0');
+			location.areaId = info.ad_info.adcode;
+			
+			location.province = info.address_component.province;
             location.city = info.address_component.city;
             location.area = info.address_component.district;
             location.street = info.address_component.street;
diff --git a/components/AreaPicker.vue b/components/AreaPicker.vue
new file mode 100644
index 0000000..5f116ca
--- /dev/null
+++ b/components/AreaPicker.vue
@@ -0,0 +1,429 @@
+<template>
+  <view class="area-picker">
+    <picker 
+      mode="multiSelector" 
+      :range="newProvinceDataList" 
+      range-key="name" 
+      @change="changeArea" 
+      @columnchange="pickerColumnchange"
+      :value="multiIndex"
+    >
+      <!-- 使用插槽，允许父组件自定义显示样式 -->
+      <slot 
+        :selectedText="selectedText"
+        :placeholder="placeholder"
+        :provinceData="newProvinceDataList[0]"
+        :cityData="newProvinceDataList[1]"
+        :areaData="newProvinceDataList[2]"
+        :multiIndex="multiIndex"
+        :currentSelection="getCurrentSelection()"
+      >
+        <!-- 默认显示样式 -->
+        <view class="picker-display">
+          <text class="picker-text" :class="{ 'placeholder': !selectedText }">{{ selectedText || placeholder }}</text>
+          <image
+            class="dropdown-icon"
+            src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iOCIgdmlld0JveD0iMCAwIDEyIDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0xIDFMNiA2TDExIDEiIHN0cm9rZT0iIzk5OTk5OSIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+"
+            mode="heightFix"
+          ></image>
+        </view>
+      </slot>
+    </picker>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'AreaPicker',
+  props: {
+    // 占位符文本
+    placeholder: {
+      type: String,
+      default: '请选择地区'
+    },
+    // 默认选中的省市区ID
+    defaultValue: {
+      type: Object,
+      default: () => ({
+        provinceId: null,
+        cityId: null,
+        areaId: null
+      })
+    },
+    // 是否禁用
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data() {
+    return {
+      // 省市区数据
+      columns: [],
+      newProvinceDataList: [[], [], []],
+      multiIndex: [0, 0, 0],
+      provinceId: null,
+      cityId: null,
+      areaId: null,
+      ready: false,
+	  selectedText: '',
+    }
+  },
+  mounted() {
+    this.getSeldCityList()
+  },
+  watch: {
+    defaultValue: {
+      handler(newVal) {
+		  console.log('----有值回显')
+        if (newVal && newVal.provinceId && this.ready) {
+          this.setDefaultValue(newVal)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    // 获取省市区数据
+    getSeldCityList() {
+      // 尝试多种方式获取数据
+      let requestMethod = null;
+      
+      // 1. 尝试使用父组件的 Post 方法
+      if (this.$parent && this.$parent.Post) {
+        requestMethod = this.$parent.Post;
+      }
+      // 2. 尝试使用全局的 Post 方法（如果通过 mixin 引入）
+      else if (this.Post) {
+        requestMethod = this.Post;
+      }
+      // 3. 尝试使用 uni.request
+      else {
+        this.requestWithUni();
+        return;
+      }
+      
+      requestMethod({}, '/api/areas/getAll').then(res => {
+        if (res) {
+          this.processAreaData(res.data)
+        }
+      }).catch(err => {
+        console.warn('省市区数据获取失败:', err)
+        // 可以在这里设置一些默认数据或提示用户
+      })
+    },
+    
+    // 使用 uni.request 获取数据的备用方法
+    requestWithUni() {
+      uni.request({
+        url: '/api/areas/getAll', // 这里需要根据实际的完整URL调整
+        method: 'POST',
+        data: {},
+        success: (res) => {
+          if (res.data) {
+            this.processAreaData(res.data.data || res.data)
+          }
+        },
+        fail: (err) => {
+          console.warn('省市区数据获取失败:', err)
+          // 可以提供一些默认的省市区数据或提示用户
+          uni.showToast({
+            title: '地区数据加载失败',
+            icon: 'none'
+          })
+        }
+      })
+    },
+    
+    // 处理省市区数据
+    processAreaData(data) {
+      var result = {}
+      for (var i = 0; i < data.length; i++) {
+        var item = data[i]
+        if (item.parent_id == 0) {
+          continue
+        }
+        // 获取省
+        if (item.parent_id == "1") {
+          result[item.id.toString()] = {}
+          result[item.id.toString()].children = []
+          result[item.id.toString()].name = item.name
+          result[item.id.toString()].id = item.id
+        } else if (result[item.parent_id.toString()]) {
+          // 填充市
+          var t = {
+            id: item.id,
+            name: item.name,
+            children: []
+          }
+          result[item.parent_id.toString()].children.push(t)
+        } else {
+          // 填充区
+          var k = {
+            id: item.id,
+            name: item.name
+          }
+          for (var j = 0; j < result[item.parent_id.toString().substr(0, 2) + "0000"].children.length; j++) {
+            if (result[item.parent_id.toString().substr(0, 2) + "0000"].children[j].id == item.parent_id) {
+              result[item.parent_id.toString().substr(0, 2) + "0000"].children[j].children.push(k)
+            }
+          }
+        }
+      }
+      
+      var r = []
+      // 将Object转为Array
+      for (var i in result) {
+        r.push(result[i])
+      }
+      
+      this.columns = r
+      this.initPickerData()
+      this.ready = true
+      
+      // 如果有默认值，设置默认选中
+      if (this.defaultValue && this.defaultValue.provinceId) {
+        this.setDefaultValue(this.defaultValue)
+      }
+    },
+    
+    // 初始化picker数据
+    initPickerData() {
+      if (this.columns.length === 0) return
+      
+      // 初始化省份数据
+      this.newProvinceDataList[0] = this.columns.map(item => ({
+        name: item.name,
+        id: item.id
+      }))
+      
+      // 初始化城市数据（默认第一个省份的城市）
+      if (this.columns[0] && this.columns[0].children) {
+        this.newProvinceDataList[1] = this.columns[0].children.map(item => ({
+          name: item.name,
+          id: item.id
+        }))
+      }
+      
+      // 初始化区县数据（默认第一个城市的区县）
+      if (this.columns[0] && this.columns[0].children[0] && this.columns[0].children[0].children) {
+        this.newProvinceDataList[2] = this.columns[0].children[0].children.map(item => ({
+          name: item.name,
+          id: item.id
+        }))
+      }
+    },
+    
+    // 设置默认值
+    setDefaultValue(defaultValue) {
+      if (!this.ready || !defaultValue) return
+      
+      // 查找省份索引
+      const provinceIndex = this.newProvinceDataList[0].findIndex(item => item.id == defaultValue.provinceId)
+      if (provinceIndex === -1) return
+      
+      this.multiIndex[0] = provinceIndex
+      
+      // 更新城市数据
+      this.newProvinceDataList[1] = this.columns[provinceIndex].children.map(item => ({
+        name: item.name,
+        id: item.id
+      }))
+      
+      // 查找城市索引
+      const cityIndex = this.newProvinceDataList[1].findIndex(item => item.id == defaultValue.cityId)
+      if (cityIndex !== -1) {
+        this.multiIndex[1] = cityIndex
+        
+        // 更新区县数据
+        this.newProvinceDataList[2] = this.columns[provinceIndex].children[cityIndex].children.map(item => ({
+          name: item.name,
+          id: item.id
+        }))
+        
+        // 查找区县索引
+        const areaIndex = this.newProvinceDataList[2].findIndex(item => item.id == defaultValue.areaId)
+        if (areaIndex !== -1) {
+          this.multiIndex[2] = areaIndex
+        }
+      }
+      
+      this.updateSelectedText()
+    },
+    
+    // 选择完成事件
+    changeArea(e) {
+      this.multiIndex = e.detail.value
+      this.updateSelectedText()
+      this.emitChange()
+    },
+    
+    // 列滑动事件
+    pickerColumnchange(e) {
+      const column = e.detail.column
+      const value = e.detail.value
+      
+      if (column === 0) {
+        // 第一列滑动（省份）
+        this.multiIndex[0] = value
+        
+        // 更新城市数据
+        this.newProvinceDataList[1] = this.columns[this.multiIndex[0]].children.map(item => ({
+          name: item.name,
+          id: item.id
+        }))
+        
+        // 更新区县数据
+        if (this.columns[this.multiIndex[0]].children.length === 1) {
+          this.newProvinceDataList[2] = this.columns[this.multiIndex[0]].children[0].children.map(item => ({
+            name: item.name,
+            id: item.id
+          }))
+        } else {
+          this.newProvinceDataList[2] = this.columns[this.multiIndex[0]].children[this.multiIndex[1]].children.map(item => ({
+            name: item.name,
+            id: item.id
+          }))
+        }
+        
+        // 重置城市和区县索引
+        this.multiIndex.splice(1, 1, 0)
+        this.multiIndex.splice(2, 1, 0)
+      } else if (column === 1) {
+        // 第二列滑动（城市）
+        this.multiIndex[1] = value
+        
+        // 更新区县数据
+        this.newProvinceDataList[2] = this.columns[this.multiIndex[0]].children[this.multiIndex[1]].children.map(item => ({
+          name: item.name,
+          id: item.id
+        }))
+        
+        // 重置区县索引
+        this.multiIndex.splice(2, 1, 0)
+      } else if (column === 2) {
+        // 第三列滑动（区县）
+        this.multiIndex[2] = value
+      }
+    },
+    
+    // 更新选中的省市区ID和显示文本
+    updateSelectedText() {
+      if (this.newProvinceDataList[0][this.multiIndex[0]] && 
+          this.newProvinceDataList[1][this.multiIndex[1]] && 
+          this.newProvinceDataList[2][this.multiIndex[2]]) {
+        
+        this.selectedText = 
+                           this.newProvinceDataList[1][this.multiIndex[1]].name 
+        
+        this.provinceId = this.newProvinceDataList[0][this.multiIndex[0]].id
+        this.cityId = this.newProvinceDataList[1][this.multiIndex[1]].id
+        this.areaId = this.newProvinceDataList[2][this.multiIndex[2]].id
+      }
+    },
+    
+    // 触发change事件
+    emitChange() {
+      const selectedText = this.newProvinceDataList[0][this.multiIndex[0]].name + 
+                          this.newProvinceDataList[1][this.multiIndex[1]].name + 
+                          this.newProvinceDataList[2][this.multiIndex[2]].name
+      
+      const result = {
+        provinceId: this.provinceId,
+        cityId: this.cityId,
+        areaId: this.areaId,
+        province: this.newProvinceDataList[0][this.multiIndex[0]]?.name || '',
+        city: this.newProvinceDataList[1][this.multiIndex[1]]?.name || '',
+        area: this.newProvinceDataList[2][this.multiIndex[2]]?.name || '',
+        fullText: selectedText
+      }
+      
+      this.$emit('change', result)
+    },
+    
+    // 获取当前选中值
+    getValue() {
+      const selectedText = this.newProvinceDataList[0][this.multiIndex[0]]?.name + 
+                          this.newProvinceDataList[1][this.multiIndex[1]]?.name + 
+                          this.newProvinceDataList[2][this.multiIndex[2]]?.name
+      
+      return {
+        provinceId: this.provinceId,
+        cityId: this.cityId,
+        areaId: this.areaId,
+        provinceName: this.newProvinceDataList[0][this.multiIndex[0]]?.name || '',
+        cityName: this.newProvinceDataList[1][this.multiIndex[1]]?.name || '',
+        areaName: this.newProvinceDataList[2][this.multiIndex[2]]?.name || '',
+        fullText: selectedText
+      }
+    },
+    
+    // 重置选择
+    reset() {
+      this.multiIndex = [0, 0, 0]
+      this.selectedText = ''
+      this.provinceId = null
+      this.cityId = null
+      this.areaId = null
+      this.initPickerData()
+    },
+    
+    // 获取当前选中的详细信息（供插槽使用）
+    getCurrentSelection() {
+      if (!this.newProvinceDataList[0][this.multiIndex[0]] || 
+          !this.newProvinceDataList[1][this.multiIndex[1]] || 
+          !this.newProvinceDataList[2][this.multiIndex[2]]) {
+        return {
+          province: null,
+          city: null,
+          area: null,
+          fullText: ''
+        }
+      }
+      
+      return {
+        province: this.newProvinceDataList[0][this.multiIndex[0]],
+        city: this.newProvinceDataList[1][this.multiIndex[1]],
+        area: this.newProvinceDataList[2][this.multiIndex[2]],
+        fullText: this.newProvinceDataList[0][this.multiIndex[0]].name + 
+                 this.newProvinceDataList[1][this.multiIndex[1]].name + 
+                 this.newProvinceDataList[2][this.multiIndex[2]].name
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.area-picker {
+  width: 100%;
+}
+
+.picker-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8rpx 16rpx;
+  border: 2rpx solid #e0e0e0;
+  border-radius: 8rpx;
+  background-color: #fff;
+  min-height: 60rpx;
+}
+
+.picker-text {
+  font-size: 30rpx;
+  color: #333;
+  flex: 1;
+  
+  &.placeholder {
+    color: #999;
+  }
+}
+
+.dropdown-icon {
+  width: 24rpx;
+  height: 16rpx;
+  margin-left: 8rpx;
+}
+</style>
\ No newline at end of file
diff --git a/components/ProductSection.vue b/components/ProductSection.vue
index 9543d49..dca2437 100644
--- a/components/ProductSection.vue
+++ b/components/ProductSection.vue
@@ -50,7 +50,7 @@
             <view class="card-title">{{ item.title }}</view>
             <view class="card-price">{{ item.price }}</view>
             <image
-              v-if="!item.isLiked"
+              v-if="!item.type"
               class="heart-icon"
               src="https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png"
               @click.stop="handleLikeClick(item, index)"
@@ -151,17 +151,26 @@ export default {
     // 处理收藏点击
     handleLikeClick(item, index) {
       // 更新本地状态
-      const updatedItem = { ...item, isLiked: !item.isLiked };
+	  this.Post({
+	  		packageId: item.id,
+			type:!item.type
+	  	},
+	  	"/framework/benefitPackage/collect",'DES'
+	  ).then((res) => {
+	  	// 显示提示
+		const updatedItem = { ...item, type: !item.type };
+		this.productList[index].type = !item.type
+	  	uni.showToast({
+	  	  title: updatedItem.type ? "已收藏" : "取消收藏",
+	  	  icon: "none",
+	  	  duration: 1500,
+	  	});
+		this.$forceUpdate()
+	  	// 向父组件发送事件
+	  	this.$emit("like-toggle", { item: updatedItem, index });
+	  });
 
-      // 显示提示
-      uni.showToast({
-        title: updatedItem.isLiked ? "已收藏" : "取消收藏",
-        icon: "none",
-        duration: 1500,
-      });
-
-      // 向父组件发送事件
-      this.$emit("like-toggle", { item: updatedItem, index });
+      
     },
 
     // 显示图片
diff --git a/components/header.vue b/components/header.vue
index 1f9dd1a..25f79fa 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -8,15 +8,36 @@
       :class="{ 'header-fixed': fixed }"
       :style="{ height: height + 'px', 'padding-top': statusBarHeight + 'px' }"
     >
+	
     <!-- 左侧：地区筛选和搜索 -->
     <view class="left-section" v-if="isSearch">
-      <view class="location-selector" @click="showLocationPicker" v-if="isLocation&&selectedLocation">
-        <text class="location-text">{{ selectedLocation }}</text>
-        <image
-          class="dropdown-icon"
-          src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iOCIgdmlld0JveD0iMCAwIDEyIDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0xIDFMNiA2TDExIDEiIHN0cm9rZT0iIzk5OTk5OSIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+"
-          mode="heightFix"
-        ></image>
+      <!-- 使用省市区选择组件 -->
+      <!-- 原有的简单地区选择 -->
+      <view  v-if="isLocation&&address.cityId ">
+		    <AreaPicker
+			:defaultValue="{
+				provinceId: address.provinceId,
+				cityId: address.cityId,
+				areaId:address.areaId
+			  }"
+		          ref="areaPicker3"
+		          placeholder="请选择省市区"
+				  :selectedText="selectedText"
+		          @change="changeAddress"
+		        >
+				 <template v-slot="{ selectedText, placeholder, currentSelection }">
+					 <view class="location-selector">
+					 	
+					 <text class="location-text">{{ selectedText }}</text>
+					 <image
+					   class="dropdown-icon"
+					   src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iOCIgdmlld0JveD0iMCAwIDEyIDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0xIDFMNiA2TDExIDEiIHN0cm9rZT0iIzk5OTk5OSIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+"
+					   mode="heightFix"
+					 ></image>
+					 </view>
+					 </template>
+				</AreaPicker>
+        
       </view>
       <image
         class="search-icon"
@@ -41,11 +62,20 @@
 </template>
 
 <script>
+import AreaPicker from './AreaPicker.vue'
+
 export default {
+  components: {
+    AreaPicker
+  },
   props: {
     isSearch: {
       type: Boolean,
       default: true,
+    },
+	address: {
+      type: Object,
+      default: () =>{},
     },
     type: {
       type: String,
@@ -55,11 +85,33 @@ export default {
       type: Boolean,
       default: false,
     },
-	isLocation: {
+    isLocation: {
       type: Boolean,
       default: false,
     },
-	selectedLocation:''
+    selectedText: {
+      type: String,
+      default: ''
+    },
+    // 新增：是否使用省市区选择组件
+    isAreaPicker: {
+      type: Boolean,
+      default: true,
+    },
+    // 省市区选择器占位符
+    areaPlaceholder: {
+      type: String,
+      default: '请选择地区'
+    },
+    // 省市区默认值
+    defaultAreaValue: {
+      type: Object,
+      default: () => ({
+        provinceId: null,
+        cityId: null,
+        areaId: null
+      })
+    }
   },
   name: "header",
   data() {
@@ -68,6 +120,8 @@ export default {
       height: 0,
       statusBarHeight: 0,
       // 地区选择
+      areaPickerVisible: false,
+      selectedAreaText: ''
     };
   },
   mounted() {
@@ -87,12 +141,45 @@ export default {
         itemList: ["苏州", "上海", "杭州", "南京", "无锡"],
         success: (res) => {
           const locations = ["苏州", "上海", "杭州", "南京", "无锡"];
-          this.selectedLocation = locations[res.tapIndex];
+          this.selectedText = locations[res.tapIndex];
           // 触发地区变更事件
-          this.$emit("locationChange", this.selectedLocation);
+          this.$emit("locationChange", this.selectedText);
         },
       });
     },
+	changeAddress(e){
+		this.$emit('change',e)
+	},
+    // 显示省市区选择弹窗
+    showAreaPicker() {
+      this.areaPickerVisible = true;
+    },
+    // 省市区选择变化事件
+    onAreaChange(areaData) {
+      this.selectedAreaText = areaData.fullText;
+      // 触发省市区变更事件，传递完整的地区数据
+      this.$emit('areaChange', areaData);
+    },
+    // 获取当前选中的省市区数据
+    getAreaValue() {
+      if (this.$refs.areaPicker) {
+        return this.$refs.areaPicker.getValue();
+      }
+      return null;
+    },
+    // 重置省市区选择
+    resetArea() {
+      this.selectedAreaText = '';
+      if (this.$refs.areaPicker) {
+        this.$refs.areaPicker.reset();
+      }
+    },
+    // 为了兼容 AreaPicker 组件中的数据请求，添加 Post 方法
+    Post(data, url) {
+      // 这里需要根据项目的实际请求方法来实现
+      // 可以调用全局的请求方法或者通过 mixin 引入
+      return this.$parent.Post ? this.$parent.Post(data, url) : Promise.reject('Post method not found');
+    }
   },
 };
 </script>
@@ -124,6 +211,56 @@ export default {
   align-items: center;
   flex: 1;
 
+  .area-picker-wrapper {
+  margin-right: 20rpx;
+  min-width: 200rpx;
+  max-width: 300rpx;
+}
+
+.area-display {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8rpx 16rpx;
+  border: 2rpx solid #e0e0e0;
+  border-radius: 8rpx;
+  background-color: #fff;
+  min-height: 60rpx;
+}
+
+.area-text {
+  font-size: 30rpx;
+  color: #333;
+  flex: 1;
+  
+  &.placeholder {
+    color: #999;
+  }
+}
+
+.dropdown-icon {
+  width: 24rpx;
+  height: 16rpx;
+  margin-left: 8rpx;
+}
+
+
+
+  .search-icon {
+    height: 36.16rpx;
+  }
+}
+
+.logo {
+  height: 36.16rpx;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.right-section {
+  flex: 1;
+}
   .location-selector {
     display: flex;
     align-items: center;
@@ -145,20 +282,4 @@ export default {
       height: 16rpx;
     }
   }
-
-  .search-icon {
-    height: 36.16rpx;
-  }
-}
-
-.logo {
-  height: 36.16rpx;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.right-section {
-  flex: 1;
-}
 </style>
diff --git a/manifest.json b/manifest.json
index 61f440a..3e3f8c0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,13 +58,13 @@
             "minified" : true
         },
         "usingComponents" : true,
-		"permission" : {
-		    "scope.userLocation" : {
-		        "desc" : "为了提供更好更快速的体验，需要获取您的当前位置"
-		    }
-		},
-		"lazyCodeLoading" : "requiredComponents",
-		"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "为了提供更好更快速的体验，需要获取您的当前位置"
+            }
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true
diff --git a/pages.json b/pages.json
index 7e24a4c..123031a 100644
--- a/pages.json
+++ b/pages.json
@@ -54,8 +54,8 @@
       "path": "pages/notes/detail",
       "style": {
         "navigationBarTitleText": "笔记详情",
-		"navigationBarBackgroundColor": "#ffffff",
-		"navigationBarTextStyle": "black"
+        "navigationBarBackgroundColor": "#ffffff",
+        "navigationBarTextStyle": "black"
       }
     },
     {
@@ -189,6 +189,14 @@
             "navigationBarTitleText": "修改昵称"
           }
         },
+        {
+          "path": "user/collection",
+          "style": {
+            "navigationBarTitleText": "我的收藏",
+            "navigationBarBackgroundColor": "#ffffff",
+            "navigationBarTextStyle": "black"
+          }
+        },
         {
           "path": "search/search",
           "style": {
diff --git a/pages/index/iSoul.vue b/pages/index/iSoul.vue
index 50c3a76..f9ca73b 100644
--- a/pages/index/iSoul.vue
+++ b/pages/index/iSoul.vue
@@ -1,107 +1,88 @@
 <template>
-  <view class="profile-container">
-    <view
-      class="user-top"
-      :style="{
+	<view class="profile-container">
+		<view class="user-top" :style="{
         backgroundImage: `url(${showImg(
           '/uploads/20250728/4ad18fba010760a527d0cf5e24bcf467.png'
         )})`,
-      }"
-    >
-      <!-- 状态栏占位 -->
-      <view class="status-bar-placeholder"></view>
-      <!-- 顶部导航 -->
-      <view class="header">
-        <!-- <view class="back-btn" @click="goBack">
+      }">
+			<!-- 状态栏占位 -->
+			<view class="status-bar-placeholder"></view>
+			<!-- 顶部导航 -->
+			<view class="header">
+				<!-- <view class="back-btn" @click="goBack">
         <text class="iconfont">‹</text>
       </view>
       <view class="more-btn">
         <text class="dots">⋯</text>
       </view> -->
-      </view>
-      <!-- 用户信息区域 -->
-      <view class="user-section" @click="gotoProfile">
-        <view class="user-avatar">
-          <image
-            :src="userInfo.avatar ? showImg(userInfo.avatar) : defaultAvatar"
-            mode="aspectFill"
-            class="avatar-img"
-          ></image>
-        </view>
-        <view class="user-info">
-          <view class="username">{{ userInfo.nickname || "去登录" }}</view>
-          <view class="user-id" v-if="userInfo.redBookId">ID：{{ userInfo.redBookId || "123456" }}</view>
-          <!-- <view class="location">
+			</view>
+			<!-- 用户信息区域 -->
+			<view class="user-section" @click="gotoProfile">
+				<view class="user-avatar">
+					<image :src="userInfo.avatar ? showImg(userInfo.avatar) : defaultAvatar" mode="aspectFill"
+						class="avatar-img"></image>
+				</view>
+				<view class="user-info">
+					<view class="username">{{ userInfo.nickname || "去登录" }}</view>
+					<view class="user-id" v-if="userInfo.redBookId">ID：{{ userInfo.redBookId || "123456" }}</view>
+					<!-- <view class="location">
             <text class="location-icon">📍</text>
             <text>IP属地：{{ userInfo.location || "上海" }}</text>
             <text class="info-icon">ⓘ</text>
           </view> -->
-        </view>
-      </view>
-
-      <!-- 城市艺术漫游 -->
-      <view class="city-art">
-        <view class="city-title">
-          <!-- <text class="pin-icon">📍</text> -->
-          <text>城市艺术漫游</text>
-        </view>
-        <!-- <view class="city-name">上海</view>
+				</view>
+			</view>
+
+			<!-- 城市艺术漫游 -->
+			<view class="city-art">
+				<view class="city-title">
+					<!-- <text class="pin-icon">📍</text> -->
+					<text>城市艺术漫游</text>
+				</view>
+				<!-- <view class="city-name">上海</view>
         <view class="gender-icon">♀</view> -->
-      </view>
-
-      <!-- 统计数据 -->
-      <view class="stats-section">
-        <view class="stats-left">
-          <view class="stat-item">
-            <view class="stat-number">{{ userStats.following || "140" }}</view>
-            <view class="stat-label">关注</view>
-          </view>
-          <view class="stat-item">
-            <view class="stat-number">{{ userStats.followers || "2462" }}</view>
-            <view class="stat-label">粉丝</view>
-          </view>
-          <view class="stat-item">
-            <view class="stat-number">{{ userStats.likes || "5.4万" }}</view>
-            <view class="stat-label">获赞与收藏</view>
-          </view>
-        </view>
-        <!-- 权益兑换入口 -->
-        <view class="exchange-entry" @click="showExchangePopup">
-          <view class="exchange-icon">🎁</view>
-          <view class="exchange-text">权益兑换</view>
-        </view>
-      </view>
-    </view>
-    <!-- 待激活的Agent -->
-    <view class="agent-section">
-      <view class="agent-header">
-        <view class="agent-title">待激活的Agent</view>
-      </view>
-      <view class="agent-content">
-        <scroll-view
-          class="agent-scroll"
-          scroll-x="true"
-          :show-scrollbar="false"
-          :enhanced="true"
-        >
-          <view class="agent-avatars">
-            <view
-              class="agent-avatar"
-              v-for="(agent, index) in agentList"
-              :key="index"
-            >
-              <image
-                :src="agent.avatar"
-                mode="aspectFill"
-                class="agent-img"
-              ></image>
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-    </view>
-    <!-- 操作按钮 -->
-    <!-- <view class="action-buttons">
+			</view>
+
+			<!-- 统计数据 -->
+			<view class="stats-section">
+				<view class="stats-left">
+					<view class="stat-item">
+						<view class="stat-number">{{ userStats.following || "140" }}</view>
+						<view class="stat-label">关注</view>
+					</view>
+					<view class="stat-item">
+						<view class="stat-number">{{ userStats.followers || "2462" }}</view>
+						<view class="stat-label">粉丝</view>
+					</view>
+					<view class="stat-item">
+						<view class="stat-number">{{ userStats.likes || "5.4万" }}</view>
+						<view class="stat-label">获赞与收藏</view>
+					</view>
+				</view>
+				<!-- 权益兑换入口 -->
+				<view class="exchange-entry" @click="showExchangePopup">
+					<view class="exchange-icon">🎁</view>
+					<view class="exchange-text">权益兑换</view>
+				</view>
+			</view>
+		</view>
+		<!-- 待激活的Agent -->
+		<view class="agent-section">
+			<view class="agent-header">
+				<view class="agent-title">待激活的Agent</view>
+			</view>
+			<view class="agent-content">
+				<scroll-view class="agent-scroll" scroll-x="true" :show-scrollbar="false" :enhanced="true">
+					<view class="agent-avatars">
+						<view class="agent-avatar" v-for="(agent, index) in agentList" :key="index">
+							<image :src="agent.avatar" mode="aspectFill" class="agent-img"></image>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- 操作按钮 -->
+		<!-- <view class="action-buttons">
       <view class="follow-btn" @click="followUser">
         <text>关注</text>
       </view>
@@ -110,1037 +91,983 @@
       </view>
     </view> -->
 
-    <!-- 数字资产权益 -->
-    <view class="digital-assets">
-      <view class="asset-card">
-        <image
-          :src="
+		<!-- 数字资产权益 -->
+		<view class="digital-assets">
+			<view class="asset-card">
+				<image
+				 @click="handleAssetAction()"
+				 :src="
+				
             showImg('/uploads/20250729/42598a2dcf4c9a6f8c6e122e54b65c4f.png')
-          "
-          mode="aspectFill"
-          class="digital-img"
-        ></image>
-        <view class="asset-actions">
-          <view
-            class="asset-action active"
-            @click="handleAssetAction('待核销')"
-          >
-            <view class="action-icon red"></view>
-            <text>待核销</text>
-          </view>
-          <view class="asset-action" @click="handleAssetAction('待发货')">
-            <view class="action-icon gray"></view>
-            <text>待发货</text>
-          </view>
-          <view class="asset-action" @click="handleAssetAction('退货/退款')">
-            <view class="action-icon gray"></view>
-            <text>退货/退款</text>
-          </view>
-          <view class="asset-action" @click="handleAssetAction('历史记录')">
-            <view class="action-icon gray"></view>
-            <text>历史记录</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 有感商品 -->
-    <view class="feeling-goods">
-      <view class="goods-card">
-        <image
-          :src="
+          " mode="aspectFill" class="digital-img"></image>
+				<view class="asset-actions">
+					<view class="asset-action active" @click="handleAssetAction('待使用')">
+						<view class="action-icon red"></view>
+						<text>待使用</text>
+					</view>
+					<view class="asset-action" @click="handleAssetAction('待收货')">
+						<view class="action-icon gray"></view>
+						<text>待收货</text>
+					</view>
+					<view class="asset-action" @click="handleAssetAction('已完成')">
+						<view class="action-icon gray"></view>
+						<text>已完成</text>
+					</view>
+					<view class="asset-action" @click="handleAssetAction('售后/退款')">
+						<view class="action-icon gray"></view>
+						<text>售后/退款</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 有感商品 -->
+		<view class="feeling-goods">
+			<view class="goods-card">
+				<image :src="
             showImg('/uploads/20250729/a010feb51e3f195563fb440f9235cc8b.png')
-          "
-          mode="aspectFill"
-          class="digital-img"
-        ></image>
-        <view class="goods-actions">
-          <view
-            class="goods-action active"
-            @click="handleGoodsAction('购物车')"
-          >
-            <view class="action-icon red"></view>
-            <text>购物车</text>
-          </view>
-          <view class="goods-action" @click="handleGoodsAction('待发货')">
-            <view class="action-icon gray"></view>
-            <text>待发货</text>
-          </view>
-          <view class="goods-action" @click="handleGoodsAction('退货/退款')">
-            <view class="action-icon gray"></view>
-            <text>退货/退款</text>
-          </view>
-          <view class="goods-action" @click="handleGoodsAction('评价')">
-            <view class="action-icon gray"></view>
-            <text>评价</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 数字资产纪念册 -->
-    <view class="memorial-section">
-      <view class="memorial-divider">
-        <view class="divider-line"></view>
-        <view class="divider-text">数字资产纪念册</view>
-        <view class="divider-line"></view>
-      </view>
-      <view class="memorial-cards">
-        <view class="memorial-card" @click="handleMemorialClick(0)">
-          <image
-            :src="
+          " mode="aspectFill" class="digital-img"></image>
+				<view class="goods-actions">
+					<view class="goods-action active" @click="handleGoodsAction('购物车')">
+						<view class="action-icon red"></view>
+						<text>购物车</text>
+					</view>
+					<view class="goods-action" @click="handleGoodsAction('待发货')">
+						<view class="action-icon gray"></view>
+						<text>待发货</text>
+					</view>
+					<view class="goods-action" @click="handleGoodsAction('退货/退款')">
+						<view class="action-icon gray"></view>
+						<text>退货/退款</text>
+					</view>
+					<view class="goods-action" @click="handleGoodsAction('评价')">
+						<view class="action-icon gray"></view>
+						<text>评价</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 数字资产纪念册 -->
+		<view class="memorial-section">
+			<view class="memorial-divider">
+				<view class="divider-line"></view>
+				<view class="divider-text">数字资产纪念册</view>
+				<view class="divider-line"></view>
+			</view>
+			<view class="memorial-cards">
+				<view class="memorial-card" @click="handleMemorialClick(0)">
+					<image :src="
               showImg('/uploads/20250729/105755e9b2e570e46b96d54ed61abe51.png')
-            "
-            mode="aspectFill"
-            class="memorial-img"
-          ></image>
-          <view class="memorial-info">
-            <text class="memorial-title">世界花园｜凤景里的苏州</text>
-            <text class="memorial-more">MORE</text>
-          </view>
-        </view>
-        <view class="memorial-card" @click="handleMemorialClick(1)">
-          <image
-            :src="
+            " mode="aspectFill" class="memorial-img"></image>
+					<view class="memorial-info">
+						<text class="memorial-title">世界花园｜凤景里的苏州</text>
+						<text class="memorial-more">MORE</text>
+					</view>
+				</view>
+				<view class="memorial-card" @click="handleMemorialClick(1)">
+					<image :src="
               showImg('/uploads/20250729/42fe2364167c2342076c4e094df3d288.png')
-            "
-            mode="aspectFill"
-            class="memorial-img"
-          ></image>
-          <view class="memorial-info">
-            <text class="memorial-title">男神女神罗曼史</text>
-            <text class="memorial-more">MORE</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 底部菜单 -->
-    <view class="bottom-menu">
-      <view
-        class="menu-item"
-        v-for="(item, index) in menuItems"
-        :key="index"
-        @click="handleMenuClick(item)"
-      >
-        <text>{{ item.title }}</text>
-      </view>
-    </view>
-
-    <CustomTabBar :currentTab="4" />
-    <MusicControl />
-
-    <!-- 权益兑换弹窗 -->
-    <uni-popup ref="exchangePopup" type="center">
-      <view class="exchange-popup">
-        <view class="popup-header">
-          <text class="popup-title">权益兑换</text>
-          <text class="popup-close" @click="closeExchangePopup">×</text>
-        </view>
-        <view class="popup-content">
-          <view class="input-section">
-            <text class="input-label">请输入兑换码</text>
-            <input
-              class="exchange-input"
-              v-model="exchangeCode"
-              placeholder="请输入兑换码"
-              maxlength="20"
-            />
-          </view>
-          <view class="popup-actions">
-            <button class="cancel-btn" @click="closeExchangePopup">取消</button>
-            <button class="confirm-btn" @click="confirmExchange">
-              确认兑换
-            </button>
-          </view>
-        </view>
-      </view>
-    </uni-popup>
-  </view>
+            " mode="aspectFill" class="memorial-img"></image>
+					<view class="memorial-info">
+						<text class="memorial-title">男神女神罗曼史</text>
+						<text class="memorial-more">MORE</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部菜单 -->
+		<view class="bottom-menu">
+			<view class="menu-item" v-for="(item, index) in menuItems" :key="index" @click="handleMenuClick(item)">
+				<text>{{ item.icon }}{{ item.title }}</text>
+			</view>
+		</view>
+
+		<CustomTabBar :currentTab="4" />
+		<MusicControl />
+
+		<!-- 权益兑换弹窗 -->
+		<uni-popup ref="exchangePopup" type="center">
+			<view class="exchange-popup">
+				<view class="popup-header">
+					<text class="popup-title">权益兑换</text>
+					<text class="popup-close" @click="closeExchangePopup">×</text>
+				</view>
+				<view class="popup-content">
+					<view class="input-section">
+						<text class="input-label">请输入兑换码</text>
+						<input class="exchange-input" v-model="exchangeCode" placeholder="请输入兑换码" maxlength="20" />
+					</view>
+					<view class="popup-actions">
+						<button class="cancel-btn" @click="closeExchangePopup">取消</button>
+						<button class="confirm-btn" @click="confirmExchange">
+							确认兑换
+						</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
 </template>
 
 <script>
-import moment from "moment";
-import CustomTabBar from "@/components/CustomTabBar.vue";
-import MusicControl from "@/components/MusicControl.vue";
-export default {
-  components: {
-    CustomTabBar,
-    MusicControl,
-  },
-  data() {
-    return {
-      userInfo: {},
-      defaultAvatar:
-        "https://changshu.js-dyyj.com/uploads/20250326/516242619f0772bee371a60684618c01.png",
-      userStats: {
-        following: "140",
-        followers: "2462",
-        likes: "5.4万",
-      },
-      agentList: [
-        {
-          avatar:
-            "https://epic.js-dyyj.com/uploads/20250728/d27ef6e6c26877da7775664fed376c6f.png",
-        },
-        {
-          avatar:
-            "https://epic.js-dyyj.com/uploads/20250728/d7bf0dd2f3f272afba687b525a7c575c.png",
-        },
-        {
-          avatar:
-            "https://epic.js-dyyj.com/uploads/20250728/d27ef6e6c26877da7775664fed376c6f.png",
-        },
-        {
-          avatar:
-            "https://epic.js-dyyj.com/uploads/20250728/d7bf0dd2f3f272afba687b525a7c575c.png",
-        },
-      ],
-      menuItems: [
-        {
-          title: "账号与安全",
-          icon: "🔒",
-        },
-        {
-          title: "购物车",
-          icon: "🛒",
-        },
-        {
-          title: "地址管理",
-          icon: "📍",
-        },
-        {
-          title: "卡券中心",
-          icon: "🎫",
-        },
-        {
-          title: "帮助与客服",
-          icon: "💬",
-        },
-      ],
-      exchangeCode: "", // 兑换码
-    };
-  },
-  onLoad() {
-    // 页面加载时的初始化逻辑
-    console.log("iSoul页面加载完成");
-  },
-  onShow() {
-    this.userInfo =
-      (uni.getStorageSync("userInfo") &&
-        JSON.parse(uni.getStorageSync("userInfo"))) ||
-      this.$store.state.user.userInfo ||
-      {};
-    console.log(this.userInfo);
-  },
-  methods: {
-    // 返回上一页
-    goBack() {
-      uni.navigateBack();
-    },
-    // 关注用户
-    followUser() {
-      uni.showToast({
-        title: "关注成功",
-        icon: "success",
-      });
-    },
-    // 发送私信
-    sendMessage() {
-      uni.navigateTo({
-        url: "/pages/chat/chat",
-      });
-    },
-    // 处理菜单点击
-    handleMenuClick(item) {
-      switch (item.title) {
-        case "账号与安全":
-          uni.navigateTo({
-            url: "/subPackages/user/privacy",
-          });
-          break;
-        case "购物车":
-          uni.navigateTo({
-            url: "/subPackages/user/gwc",
-          });
-          break;
-        case "地址管理":
-          uni.navigateTo({
-            url: "/subPackages/user/travelerList",
-          });
-          break;
-        case "卡券中心":
-          uni.navigateTo({
-            url: "/subPackages/user/coupon",
-          });
-          break;
-        case "帮助与客服":
-          uni.showModal({
-            title: "客服电话",
-            content:
-              "0515-69186109\n服务时间：周一至周五\n9:00-12:00，13:00-18:00",
-            confirmText: "拨打",
-            success: (res) => {
-              if (res.confirm) {
-                uni.makePhoneCall({
-                  phoneNumber: "0515-69186109",
-                });
-              }
-            },
-          });
-          break;
-        default:
-          uni.showToast({
-            title: item.title,
-            icon: "none",
-          });
-      }
-    },
-    // 个人信息或登录
-    gotoProfile() {
-      // 有token去个人信息，没有去登录
-      if (this.userInfo.token) {
-        uni.navigateTo({
-          url: "/subPackages/user/profile",
-        });
-      } else {
-        uni.navigateTo({
-          url: "/pages/login/login",
-        });
-      }
-    },
-
-    // 数字资产权益点击
-    handleAssetAction(action) {
-      switch (action) {
-        case "待核销":
-          uni.navigateTo({
-            url: "/subPackages/orderQy/list?status=PAYMENT_SUCCESSFULLY",
-          });
-          break;
-        case "待发货":
-          uni.navigateTo({
-            url: "/subPackages/orderQy/list?status=POST",
-          });
-          break;
-        case "退货/退款":
-          uni.navigateTo({
-            url: "/subPackages/orderQy/list?status=WAIT_REFUND",
-          });
-          break;
-        case "历史记录":
-          uni.navigateTo({
-            url: "/subPackages/orderQy/list",
-          });
-          break;
-      }
-    },
-    // 有感商品点击
-    handleGoodsAction(action) {
-      switch (action) {
-        case "购物车":
-          uni.navigateTo({
-            url: "/subPackages/user/gwc",
-          });
-          break;
-        case "待发货":
-          uni.navigateTo({
-            url: "/subPackages/order/trades?status=POST",
-          });
-          break;
-        case "退货/退款":
-          uni.navigateTo({
-            url: "/subPackages/order/trades?status=WAIT_REFUND",
-          });
-          break;
-        case "评价":
-          uni.navigateTo({
-            url: "/subPackages/order/trades?status=WAIT_COMMENT",
-          });
-          break;
-      }
-    },
-    // 纪念册卡片点击
-    handleMemorialClick(index) {
-      // 点击任何纪念册卡片都跳转到数字资产纪念册页面
-      uni.navigateTo({
-        url: "/subPackages/memorialAlbum/index",
-      });
-    },
-
-    // 显示权益兑换弹窗
-    showExchangePopup() {
-      this.exchangeCode = ""; // 清空输入框
-      this.$refs.exchangePopup.open();
-    },
-
-    // 关闭权益兑换弹窗
-    closeExchangePopup() {
-      this.$refs.exchangePopup.close();
-    },
-
-    // 确认兑换
-    async confirmExchange() {
-      if (!this.exchangeCode.trim()) {
-        uni.showToast({
-          title: "请输入兑换码",
-          icon: "none",
-        });
-        return;
-      }
-
-      // 显示加载
-      uni.showLoading({
-        title: "兑换中...",
-      });
-
-      try {
-        // 调用兑换API
-        const result = await this.exchangeEquity(this.exchangeCode);
-
-        uni.hideLoading();
-
-        if (result.success) {
-          uni.showToast({
-            title: "兑换成功！",
-            icon: "success",
-          });
-          this.closeExchangePopup();
-        } else {
-          uni.showToast({
-            title: result.message || "兑换失败",
-            icon: "none",
-          });
-        }
-      } catch (error) {
-        uni.hideLoading();
-        uni.showToast({
-          title: "兑换失败，请稍后重试",
-          icon: "none",
-        });
-      }
-    },
-
-    // API - 兑换权益
-    async exchangeEquity(code) {
-      // 模拟API调用
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          // 模拟不同的兑换结果
-          if (code === "EPIC2024") {
-            resolve({
-              success: true,
-              message: "兑换成功！获得数字藏品一枚",
-            });
-          } else if (code === "TEST123") {
-            resolve({
-              success: true,
-              message: "兑换成功！获得优惠券一张",
-            });
-          } else {
-            resolve({
-              success: false,
-              message: "兑换码无效或已使用",
-            });
-          }
-        }, 1500);
-      });
-    },
-  },
-};
+	import moment from "moment";
+	import CustomTabBar from "@/components/CustomTabBar.vue";
+	import MusicControl from "@/components/MusicControl.vue";
+	export default {
+		components: {
+			CustomTabBar,
+			MusicControl,
+		},
+		data() {
+			return {
+				userInfo: {},
+				defaultAvatar: "https://changshu.js-dyyj.com/uploads/20250326/516242619f0772bee371a60684618c01.png",
+				userStats: {
+					following: "140",
+					followers: "2462",
+					likes: "5.4万",
+				},
+				agentList: [{
+						avatar: "https://epic.js-dyyj.com/uploads/20250728/d27ef6e6c26877da7775664fed376c6f.png",
+					},
+					{
+						avatar: "https://epic.js-dyyj.com/uploads/20250728/d7bf0dd2f3f272afba687b525a7c575c.png",
+					},
+					{
+						avatar: "https://epic.js-dyyj.com/uploads/20250728/d27ef6e6c26877da7775664fed376c6f.png",
+					},
+					{
+						avatar: "https://epic.js-dyyj.com/uploads/20250728/d7bf0dd2f3f272afba687b525a7c575c.png",
+					},
+				],
+				menuItems: [{
+						title: "账号与安全",
+						icon: "🔒",
+					},
+					{
+						title: "购物车",
+						icon: "🛒",
+					},
+					{
+						title: "我的收藏",
+						icon: "💬",
+					},
+					{
+						title: "地址管理",
+						icon: "📍",
+					},
+					{
+						title: "卡券中心",
+						icon: "🎫",
+					},
+					{
+						title: "帮助与客服",
+						icon: "💬",
+					},
+
+				],
+				exchangeCode: "", // 兑换码
+			};
+		},
+		onLoad() {
+			// 页面加载时的初始化逻辑
+			console.log("iSoul页面加载完成");
+		},
+		onShow() {
+			this.userInfo =
+				(uni.getStorageSync("userInfo") &&
+					JSON.parse(uni.getStorageSync("userInfo"))) ||
+				this.$store.state.user.userInfo || {};
+			console.log(this.userInfo);
+		},
+		methods: {
+			// 返回上一页
+			goBack() {
+				uni.navigateBack();
+			},
+			// 关注用户
+			followUser() {
+				uni.showToast({
+					title: "关注成功",
+					icon: "success",
+				});
+			},
+			// 发送私信
+			sendMessage() {
+				uni.navigateTo({
+					url: "/pages/chat/chat",
+				});
+			},
+			// 处理菜单点击
+			handleMenuClick(item) {
+				switch (item.title) {
+					case "账号与安全":
+						uni.navigateTo({
+							url: "/subPackages/user/privacy",
+						});
+						break;
+					case "购物车":
+						uni.navigateTo({
+							url: "/subPackages/user/gwc",
+						});
+						break;
+					case "地址管理":
+						uni.navigateTo({
+							url: "/subPackages/user/travelerList",
+						});
+						break;
+					case "卡券中心":
+						uni.navigateTo({
+							url: "/subPackages/user/coupon",
+						});
+						break;
+					case "我的收藏":
+						uni.navigateTo({
+							url: "/subPackages/user/collection",
+						});
+						break;
+					case "帮助与客服":
+						uni.showModal({
+							title: "客服电话",
+							content: "0515-69186109\n服务时间：周一至周五\n9:00-12:00，13:00-18:00",
+							confirmText: "拨打",
+							success: (res) => {
+								if (res.confirm) {
+									uni.makePhoneCall({
+										phoneNumber: "0515-69186109",
+									});
+								}
+							},
+						});
+						break;
+					default:
+						uni.showToast({
+							title: item.title,
+							icon: "none",
+						});
+				}
+			},
+			// 个人信息或登录
+			gotoProfile() {
+				// 有token去个人信息，没有去登录
+				if (this.userInfo.token) {
+					uni.navigateTo({
+						url: "/subPackages/user/profile",
+					});
+				} else {
+					uni.navigateTo({
+						url: "/pages/login/login",
+					});
+				}
+			},
+
+			// 数字资产权益点击
+			handleAssetAction(action) {
+				switch (action) {
+					case "待使用":
+						uni.navigateTo({
+							url: "/subPackages/orderQy/list?status=1",
+						});
+						break;
+					case "待收货":
+						uni.navigateTo({
+							url: "/subPackages/orderQy/list?status=2",
+						});
+						break;
+					case "已完成":
+						uni.navigateTo({
+							url: "/subPackages/orderQy/list?status=3",
+						});
+						break;
+					case "售后/退款":
+						uni.navigateTo({
+							url: "/subPackages/orderQy/list?status=4",
+						});
+						break;
+					default:
+					uni.navigateTo({
+						url: "/subPackages/orderQy/list",
+					});
+						break;
+					
+				}
+			},
+			// 有感商品点击
+			handleGoodsAction(action) {
+				switch (action) {
+					case "购物车":
+						uni.navigateTo({
+							url: "/subPackages/user/gwc",
+						});
+						break;
+					case "待发货":
+						uni.navigateTo({
+							url: "/subPackages/order/trades?status=POST",
+						});
+						break;
+					case "退货/退款":
+						uni.navigateTo({
+							url: "/subPackages/order/trades?status=WAIT_REFUND",
+						});
+						break;
+					case "评价":
+						uni.navigateTo({
+							url: "/subPackages/order/trades?status=WAIT_COMMENT",
+						});
+						break;
+				}
+			},
+			// 纪念册卡片点击
+			handleMemorialClick(index) {
+				// 点击任何纪念册卡片都跳转到数字资产纪念册页面
+				uni.navigateTo({
+					url: "/subPackages/memorialAlbum/index",
+				});
+			},
+
+			// 显示权益兑换弹窗
+			showExchangePopup() {
+				this.exchangeCode = ""; // 清空输入框
+				this.$refs.exchangePopup.open();
+			},
+
+			// 关闭权益兑换弹窗
+			closeExchangePopup() {
+				this.$refs.exchangePopup.close();
+			},
+
+			// 确认兑换
+			async confirmExchange() {
+				if (!this.exchangeCode.trim()) {
+					uni.showToast({
+						title: "请输入兑换码",
+						icon: "none",
+					});
+					return;
+				}
+
+
+
+				this.Post({
+						activeCode: this.exchangeCode.trim(),
+					},
+					"/framework/order/active",
+					"DES"
+				).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: "兑换成功！",
+							icon: "none",
+						});
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none",
+						});
+					}
+				});
+
+			},
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-view {
-  box-sizing: border-box;
-}
-
-.profile-container {
-  background: white;
-  min-height: 100vh;
-  padding-bottom: 200rpx;
-  color: white;
-}
-
-/* 状态栏占位 */
-.status-bar-placeholder {
-  height: var(--status-bar-height);
-  width: 100%;
-}
-
-/* 顶部导航 */
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 48px;
-}
-
-.back-btn,
-.more-btn {
-  width: 60rpx;
-  height: 60rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 40rpx;
-  color: white;
-}
-
-.dots {
-  font-size: 32rpx;
-  font-weight: bold;
-}
-
-/* 用户信息区域 */
-.user-section {
-  display: flex;
-  align-items: center;
-  padding: 0 40rpx 30rpx;
-}
-
-.user-avatar {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 50%;
-  overflow: hidden;
-  margin-right: 30rpx;
-}
-
-.avatar-img {
-  width: 100%;
-  height: 100%;
-}
-
-.user-info {
-  flex: 1;
-}
-
-.username {
-  font-size: 36rpx;
-  font-weight: bold;
-  color: white;
-  margin-bottom: 10rpx;
-}
-
-.user-id {
-  font-size: 24rpx;
-  color: rgba(255, 255, 255, 0.8);
-  margin-bottom: 10rpx;
-}
-
-.location {
-  display: flex;
-  align-items: center;
-  font-size: 24rpx;
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.location-icon,
-.info-icon {
-  margin-right: 8rpx;
-}
-
-/* 城市艺术漫游 */
-.city-art {
-  padding: 0 40rpx 20rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.city-title {
-  display: flex;
-  align-items: center;
-  font-size: 28rpx;
-  color: rgba(255, 255, 255, 0.9);
-}
-
-.pin-icon {
-  margin-right: 8rpx;
-}
-
-.city-name {
-  font-size: 28rpx;
-  color: white;
-  font-weight: bold;
-}
-
-.gender-icon {
-  width: 40rpx;
-  height: 40rpx;
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 24rpx;
-}
-
-/* 统计数据 */
-.stats-section {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 80rpx;
-  padding-bottom: 50rpx;
-  padding: 0 40rpx;
-}
-
-.stats-left {
-  display: flex;
-  gap: 60rpx;
-}
-
-.stat-item {
-  text-align: center;
-  min-width: 80rpx;
-}
-
-.stat-number {
-  font-size: 32rpx;
-  font-weight: bold;
-  color: white;
-  margin-bottom: 8rpx;
-}
-
-.stat-label {
-  font-size: 24rpx;
-  color: rgba(255, 255, 255, 0.8);
-}
-
-/* 权益兑换入口 */
-.exchange-entry {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 16rpx;
-  background: rgba(255, 255, 255, 0.1);
-  border-radius: 20rpx;
-  min-width: 120rpx;
-  transition: all 0.3s ease;
-
-  &:active {
-    transform: scale(0.95);
-    background: rgba(255, 255, 255, 0.2);
-  }
-}
-
-.exchange-icon {
-  font-size: 32rpx;
-  margin-bottom: 8rpx;
-}
-
-.exchange-text {
-  font-size: 22rpx;
-  color: rgba(255, 255, 255, 0.9);
-  font-weight: 500;
-}
-
-/* 操作按钮 */
-.action-buttons {
-  display: flex;
-  padding: 0 40rpx 40rpx;
-  gap: 20rpx;
-}
-
-.follow-btn {
-  flex: 1;
-  background: #ff4757;
-  border-radius: 50rpx;
-  padding: 20rpx;
-  text-align: center;
-  color: white;
-  font-size: 28rpx;
-  font-weight: bold;
-}
-
-.message-btn {
-  flex: 1;
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 50rpx;
-  padding: 20rpx;
-  text-align: center;
-  color: white;
-  font-size: 28rpx;
-  font-weight: bold;
-}
-
-/* 待激活的Agent */
-.agent-section {
-  margin: 0 47rpx;
-  border-radius: 20rpx;
-  margin-bottom: 30rpx;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
-  padding: 30rpx 0;
-}
-
-.agent-header {
-  margin-right: 30rpx;
-  flex-shrink: 0;
-}
-
-.agent-title {
-  font-size: 28rpx;
-  color: #000000;
-}
-
-.agent-content {
-  flex: 1;
-}
-
-.agent-scroll {
-  width: 430rpx;
-  white-space: nowrap;
-  /* 微信小程序隐藏横向滚动条 */
-  overflow: hidden;
-  /* Webkit浏览器 */
-  &::-webkit-scrollbar {
-    display: none !important;
-    width: 0 !important;
-    height: 0 !important;
-  }
-  /* Firefox */
-  scrollbar-width: none;
-  /* IE和Edge */
-  -ms-overflow-style: none;
-}
-
-.agent-avatars {
-  display: inline-flex;
-  gap: 20rpx;
-}
-
-.agent-avatar {
-  width: 104rpx;
-  height: 104rpx;
-  border-radius: 50%;
-  overflow: hidden;
-  flex-shrink: 0;
-}
-
-.agent-img {
-  width: 100%;
-  height: 100%;
-}
-
-/* 数字资产权益 */
-.digital-assets {
-  margin: 0 30rpx 0rpx;
-}
-
-.asset-card {
-  border-radius: 20rpx;
-  overflow: hidden;
-}
-
-.asset-bg {
-  padding: 40rpx 30rpx 30rpx;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  position: relative;
-  overflow: hidden;
-}
-
-.asset-bg::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle cx="85" cy="15" r="8" fill="rgba(255,255,255,0.1)"/><circle cx="15" cy="85" r="6" fill="rgba(255,255,255,0.08)"/><circle cx="70" cy="70" r="4" fill="rgba(255,255,255,0.06)"/></svg>');
-  pointer-events: none;
-}
-
-.asset-title {
-  font-size: 32rpx;
-  color: white;
-  font-weight: 600;
-  position: relative;
-  z-index: 1;
-}
-
-.asset-actions {
-  display: flex;
-  padding: 20rpx 0;
-
-  background: white;
-  font-size: 25rpx;
-}
-
-.asset-action {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 0 10rpx;
-  font-size: 24rpx;
-  color: #666;
-  position: relative;
-}
-
-.asset-action.active {
-  color: #ff4757;
-}
-
-.action-icon {
-  width: 36rpx;
-  height: 36rpx;
-  border-radius: 50%;
-  margin-bottom: 12rpx;
-}
-
-.action-icon.red {
-  background: #ff4757;
-}
-
-.action-icon.gray {
-  background: #ccc;
-}
-
-/* 有感商品 */
-.feeling-goods {
-  margin: 20rpx 30rpx 30rpx;
-}
-
-.goods-card {
-  border-radius: 20rpx;
-  overflow: hidden;
-}
-
-.goods-bg {
-  padding: 40rpx 30rpx 20rpx;
-  position: relative;
-}
-
-.goods-title {
-  font-size: 32rpx;
-  color: white;
-  font-weight: bold;
-  margin-bottom: 10rpx;
-}
-
-.goods-brand {
-  font-size: 36rpx;
-  color: white;
-  font-weight: bold;
-  margin-bottom: 5rpx;
-}
-
-.goods-subtitle {
-  font-size: 24rpx;
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.goods-actions {
-  display: flex;
-  background: white;
-}
-
-.goods-action {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 20rpx 10rpx;
-  font-size: 24rpx;
-  color: #666;
-}
-
-.goods-action.active {
-  color: #ff4757;
-}
-
-/* 数字资产纪念册 */
-.memorial-section {
-  margin: 0 47rpx;
-  margin-bottom: 30rpx;
-}
-
-.memorial-divider {
-  display: flex;
-  align-items: center;
-  padding: 30rpx 0;
-  margin-bottom: 30rpx;
-}
-
-.divider-line {
-  flex: 1;
-  height: 2rpx;
-  background: #e0e0e0;
-}
-
-.divider-text {
-  padding: 0 30rpx;
-  font-size: 28rpx;
-  color: #000000;
-  font-weight: 500;
-  white-space: nowrap;
-}
-
-.memorial-cards {
-  display: flex;
-  gap: 20rpx;
-}
-
-.memorial-card {
-  flex: 1;
-  border-radius: 10rpx;
-  overflow: hidden;
-  background: white;
-}
-
-.memorial-img {
-  width: 100%;
-  height: 425rpx;
-}
-
-.memorial-info {
-  padding: 20rpx 10rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.memorial-title {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-size: 22rpx;
-  color: #000000;
-  flex: 1;
-}
-
-.memorial-more {
-  font-size: 14rpx;
-  color: #999;
-}
-
-/* 底部菜单 */
-.bottom-menu {
-  padding: 40rpx 30rpx;
-  background: white;
-  margin: 0 30rpx;
-  border-radius: 20rpx;
-  margin-bottom: 30rpx;
-}
-
-.menu-item {
-  padding: 30rpx 0;
-  border-bottom: 1rpx solid #f5f5f5;
-  font-size: 28rpx;
-  color: #333;
-}
-
-.menu-item:last-child {
-  border-bottom: none;
-}
-
-// 用户顶部背景区域
-.user-top {
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
-  padding-bottom: 20rpx;
-}
-
-.digital-img {
-  height: 265rpx;
-  width: 100%;
-  border-radius: 20rpx;
-}
-
-/* 权益兑换弹窗 */
-.exchange-popup {
-  width: 600rpx;
-  background-color: #ffffff;
-  border-radius: 16rpx;
-  overflow: hidden;
-}
-
-.popup-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 30rpx;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.popup-title {
-  font-size: 32rpx;
-  font-weight: 600;
-  color: #333;
-}
-
-.popup-close {
-  font-size: 40rpx;
-  color: #999;
-  padding: 0 10rpx;
-}
-
-.popup-content {
-  padding: 40rpx 30rpx 30rpx;
-}
-
-.input-section {
-  margin-bottom: 40rpx;
-}
-
-.input-label {
-  display: block;
-  font-size: 28rpx;
-  color: #333;
-  margin-bottom: 20rpx;
-  font-weight: 500;
-}
-
-.exchange-input {
-  width: 100%;
-  height: 88rpx;
-  border: 2rpx solid #e0e0e0;
-  border-radius: 12rpx;
-  padding: 0 20rpx;
-  font-size: 28rpx;
-  color: #333;
-  box-sizing: border-box;
-
-  &:focus {
-    border-color: #667eea;
-  }
-}
-
-.popup-actions {
-  display: flex;
-  gap: 20rpx;
-}
-
-.cancel-btn,
-.confirm-btn {
-  flex: 1;
-  height: 80rpx;
-  border-radius: 12rpx;
-  font-size: 28rpx;
-  font-weight: 600;
-  border: none;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: all 0.3s ease;
-
-  &:active {
-    transform: scale(0.98);
-  }
-}
-
-.cancel-btn {
-  background: #f5f5f5;
-  color: #666;
-}
-
-.confirm-btn {
-  background: #667eea;
-  color: #ffffff;
-}
-</style>
+	view {
+		box-sizing: border-box;
+	}
+
+	.profile-container {
+		background: white;
+		min-height: 100vh;
+		padding-bottom: 200rpx;
+		color: white;
+	}
+
+	/* 状态栏占位 */
+	.status-bar-placeholder {
+		height: var(--status-bar-height);
+		width: 100%;
+	}
+
+	/* 顶部导航 */
+	.header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 48px;
+	}
+
+	.back-btn,
+	.more-btn {
+		width: 60rpx;
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 40rpx;
+		color: white;
+	}
+
+	.dots {
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	/* 用户信息区域 */
+	.user-section {
+		display: flex;
+		align-items: center;
+		padding: 0 40rpx 30rpx;
+	}
+
+	.user-avatar {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		margin-right: 30rpx;
+	}
+
+	.avatar-img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.user-info {
+		flex: 1;
+	}
+
+	.username {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: white;
+		margin-bottom: 10rpx;
+	}
+
+	.user-id {
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.8);
+		margin-bottom: 10rpx;
+	}
+
+	.location {
+		display: flex;
+		align-items: center;
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.8);
+	}
+
+	.location-icon,
+	.info-icon {
+		margin-right: 8rpx;
+	}
+
+	/* 城市艺术漫游 */
+	.city-art {
+		padding: 0 40rpx 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.city-title {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.9);
+	}
+
+	.pin-icon {
+		margin-right: 8rpx;
+	}
+
+	.city-name {
+		font-size: 28rpx;
+		color: white;
+		font-weight: bold;
+	}
+
+	.gender-icon {
+		width: 40rpx;
+		height: 40rpx;
+		background: rgba(255, 255, 255, 0.2);
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 24rpx;
+	}
+
+	/* 统计数据 */
+	.stats-section {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 80rpx;
+		padding-bottom: 50rpx;
+		padding: 0 40rpx;
+	}
+
+	.stats-left {
+		display: flex;
+		gap: 60rpx;
+	}
+
+	.stat-item {
+		text-align: center;
+		min-width: 80rpx;
+	}
+
+	.stat-number {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: white;
+		margin-bottom: 8rpx;
+	}
+
+	.stat-label {
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.8);
+	}
+
+	/* 权益兑换入口 */
+	.exchange-entry {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 16rpx;
+		background: rgba(255, 255, 255, 0.1);
+		border-radius: 20rpx;
+		min-width: 120rpx;
+		transition: all 0.3s ease;
+
+		&:active {
+			transform: scale(0.95);
+			background: rgba(255, 255, 255, 0.2);
+		}
+	}
+
+	.exchange-icon {
+		font-size: 32rpx;
+		margin-bottom: 8rpx;
+	}
+
+	.exchange-text {
+		font-size: 22rpx;
+		color: rgba(255, 255, 255, 0.9);
+		font-weight: 500;
+	}
+
+	/* 操作按钮 */
+	.action-buttons {
+		display: flex;
+		padding: 0 40rpx 40rpx;
+		gap: 20rpx;
+	}
+
+	.follow-btn {
+		flex: 1;
+		background: #ff4757;
+		border-radius: 50rpx;
+		padding: 20rpx;
+		text-align: center;
+		color: white;
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+
+	.message-btn {
+		flex: 1;
+		background: rgba(255, 255, 255, 0.2);
+		border-radius: 50rpx;
+		padding: 20rpx;
+		text-align: center;
+		color: white;
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+
+	/* 待激活的Agent */
+	.agent-section {
+		margin: 0 47rpx;
+		border-radius: 20rpx;
+		margin-bottom: 30rpx;
+		overflow: hidden;
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0;
+	}
+
+	.agent-header {
+		margin-right: 30rpx;
+		flex-shrink: 0;
+	}
+
+	.agent-title {
+		font-size: 28rpx;
+		color: #000000;
+	}
+
+	.agent-content {
+		flex: 1;
+	}
+
+	.agent-scroll {
+		width: 430rpx;
+		white-space: nowrap;
+		/* 微信小程序隐藏横向滚动条 */
+		overflow: hidden;
+
+		/* Webkit浏览器 */
+		&::-webkit-scrollbar {
+			display: none !important;
+			width: 0 !important;
+			height: 0 !important;
+		}
+
+		/* Firefox */
+		scrollbar-width: none;
+		/* IE和Edge */
+		-ms-overflow-style: none;
+	}
+
+	.agent-avatars {
+		display: inline-flex;
+		gap: 20rpx;
+	}
+
+	.agent-avatar {
+		width: 104rpx;
+		height: 104rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		flex-shrink: 0;
+	}
+
+	.agent-img {
+		width: 100%;
+		height: 100%;
+	}
+
+	/* 数字资产权益 */
+	.digital-assets {
+		margin: 0 30rpx 0rpx;
+	}
+
+	.asset-card {
+		border-radius: 20rpx;
+		overflow: hidden;
+	}
+
+	.asset-bg {
+		padding: 40rpx 30rpx 30rpx;
+		background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+		position: relative;
+		overflow: hidden;
+	}
+
+	.asset-bg::before {
+		content: "";
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle cx="85" cy="15" r="8" fill="rgba(255,255,255,0.1)"/><circle cx="15" cy="85" r="6" fill="rgba(255,255,255,0.08)"/><circle cx="70" cy="70" r="4" fill="rgba(255,255,255,0.06)"/></svg>');
+		pointer-events: none;
+	}
+
+	.asset-title {
+		font-size: 32rpx;
+		color: white;
+		font-weight: 600;
+		position: relative;
+		z-index: 1;
+	}
+
+	.asset-actions {
+		display: flex;
+		padding: 20rpx 0;
+
+		background: white;
+		font-size: 25rpx;
+	}
+
+	.asset-action {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 0 10rpx;
+		font-size: 24rpx;
+		color: #666;
+		position: relative;
+	}
+
+	.asset-action.active {
+		color: #ff4757;
+	}
+
+	.action-icon {
+		width: 36rpx;
+		height: 36rpx;
+		border-radius: 50%;
+		margin-bottom: 12rpx;
+	}
+
+	.action-icon.red {
+		background: #ff4757;
+	}
+
+	.action-icon.gray {
+		background: #ccc;
+	}
+
+	/* 有感商品 */
+	.feeling-goods {
+		margin: 20rpx 30rpx 30rpx;
+	}
+
+	.goods-card {
+		border-radius: 20rpx;
+		overflow: hidden;
+	}
+
+	.goods-bg {
+		padding: 40rpx 30rpx 20rpx;
+		position: relative;
+	}
+
+	.goods-title {
+		font-size: 32rpx;
+		color: white;
+		font-weight: bold;
+		margin-bottom: 10rpx;
+	}
+
+	.goods-brand {
+		font-size: 36rpx;
+		color: white;
+		font-weight: bold;
+		margin-bottom: 5rpx;
+	}
+
+	.goods-subtitle {
+		font-size: 24rpx;
+		color: rgba(255, 255, 255, 0.8);
+	}
+
+	.goods-actions {
+		display: flex;
+		background: white;
+	}
+
+	.goods-action {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 20rpx 10rpx;
+		font-size: 24rpx;
+		color: #666;
+	}
+
+	.goods-action.active {
+		color: #ff4757;
+	}
+
+	/* 数字资产纪念册 */
+	.memorial-section {
+		margin: 0 47rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.memorial-divider {
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0;
+		margin-bottom: 30rpx;
+	}
+
+	.divider-line {
+		flex: 1;
+		height: 2rpx;
+		background: #e0e0e0;
+	}
+
+	.divider-text {
+		padding: 0 30rpx;
+		font-size: 28rpx;
+		color: #000000;
+		font-weight: 500;
+		white-space: nowrap;
+	}
+
+	.memorial-cards {
+		display: flex;
+		gap: 20rpx;
+	}
+
+	.memorial-card {
+		flex: 1;
+		border-radius: 10rpx;
+		overflow: hidden;
+		background: white;
+	}
+
+	.memorial-img {
+		width: 100%;
+		height: 425rpx;
+	}
+
+	.memorial-info {
+		padding: 20rpx 10rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.memorial-title {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		font-size: 22rpx;
+		color: #000000;
+		flex: 1;
+	}
+
+	.memorial-more {
+		font-size: 14rpx;
+		color: #999;
+	}
+
+	/* 底部菜单 */
+	.bottom-menu {
+		padding: 40rpx 30rpx;
+		background: white;
+		margin: 0 30rpx;
+		border-radius: 20rpx;
+		margin-bottom: 30rpx;
+	}
+
+	.menu-item {
+		padding: 30rpx 0;
+		border-bottom: 1rpx solid #f5f5f5;
+		font-size: 28rpx;
+		color: #333;
+	}
+
+	.menu-item:last-child {
+		border-bottom: none;
+	}
+
+	// 用户顶部背景区域
+	.user-top {
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+		padding-bottom: 20rpx;
+	}
+
+	.digital-img {
+		height: 265rpx;
+		width: 100%;
+		border-radius: 20rpx;
+	}
+
+	/* 权益兑换弹窗 */
+	.exchange-popup {
+		width: 600rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+
+	.popup-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 30rpx;
+		border-bottom: 1px solid #f0f0f0;
+	}
+
+	.popup-title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+
+	.popup-close {
+		font-size: 40rpx;
+		color: #999;
+		padding: 0 10rpx;
+	}
+
+	.popup-content {
+		padding: 40rpx 30rpx 30rpx;
+	}
+
+	.input-section {
+		margin-bottom: 40rpx;
+	}
+
+	.input-label {
+		display: block;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 20rpx;
+		font-weight: 500;
+	}
+
+	.exchange-input {
+		width: 100%;
+		height: 88rpx;
+		border: 2rpx solid #e0e0e0;
+		border-radius: 12rpx;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+		color: #333;
+		box-sizing: border-box;
+
+		&:focus {
+			border-color: #667eea;
+		}
+	}
+
+	.popup-actions {
+		display: flex;
+		gap: 20rpx;
+	}
+
+	.cancel-btn,
+	.confirm-btn {
+		flex: 1;
+		height: 80rpx;
+		border-radius: 12rpx;
+		font-size: 28rpx;
+		font-weight: 600;
+		border: none;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.3s ease;
+
+		&:active {
+			transform: scale(0.98);
+		}
+	}
+
+	.cancel-btn {
+		background: #f5f5f5;
+		color: #666;
+	}
+
+	.confirm-btn {
+		background: #667eea;
+		color: #ffffff;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7fc3b79..4eb4361 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,230 +1,240 @@
 <template>
-  <view class="bg">
-    <headerVue :selectedLocation="selectedLocation" fixed isLocation></headerVue>
+	<view class="bg">
+		<headerVue @change="changeAddress" :address="addressInfo" fixed isLocation></headerVue>
 
-    <!-- 灵动岛组件 -->
-    <!-- 灵动岛组件 - 自包含，无需传递参数 -->
-    <DynamicIsland
-      ref="dynamicIsland"
-      :page-id="'index_page'"
-      @toggle="handleIslandToggle"
-      @action="handleIslandAction"
-    />
+		<!-- 灵动岛组件 -->
+		<!-- 灵动岛组件 - 自包含，无需传递参数 -->
+		<DynamicIsland ref="dynamicIsland" :page-id="'index_page'" @toggle="handleIslandToggle"
+			@action="handleIslandAction" />
 
-    <view class="content" @click="handleContentClick">
-      <!-- 权益商品区域 -->
-      <ProductSection
-        title="权益商品"
-        :productList="productList"
-        moreUrl="/subPackages/equityGoods/index"
-        detailUrlPrefix="/subPackages/equityGoods/detail"
-        @like-toggle="handleLikeToggle"
-      />
-      <ProductSection
-	  titleBgColor="#92FF8F"
-	  aiTagTextColor="#08FB05"
-	  
-	  aiTagBorderColor="#6EAA3D"
-        title="有感商品"
-        :productList="productListFeeling"
-        moreUrl="/pages/index/sensoryStore"
-        detailUrlPrefix="/subPackages/techan/detail"
-        @like-toggle="handleLikeToggle"
-		isFeel
-      />
-      <view class="tab-bar-placeholder"></view>
-    </view>
+		<view class="content" @click="handleContentClick">
+			<!-- 权益商品区域 -->
+			<ProductSection  v-if="productList.length" title="权益商品" :productList="productList"
+				moreUrl="/subPackages/equityGoods/index" detailUrlPrefix="/subPackages/equityGoods/detail"
+				@like-toggle="handleLikeToggle" />
+			<ProductSection titleBgColor="#92FF8F" aiTagTextColor="#08FB05" aiTagBorderColor="#6EAA3D" title="有感商品"
+				:productList="productListFeeling" moreUrl="/pages/index/sensoryStore"
+				detailUrlPrefix="/subPackages/techan/detail" @like-toggle="handleLikeToggle" isFeel />
+			<view class="tab-bar-placeholder"></view>
+		</view>
 
-    <CustomTabBar :currentTab="0" />
-    <MusicControl />
-  </view>
+		<CustomTabBar :currentTab="0" />
+		<MusicControl />
+	</view>
 </template>
 
 <script>
-import MusicControl from "@/components/MusicControl.vue";
-import headerVue from "@/components/header.vue";
-import CustomTabBar from "@/components/CustomTabBar.vue";
-import DynamicIsland from "@/components/DynamicIsland.vue";
-import ProductSection from "@/components/ProductSection.vue";
-export default {
-  components: {
-    CustomTabBar,
-    headerVue,
-    MusicControl,
-    DynamicIsland,
-    ProductSection,
-  },
-  computed: {
-    // 其他计算属性可以在这里添加
-  },
-  data() {
-    return {
-      topBanner: [],
-      productList: [
-        {
-          id: 1,
-          image:
-            "https://epic.js-dyyj.com/uploads/20250728/58aed304917c9d60761f833c4f8dceb8.png",
-          avatar:
-            "https://epic.js-dyyj.com/uploads/20250728/d27ef6e6c26877da7775664fed376c6f.png",
-          aiName: "文徵明",
-          title: "世界花园 | 研学之旅",
-          price: "588.00",
-          isLiked: true,
-        },
-        {
-          id: 2,
-          image:
-            "https://epic.js-dyyj.com/uploads/20250728/00e8704b23a0c9fd57023527146211b9.png",
-          avatar:
-            "https://epic.js-dyyj.com/uploads/20250728/d7bf0dd2f3f272afba687b525a7c575c.png",
-          aiName: "苏青壳",
-          title: "生命的扶持 | 风景之旅",
-          price: "398.00",
-          isLiked: false,
-        },
-      ],
-	  productListFeeling: [
-	    {
-	      id: 34,
-	      image:
-	        "https://epic.js-dyyj.com/uploads/20250728/22e319f3feb1b63fbb539d425c51fe70.png",
-	      title: "OUT OF SPACE 东方线香",
-	      price: "138.00",
-	      isLiked: true,
-		  isShop:true
-	    },
-	    {
-	      id: 32,
-	      image:
-	        "https://epic.js-dyyj.com/uploads/20250728/cc9907153c887a6428283a407928db9a.png",
-	      title: "AI-Agent智能玩具",
-	      price: "398.00",
-	      isLiked: false,
-	    },
-	  ],
-	  selectedLocation:''
-    };
-  },
-  onLoad() {},
-  async onReady() {
-	 let res =await  this.$main.getLocationInfo()
-	 console.log(res)
-	 this.selectedLocation = res&&res.city
-	 uni.setStorageSync('SYS_ADDRESS_INFO',JSON.stringify(res))
-    this.getList();
+	import MusicControl from "@/components/MusicControl.vue";
+	import headerVue from "@/components/header.vue";
+	import CustomTabBar from "@/components/CustomTabBar.vue";
+	import DynamicIsland from "@/components/DynamicIsland.vue";
+	import ProductSection from "@/components/ProductSection.vue";
+	export default {
+		components: {
+			CustomTabBar,
+			headerVue,
+			MusicControl,
+			DynamicIsland,
+			ProductSection,
+		},
+		computed: {
+			// 其他计算属性可以在这里添加
+		},
+		data() {
+			return {
+				topBanner: [],
+				productList: [
+					// {
+					//   id: 1,
+					//   image:
+					//     "https://epic.js-dyyj.com/uploads/20250728/58aed304917c9d60761f833c4f8dceb8.png",
+					//   avatar:
+					//     "https://epic.js-dyyj.com/uploads/20250728/d27ef6e6c26877da7775664fed376c6f.png",
+					//   aiName: "文徵明",
+					//   title: "世界花园 | 研学之旅",
+					//   price: "588.00",
+					//   isLiked: true,
+					// },
+					// {
+					//   id: 2,
+					//   image:
+					//     "https://epic.js-dyyj.com/uploads/20250728/00e8704b23a0c9fd57023527146211b9.png",
+					//   avatar:
+					//     "https://epic.js-dyyj.com/uploads/20250728/d7bf0dd2f3f272afba687b525a7c575c.png",
+					//   aiName: "苏青壳",
+					//   title: "生命的扶持 | 风景之旅",
+					//   price: "398.00",
+					//   isLiked: false,
+					// },
+				],
+				productListFeeling: [{
+						id: 34,
+						image: "https://epic.js-dyyj.com/uploads/20250728/22e319f3feb1b63fbb539d425c51fe70.png",
+						title: "OUT OF SPACE 东方线香",
+						price: "138.00",
+						isLiked: true,
+						isShop: true
+					},
+					{
+						id: 32,
+						image: "https://epic.js-dyyj.com/uploads/20250728/cc9907153c887a6428283a407928db9a.png",
+						title: "AI-Agent智能玩具",
+						price: "398.00",
+						isLiked: false,
+					},
+				],
+				selectedText: '',
+				addressInfo: null,
+			};
+		},
+		onLoad() {},
+		async onReady() {
+			let res = await this.$main.getLocationInfo()
+			console.log(res)
+			this.addressInfo = res
+			this.selectedText = res && res.city
+			uni.setStorageSync('SYS_ADDRESS_INFO', JSON.stringify(res))
+			this.getList();
+			this.geBenefitPackaget()
 
-  },
-  onShow() {
-    this.browse_record({ type: "page", title: "首页" });
-	this.$nextTick(() =>{
-		this.$refs.dynamicIsland.getUserInfo();
-	})
-  },
-  onPageScroll(e) {
-    // 只触发带页面ID的事件，避免不同页面间的状态冲突
-    uni.$emit("pageScroll_index_page", e.scrollTop);
-  },
-  onReachBottom() {},
-  methods: {
-    gotoUrlNew(item, index) {
-      if (index == 0) {
-        uni.switchTab({
-          url: "/pages/index/readingBody",
-        });
-      } else if (index == 1) {
-        uni.switchTab({
-          url: "/pages/index/intelligentAgent",
-        });
-      }
-    },
-    viewDetail(item) {
-      if (item.url) {
-        uni.navigateTo({
-          url:
-            "/subPackages/webPage/webPage?url=" + encodeURIComponent(item.url),
-        });
-        return;
-      }
-      uni.navigateTo({
-        url: "/subPackages/letter/detail?id=" + item.id,
-      });
-    },
-    getList() {
-      // 大轮播
-      this.Post(
-        {
-          type_id: 3,
-          position: 17,
-        },
-        "/api/adv/getAdv"
-      ).then((res) => {
-        if (res.data) {
-          this.topBanner = res.data;
-        }
-      });
-    },
-    gotoVideo(item) {
-      uni.navigateTo({
-        url:
-          "/subPackages/video/video?item=" +
-          encodeURIComponent(JSON.stringify(item)),
-      });
-    },
-    
-    // 处理收藏状态切换
-    handleLikeToggle({ item, index }) {
-      this.productList[index] = item;
-    },
+		},
+		onShow() {
+			this.browse_record({
+				type: "page",
+				title: "首页"
+			});
+			this.$nextTick(() => {
+				this.$refs.dynamicIsland.getUserInfo();
+			})
+		},
+		onPageScroll(e) {
+			// 只触发带页面ID的事件，避免不同页面间的状态冲突
+			uni.$emit("pageScroll_index_page", e.scrollTop);
+		},
+		onReachBottom() {},
+		methods: {
+			changeAddress(res){
+				this.addressInfo = res
+				uni.setStorageSync('SYS_ADDRESS_INFO', JSON.stringify(res))
+				this.geBenefitPackaget()
+			},
+			gotoUrlNew(item, index) {
+				if (index == 0) {
+					uni.switchTab({
+						url: "/pages/index/readingBody",
+					});
+				} else if (index == 1) {
+					uni.switchTab({
+						url: "/pages/index/intelligentAgent",
+					});
+				}
+			},
+			viewDetail(item) {
+				if (item.url) {
+					uni.navigateTo({
+						url: "/subPackages/webPage/webPage?url=" + encodeURIComponent(item.url),
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: "/subPackages/letter/detail?id=" + item.id,
+				});
+			},
+			getList() {
+				// 大轮播
+				this.Post({
+						type_id: 3,
+						position: 17,
+					},
+					"/api/adv/getAdv"
+				).then((res) => {
+					if (res.data) {
+						this.topBanner = res.data;
+					}
+				});
+			},
+			geBenefitPackaget() {
+				this.Post({
+						cityId: this.addressInfo.cityId
+					},
+					"/framework/index/benefitPackage/list",
+					'DES'
+				).then((res) => {
+					if (res.data) {
+						this.productList = res.data.map(item => {
+							return {
+								...item,
+								image: item.mainUrl,
+								id: item.benefitPackageId,
+								avatar: "https://epic.js-dyyj.com/uploads/20250728/d27ef6e6c26877da7775664fed376c6f.png",
+								aiName: "文徵明",
+							}
+						})
+					}
+				});
+			},
+			gotoVideo(item) {
+				uni.navigateTo({
+					url: "/subPackages/video/video?item=" +
+						encodeURIComponent(JSON.stringify(item)),
+				});
+			},
 
-    // 处理灵动岛点击切换
-    handleIslandToggle(isExpanded) {
-      console.log("灵动岛状态切换:", isExpanded ? "展开模式" : "紧凑模式");
-    },
+			// 处理收藏状态切换
+			handleLikeToggle({
+				item,
+				index
+			}) {
+				this.productList[index] = item;
+			},
 
-    // 处理灵动岛操作按钮
-    handleIslandAction() {
-      uni.showToast({
-        title: "执行操作",
-        icon: "none",
-      });
-      console.log("执行操作");
-    },
+			// 处理灵动岛点击切换
+			handleIslandToggle(isExpanded) {
+				console.log("灵动岛状态切换:", isExpanded ? "展开模式" : "紧凑模式");
+			},
 
-    // 处理内容区域点击
-    handleContentClick() {
-      // 点击内容区域时收缩灵动岛
-      if (this.$refs.dynamicIsland) {
-        this.$refs.dynamicIsland.collapseIsland();
-      }
-    },
-  },
-};
+			// 处理灵动岛操作按钮
+			handleIslandAction() {
+				uni.showToast({
+					title: "执行操作",
+					icon: "none",
+				});
+				console.log("执行操作");
+			},
+
+			// 处理内容区域点击
+			handleContentClick() {
+				// 点击内容区域时收缩灵动岛
+				if (this.$refs.dynamicIsland) {
+					this.$refs.dynamicIsland.collapseIsland();
+				}
+			},
+		},
+	};
 </script>
 <style>
-	page{
-		
-	}
+	page {}
 </style>
 <style lang="scss" scoped>
-.bg {
-  min-height: 100vh;
-  background: #f5f5f5;
-  display: flex;
-  flex-direction: column;
-}
-/* 页面样式 */
+	.bg {
+		min-height: 100vh;
+		background: #f5f5f5;
+		display: flex;
+		flex-direction: column;
+	}
 
-.content {
-  height: calc(100vh - 123rpx);
-  width: 100%;
-  padding: 0 20rpx;
-  box-sizing: border-box;
-  margin-top: 20rpx;
-}
+	/* 页面样式 */
 
-.tab-bar-placeholder {
-  height: 143rpx;
-  width: 100%;
-}
-</style>
+	.content {
+		height: calc(100vh - 123rpx);
+		width: 100%;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+	}
+
+	.tab-bar-placeholder {
+		height: 143rpx;
+		width: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/timeShopBank.vue b/pages/index/timeShopBank.vue
index 9127a06..9bebf11 100644
--- a/pages/index/timeShopBank.vue
+++ b/pages/index/timeShopBank.vue
@@ -378,9 +378,9 @@ page {
 }
 
 .fab-btn {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 60rpx;
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
   background: linear-gradient(135deg, #ff4757, #ff6b7a);
   color: #fff;
   border: none;
diff --git a/static/js/request.js b/static/js/request.js
index 748927b..4b4cb20 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -2,10 +2,13 @@ import Vue from 'vue';
 import store from '@/store';
 
 // 定义 API URL
+// const DEV_API_URL = 'https://epic.new.js-dyyj.com';
 const DEV_API_URL = 'https://epic.js-dyyj.com';
 const PROD_API_URL = 'https://epic.js-dyyj.com';
 const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;
-
+const DEV_API_URL_DES = 'http://192.168.124.118:8083/xcx';
+const PROD_API_URL_DES = 'http://192.168.124.118:8083/xcx';
+const NEWAPIURL_DES = process.env.NODE_ENV === 'development' ? DEV_API_URL_DES : PROD_API_URL_DES;
 // 获取token
 const getToken = () => {
     const userInfoFromStorage = uni.getStorageSync('userInfo');
@@ -17,7 +20,16 @@ const getToken = () => {
     }
     return store.state.user.userInfo.token;
 };
-
+const getUserId = () => {
+    const userInfoFromStorage = uni.getStorageSync('userInfo');
+    if (userInfoFromStorage) {
+        const userInfo = JSON.parse(userInfoFromStorage);
+        if (userInfo.id) {
+            return userInfo.id;
+        }
+    }
+    return store.state.user.userInfo.id;
+};
 // 定义错误处理函数 noForceLogin 不强制登录
 const handleError = (res, reject, noForceLogin) => {
 	if (res.data?.code === 401) {
@@ -38,26 +50,39 @@ const handleError = (res, reject, noForceLogin) => {
 
 // 挂载到 Vue 原型上
 Vue.prototype.NEWAPIURL = NEWAPIURL;
+Vue.prototype.NEWAPIURL_DES = NEWAPIURL_DES;
+
 // #ifdef H5
 Vue.prototype.NEWAPIURL = '/api';
+Vue.prototype.NEWAPIURL_DES = '/api_des';
 // #endif
 
-Vue.prototype.Post = (params = {}, apiurl) => {
+Vue.prototype.Post = (params = {}, apiurl,customUrl) => {
     const token = getToken();
     if (token) {
         params.token = token;
     }
+	let baseUrl = Vue.prototype.NEWAPIURL
+	if (customUrl) {
+			const urls = {
+				DES: Vue.prototype.NEWAPIURL_DES,
+			}
+			baseUrl = urls[customUrl] 
+		} else {
+			baseUrl = Vue.prototype.NEWAPIURL
+		}
     return new Promise((resolve, reject) => {
         uni.showLoading({
             title: '加载中'
         });
         uni.request({
             method: params.method || 'GET',
-            url: Vue.prototype.NEWAPIURL + apiurl,
+            url:baseUrl  + apiurl,
             data: params,
             header: {
                 'content-type': 'application/json',
-                'token': token || ''
+                'token': token || '',
+				'userId': getUserId() || '',
             },
             success: (res) => {
                 console.log('success', res.data);
diff --git a/subPackages/equityGoods/detail.vue b/subPackages/equityGoods/detail.vue
index 1ca1150..b5c30ee 100644
--- a/subPackages/equityGoods/detail.vue
+++ b/subPackages/equityGoods/detail.vue
@@ -40,11 +40,11 @@
     <view class="product-info">
       <!-- 标题和标签 -->
       <view class="title-section">
-        <view class="product-title">食在苏州｜世界美食之都巡礼</view>
+        <view class="product-title">{{ goodsInfo.title||'-' }}</view>
         <view class="tags-container">
           <view class="limit-tag">限量</view>
-          <view class="limit-count">1000份</view>
-          <view class="remaining">剩余 900份</view>
+          <view class="limit-count">{{ goodsInfo.publishQuantity||0 }}份</view>
+          <view class="remaining">剩余 {{ goodsInfo.remainQuantity||0 }}份</view>
         </view>
       </view>
 
@@ -52,15 +52,24 @@
       <view class="price-section">
         <view class="price-container">
           <text class="currency">¥</text>
-          <text class="price">699.00</text>
+          <text class="price">{{ goodsInfo.price||0 }}</text>
         </view>
         <view class="collect-container">
           <image
+            v-if="!goodsInfo.type"
             class="heart-icon"
             src="https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png"
-            @click.stop="handleLikeClick(item, index)"
+            @click.stop="handleLikeClick()"
           ></image>
-          <text class="collect-count">1700收藏</text>
+          <image
+            v-if="goodsInfo.type"
+            class="heart-icon"
+            src="https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png"
+            @click.stop="handleLikeClick()"
+          ></image>
+          <text class="collect-count"
+            >{{ goodsInfo.collectQuantity || 0 }}人收藏</text
+          >
         </view>
       </view>
 
@@ -98,8 +107,26 @@
           :key="index"
         >
           <view class="detail-content-wrapper">
-            <text class="detail-label">{{ item.label }}</text>
-            <text class="detail-content">{{ item.content }}</text>
+            <!-- <text v-if="item.goodsType == 1" class="detail-label">
+							{{index+1}}、 数字资产
+						</text>
+						<text class="detail-label" v-else-if="item.goodsType == 2">
+							{{index+1}}、 资源产品
+						</text>
+						<text class="detail-label" v-else-if="item.goodsType == 3">
+							{{index+1}}、 景点门票
+						</text> -->
+            <text class="detail-label">
+              产品{{
+                ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十"][
+                  index
+                ]
+              }}：
+            </text>
+            <text class="detail-content"
+              >{{ item.goodsName }}{{ item.skuName || "" }}</text
+            >
+            <text class="detail-content">X{{ item.bindQuantity }}份</text>
           </view>
           <!-- 在最后一个显示项的右侧添加展开收起图标 -->
           <!-- <view v-if="index === displayEquityList.length - 1" class="toggle-icon" @click="toggleEquityExpand">
@@ -113,16 +140,18 @@
     </view>
 
     <!-- Tab切换区域 -->
-    <view class="tab-nav">
-      <view
-        v-for="(tab, index) in tabList"
-        :key="index"
-        :class="['tab-item', { active: currentTab === index }]"
-        @click="switchTab(index)"
-      >
-        <text class="tab-text">{{ tab.name }}</text>
+    <scroll-view class="tab-nav" scroll-x="true" :show-scrollbar="false">
+      <view class="tab-container">
+        <view
+          v-for="(tab, index) in tabList"
+          :key="index"
+          :class="['tab-item', { active: currentTab === index }]"
+          @click="switchTab(index)"
+        >
+          <text class="tab-text">{{ tab.name }}</text>
+        </view>
       </view>
-    </view>
+    </scroll-view>
     <view class="tab-section">
       <!-- Tab导航 -->
 
@@ -133,43 +162,33 @@
           <view class="certificate-container">
             <image
               class="certificate-image"
-              src="https://epic.js-dyyj.com/uploads/20250731/d7d5be03617e3cce94dc34e8de426395.png"
+              :src="goodsInfo.ipDigitalAsset.copyrightUrl"
               mode="widthFix"
-            ></image>
+            >
+            </image>
           </view>
         </view>
 
         <!-- IP资产详情 -->
         <view v-if="currentTab === 1" class="tab-panel">
-          <image
-            :src="
-              showImg('/uploads/20250731/0d8cb190c358c0cf52fab89bb98a0373.jpg')
-            "
-            style="width: 100%"
-            mode="widthFix"
-          ></image>
+          <view class="" v-html="goodsInfo.ipDigitalAsset.detailUrl"> </view>
         </view>
 
-        <!-- 数据商品详情 -->
-        <view v-if="currentTab === 2" class="tab-panel">
-          <image
-            :src="
-              showImg('/uploads/20250731/ecf91ddfb9f89658a7d82e3ff846f71c.png')
-            "
-            style="width: 100%"
-            mode="widthFix"
-          ></image>
-        </view>
-        <!-- 权益信息 -->
-        <view v-if="currentTab === 3" class="tab-panel">
-          <image
-            :src="
-              showImg('/uploads/20250731/83af15ea93f0cd91eb780a7bb240257a.jpg')
-            "
-            style="width: 100%"
-            mode="widthFix"
-          ></image>
+        <!-- 门票详情 -->
+        <view
+          v-if="currentTab === 2 && goodsInfo.sku && goodsInfo.sku.product"
+          class="tab-panel"
+        >
+          <view class="" v-html="goodsInfo.sku.product.expenseInfo"> </view>
+          <view class="" v-html="goodsInfo.sku.product.bookInfo"> </view>
+          <view class="" v-html="goodsInfo.sku.product.cancelInfo"> </view>
         </view>
+        <!-- 商品详情 -->
+        <template v-for="(item, index) in goodsInfo.goodsVos">
+          <view v-if="currentTab == index + 3" class="tab-panel">
+            <view class="" v-html="item.detailUrl"> </view>
+          </view>
+        </template>
       </view>
     </view>
 
@@ -186,43 +205,14 @@
 export default {
   data() {
     return {
-      topBanner: [
-        "/uploads/20250731/5f6f00e6f037c5ca03423b3ed190c20d.png",
-        "/uploads/20250731/5f6f00e6f037c5ca03423b3ed190c20d.png",
-      ],
+      topBanner: [],
       list: [],
       swiperIndex: 0,
       isEquityExpanded: false, // 权益详情展开状态
       currentTab: 0, // 当前选中的tab索引
-      tabList: [
-        {
-          name: "登记证书",
-        },
-        {
-          name: "IP资产详情",
-        },
-        {
-          name: "资源商品详情",
-        },
-        {
-          name: "资源商品详情",
-        },
-      ],
-      equityList: [
-        // 权益列表数据
-        {
-          label: "权益1：",
-          content: "数字资产*1、数字资产*1",
-        },
-        {
-          label: "权益2：",
-          content: "IP文创公仔*1、IP文创公仔*1",
-        },
-        {
-          label: "权益3：",
-          content: "XX园林门票*1、XX园林门票*1",
-        },
-      ],
+      tabList: [],
+      equityList: [],
+      goodsInfo: null,
     };
   },
   computed: {
@@ -234,7 +224,40 @@ export default {
       // 	this.equityList.slice(0, 2);
     },
   },
+  onLoad(e) {
+    this.getDetail(e.id);
+  },
   methods: {
+    getDetail(benefitPackageId) {
+      this.Post(
+        {},
+        `/framework/benefitPackage/detail/${benefitPackageId}`,
+        "DES"
+      ).then((res) => {
+        res.data.goodsVos.forEach((element) => {
+          element.detailUrl = this.addImgStyleToHtml(element.detailUrl);
+        });
+        this.goodsInfo = res.data;
+        this.goodsInfo.ipDigitalAsset.detailUrl = this.addImgStyleToHtml(
+          this.goodsInfo.ipDigitalAsset.detailUrl
+        );
+        this.topBanner = res.data.coverUrl.split(",");
+        this.equityList = res.data.benefitGoods;
+        this.generateTabList();
+      });
+    },
+    handleLikeClick() {
+      this.Post(
+        {
+          packageId: this.goodsInfo.benefitPackageId,
+          type: !this.goodsInfo.type,
+        },
+        "/framework/benefitPackage/collect",
+        "DES"
+      ).then((res) => {
+        this.goodsInfo.type = !this.goodsInfo.type;
+      });
+    },
     swiperChange(e) {
       this.swiperIndex = e.detail.current;
     },
@@ -252,15 +275,58 @@ export default {
       });
       // 这里可以添加购买逻辑
     },
-    // 处理收藏点击
-    handleLikeClick(item, index) {
-      console.log("收藏点击", item, index);
-      // 这里可以添加收藏逻辑
-    },
+
     // 切换tab
     switchTab(index) {
       this.currentTab = index;
     },
+    addImgStyleToHtml(htmlStr) {
+      return htmlStr.replace(/<img\b([^>]*)>/gi, (match, attrs) => {
+        // 检查是否已有 style 属性
+        console.log("====开始计算");
+        if (/style\s*=/.test(attrs)) {
+          // 已有 style，合并 width:100%
+          return `<img${attrs.replace(
+            /style\s*=\s*(['"])(.*?)\1/,
+            (m, quote, styleVal) => {
+              // 合并 width:100% 到已有 style
+              let newStyle = styleVal;
+              if (!/width\s*:\s*100%/.test(styleVal)) {
+                newStyle = `width:100%;${styleVal}`;
+              }
+              return `style=${quote}${newStyle}${quote}`;
+            }
+          )}>`;
+        } else {
+          // 没有 style，直接加
+          return `<img${attrs} style="width:100%">`;
+        }
+      });
+    },
+
+    // 根据商品信息动态生成Tab列表
+    generateTabList() {
+      this.tabList = [];
+
+      // 基础Tab - 始终显示
+      this.tabList.push({ name: "登记证书" });
+      this.tabList.push({ name: "IP资产详情" });
+
+      // 根据商品信息动态添加Tab
+      if (this.goodsInfo) {
+        // 如果有门票信息，添加门票详情Tab
+        if (this.goodsInfo.sku && this.goodsInfo.sku.product) {
+          this.tabList.push({ name: "门票详情" });
+        }
+
+        // 如果有goodsVos内容，添加商品详情Tab
+        if (this.goodsInfo.goodsVos) {
+          this.goodsInfo.goodsVos.forEach((element) => {
+            this.tabList.push({ name: "权益商品" });
+          });
+        }
+      }
+    },
   },
 };
 </script>
@@ -345,7 +411,7 @@ export default {
         background: #94fafa;
         color: #333333;
         padding: 8rpx 16rpx;
-        font-size: 20rpx;
+        font-size: 26rpx;
         border-radius: 6rpx 0 0 6rpx;
       }
 
@@ -353,13 +419,13 @@ export default {
         background: #f0f0f0;
         color: #000000;
         padding: 8rpx 16rpx;
-        font-size: 20rpx;
+        font-size: 26rpx;
         border-radius: 0rpx 6rpx 6rpx 0;
       }
 
       .remaining {
         color: #808080;
-        font-size: 22rpx;
+        font-size: 26rpx;
         margin-left: auto;
       }
     }
@@ -474,28 +540,24 @@ export default {
     border-top: 1rpx solid #e5e5e5;
     padding-top: 60rpx;
     padding-bottom: 20rpx;
+
     .equity-detail-item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
       margin-bottom: 10rpx;
       line-height: 1.5;
 
       .detail-content-wrapper {
-        display: flex;
-        flex: 1;
-
         .detail-label {
-          font-size: 26rpx;
+          font-size: 28rpx;
           color: #808080;
           font-weight: 500;
+          margin-right: 10rpx;
         }
 
         .detail-content {
-          font-size: 26rpx;
+          font-size: 28rpx;
           color: #808080;
-          flex: 1;
           font-weight: 500;
+          margin-right: 10rpx;
         }
       }
 
@@ -535,28 +597,40 @@ export default {
 .tab-nav {
   margin: 0 40rpx;
   margin-top: 40rpx;
-  display: flex;
-  justify-content: space-between;
+  white-space: nowrap;
 
-  .tab-item {
-    padding: 10rpx 20rpx;
-    text-align: center;
-    color: #3e3a39;
-    cursor: pointer;
-    transition: all 0.3s ease;
-    background-color: #94fafa66;
+  .tab-container {
     display: flex;
-    align-items: center;
-    &.active {
-      background-color: #94fafa;
-      color: #525454;
-      font-size: 24rpx;
-      border-radius: 10rpx 10rpx 0 0;
-      font-weight: bold;
-    }
+    min-width: 100%;
+
+    .tab-item {
+      padding: 10rpx 20rpx;
+      text-align: center;
+      color: #3e3a39;
+      cursor: pointer;
+      transition: all 0.3s ease;
+      background-color: #94fafa66;
+      display: flex;
+      align-items: center;
+      flex-shrink: 0;
+      margin-right: 16rpx;
 
-    .tab-text {
-      font-size: 24rpx;
+      &:last-child {
+        margin-right: 0;
+      }
+
+      &.active {
+        background-color: #94fafa;
+        color: #525454;
+        font-size: 30rpx;
+        border-radius: 10rpx 10rpx 0 0;
+        font-weight: bold;
+      }
+
+      .tab-text {
+        font-size: 30rpx;
+        white-space: nowrap;
+      }
     }
   }
 }
@@ -576,6 +650,9 @@ export default {
 
     .tab-panel {
       min-height: 400rpx;
+      img {
+        width: 100%;
+      }
 
       // 证书容器
       .certificate-container {
@@ -653,6 +730,29 @@ export default {
           }
         }
       }
+
+      // 权益详情列表
+      .equity-detail-list {
+        .equity-detail-item {
+          margin-bottom: 30rpx;
+          padding: 20rpx;
+          background: #f8f9fa;
+          border-radius: 12rpx;
+
+          .equity-name {
+            font-size: 28rpx;
+            color: #333;
+            font-weight: 600;
+            margin-bottom: 12rpx;
+          }
+
+          .equity-desc {
+            font-size: 26rpx;
+            color: #666;
+            line-height: 1.5;
+          }
+        }
+      }
     }
   }
 }
@@ -664,15 +764,15 @@ export default {
   left: 0;
   right: 0;
   background: white;
-  padding: 20rpx 30rpx 40rpx;
+  padding: 20rpx 30rpx;
   border-top: 1rpx solid #e5e5e5;
   z-index: 100;
-  padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
-  padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx);
+  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
 
   .purchase-button {
-    width: 100%;
+    width: 690rpx;
     height: 88rpx;
+    margin: 0 auto;
     background: #94fafa;
     border-radius: 44rpx;
     display: flex;
diff --git a/subPackages/equityGoods/index.vue b/subPackages/equityGoods/index.vue
index 35a613e..d7ef82c 100644
--- a/subPackages/equityGoods/index.vue
+++ b/subPackages/equityGoods/index.vue
@@ -1,13 +1,36 @@
 
 <template>
 	<view class="" style="font-size: 0;" @click="toList">
-		<image class="bannerImg" mode="aspectFill" :src="showImg('/uploads/20250728/5625c6a60945a256da15ef983d6db87c.png')"> </image>
+		<image class="bannerImg" mode="aspectFill" :src="img"> </image>
 	</view>
 </template>
 
 <script>
 	export default{
+		data(){
+			return{
+				img:''
+			}
+		},
+		onLoad() {
+			this.getList()
+		},
 		methods:{
+			getList() {
+				let address = uni.getStorageSync('SYS_ADDRESS_INFO')
+				let code = ''
+				if(address){
+					code = JSON.parse(address).cityId
+				}
+				this.Post({
+						cityId:code
+					},
+					"/framework/index/getUrl",
+					'DES'
+				).then((res) => {
+					this.img = res.msg
+				});
+			},
 			toList(){
 				uni.navigateTo({
 					url:'/subPackages/equityGoods/list'
diff --git a/subPackages/equityGoods/list.vue b/subPackages/equityGoods/list.vue
index 2f7d07b..70a34cc 100644
--- a/subPackages/equityGoods/list.vue
+++ b/subPackages/equityGoods/list.vue
@@ -1,650 +1,651 @@
 <template>
-  <view class="equity-goods-page">
-    <image
-      style="width: 100%"
-      mode="widthFix"
-      :src="showImg('/uploads/20250728/748adc244fc7db313f569a6005344950.png')"
-    ></image>
-    <view class="location-selector">
-      <text class="location-text">扬州</text>
-      <image
-        class="dropdown-icon"
-        src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iOCIgdmlld0JveD0iMCAwIDEyIDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0xIDFMNiA2TDExIDEiIHN0cm9rZT0iIzk5OTk5OSIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+"
-        mode="heightFix"
-      ></image>
-    </view>
-    <!-- 顶部标题区域 -->
-    <view class="header-section">
-      <view class="title">扬州数字资产权益产品</view>
-      <view class="filter-buttons">
-        <view class="filter-btn">最新上架</view>
-        <view class="filter-btn">销量</view>
-      </view>
-    </view>
-
-    <!-- 商品网格 -->
-    <view class="products-grid">
-      <view
-        class="product-item"
-        :style="{
+	<view class="equity-goods-page">
+		<image style="width: 100%" mode="widthFix"
+			:src="showImg('/uploads/20250728/748adc244fc7db313f569a6005344950.png')"></image>
+		<view class="location-selector" v-if="addressInfo">
+			<AreaPicker :defaultValue="{
+		provinceId: addressInfo.provinceId,
+		cityId: addressInfo.cityId,
+		areaId:addressInfo.areaId
+	  }" placeholder="请选择省市区"  @change="changeAddress">
+				<template v-slot="{ selectedText, placeholder, currentSelection }">
+
+					<text class="location-text">{{selectedText}}</text>
+					<image class="dropdown-icon"
+						src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iOCIgdmlld0JveD0iMCAwIDEyIDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0xIDFMNiA2TDExIDEiIHN0cm9rZT0iIzk5OTk5OSIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPC9zdmc+"
+						mode="heightFix"></image>
+				</template>
+			</AreaPicker>
+		</view>
+		<!-- 顶部标题区域 -->
+		<view class="header-section">
+			<view class="title">{{addressInfo&&addressInfo.city}}数字资产权益产品</view>
+			<view class="filter-buttons">
+				<view class="filter-btn" @click="hanleUpdate(0)">最新上架</view>
+				<view class="filter-btn" @click="hanleUpdate(1)">销量</view>
+			</view>
+		</view>
+
+		<!-- 商品网格 -->
+		<view class="products-grid" v-if="productList.length > 0">
+			<view class="product-item" :style="{
           'border-width':
             index == productList.length - 1 || index == productList.length - 2
               ? 0
               : '0.5rpx',
-        }"
-        v-for="(item, index) in productList"
-        :key="index"
-        @click="goToDetail(item)"
-      >
-        <image
-          class="product-image"
-          :src="item.image"
-          mode="aspectFill"
-        ></image>
-        <view class="product-info">
-          <view class="product-title">{{ item.title }}</view>
-          <view class="product-price-box">
-            <view class="product-price">{{ item.price }}</view>
-            <view class="">
-              <image
-                class="heart-icon"
-                src="https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png"
-              >
-              </image>
-              <!-- <image
-         		   v-else
-         		   class="heart-icon"
-         		   src="https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png"
-         		   @click.stop="handleLikeClick(item, index)"
-         		 ></image> -->
-              <image
-                class="shop-icon"
-                src="https://epic.js-dyyj.com/uploads/20250728/195bfc195a54b93c13595a01a5d8bb3b.png"
-              >
-              </image>
-              <!-- 	<image
-         		 	  v-else
-         		 	  class="shop-icon"
-         		 	  src="https://epic.js-dyyj.com/uploads/20250728/77c4546ac6415f9db69bb10888d2a975.png"
-         		 	  @click.isShop="handleLikeClick(item, index)"
-         		 	></image> -->
-            </view>
-          </view>
-          <view class="product-details">
-            <text class="detail-item">{{ item.limitInfo }}</text>
-            <text class="detail-item">{{ item.paymentInfo }}</text>
-            <text class="detail-item">{{ item.viewInfo }}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 底部地图区域 -->
-    <view class="map-section">
-      <view class="map-title" @click="showReservationPopup"
-        >业务办理 | 预约参观</view
-      >
-      <view class="map-container">
-        <map
-          class="map-component"
-          :latitude="mapData.latitude"
-          :longitude="mapData.longitude"
-          :scale="mapData.scale"
-        ></map>
-      </view>
-      <view class="map-description">
-        <view class="location-info">
-          <image
-            class="location-icon"
-            :src="
+        }" v-for="(item, index) in productList" :key="index" @click="goToDetail(item)">
+				<image class="product-image" :src="item.coverUrl.split(',')[0]" mode="aspectFill"></image>
+				<view class="product-info">
+					<view class="product-title">{{ item.title }}</view>
+					<view class="product-price-box">
+						<view class="product-price">{{ item.price }}</view>
+						<view class="">
+							<image v-if="!item.type" @click.stop="handleLikeClick(item,index)" class="heart-icon"
+								src="https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png">
+							</image>
+							<image @click.stop="handleLikeClick(item,index)" v-else class="heart-icon"
+								src="https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png">
+							</image>
+						</view>
+					</view>
+					<view class="product-details">
+						<text class="detail-item">限量发售{{ item.publishQuantity }}份</text>
+						<text class="detail-item">{{item.purchaseQuantity||0}}人付款</text>
+						<text class="detail-item">浏览{{item.viewQuantity||0}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 空状态展示 -->
+		<view class="empty-state" v-else>
+			<view class="empty-content">
+				<image class="empty-icon" 
+					src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgdmlld0JveD0iMCAwIDEwMCAxMDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxjaXJjbGUgY3g9IjUwIiBjeT0iNTAiIHI9IjQ1IiBzdHJva2U9IiNEREREREQiIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0ibm9uZSIvPgo8cGF0aCBkPSJNMzUgNDBINjVNMzUgNTBINjVNMzUgNjBINjUiIHN0cm9rZT0iI0RERERERCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiLz4KPC9zdmc+" 
+					mode="widthFix"></image>
+				<view class="empty-title">暂无商品</view>
+				<view class="empty-desc">当前地区暂时没有可购买的权益产品</view>
+				<view class="empty-tip">可以尝试切换其他地区查看</view>
+			</view>
+		</view>
+
+		<!-- 底部地图区域 -->
+		<view class="map-section">
+			<view class="map-title" @click="showReservationPopup">业务办理 | 预约参观</view>
+			<view class="map-container">
+				<map class="map-component" :latitude="mapData.latitude" :longitude="mapData.longitude"
+					:scale="mapData.scale"></map>
+			</view>
+			<view class="map-description">
+				<view class="location-info">
+					<image class="location-icon" :src="
               showImg('/uploads/20250728/56804fe109efd614ba955d3110cd6750.png')
-            "
-            mode="widthFix"
-          ></image>
-          <text class="location-name"
-            >国家文化大数据华东区域交易平台扬州运营中心</text
-          >
-        </view>
-      </view>
-    </view>
-
-    <!-- 预约参观弹窗 -->
-    <uni-popup ref="reservationPopup" type="center">
-      <view class="reservation-popup">
-        <view class="popup-header">
-          <text class="popup-title">预约参观</text>
-          <text class="popup-close" @click="closeReservationPopup">×</text>
-        </view>
-        <view class="popup-content">
-          <view class="input-section">
-            <text class="input-label">姓名</text>
-            <input
-              class="reservation-input"
-              v-model="reservationForm.name"
-              placeholder="请输入您的姓名"
-              maxlength="10"
-            />
-          </view>
-          <view class="input-section">
-            <text class="input-label">手机号</text>
-            <input
-              class="reservation-input"
-              v-model="reservationForm.phone"
-              placeholder="请输入手机号码"
-              type="number"
-              maxlength="11"
-            />
-          </view>
-          <view class="popup-actions">
-            <button class="cancel-btn" @click="closeReservationPopup">
-              取消
-            </button>
-            <button class="confirm-btn" @click="confirmReservation">
-              确认预约
-            </button>
-          </view>
-        </view>
-      </view>
-    </uni-popup>
-  </view>
+            " mode="widthFix"></image>
+					<text class="location-name">国家文化大数据华东区域交易平台{{addressInfo&&addressInfo.city}}运营中心</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 预约参观弹窗 -->
+		<uni-popup ref="reservationPopup" type="center">
+			<view class="reservation-popup">
+				<view class="popup-header">
+					<text class="popup-title">预约参观</text>
+					<text class="popup-close" @click="closeReservationPopup">×</text>
+				</view>
+				<view class="popup-content">
+					<view class="input-section">
+						<text class="input-label">姓名</text>
+						<input class="reservation-input" v-model="reservationForm.name" placeholder="请输入您的姓名"
+							maxlength="10" />
+					</view>
+					<view class="input-section">
+						<text class="input-label">手机号</text>
+						<input class="reservation-input" v-model="reservationForm.phone" placeholder="请输入手机号码"
+							type="number" maxlength="11" />
+					</view>
+					<view class="popup-actions">
+						<button class="cancel-btn" @click="closeReservationPopup">
+							取消
+						</button>
+						<button class="confirm-btn" @click="confirmReservation">
+							确认预约
+						</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
 </template>
 
 <script>
-export default {
-  name: "EquityGoodsList",
-  mixins: [require("@/mixins/myMixins.js")],
-  data() {
-    return {
-      productList: [
-        {
-          id: 1,
-          title: "食在扬州｜世界美食之都巡礼",
-          price: "699.00",
-          image:
-            "https://images.unsplash.com/photo-1414235077428-338989a2e8c0?auto=format&fit=crop&w=800",
-          isLiked: false,
-          limitInfo: "限量发售 x 1000份",
-          paymentInfo: "100+付款",
-          viewInfo: "浏览10W",
-        },
-        {
-          id: 2,
-          title: "二十四桥｜诗意之城",
-          price: "588.00",
-          image:
-            "https://images.unsplash.com/photo-1578662996442-48f60103fc96?auto=format&fit=crop&w=800",
-          isLiked: true,
-          limitInfo: "限量发售 x 1000份",
-          paymentInfo: "100+付款",
-          viewInfo: "浏览10W",
-        },
-        {
-          id: 3,
-          title: "以手抄心｜书法体验",
-          price: "699.00",
-          image:
-            "https://images.unsplash.com/photo-1513475382585-d06e58bcb0e0?auto=format&fit=crop&w=800",
-          isLiked: false,
-          limitInfo: "限量发售 x 1000份",
-          paymentInfo: "100+付款",
-          viewInfo: "浏览10W",
-        },
-        {
-          id: 4,
-          title: "世界花园｜诗学之旅",
-          price: "588.00",
-          image:
-            "https://images.unsplash.com/photo-1490750967868-88aa4486c946?auto=format&fit=crop&w=800",
-          isLiked: false,
-          limitInfo: "限量发售 x 1000份",
-          paymentInfo: "100+付款",
-          viewInfo: "浏览10W",
-        },
-      ],
-      heartIcon:
-        "https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png",
-      heartFilledIcon:
-        "https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png",
-      cartIcon:
-        "https://images.unsplash.com/photo-1563013544-824ae1b704d3?auto=format&fit=crop&w=100",
-      mapData: {
-        latitude: 31.2989,
-        longitude: 120.5853,
-        scale: 17,
-      },
-      // 预约表单数据
-      reservationForm: {
-        name: "",
-        phone: "",
-      },
-    };
-  },
-  methods: {
-    goToDetail(item) {
-      uni.navigateTo({
-        url: `/subPackages/equityGoods/detail?id=${item.id}`,
-      });
-    },
-    toggleLike(item, index) {
-      this.productList[index].isLiked = !this.productList[index].isLiked;
-      uni.showToast({
-        title: this.productList[index].isLiked ? "已收藏" : "取消收藏",
-        icon: "none",
-      });
-    },
-    addToCart(item) {
-      uni.showToast({
-        title: "已加入购物车",
-        icon: "success",
-      });
-    },
-    // 显示预约弹窗
-    showReservationPopup() {
-      this.$refs.reservationPopup.open();
-    },
-    // 关闭预约弹窗
-    closeReservationPopup() {
-      this.$refs.reservationPopup.close();
-      // 清空表单
-      this.reservationForm.name = "";
-      this.reservationForm.phone = "";
-    },
-    // 确认预约
-    async confirmReservation() {
-      // 表单验证
-      if (!this.reservationForm.name.trim()) {
-        uni.showToast({
-          title: "请输入姓名",
-          icon: "none",
-        });
-        return;
-      }
-
-      if (!this.reservationForm.phone.trim()) {
-        uni.showToast({
-          title: "请输入手机号",
-          icon: "none",
-        });
-        return;
-      }
-
-      // 手机号格式验证
-      const phoneRegex = /^1[3-9]\d{9}$/;
-      if (!phoneRegex.test(this.reservationForm.phone)) {
-        uni.showToast({
-          title: "请输入正确的手机号",
-          icon: "none",
-        });
-        return;
-      }
-
-      try {
-        uni.showLoading({
-          title: "提交中...",
-        });
-
-        // 提交预约信息
-        await this.submitReservation(this.reservationForm);
-
-        uni.hideLoading();
-        uni.showToast({
-          title: "预约成功！",
-          icon: "success",
-        });
-
-        this.closeReservationPopup();
-      } catch (error) {
-        uni.hideLoading();
-        uni.showToast({
-          title: "预约失败，请重试",
-          icon: "none",
-        });
-      }
-    },
-    // 提交预约信息（模拟API）
-    async submitReservation(formData) {
-      return new Promise((resolve, reject) => {
-        setTimeout(() => {
-          // 模拟API调用
-          console.log("预约信息:", formData);
-          resolve({
-            success: true,
-            message: "预约成功",
-          });
-        }, 1500);
-      });
-    },
-  },
-};
+	import AreaPicker from '@/components/AreaPicker.vue'
+	export default {
+		name: "EquityGoodsList",
+		components: {
+			AreaPicker
+		},
+		mixins: [require("@/mixins/myMixins.js")],
+		data() {
+			return {
+				productList: [
+
+				],
+				heartIcon: "https://epic.js-dyyj.com/uploads/20250728/2f3ae212c01fa3b67be81abc5723cf5c.png",
+				heartFilledIcon: "https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png",
+				cartIcon: "https://images.unsplash.com/photo-1563013544-824ae1b704d3?auto=format&fit=crop&w=100",
+				mapData: {
+					latitude: 31.2989,
+					longitude: 120.5853,
+					scale: 17,
+				},
+				// 预约表单数据
+				reservationForm: {
+					name: "",
+					phone: "",
+				},
+				sortValue: '',
+				addressInfo: {}
+			};
+		},
+		onLoad() {
+			let address = uni.getStorageSync('SYS_ADDRESS_INFO')
+			if (address) {
+				this.addressInfo = JSON.parse(address)
+			}
+			this.geBenefitPackaget()
+		},
+		methods: {
+			changeAddress(e){
+				console.log(e)
+				this.addressInfo =e
+				 uni.setStorageSync('SYS_ADDRESS_INFO',JSON.stringify(e))
+				this.geBenefitPackaget()
+			},
+			hanleUpdate(e) {
+				this.sortValue = e
+				this.geBenefitPackaget()
+			},
+			handleLikeClick(item, index) {
+				this.Post({
+						packageId: item.benefitPackageId,
+						type: !item.type,
+					},
+					"/framework/benefitPackage/collect",
+					"DES"
+				).then((res) => {
+					this.productList[index].type = !item.type;
+				});
+			},
+			geBenefitPackaget() {
+				this.Post({
+						cityId: this.addressInfo.cityId,
+						sortValue: this.sortValue
+					},
+					"/framework/benefitPackage/list",
+					'DES'
+				).then((res) => {
+					if (res.data) {
+						this.productList = res.data
+					}
+				});
+			},
+			goToDetail(item) {
+				uni.navigateTo({
+					url: `/subPackages/equityGoods/detail?id=${item.benefitPackageId}`,
+				});
+			},
+			// 显示预约弹窗
+			showReservationPopup() {
+				this.$refs.reservationPopup.open();
+			},
+			// 关闭预约弹窗
+			closeReservationPopup() {
+				this.$refs.reservationPopup.close();
+				// 清空表单
+				this.reservationForm.name = "";
+				this.reservationForm.phone = "";
+			},
+			// 确认预约
+			async confirmReservation() {
+				// 表单验证
+				if (!this.reservationForm.name.trim()) {
+					uni.showToast({
+						title: "请输入姓名",
+						icon: "none",
+					});
+					return;
+				}
+
+				if (!this.reservationForm.phone.trim()) {
+					uni.showToast({
+						title: "请输入手机号",
+						icon: "none",
+					});
+					return;
+				}
+
+				// 手机号格式验证
+				const phoneRegex = /^1[3-9]\d{9}$/;
+				if (!phoneRegex.test(this.reservationForm.phone)) {
+					uni.showToast({
+						title: "请输入正确的手机号",
+						icon: "none",
+					});
+					return;
+				}
+
+				try {
+					uni.showLoading({
+						title: "提交中...",
+					});
+
+					// 提交预约信息
+					await this.submitReservation(this.reservationForm);
+
+					uni.hideLoading();
+					uni.showToast({
+						title: "预约成功！",
+						icon: "success",
+					});
+
+					this.closeReservationPopup();
+				} catch (error) {
+					uni.hideLoading();
+					uni.showToast({
+						title: "预约失败，请重试",
+						icon: "none",
+					});
+				}
+			},
+			// 提交预约信息（模拟API）
+			async submitReservation(formData) {
+				return new Promise((resolve, reject) => {
+					setTimeout(() => {
+						// 模拟API调用
+						console.log("预约信息:", formData);
+						resolve({
+							success: true,
+							message: "预约成功",
+						});
+					}, 1500);
+				});
+			},
+		},
+	};
 </script>
 <style>
-page {
-  background-color: #f5f5f5;
-}
+	page {
+		background-color: #f5f5f5;
+	}
 </style>
 <style lang="scss" scoped>
-.equity-goods-page {
-  min-height: 100vh;
-  background: #f5f5f5;
-  padding-bottom: 40rpx;
-}
-
-.header-section {
-  padding: 60rpx 30rpx 30rpx;
-
-  .title {
-    font-size: 36rpx;
-    color: #000000;
-    text-align: center;
-    margin-bottom: 30rpx;
-    padding-bottom: 30rpx;
-    font-weight: 500;
-    border-bottom: 0.5rpx solid #999999;
-  }
-
-  .filter-buttons {
-    display: flex;
-    justify-content: space-between;
-    gap: 40rpx;
-
-    .filter-btn {
-      font-size: 28rpx;
-      color: #000000;
-      border-radius: 20rpx;
-      transition: all 0.3s;
-
-      &.active {
-        background: #007aff;
-        color: white;
-      }
-    }
-  }
-}
-
-.products-grid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 20rpx;
-  padding: 30rpx;
-
-  .product-item {
-    overflow: hidden;
-    border-bottom: 0.5rpx solid #999999;
-    margin-bottom: 15rpx;
-    padding-bottom: 20rpx;
-    &:active {
-      transform: scale(0.98);
-    }
-
-    .product-image {
-      width: 100%;
-      height: 429rpx;
-      object-fit: cover;
-      border-radius: 20rpx;
-    }
-
-    .product-info {
-      padding: 20rpx 0;
-
-      .product-title {
-        font-size: 22rpx;
-        color: #000000;
-        margin-bottom: 16rpx;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        font-weight: 500;
-      }
-
-      .product-price {
-        font-size: 36rpx;
-        font-weight: 500;
-        color: #000000;
-      }
-
-      .product-details {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-
-        .detail-item {
-          font-size: 16rpx;
-          color: #808080;
-        }
-      }
-    }
-  }
-}
-
-.map-section {
-  border-top: 0.5rpx solid #999999;
-  margin: 30rpx 30rpx 0;
-  overflow: hidden;
-
-  .map-title {
-    padding: 30rpx;
-    font-size: 22rpx;
-    font-weight: 500;
-    color: #000000;
-    text-align: center;
-  }
-
-  .map-container {
-    position: relative;
-    height: 330rpx;
-    border: 6rpx solid white;
-    border-radius: 20rpx;
-    transform: translateY(0);
-    overflow: hidden;
-    .map-component {
-      width: 100%;
-      height: 100%;
-      border-radius: 20rpx;
-    }
-  }
-
-  .map-description {
-    padding: 30rpx;
-
-    .location-info {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 16rpx;
-
-      .location-icon {
-        width: 40rpx;
-      }
-
-      .location-name {
-        font-size: 22rpx;
-        color: #808080;
-      }
-    }
-  }
-}
-
-.heart-icon {
-  width: 35rpx;
-  height: 30rpx;
-  transition: all 0.3s ease;
-  flex-shrink: 0;
-  top: -2rpx;
-  position: relative;
-  margin-right: 6rpx;
-
-  &.liked {
-    opacity: 1;
-    filter: hue-rotate(320deg) saturate(2);
-  }
-
-  &:active {
-    transform: scale(1.2);
-  }
-}
-
-.shop-icon {
-  width: 39rpx;
-  height: 36rpx;
-  transition: all 0.3s ease;
-  flex-shrink: 0;
-  margin-left: 10rpx;
-
-  &.liked {
-    opacity: 1;
-    filter: hue-rotate(320deg) saturate(2);
-  }
-
-  &:active {
-    transform: scale(1.2);
-  }
-}
-
-.product-price-box {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 10rpx;
-}
-.location-selector {
-  position: absolute;
-  top: 20rpx;
-  left: 20rpx;
-  display: flex;
-  align-items: center;
-  padding: 8rpx 16rpx;
-  // border: 2rpx solid #e0e0e0;
-  border-radius: 20rpx;
-  min-width: 100rpx;
-  margin-right: 20rpx;
-
-  .location-text {
-    font-size: 30rpx;
-    color: white;
-    margin-right: 8rpx;
-  }
-
-  .dropdown-icon {
-    width: 24rpx;
-    height: 16rpx;
-  }
-}
-
-// 预约弹窗样式
-.reservation-popup {
-  width: 600rpx;
-  background: white;
-  border-radius: 24rpx;
-  overflow: hidden;
-
-  .popup-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 32rpx 32rpx 24rpx;
-    border-bottom: 1rpx solid #f0f0f0;
-
-    .popup-title {
-      font-size: 32rpx;
-      font-weight: 600;
-      color: #333;
-    }
-
-    .popup-close {
-      font-size: 40rpx;
-      color: #999;
-      line-height: 1;
-      padding: 8rpx;
-      cursor: pointer;
-      transition: color 0.3s;
-
-      &:active {
-        color: #666;
-      }
-    }
-  }
-
-  .popup-content {
-    padding: 32rpx;
-
-    .input-section {
-      margin-bottom: 32rpx;
-
-      .input-label {
-        display: block;
-        font-size: 28rpx;
-        color: #333;
-        margin-bottom: 16rpx;
-        font-weight: 500;
-      }
-
-      .reservation-input {
-        width: 100%;
-        height: 88rpx;
-        border: 2rpx solid #e0e0e0;
-        border-radius: 12rpx;
-        padding: 0 24rpx;
-        font-size: 28rpx;
-        color: #333;
-        background: #fafafa;
-        transition: all 0.3s;
-        box-sizing: border-box;
-
-        &:focus {
-          border-color: #007aff;
-          background: white;
-        }
-
-        &::placeholder {
-          color: #999;
-        }
-      }
-    }
-
-    .popup-actions {
-      display: flex;
-      gap: 24rpx;
-      margin-top: 40rpx;
-
-      .cancel-btn,
-      .confirm-btn {
-        flex: 1;
-        height: 74rpx;
-        border-radius: 12rpx;
-        font-size: 28rpx;
-        font-weight: 600;
-        border: none;
-        transition: all 0.3s;
-
-        &:active {
-          transform: scale(0.98);
-        }
-      }
-
-      .cancel-btn {
-        background: #f5f5f5;
-        color: #666;
-
-        &:active {
-          background: #e8e8e8;
-        }
-      }
-
-      .confirm-btn {
-        background: #007aff;
-        color: white;
-
-        &:active {
-          background: #0056cc;
-        }
-      }
-    }
-  }
-}
-
-// 地图标题点击样式
-.map-title {
-  cursor: pointer;
-  transition: all 0.3s;
-}
-</style>
+	.equity-goods-page {
+		min-height: 100vh;
+		background: #f5f5f5;
+		padding-bottom: 40rpx;
+	}
+
+	.header-section {
+		padding: 60rpx 30rpx 30rpx;
+
+		.title {
+			font-size: 36rpx;
+			color: #000000;
+			text-align: center;
+			margin-bottom: 30rpx;
+			padding-bottom: 30rpx;
+			font-weight: 500;
+			border-bottom: 0.5rpx solid #999999;
+		}
+
+		.filter-buttons {
+			display: flex;
+			justify-content: space-between;
+			gap: 40rpx;
+
+			.filter-btn {
+				font-size: 28rpx;
+				color: #000000;
+				border-radius: 20rpx;
+				transition: all 0.3s;
+
+				&.active {
+					background: #007aff;
+					color: white;
+				}
+			}
+		}
+	}
+
+	.products-grid {
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		gap: 20rpx;
+		padding: 30rpx;
+
+		.product-item {
+			overflow: hidden;
+			border-bottom: 0.5rpx solid #999999;
+			margin-bottom: 15rpx;
+			padding-bottom: 20rpx;
+
+			&:active {
+				transform: scale(0.98);
+			}
+
+			.product-image {
+				width: 100%;
+				height: 429rpx;
+				object-fit: cover;
+				border-radius: 20rpx;
+			}
+
+			.product-info {
+				padding: 20rpx 0;
+
+				.product-title {
+					font-size: 22rpx;
+					color: #000000;
+					margin-bottom: 16rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					font-weight: 500;
+				}
+
+				.product-price {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #000000;
+				}
+
+				.product-details {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.detail-item {
+						font-size: 18rpx;
+						color: #808080;
+					}
+				}
+			}
+		}
+	}
+
+	// 空状态样式
+	.empty-state {
+		padding: 80rpx 30rpx;
+		min-height: 400rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.empty-content {
+			text-align: center;
+			max-width: 400rpx;
+
+			.empty-icon {
+				width: 120rpx;
+				height: 120rpx;
+				margin: 0 auto 40rpx;
+				opacity: 0.6;
+			}
+
+			.empty-title {
+				font-size: 32rpx;
+				color: #666666;
+				font-weight: 500;
+				margin-bottom: 20rpx;
+			}
+
+			.empty-desc {
+				font-size: 26rpx;
+				color: #999999;
+				line-height: 1.5;
+				margin-bottom: 16rpx;
+			}
+
+			.empty-tip {
+				font-size: 24rpx;
+				color: #BBBBBB;
+				line-height: 1.4;
+			}
+		}
+	}
+
+	.map-section {
+		border-top: 0.5rpx solid #999999;
+		margin: 30rpx 30rpx 0;
+		overflow: hidden;
+
+		.map-title {
+			padding: 30rpx;
+			font-size: 22rpx;
+			font-weight: 500;
+			color: #000000;
+			text-align: center;
+		}
+
+		.map-container {
+			position: relative;
+			height: 330rpx;
+			border: 6rpx solid white;
+			border-radius: 20rpx;
+			transform: translateY(0);
+			overflow: hidden;
+
+			.map-component {
+				width: 100%;
+				height: 100%;
+				border-radius: 20rpx;
+			}
+		}
+
+		.map-description {
+			padding: 30rpx;
+
+			.location-info {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				gap: 16rpx;
+
+				.location-icon {
+					width: 40rpx;
+				}
+
+				.location-name {
+					font-size: 22rpx;
+					color: #808080;
+				}
+			}
+		}
+	}
+
+	.heart-icon {
+		width: 35rpx;
+		height: 30rpx;
+		transition: all 0.3s ease;
+		flex-shrink: 0;
+		top: -2rpx;
+		position: relative;
+		margin-right: 6rpx;
+
+		&.liked {
+			opacity: 1;
+			filter: hue-rotate(320deg) saturate(2);
+		}
+
+		&:active {
+			transform: scale(1.2);
+		}
+	}
+
+	.shop-icon {
+		width: 39rpx;
+		height: 36rpx;
+		transition: all 0.3s ease;
+		flex-shrink: 0;
+		margin-left: 10rpx;
+
+		&.liked {
+			opacity: 1;
+			filter: hue-rotate(320deg) saturate(2);
+		}
+
+		&:active {
+			transform: scale(1.2);
+		}
+	}
+
+	.product-price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 10rpx;
+	}
+
+	.location-selector {
+		position: absolute;
+		top: 20rpx;
+		left: 20rpx;
+		display: flex;
+		align-items: center;
+		padding: 8rpx 16rpx;
+		// border: 2rpx solid #e0e0e0;
+		border-radius: 20rpx;
+		min-width: 100rpx;
+		margin-right: 20rpx;
+
+		.location-text {
+			font-size: 30rpx;
+			color: white;
+			margin-right: 8rpx;
+		}
+
+		.dropdown-icon {
+			width: 24rpx;
+			height: 16rpx;
+		}
+	}
+
+	// 预约弹窗样式
+	.reservation-popup {
+		width: 600rpx;
+		background: white;
+		border-radius: 24rpx;
+		overflow: hidden;
+
+		.popup-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 32rpx 32rpx 24rpx;
+			border-bottom: 1rpx solid #f0f0f0;
+
+			.popup-title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333;
+			}
+
+			.popup-close {
+				font-size: 40rpx;
+				color: #999;
+				line-height: 1;
+				padding: 8rpx;
+				cursor: pointer;
+				transition: color 0.3s;
+
+				&:active {
+					color: #666;
+				}
+			}
+		}
+
+		.popup-content {
+			padding: 32rpx;
+
+			.input-section {
+				margin-bottom: 32rpx;
+
+				.input-label {
+					display: block;
+					font-size: 28rpx;
+					color: #333;
+					margin-bottom: 16rpx;
+					font-weight: 500;
+				}
+
+				.reservation-input {
+					width: 100%;
+					height: 88rpx;
+					border: 2rpx solid #e0e0e0;
+					border-radius: 12rpx;
+					padding: 0 24rpx;
+					font-size: 28rpx;
+					color: #333;
+					background: #fafafa;
+					transition: all 0.3s;
+					box-sizing: border-box;
+
+					&:focus {
+						border-color: #007aff;
+						background: white;
+					}
+
+					&::placeholder {
+						color: #999;
+					}
+				}
+			}
+
+			.popup-actions {
+				display: flex;
+				gap: 24rpx;
+				margin-top: 40rpx;
+
+				.cancel-btn,
+				.confirm-btn {
+					flex: 1;
+					height: 74rpx;
+					border-radius: 12rpx;
+					font-size: 28rpx;
+					font-weight: 600;
+					border: none;
+					transition: all 0.3s;
+
+					&:active {
+						transform: scale(0.98);
+					}
+				}
+
+				.cancel-btn {
+					background: #f5f5f5;
+					color: #666;
+
+					&:active {
+						background: #e8e8e8;
+					}
+				}
+
+				.confirm-btn {
+					background: #007aff;
+					color: white;
+
+					&:active {
+						background: #0056cc;
+					}
+				}
+			}
+		}
+	}
+
+	// 地图标题点击样式
+	.map-title {
+		cursor: pointer;
+		transition: all 0.3s;
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/orderQy/confrim.vue b/subPackages/orderQy/confrim.vue
index a56336c..64a8170 100644
--- a/subPackages/orderQy/confrim.vue
+++ b/subPackages/orderQy/confrim.vue
@@ -60,20 +60,52 @@
         <view class="section-title">
           <text>IP资产供应商：{{ supplier || "苏州XXX博物馆" }}</text>
         </view>
-        <view class="goods-card" v-for="item in 4">
+        <view
+          class="goods-card"
+          v-for="(item, index) in goodsList"
+          :key="index"
+        >
           <image
             class="goods-image"
-            :src="goodsInfo.image || '/static/image/goods-default.jpg'"
+            :src="item.image || '/static/image/goods-default.jpg'"
             mode="aspectFill"
           />
           <view class="goods-info">
             <text class="goods-name">{{
-              goodsInfo.name || "食在苏州 | 世界美食之都巡礼+实物探真"
+              item.name || "食在苏州 | 世界美食之都巡礼+实物探真"
             }}</text>
-            <text class="goods-desc">{{
-              goodsInfo.desc || "商品规格信息描述"
-            }}</text>
-            <text class="goods-price">¥{{ goodsInfo.price || "699.00" }}</text>
+
+            <!-- 规格列表 -->
+            <view class="specifications-list">
+              <view
+                class="spec-item"
+                v-for="(spec, specIndex) in item.specifications"
+                :key="specIndex"
+                @click="selectSpecification(index, specIndex)"
+              >
+                <view class="spec-content">
+                  <text class="spec-label">规格{{ specIndex + 1 }}</text>
+                  <text
+                    class="spec-text"
+                    :class="{ placeholder: !spec.selectedSpec }"
+                  >
+                    {{ spec.selectedSpec || "请选择规格" }}
+                  </text>
+                </view>
+                <uni-icons type="right" size="14" color="#c0c4cc" />
+              </view>
+
+              <!-- 添加规格按钮 -->
+              <view
+                class="add-spec-btn"
+                v-if="item.specifications.length < item.quantity"
+                @click="addSpecification(index)"
+              >
+                <text class="add-spec-text">+ 添加规格</text>
+              </view>
+            </view>
+
+            <text class="goods-price">¥{{ item.price || "699.00" }}</text>
           </view>
         </view>
       </view>
@@ -123,6 +155,94 @@
       <view class="submit-section-content" style="height: 230rpx"> </view>
     </scroll-view>
 
+    <!-- 规格选择弹窗 -->
+    <uni-popup ref="specificationPopup" type="bottom">
+      <view class="specification-popup">
+        <view class="popup-header">
+          <text class="popup-title">选择规格</text>
+          <text class="popup-close" @click="closeSpecificationPopup">×</text>
+        </view>
+
+        <view class="popup-content">
+          <!-- 商品信息 -->
+          <view class="goods-preview">
+            <image
+              class="preview-image"
+              :src="currentGoods.image || '/static/image/goods-default.jpg'"
+              mode="aspectFill"
+            />
+            <view class="preview-info">
+              <text class="preview-name">{{ currentGoods.name }}</text>
+              <!-- <text class="preview-price">¥{{ currentGoods.price }}</text> -->
+            </view>
+          </view>
+
+          <!-- 一级规格选择 -->
+          <view class="spec-section">
+            <text class="spec-title">
+              {{ specificationData.level1Title || "规格" }}
+              <text class="required">*</text>
+            </text>
+            <view class="spec-options">
+              <view
+                v-for="(option, index) in specificationData.level1Options"
+                :key="index"
+                :class="['spec-option', { active: selectedLevel1 === index }]"
+                @click="selectLevel1(index)"
+              >
+                <text class="option-text">{{ option.name }}</text>
+              </view>
+            </view>
+          </view>
+
+          <!-- 二级规格选择 -->
+          <view
+            class="spec-section"
+            v-if="
+              specificationData.level2Options &&
+              specificationData.level2Options.length > 0
+            "
+          >
+            <text class="spec-title">
+              {{ specificationData.level2Title || "子规格" }}
+              <text class="required">*</text>
+            </text>
+            <view class="spec-options">
+              <view
+                v-for="(option, index) in specificationData.level2Options"
+                :key="index"
+                :class="['spec-option', { active: selectedLevel2 === index }]"
+                @click="selectLevel2(index)"
+              >
+                <text class="option-text">{{ option.name }}</text>
+              </view>
+            </view>
+          </view>
+
+          <!-- 数量选择 -->
+          <!-- <view class="quantity-section">
+             <text class="quantity-title">数量</text>
+             <view class="quantity-control">
+               <text class="quantity-btn" @click="decreaseQuantity">-</text>
+               <text class="quantity-value">{{ quantity }}</text>
+               <text class="quantity-btn" @click="increaseQuantity">+</text>
+             </view>
+           </view> -->
+        </view>
+
+        <!-- 确认按钮 -->
+        <view class="popup-actions">
+          <button
+            class="confirm-spec-btn"
+            @click="confirmSpecification"
+            :disabled="!canConfirmSpec"
+          >
+            确认规格
+          </button>
+        </view>
+      </view>
+    </uni-popup>
+
     <!-- 底部提交区域 -->
     <view
       class=" "
@@ -159,6 +279,8 @@ export default {
         price: "",
         image: "",
       },
+      // 商品列表
+      goodsList: [],
       // 供应商
       supplier: "",
       // 履约方式
@@ -171,6 +293,20 @@ export default {
       coupon: "",
       // 总金额
       totalAmount: "",
+
+      // 规格选择相关
+      currentGoodsIndex: -1,
+      currentSpecIndex: -1,
+      currentGoods: {},
+      specificationData: {
+        level1Title: "",
+        level1Options: [],
+        level2Title: "",
+        level2Options: [],
+      },
+      selectedLevel1: -1,
+      selectedLevel2: -1,
+      quantity: 1,
     };
   },
 
@@ -202,6 +338,27 @@ export default {
     uni.$off("addressSelected", this.handleAddressSelected);
   },
 
+  computed: {
+    // 是否可以确认规格
+    canConfirmSpec() {
+      // 必须选择一级规格
+      if (this.selectedLevel1 < 0) {
+        return false;
+      }
+
+      // 如果有二级规格选项，则必须选择二级规格
+      if (
+        this.specificationData.level2Options &&
+        this.specificationData.level2Options.length > 0
+      ) {
+        return this.selectedLevel2 >= 0;
+      }
+
+      // 如果没有二级规格选项，只需要选择一级规格即可
+      return true;
+    },
+  },
+
   methods: {
     // 返回上一页
     goBack() {
@@ -295,26 +452,310 @@ export default {
         const goodsData = await this.getGoodsDetail(goodsId);
         this.goodsInfo = goodsData;
         this.supplier = goodsData.supplier;
-        this.totalAmount = goodsData.price;
+
+        // 初始化商品列表
+        this.goodsList = [
+          {
+            id: goodsData.id,
+            name: goodsData.name,
+            price: goodsData.price,
+            image: goodsData.image,
+            quantity: 3, // 默认数量为3，可以根据实际需求调整
+            specifications: [
+              {
+                selectedSpec: "",
+                selectedLevel1: -1,
+                selectedLevel2: -1,
+              },
+            ],
+          },
+        ];
+
+        this.calculateTotalAmount();
       } catch (error) {
         console.error("加载商品信息失败:", error);
+        // 使用模拟数据
+        this.loadMockGoodsData();
       }
     },
 
+    // 加载模拟商品数据
+    loadMockGoodsData() {
+      this.goodsList = [
+        {
+          id: 1,
+          name: "食在苏州 | 世界美食之都巡礼+实物探真",
+          price: "699.00",
+          image: "/static/image/goods-sample.jpg",
+          quantity: 3,
+          specifications: [
+            {
+              selectedSpec: "",
+              selectedLevel1: -1,
+              selectedLevel2: -1,
+            },
+          ],
+        },
+        {
+          id: 2,
+          name: "苏州园林文化体验套餐",
+          price: "899.00",
+          image: "/static/image/goods-sample.jpg",
+          quantity: 2,
+          specifications: [
+            {
+              selectedSpec: "",
+              selectedLevel1: -1,
+              selectedLevel2: -1,
+            },
+          ],
+        },
+      ];
+      this.calculateTotalAmount();
+    },
+
     // 加载默认地址
     async loadDefaultAddress() {
       try {
+		  this.Post({
+		  		isDefault:1
+		  	},
+		  	"/framework/concat/selectList",
+		  	'DES'
+		  ).then((res) => {
+			  if(res.data){
+				  this.updateAddressInfo(res.data[0]);
+			  }
+		  });
         // 这里调用实际的API接口获取默认地址
-        const addressData = await this.getDefaultAddress();
-        if (addressData && !this.address.id) {
-          // 只有当前没有地址时才设置默认地址
-          this.updateAddressInfo(addressData);
-        }
       } catch (error) {
         console.error("加载默认地址失败:", error);
       }
     },
 
+    // 选择规格
+    selectSpecification(goodsIndex, specIndex) {
+      this.currentGoodsIndex = goodsIndex;
+      this.currentSpecIndex = specIndex;
+      this.currentGoods = this.goodsList[goodsIndex];
+      this.loadSpecificationData(this.currentGoods.id);
+
+      // 回显之前的选择
+      const currentSpec = this.currentGoods.specifications[specIndex];
+      this.selectedLevel1 = currentSpec.selectedLevel1 || -1;
+      this.selectedLevel2 = currentSpec.selectedLevel2 || -1;
+      this.quantity = this.currentGoods.quantity || 1;
+
+      this.$refs.specificationPopup.open();
+    },
+
+    // 添加规格
+    addSpecification(goodsIndex) {
+      const goods = this.goodsList[goodsIndex];
+      if (goods.specifications.length < goods.quantity) {
+        goods.specifications.push({
+          selectedSpec: "",
+          selectedLevel1: -1,
+          selectedLevel2: -1,
+        });
+      }
+    },
+
+    // 关闭规格选择弹窗
+    closeSpecificationPopup() {
+      this.$refs.specificationPopup.close();
+      this.resetSpecificationData();
+    },
+
+    // 重置规格选择数据
+    resetSpecificationData() {
+      this.selectedLevel1 = -1;
+      this.selectedLevel2 = -1;
+      this.quantity = 1; // 保持默认数量为1
+    },
+
+    // 加载规格数据
+    async loadSpecificationData(goodsId) {
+      try {
+        const specData = await this.getSpecificationData(goodsId);
+        this.specificationData = specData;
+
+        // 如果有之前的选择，需要更新二级规格选项
+        if (
+          this.selectedLevel1 >= 0 &&
+          this.specificationData.level1Options[this.selectedLevel1]
+        ) {
+          const level1Option =
+            this.specificationData.level1Options[this.selectedLevel1];
+          if (level1Option.children) {
+            this.specificationData.level2Options = level1Option.children;
+          } else {
+            this.specificationData.level2Options = [];
+          }
+        }
+      } catch (error) {
+        console.error("加载规格数据失败:", error);
+        // 使用模拟数据
+        this.loadMockSpecificationData();
+      }
+    },
+
+    // 选择一级规格
+    selectLevel1(index) {
+      this.selectedLevel1 = index;
+      this.selectedLevel2 = -1; // 重置二级选择
+
+      // 根据一级选择更新二级选项
+      if (
+        this.specificationData.level1Options[index] &&
+        this.specificationData.level1Options[index].children
+      ) {
+        this.specificationData.level2Options =
+          this.specificationData.level1Options[index].children;
+      } else {
+        this.specificationData.level2Options = [];
+      }
+    },
+
+    // 选择二级规格
+    selectLevel2(index) {
+      this.selectedLevel2 = index;
+    },
+
+    // 减少数量
+    decreaseQuantity() {
+      if (this.quantity > 1) {
+        this.quantity--;
+      }
+    },
+
+    // 增加数量
+    increaseQuantity() {
+      this.quantity++;
+    },
+
+    // 确认规格选择
+    confirmSpecification() {
+      // 校验一级规格
+      if (this.selectedLevel1 < 0) {
+        uni.showToast({
+          title: "请选择一级规格",
+          icon: "none",
+        });
+        return;
+      }
+
+      // 校验二级规格（如果有二级规格选项）
+      if (
+        this.specificationData.level2Options &&
+        this.specificationData.level2Options.length > 0
+      ) {
+        if (this.selectedLevel2 < 0) {
+          uni.showToast({
+            title: "请选择二级规格",
+            icon: "none",
+          });
+          return;
+        }
+      }
+
+      const level1Option =
+        this.specificationData.level1Options[this.selectedLevel1];
+      const level2Option =
+        this.selectedLevel2 >= 0
+          ? this.specificationData.level2Options[this.selectedLevel2]
+          : null;
+
+      // 构建规格文本
+      let specText = level1Option.name;
+      if (level2Option) {
+        specText += ` / ${level2Option.name}`;
+      }
+      // if (this.quantity > 1) {
+      //   specText += ` × ${this.quantity}`;
+      // }
+
+      // 更新商品规格信息
+      this.goodsList[this.currentGoodsIndex].specifications[
+        this.currentSpecIndex
+      ].selectedSpec = specText;
+      this.goodsList[this.currentGoodsIndex].specifications[
+        this.currentSpecIndex
+      ].selectedLevel1 = this.selectedLevel1;
+      this.goodsList[this.currentGoodsIndex].specifications[
+        this.currentSpecIndex
+      ].selectedLevel2 = this.selectedLevel2;
+
+      // 更新价格
+      let price = level1Option.price || this.currentGoods.price;
+      if (level2Option && level2Option.price) {
+        price = level2Option.price;
+      }
+      this.goodsList[this.currentGoodsIndex].price = price;
+
+      // 重新计算总金额
+      this.calculateTotalAmount();
+
+      this.closeSpecificationPopup();
+
+      uni.showToast({
+        title: "规格选择成功",
+        icon: "success",
+      });
+    },
+
+    // 计算总金额
+    calculateTotalAmount() {
+      let total = 0;
+      this.goodsList.forEach((item) => {
+        if (item.price) {
+          // 计算已选择规格的数量
+          const selectedSpecsCount = item.specifications.filter(
+            (spec) => spec.selectedSpec
+          ).length;
+          total += parseFloat(item.price) * selectedSpecsCount;
+        }
+      });
+      this.totalAmount = total.toFixed(2);
+    },
+
+    // 加载模拟规格数据
+    loadMockSpecificationData() {
+      this.specificationData = {
+        level1Title: "套餐类型",
+        level1Options: [
+          {
+            name: "标准套餐",
+            price: "699.00",
+            children: [
+              { name: "单人套餐", price: "699.00" },
+              { name: "双人套餐", price: "1299.00" },
+              { name: "家庭套餐", price: "1899.00" },
+            ],
+          },
+          {
+            name: "豪华套餐",
+            price: "999.00",
+            children: [
+              { name: "VIP单人", price: "999.00" },
+              { name: "VIP双人", price: "1799.00" },
+              { name: "VIP家庭", price: "2599.00" },
+            ],
+          },
+          {
+            name: "定制套餐",
+            price: "1299.00",
+            children: [
+              { name: "定制单人", price: "1299.00" },
+              { name: "定制双人", price: "2299.00" },
+            ],
+          },
+        ],
+        level2Title: "具体套餐",
+        level2Options: [],
+      };
+    },
+
     // 提交订单
     async submitOrder() {
       // 验证必填项
@@ -326,9 +767,14 @@ export default {
         return;
       }
 
-      if (!this.deliveryMethod) {
+      // 验证所有商品是否已选择规格
+      const unselectedGoods = this.goodsList.filter((item) => {
+        // 检查是否有规格未选择
+        return item.specifications.some((spec) => !spec.selectedSpec);
+      });
+      if (unselectedGoods.length > 0) {
         uni.showToast({
-          title: "请选择履约方式",
+          title: "请选择所有商品的规格",
           icon: "none",
         });
         return;
@@ -400,26 +846,50 @@ export default {
       });
     },
 
-    // API接口 - 获取默认地址
-    async getDefaultAddress() {
+    // API接口 - 获取规格数据
+    async getSpecificationData(goodsId) {
       // 模拟API数据
       return new Promise((resolve) => {
         setTimeout(() => {
           resolve({
-            id: 1,
-            name: "XX先生",
-            tel: "18312341234",
-            address: "江苏省苏州市姑苏区XXXXXX",
-            province_text: "江苏省",
-            city_text: "苏州市",
-            district_text: "姑苏区",
-            detail_addr: "XXXXXX",
-            is_default: 1,
+            level1Title: "套餐类型",
+            level1Options: [
+              {
+                name: "标准套餐",
+                price: "699.00",
+                children: [
+                  { name: "单人套餐", price: "699.00" },
+                  { name: "双人套餐", price: "1299.00" },
+                  { name: "家庭套餐", price: "1899.00" },
+                ],
+              },
+              {
+                name: "豪华套餐",
+                price: "999.00",
+                children: [
+                  { name: "VIP单人", price: "999.00" },
+                  { name: "VIP双人", price: "1799.00" },
+                  { name: "VIP家庭", price: "2599.00" },
+                ],
+              },
+              {
+                name: "定制套餐",
+                price: "1299.00",
+                children: [
+                  { name: "定制单人", price: "1299.00" },
+                  { name: "定制双人", price: "2299.00" },
+                ],
+              },
+            ],
+            level2Title: "具体套餐",
+            level2Options: [],
           });
-        }, 500);
+        }, 300);
       });
     },
 
+
+
     // API接口 - 创建订单
     async createOrder(orderData) {
       // 模拟API调用
@@ -769,4 +1239,273 @@ $bg-light: #f7fafc;
     background-color: rgba(45, 55, 72, 0.8);
   }
 }
+
+// 规格选择弹窗样式
+.specification-popup {
+  background: white;
+  border-radius: 24rpx 24rpx 0 0;
+  max-height: 80vh;
+  overflow: hidden;
+}
+
+.popup-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 32rpx 30rpx 24rpx;
+  border-bottom: 1rpx solid $border-color;
+
+  .popup-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: $text-primary;
+  }
+
+  .popup-close {
+    font-size: 40rpx;
+    color: $text-muted;
+    line-height: 1;
+    padding: 8rpx;
+    cursor: pointer;
+    transition: color 0.3s;
+
+    &:active {
+      color: $text-secondary;
+    }
+  }
+}
+
+.popup-content {
+  padding: 30rpx;
+  max-height: 60vh;
+  overflow-y: auto;
+}
+
+// 商品预览
+.goods-preview {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+  padding: 24rpx;
+  background: $bg-light;
+  border-radius: 16rpx;
+  margin-bottom: 30rpx;
+
+  .preview-image {
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 12rpx;
+    flex-shrink: 0;
+  }
+
+  .preview-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 8rpx;
+  }
+
+  .preview-name {
+    font-size: 26rpx;
+    color: $text-primary;
+    font-weight: 500;
+    line-height: 1.3;
+  }
+
+  .preview-price {
+    font-size: 28rpx;
+    color: $danger-color;
+    font-weight: 600;
+  }
+}
+
+// 规格选择区域
+.spec-section {
+  margin-bottom: 30rpx;
+
+  .spec-title {
+    font-size: 28rpx;
+    color: $text-primary;
+    font-weight: 600;
+    margin-bottom: 20rpx;
+    display: block;
+
+    .required {
+      color: $danger-color;
+      margin-left: 4rpx;
+    }
+  }
+
+  .spec-options {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+  }
+
+  .spec-option {
+    padding: 16rpx 24rpx;
+    border: 2rpx solid $border-color;
+    border-radius: 12rpx;
+    background: white;
+    transition: all 0.3s ease;
+    cursor: pointer;
+
+    &:active {
+      transform: scale(0.95);
+    }
+
+    &.active {
+      border-color: $primary-color;
+      background: rgba(102, 126, 234, 0.1);
+    }
+
+    .option-text {
+      font-size: 26rpx;
+      color: $text-primary;
+      font-weight: 500;
+    }
+  }
+}
+
+// 数量选择
+.quantity-section {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24rpx 0;
+  border-top: 1rpx solid $border-color;
+
+  .quantity-title {
+    font-size: 28rpx;
+    color: $text-primary;
+    font-weight: 600;
+  }
+
+  .quantity-control {
+    display: flex;
+    align-items: center;
+    gap: 20rpx;
+  }
+
+  .quantity-btn {
+    width: 60rpx;
+    height: 60rpx;
+    border: 2rpx solid $border-color;
+    border-radius: 12rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: $text-primary;
+    font-weight: 600;
+    background: white;
+    transition: all 0.3s ease;
+    cursor: pointer;
+
+    &:active {
+      background: $bg-light;
+      border-color: $primary-color;
+    }
+  }
+
+  .quantity-value {
+    font-size: 28rpx;
+    color: $text-primary;
+    font-weight: 600;
+    min-width: 60rpx;
+    text-align: center;
+  }
+}
+
+// 确认按钮
+.popup-actions {
+  padding: 24rpx 30rpx 40rpx;
+  border-top: 1rpx solid $border-color;
+  background: white;
+
+  .confirm-spec-btn {
+    width: 100%;
+    height: 88rpx;
+    background: $primary-color;
+    color: white;
+    border: none;
+    border-radius: 44rpx;
+    font-size: 32rpx;
+    font-weight: 600;
+    transition: all 0.3s ease;
+
+    &:active {
+      transform: scale(0.98);
+      background: rgba(102, 126, 234, 0.8);
+    }
+
+    &:disabled {
+      background: $text-muted;
+      cursor: not-allowed;
+    }
+  }
+}
+
+// 商品卡片中的规格信息样式
+.specifications-list {
+  margin: 12rpx 0;
+}
+
+.spec-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16rpx 0;
+  border-bottom: 1rpx solid #f0f0f0;
+
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.spec-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+}
+
+.spec-label {
+  font-size: 22rpx;
+  color: $text-secondary;
+  font-weight: 500;
+}
+
+.spec-text {
+  font-size: 24rpx;
+  color: $text-primary;
+  font-weight: 500;
+
+  &.placeholder {
+    color: $text-muted;
+  }
+}
+
+.add-spec-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20rpx 0;
+  margin-top: 8rpx;
+  border: 2rpx dashed $border-color;
+  border-radius: 12rpx;
+  background: rgba(102, 126, 234, 0.02);
+  transition: all 0.3s ease;
+
+  &:active {
+    background: rgba(102, 126, 234, 0.1);
+    border-color: $primary-color;
+  }
+}
+
+.add-spec-text {
+  font-size: 24rpx;
+  color: $primary-color;
+  font-weight: 500;
+}
 </style>
diff --git a/subPackages/orderQy/detail.vue b/subPackages/orderQy/detail.vue
index 0c92641..2454f60 100644
--- a/subPackages/orderQy/detail.vue
+++ b/subPackages/orderQy/detail.vue
@@ -53,8 +53,11 @@
       >
         <view class="goods-checkbox">
           <view class="checkbox-icon">
-			  <image mode="aspectFill" src="https://picsum.photos/200/300"></image>
-		  </view>
+            <image
+              mode="aspectFill"
+              src="https://picsum.photos/200/300"
+            ></image>
+          </view>
         </view>
         <view class="goods-content">
           <view class="goods-info">
@@ -62,14 +65,32 @@
             <view class="goods-desc">{{
               goods.description || goods.spec
             }}</view>
+            <view class="goods-quantity">数量：{{ goods.quantity || 1 }}</view>
           </view>
           <view class="goods-actions">
-            <button class="action-btn" :class="[getGoodsActionClass(goods.type)]">
+            <button
+              class="action-btn"
+              :class="[getGoodsActionClass(goods.type)]"
+            >
               {{ getGoodsActionText(goods.type) }}
             </button>
           </view>
         </view>
       </view>
+
+      <!-- 金额汇总 -->
+      <view class="amount-summary">
+        <view class="summary-row">
+          <text class="summary-label">订单金额</text>
+          <text class="summary-value">¥{{ orderDetail.goodsAmount }}</text>
+        </view>
+        <view class="summary-row">
+          <text class="summary-label">运费</text>
+          <text class="summary-value"
+            >¥{{ orderDetail.shippingFee || "5.00" }}</text
+          >
+        </view>
+      </view>
     </view>
 
     <!-- 订单信息 -->
@@ -690,7 +711,7 @@ export default {
   font-size: 28rpx;
   font-weight: 600;
   color: #333;
-  margin-bottom: 20rpx;
+  margin-bottom: 0;
 }
 
 // 商品列表
@@ -717,12 +738,12 @@ export default {
 }
 
 .checkbox-icon {
-  width: 150rpx;
-  height:150rpx;
-  image{
-	  width: 100%;
-	  height: 100%;
-	  border-radius: 10rpx;
+  width: 100rpx;
+  height: 100rpx;
+  image {
+    width: 100%;
+    height: 100%;
+    border-radius: 10rpx;
   }
 }
 
@@ -749,6 +770,13 @@ export default {
   font-size: 24rpx;
   color: #666;
   line-height: 1.4;
+  margin-bottom: 8rpx;
+}
+
+.goods-quantity {
+  font-size: 22rpx;
+  color: #999;
+  font-weight: 500;
 }
 
 .goods-actions {
@@ -761,22 +789,50 @@ export default {
   font-size: 24rpx;
   border: none;
 
-  &.btn-view {
-    background-color: #f0f0f0;
-    color: #666;
-  }
+  padding: 0rpx 20rpx;
+  border-radius: 10rpx;
+  font-size: 24rpx;
+  font-weight: 600;
+  border: none;
+  color: #333333;
+  transition: all 0.3s ease;
+  min-width: 100rpx;
+  text-align: center;
+  background-color: #77f3f9;
+  height: 55rpx;
+  line-height: 55rpx;
+}
 
-  &.btn-logistics {
-    background-color: #007aff;
-    color: #fff;
-  }
+// 金额汇总
+.amount-summary {
+  padding: 20rpx 30rpx;
+  border-top: 1rpx solid #f0f0f0;
+  background-color: white;
+}
 
-  &.btn-used {
-    background-color: #34c759;
-    color: #fff;
+.summary-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 12rpx;
+
+  &:last-child {
+    margin-bottom: 0;
   }
 }
 
+.summary-label {
+  font-size: 26rpx;
+  color: #666;
+  font-weight: 500;
+}
+
+.summary-value {
+  font-size: 26rpx;
+  color: #333;
+  font-weight: 600;
+}
+
 // 订单信息
 .order-info-section {
   background-color: #fff;
@@ -844,21 +900,18 @@ export default {
 
   .action-btn {
     flex: 1;
-    height: 80rpx;
-    border-radius: 40rpx;
-    font-size: 28rpx;
-    border: none;
+    padding: 0rpx 20rpx;
+    border-radius: 10rpx;
+    font-size: 24rpx;
     font-weight: 600;
-
-    &.secondary {
-      background-color: #f0f0f0;
-      color: #666;
-    }
-
-    &.primary {
-      background-color: #333;
-      color: #fff;
-    }
+    border: none;
+    color: #333333;
+    transition: all 0.3s ease;
+    min-width: 100rpx;
+    text-align: center;
+    background-color: #77f3f9;
+    height: 55rpx;
+    line-height: 55rpx;
   }
 }
 
diff --git a/subPackages/orderQy/list.vue b/subPackages/orderQy/list.vue
index 2e24388..7fe9661 100644
--- a/subPackages/orderQy/list.vue
+++ b/subPackages/orderQy/list.vue
@@ -4,7 +4,7 @@
     <view class="tab-container">
       <view
         class="tab-item"
-        :class="{ active: currentTab === index }"
+        :class="{ active: currentTab == index }"
         v-for="(tab, index) in tabs"
         :key="index"
         @click="switchTab(index)"
@@ -19,10 +19,10 @@
       scroll-y
       @scrolltolower="loadMore"
       refresher-enabled
-	  :show-scrollbar="false"
+      :show-scrollbar="false"
       :refresher-triggered="refresherTriggered"
       @refresherrefresh="onRefresh"
-	  enhanced
+      enhanced
     >
       <!-- 订单项 -->
       <view
@@ -32,42 +32,35 @@
         @click="goToOrderDetail(order)"
       >
         <!-- 订单头部 -->
-        <view class="order-header">
-          <view class="order-left">
-            <view class="order-number-section">
-              <text class="order-label">订单号</text>
-              <text class="order-number">{{ order.orderNo }}</text>
-            </view>
-          </view>
-          <view class="order-status-wrapper">
-            <text class="order-status" :class="[getStatusClass(order.status)]">
-              {{ getStatusText(order.status) }}
-            </text>
-          </view>
-        </view>
 
         <!-- 权益商品包名 -->
         <view class="package-section">
-          <view class="package-icon">📦</view>
           <text class="package-name">{{ order.packageName }}</text>
+          <text class="status-name">{{ getStatusText(order.status) }}</text>
         </view>
 
         <!-- 商品列表 -->
         <view class="goods-section">
-          <view class="goods-title">商品清单</view>
           <view class="goods-list">
             <view
               class="goods-item"
               v-for="goods in order.goodsList"
               :key="goods.id"
             >
-              <image class="goods-image" :src="goods.image" mode="aspectFill" />
+              <image
+                class="goods-image"
+                src="https://picsum.photos/200/200"
+                mode="aspectFill"
+              />
               <view class="goods-info">
                 <text class="goods-name">{{ goods.name }}</text>
                 <view class="goods-meta">
                   <text class="goods-type">{{
                     getGoodsTypeName(goods.type)
                   }}</text>
+                  <text class="goods-quantity"
+                    >数量：{{ goods.quantity || 1 }}</text
+                  >
                 </view>
               </view>
               <view class="goods-action">
@@ -86,10 +79,6 @@
         <!-- 订单底部 -->
         <view class="order-footer">
           <view class="order-info">
-            <view class="order-time-section">
-              <text class="time-label">下单时间</text>
-              <text class="order-time">{{ formatTime(order.createTime) }}</text>
-            </view>
             <view class="order-total-section">
               <text class="total-label">实付金额</text>
               <text class="order-total">¥{{ order.totalAmount }}</text>
@@ -101,7 +90,6 @@
               @click.stop="showEquityCode(order)"
               v-if="order.status !== 0"
             >
-              <text class="btn-icon">🎫</text>
               <text>权益码</text>
             </button>
           </view>
@@ -189,7 +177,10 @@ export default {
       },
     };
   },
-  onLoad() {
+  onLoad(e) {
+	  if(e.status){
+		  this.currentTab = e.status
+	  }
     this.loadOrderList();
   },
   methods: {
@@ -330,6 +321,9 @@ export default {
         title: "查看数字资产",
         icon: "none",
       });
+	  uni.navigateTo({
+			url:'/subPackages/memorialAlbum/detail'
+	  })
     },
 
     // 预约发货
@@ -505,8 +499,9 @@ $bg-light: #f7fafc;
 // Tab样式
 .tab-container {
   display: flex;
-  background-color: $primary-color;
+  background-color: #ffffff;
   border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+  color: black;
   position: sticky;
   top: 0;
   z-index: 10;
@@ -518,10 +513,11 @@ $bg-light: #f7fafc;
   text-align: center;
   position: relative;
   transition: all 0.3s ease;
+  color: #333333;
 
   &.active {
     .tab-text {
-      color: #ffffff;
+      color: #77f3f9;
       font-weight: 600;
     }
 
@@ -533,21 +529,21 @@ $bg-light: #f7fafc;
       transform: translateX(-50%);
       width: 60rpx;
       height: 4rpx;
-      background-color: #ffffff;
+      background-color: #77f3f9;
       border-radius: 2rpx;
     }
   }
 
   &:not(.active) {
     .tab-text {
-      opacity: 0.7;
+      opacity: 1;
     }
   }
 }
 
 .tab-text {
   font-size: 26rpx;
-  color: #ffffff;
+  color: #333333;
   font-weight: 600;
   transition: all 0.3s ease;
 }
@@ -647,22 +643,28 @@ $bg-light: #f7fafc;
 // 权益商品包
 .package-section {
   display: flex;
+  justify-content: space-between;
   align-items: center;
-  padding: 20rpx 28rpx;
-  margin: 0 20rpx;
-  margin-top: -6rpx;
-}
-
-.package-icon {
-  font-size: 36rpx;
-  margin-right: 20rpx;
+  padding: 20rpx 20rpx;
 }
 
 .package-name {
+  flex: 1;
   font-size: 30rpx;
   color: $text-primary;
   font-weight: 600;
   letter-spacing: 0.5rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  margin-right: 20rpx;
+}
+
+.status-name {
+  font-size: 26rpx;
+  color: $text-secondary;
+  font-weight: 500;
+  flex-shrink: 0;
 }
 
 // 商品部分
@@ -718,7 +720,7 @@ $bg-light: #f7fafc;
 
 .goods-name {
   display: block;
-  font-size: 30rpx;
+  font-size: 26rpx;
   color: $text-primary;
   font-weight: 600;
   margin-bottom: 12rpx;
@@ -737,10 +739,17 @@ $bg-light: #f7fafc;
 .goods-type {
   font-size: 24rpx;
   color: $text-secondary;
-  background: $secondary-color;
-  padding: 8rpx 16rpx;
+  // background: $secondary-color;
+  // padding: 8rpx 16rpx;
   border-radius: 20rpx;
   font-weight: 500;
+  margin-right: 16rpx;
+}
+
+.goods-quantity {
+  font-size: 22rpx;
+  color: $text-muted;
+  font-weight: 500;
 }
 
 .goods-price {
@@ -753,30 +762,32 @@ $bg-light: #f7fafc;
 .goods-action {
   .action-btn {
     padding: 0rpx 20rpx;
-    border-radius: 20rpx;
+    border-radius: 10rpx;
     font-size: 24rpx;
     font-weight: 600;
     border: none;
-    color: #ffffff;
+    color: #333333;
     transition: all 0.3s ease;
     min-width: 100rpx;
     text-align: center;
-
+    background-color: #77f3f9;
+    height: 55rpx;
+    line-height: 55rpx;
     &:active {
       transform: scale(0.95);
     }
 
-    &.btn-view {
-      background: $primary-color;
-    }
+    // &.btn-view {
+    //   background: $primary-color;
+    // }
 
-    &.btn-reserve {
-      background: $warning-color;
-    }
+    // &.btn-reserve {
+    //   background: $warning-color;
+    // }
 
-    &.btn-use {
-      background: $success-color;
-    }
+    // &.btn-use {
+    //   background: $success-color;
+    // }
   }
 }
 
@@ -786,7 +797,7 @@ $bg-light: #f7fafc;
   justify-content: space-between;
   align-items: center;
   padding: 24rpx 28rpx;
-  background: $secondary-color;
+  background: white;
   margin-top: 20rpx;
 }
 
@@ -798,13 +809,11 @@ $bg-light: #f7fafc;
 
 .order-time-section,
 .order-total-section {
-  display: flex;
-  flex-direction: column;
-  gap: 6rpx;
 }
 
 .time-label,
 .total-label {
+  margin-right: 10rpx;
   font-size: 22rpx;
   color: $text-muted;
   font-weight: 500;
@@ -832,15 +841,15 @@ $bg-light: #f7fafc;
     align-items: center;
     gap: 10rpx;
     padding: 2rpx 24rpx;
-    background: $primary-color;
-    color: #ffffff;
-    border-radius: 24rpx;
+    background: white;
+    color: #333333;
+    border-radius: 10rpx;
     font-size: 24rpx;
     font-weight: 600;
-    border: none;
+    border: 1rpx solid #77f3f9;
     transition: all 0.3s ease;
-    box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-
+    height: 55rpx;
+    line-height: 55rpx;
     &:active {
       transform: scale(0.95);
     }
diff --git a/subPackages/user/collection.vue b/subPackages/user/collection.vue
new file mode 100644
index 0000000..617a1fb
--- /dev/null
+++ b/subPackages/user/collection.vue
@@ -0,0 +1,408 @@
+<template>
+  <view class="collection-page">
+    <!-- 顶部标题区域 -->
+    <!-- 商品网格 -->
+    <view class="products-grid" v-if="collectionList.length > 0">
+      <view
+        class="product-item"
+        :style="{
+          'border-width':
+            index == collectionList.length - 1 ||
+            index == collectionList.length - 2
+              ? 0
+              : '0.5rpx',
+        }"
+        v-for="(item, index) in collectionList"
+        :key="index"
+        @click="goToDetail(item)"
+      >
+        <image
+          class="product-image"
+          src="https://images.unsplash.com/photo-1578662996442-48f60103fc96?auto=format&fit=crop&w=400"
+          mode="aspectFill"
+        ></image>
+        <view class="product-info">
+          <view class="product-title">{{ item.title }}</view>
+          <view class="product-price-box">
+            <view class="product-price">{{ item.price }}</view>
+            <view class="">
+              <image
+                @click.stop="handleUnlikeClick(item, index)"
+                class="heart-icon"
+                src="https://epic.js-dyyj.com/uploads/20250728/dd7ed269b24e84a2dd141da6ab980fd6.png"
+              >
+              </image>
+            </view>
+          </view>
+          <view class="product-details">
+            <text class="detail-item"
+              >限量发售{{ item.publishQuantity }}份</text
+            >
+            <text class="detail-item"
+              >{{ item.purchaseQuantity || 0 }}人付款</text
+            >
+            <text class="detail-item">浏览{{ item.viewQuantity || 0 }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态展示 -->
+    <view class="empty-state" v-else>
+      <view class="empty-content">
+        <image
+          class="empty-icon"
+          src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgdmlld0JveD0iMCAwIDEwMCAxMDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxjaXJjbGUgY3g9IjUwIiBjeT0iNTAiIHI9IjQ1IiBzdHJva2U9IiNEREREREQiIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0ibm9uZSIvPgo8cGF0aCBkPSJNMzUgNDBINjVNMzUgNTBINjVNMzUgNjBINjUiIHN0cm9rZT0iI0RERERERCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiLz4KPC9zdmc+"
+          mode="widthFix"
+        ></image>
+        <view class="empty-title">暂无收藏</view>
+        <view class="empty-desc">您还没有收藏任何商品</view>
+        <view class="empty-tip">去发现更多精彩商品吧</view>
+        <view class="empty-action" @click="goToDiscover">
+          <text class="action-text">去发现</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "UserCollection",
+  mixins: [require("@/mixins/myMixins.js")],
+  data() {
+    return {
+      collectionList: [],
+      sortValue: 0, // 0: 最新收藏, 1: 价格排序
+    };
+  },
+  onLoad() {
+    this.loadCollectionList();
+  },
+  onShow() {
+    // 每次显示页面时刷新收藏列表
+    this.loadCollectionList();
+  },
+  methods: {
+    // 加载收藏列表
+    loadCollectionList() {
+      this.Post(
+        {
+          sortValue: this.sortValue,
+        },
+        "/framework/benefitPackage/collectList",
+        "DES"
+      )
+        .then((res) => {
+          if (res.data) {
+            this.collectionList = res.data;
+          }
+        })
+        .catch((error) => {
+          console.error("加载收藏列表失败:", error);
+          // 使用模拟数据
+        });
+    },
+
+    // 模拟数据（当API不可用时使用）
+    loadMockData() {
+      this.collectionList = [
+        {
+          benefitPackageId: 1,
+          title: "苏州园林数字藏品",
+          price: "299",
+          coverUrl:
+            "https://images.unsplash.com/photo-1578662996442-48f60103fc96?auto=format&fit=crop&w=400",
+          publishQuantity: 1000,
+          purchaseQuantity: 156,
+          viewQuantity: 2340,
+          type: true,
+        },
+        {
+          benefitPackageId: 2,
+          title: "江南水乡文化资产",
+          price: "199",
+          coverUrl:
+            "https://images.unsplash.com/photo-1578662996442-48f60103fc96?auto=format&fit=crop&w=400",
+          publishQuantity: 500,
+          purchaseQuantity: 89,
+          viewQuantity: 1200,
+          type: true,
+        },
+        {
+          benefitPackageId: 3,
+          title: "吴文化数字纪念册",
+          price: "399",
+          coverUrl:
+            "https://images.unsplash.com/photo-1578662996442-48f60103fc96?auto=format&fit=crop&w=400",
+          publishQuantity: 200,
+          purchaseQuantity: 45,
+          viewQuantity: 890,
+          type: true,
+        },
+        {
+          benefitPackageId: 4,
+          title: "苏州丝绸数字资产",
+          price: "159",
+          coverUrl:
+            "https://images.unsplash.com/photo-1578662996442-48f60103fc96?auto=format&fit=crop&w=400",
+          publishQuantity: 800,
+          purchaseQuantity: 234,
+          viewQuantity: 1560,
+          type: true,
+        },
+      ];
+    },
+
+    // 排序处理
+    handleSort(sortType) {
+      this.sortValue = sortType;
+      this.loadCollectionList();
+    },
+
+    // 取消收藏
+    handleUnlikeClick(item, index) {
+      uni.showModal({
+        title: "取消收藏",
+        content: "确定要取消收藏这个商品吗？",
+        success: (res) => {
+          if (res.confirm) {
+            this.Post(
+              {
+                packageId: item.benefitPackageId,
+                type: false,
+              },
+              "/framework/benefitPackage/collect",
+              "DES"
+            )
+              .then((res) => {
+                // 从列表中移除
+                this.collectionList.splice(index, 1);
+                uni.showToast({
+                  title: "已取消收藏",
+                  icon: "success",
+                });
+              })
+              .catch((error) => {
+                console.error("取消收藏失败:", error);
+                // 模拟成功
+                this.collectionList.splice(index, 1);
+                uni.showToast({
+                  title: "已取消收藏",
+                  icon: "success",
+                });
+              });
+          }
+        },
+      });
+    },
+
+    // 跳转到商品详情
+    goToDetail(item) {
+      uni.navigateTo({
+        url: `/subPackages/equityGoods/detail?id=${item.benefitPackageId}`,
+      });
+    },
+
+    // 跳转到发现页面
+    goToDiscover() {
+      uni.navigateTo({
+        url: "/subPackages/equityGoods/list",
+      });
+    },
+  },
+};
+</script>
+
+<style>
+page {
+  background-color: #f5f5f5;
+}
+</style>
+
+<style lang="scss" scoped>
+.collection-page {
+  min-height: 100vh;
+  background: #f5f5f5;
+  padding-bottom: 40rpx;
+}
+
+.header-section {
+  padding: 60rpx 30rpx 30rpx;
+
+  .title {
+    font-size: 36rpx;
+    color: #000000;
+    text-align: center;
+    margin-bottom: 30rpx;
+    padding-bottom: 30rpx;
+    font-weight: 500;
+    border-bottom: 0.5rpx solid #999999;
+  }
+
+  .filter-buttons {
+    display: flex;
+    justify-content: space-between;
+    gap: 40rpx;
+
+    .filter-btn {
+      font-size: 28rpx;
+      color: #000000;
+      border-radius: 20rpx;
+      transition: all 0.3s;
+      padding: 12rpx 24rpx;
+
+      &.active {
+        background: #007aff;
+        color: white;
+      }
+    }
+  }
+}
+
+.products-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 20rpx;
+  padding: 30rpx;
+
+  .product-item {
+    overflow: hidden;
+    background: white;
+    border-radius: 16rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+    transition: all 0.3s ease;
+
+    &:active {
+      transform: scale(0.98);
+      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.12);
+    }
+
+    .product-image {
+      width: 100%;
+      height: 429rpx;
+      object-fit: cover;
+      border-radius: 20rpx;
+    }
+
+    .product-info {
+      padding: 20rpx 24rpx 24rpx;
+
+      .product-title {
+        font-size: 22rpx;
+        color: #000000;
+        margin-bottom: 16rpx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-weight: 500;
+      }
+
+      .product-price {
+        font-size: 36rpx;
+        font-weight: 500;
+        color: #000000;
+      }
+
+      .product-details {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .detail-item {
+          font-size: 18rpx;
+          color: #808080;
+        }
+      }
+    }
+  }
+}
+
+// 空状态样式
+.empty-state {
+  padding: 80rpx 30rpx;
+  min-height: 80vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .empty-content {
+    text-align: center;
+    max-width: 400rpx;
+
+    .empty-icon {
+      width: 120rpx;
+      height: 120rpx;
+      margin: 0 auto 40rpx;
+      opacity: 0.6;
+    }
+
+    .empty-title {
+      font-size: 32rpx;
+      color: #666666;
+      font-weight: 500;
+      margin-bottom: 20rpx;
+    }
+
+    .empty-desc {
+      font-size: 26rpx;
+      color: #999999;
+      line-height: 1.5;
+      margin-bottom: 16rpx;
+    }
+
+    .empty-tip {
+      font-size: 24rpx;
+      color: #bbbbbb;
+      line-height: 1.4;
+      margin-bottom: 40rpx;
+    }
+
+    .empty-action {
+      display: inline-block;
+      padding: 20rpx 40rpx;
+      background: #007aff;
+      border-radius: 40rpx;
+      transition: all 0.3s;
+
+      &:active {
+        transform: scale(0.95);
+        background: #0056cc;
+      }
+
+      .action-text {
+        font-size: 28rpx;
+        color: white;
+        font-weight: 500;
+      }
+    }
+  }
+}
+
+.heart-icon {
+  width: 35rpx;
+  height: 30rpx;
+  transition: all 0.3s ease;
+  flex-shrink: 0;
+  top: -2rpx;
+  position: relative;
+  margin-right: 6rpx;
+
+  &.liked {
+    opacity: 1;
+    filter: hue-rotate(320deg) saturate(2);
+  }
+
+  &:active {
+    transform: scale(1.2);
+  }
+}
+
+.product-price-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10rpx;
+}
+</style>
diff --git a/utils/request.js b/utils/request.js
index a153675..5654641 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -10,9 +10,9 @@
  * @returns {Promise} - 返回Promise对象
  */
 
-const DOMAIN = 'https://m.dayunyuanjian.com';
-
 export const request = (options = {}) => {
+	const DOMAIN = 'https://m.dayunyuanjian.com';
+	
 	return new Promise((resolve, reject) => {
 		options.url = options.url.startsWith('/') ? `${DOMAIN}${options.url}` : options.url;
 		// 默认配置